From c054059c05608b1c7235e18b3da0dfa095ebfe4d Mon Sep 17 00:00:00 2001
From: haoxuan <haoxuan>
Date: 星期五, 22 九月 2023 10:45:18 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.5.5:10010/r/web/WMS

---
 src/views/overview/OverviewListView.vue |   81 +++++++++++++++++++++++-----------------
 1 files changed, 47 insertions(+), 34 deletions(-)

diff --git a/src/views/overview/OverviewListView.vue b/src/views/overview/OverviewListView.vue
index 54e79fe..b5a8f1e 100644
--- a/src/views/overview/OverviewListView.vue
+++ b/src/views/overview/OverviewListView.vue
@@ -89,74 +89,74 @@
       let tableColumn = [
         {
           label: "鍗曞彿",
-          prop: "id",
+          prop: "number",
           isShowColumn: true,
           default: true
         },
         {
           label: "浠�",
-          prop: "deviceName",
+          prop: "from",
           isShowColumn: showcol.includes("浠�"),
           default: false
         },
         {
           label: "鑷�",
-          prop: "id",
+          prop: "to",
           isShowColumn: showcol.includes("鑷�"),
           default: false
         },
         {
           label: "鑱旂郴浜�",
-          prop: "deviceId",
+          prop: "companyName",
           isShowColumn: showcol.includes("鑱旂郴浜�"),
           default: false
         },
         {
           label: "璐熻矗浜�",
-          prop: "shopName",
+          prop: "contacterName",
           isShowColumn: showcol.includes("璐熻矗浜�"),
           default: false
         },
         {
           label: "鏃ユ湡",
-          prop: "preTime",
+          prop: "operationDate",
           isShowColumn: showcol.includes("鏃ユ湡"),
           default: false,
           date: true
         },
-        {
-          label: "浜у搧鍙敤鎬�",
-          prop: "status",
-          isShowColumn: showcol.includes("浜у搧鍙敤鎬�"),
-          default: false
-        },
-        {
-          label: "鎴鏃ユ湡",
-          prop: "faultTime",
-          isShowColumn: showcol.includes("鎴鏃ユ湡"),
-          default: false
-        },
-        {
-          label: "瀹為檯鏃ユ湡",
-          prop: "shopName",
-          isShowColumn: showcol.includes("瀹為檯鏃ユ湡"),
-          default: false
-        },
+        // {
+        //   label: "浜у搧鍙敤鎬�",
+        //   prop: "status",
+        //   isShowColumn: showcol.includes("浜у搧鍙敤鎬�"),
+        //   default: false
+        // },
+        // {
+        //   label: "鎴鏃ユ湡",
+        //   prop: "faultTime",
+        //   isShowColumn: showcol.includes("鎴鏃ユ湡"),
+        //   default: false
+        // },
+        // {
+        //   label: "瀹為檯鏃ユ湡",
+        //   prop: "shopName",
+        //   isShowColumn: showcol.includes("瀹為檯鏃ユ湡"),
+        //   default: false
+        // },
         {
           label: "鏉ユ簮鍗曟嵁",
-          prop: "faultLevel",
+          prop: "sourceNumber",
           isShowColumn: showcol.includes("鏉ユ簮鍗曟嵁"),
           default: false
         },
-        {
-          label: "娆犲崟",
-          prop: "status",
-          isShowColumn: showcol.includes("娆犲崟"),
-          default: false
-        },
+        // {
+        //   label: "娆犲崟",
+        //   prop: "status",
+        //   isShowColumn: showcol.includes("娆犲崟"),
+        //   default: false
+        // },
         {
           label: "鍏ュ簱绫诲瀷",
-          prop: "faultTime",
+          prop: "operationTypeName",
           isShowColumn: showcol.includes("鍏ュ簱绫诲瀷"),
           default: false
         },
@@ -166,7 +166,9 @@
           width: 120,
           isShowColumn: showcol.includes("鐘舵��"),
           default: false,
-          status: true
+          status: true,
+          isCallMethod: true,
+          getCallMethod: this.getStatus
         }
       ]
       return tableColumn
@@ -186,7 +188,9 @@
         if (res.data.code === 200) {
           const list = res.data.data.map((item) => {
             return {
-              ...item
+              ...item,
+              from: item.fromLocation.name,
+              to: item.toLocation.name
             }
           })
           this.tableList.tableInfomation = list || []
@@ -197,18 +201,27 @@
     // 鎼滅储
     getList(val) {
       console.log(val)
+      this.pagerOptions.currPage = 1
+      this.getData()
     },
     // 琛岀偣鍑�
     tableRowClick(row) {
       console.log(row)
       this.editConfig.visible = true
       this.editConfig.title = "缂栬緫"
+      this.editConfig.operationTypeId = this.$route.params.id
       this.editConfig.infomation = { ...row }
     },
     // 鏂板缓
     addBtnClick() {
       this.editConfig.visible = true
       this.editConfig.title = "鏂板缓"
+      this.editConfig.operationTypeId = this.$route.params.id
+      this.editConfig.infomation = {}
+    },
+    // 鐘舵��
+    getStatus(val) {
+      return val === 1 ? "鑽夌" : val === 3 ? "灏辩华" : "瀹屾垚"
     }
   }
 }

--
Gitblit v1.8.0