From e267aaa1629571bf8fc6cdcf80152c5558342425 Mon Sep 17 00:00:00 2001
From: haoxuan <haoxuan>
Date: 星期四, 21 九月 2023 16:52:26 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.5.5:10010/r/web/WMS

---
 src/views/overview/OverviewListView.vue |   48 +++++++++++++++++++++++++++++-------------------
 1 files changed, 29 insertions(+), 19 deletions(-)

diff --git a/src/views/overview/OverviewListView.vue b/src/views/overview/OverviewListView.vue
index 1f628c3..aab7906 100644
--- a/src/views/overview/OverviewListView.vue
+++ b/src/views/overview/OverviewListView.vue
@@ -27,14 +27,14 @@
       v-if="editConfig.visible"
       :work-type="workType"
       :edit-common-config="editConfig"
-      :add-name="this.$route.query.name"
+      :add-name="this.$route.params.name"
     />
   </div>
 </template>
 
 <script>
 import pageMixin from "@/components/makepager/pager/mixin/pageMixin"
-import { getProductList } from "@/api/product/product"
+import { getOperation } from "@/api/overview/overview"
 // import DetailProduct from "@/views/productManage/product/DetailProduct"
 import AddOverviewDialog from "@/views/overview/AddOverviewDialog"
 
@@ -59,12 +59,13 @@
         title: "鏂板缓",
         infomation: {}
       },
-      workType: this.$route.query.workType
+      workType: this.$route.params.workType
     }
   },
   created() {
     this.setTable()
     this.getData()
+    console.log(this.$route.params.workType)
   },
   methods: {
     setTable() {
@@ -88,37 +89,37 @@
       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
@@ -143,7 +144,7 @@
         },
         {
           label: "鏉ユ簮鍗曟嵁",
-          prop: "faultLevel",
+          prop: "sourceNumber",
           isShowColumn: showcol.includes("鏉ユ簮鍗曟嵁"),
           default: false
         },
@@ -165,7 +166,9 @@
           width: 120,
           isShowColumn: showcol.includes("鐘舵��"),
           default: false,
-          status: true
+          status: true,
+          isCallMethod: true,
+          getCallMethod: this.getStatus
         }
       ]
       return tableColumn
@@ -175,23 +178,23 @@
       this.tableList.tableColumn = this.setTableColumn(val)
     },
     // 璇锋眰鏁版嵁
-    async getData(val, content) {
-      await getProductList({
-        [val]: content,
+    async getData() {
+      await getOperation({
+        operationTypeId: this.$route.params.id,
         page: this.pagerOptions.currPage,
         pageSize: this.pagerOptions.pageSize
       }).then((res) => {
+        console.log(res.data.data)
         if (res.data.code === 200) {
-          const list = res.data.data.list.map((item) => {
+          const list = res.data.data.map((item) => {
             return {
               ...item,
-              supplierNumber: item.supplier.number,
-              status: "灏辩华",
-              preTime: "2023-09-04 11:20:00"
+              from: item.fromLocation.name,
+              to: item.toLocation.name
             }
           })
           this.tableList.tableInfomation = list || []
-          this.pagerOptions.totalCount = res.data.data.total
+          this.pagerOptions.totalCount = res.data.total
         }
       })
     },
@@ -204,12 +207,19 @@
       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