From d68b036a3b3c67273b8effa3c9925ef3869a91ba Mon Sep 17 00:00:00 2001
From: haoxuan <haoxuan>
Date: 星期三, 07 二月 2024 13:56:50 +0800
Subject: [PATCH] wms项目 wms系统参数设置的页面开发+路由+是否显示表头配置

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

diff --git a/src/views/overview/OverviewListView.vue b/src/views/overview/OverviewListView.vue
index fc3a8d8..974ba53 100644
--- a/src/views/overview/OverviewListView.vue
+++ b/src/views/overview/OverviewListView.vue
@@ -1,8 +1,8 @@
 <template>
   <div class="rightContent">
-    <div class="label-fixed-element">
+    <!-- <div class="label-fixed-element">
       <span>{{ params.name }}</span>
-    </div>
+    </div> -->
     <div class="top">
       <SearchCommonView
         :add-title="'鏂板缓'"
@@ -22,7 +22,7 @@
               <template slot-scope="scope">
                 <el-button @click="tableRowClick(scope.row, '鏌ョ湅')" type="text" size="small">鏌ョ湅</el-button>
                 <el-button
-                  v-if="scope.row.status !== 4"
+                  v-if="scope.row.status !== 4 && scope.row.status !== 5"
                   @click="tableRowClick(scope.row, '缂栬緫')"
                   type="text"
                   size="small"
@@ -40,7 +40,7 @@
     <!-- 鏂板缓/缂栬緫 -->
     <AddOverviewDialog
       v-if="editConfig.visible"
-      :work-type="workType"
+      :workType="workType"
       :edit-common-config="editConfig"
       :add-name="addName"
       :display-edit="displayEdit"
@@ -82,11 +82,11 @@
       formLabel: "",
       toLabel: "",
       addName: "",
-      searchTaskMap: []
+      searchTaskMap: [],
+      numberLabel: "鍗曞彿"
     }
   },
   created() {
-    console.log(this.workType)
     this.setFormToLabel()
     this.setTable()
     var paramsData = sessionStorage.getItem("paramsData")
@@ -112,12 +112,15 @@
       if (this.workType === 1) {
         this.formLabel = "渚涘簲鍟嗕綅缃�"
         this.toLabel = "浠撳簱浣嶇疆"
+        this.numberLabel = "鍏ュ簱鍗曞彿"
       } else if (this.workType === 2) {
         this.formLabel = "浠撳簱浣嶇疆"
         this.toLabel = "瀹㈡埛浣嶇疆"
+        this.numberLabel = "鍑哄簱鍗曞彿"
       } else {
         this.formLabel = "璋冨嚭浣嶇疆"
         this.toLabel = "璋冨叆浣嶇疆"
+        this.numberLabel = "璋冩嫧鍗曞彿"
       }
     },
     setTable() {
@@ -141,7 +144,7 @@
     setTableColumn(showcol) {
       let tableColumn = [
         {
-          label: "鍗曞彿",
+          label: this.numberLabel,
           prop: "number",
           isShowColumn: true,
           default: true
@@ -234,7 +237,7 @@
     async getData() {
       await getOperation({
         number: this.keyword,
-        operationTypeId: this.params.id,
+        operationTypeId: this.$route.params.id ? this.$route.params.id : this.params.id,
         page: this.pagerOptions.currPage,
         pageSize: this.pagerOptions.pageSize,
         status: this.params.status
@@ -244,8 +247,8 @@
           const list = res.data.map((item) => {
             return {
               ...item,
-              from: item.fromLocation.name,
-              to: item.toLocation.name
+              from: item.location.jointName,
+              to: item.location.jointName
             }
           })
           this.tableList.tableInfomation = list || []
@@ -262,25 +265,42 @@
     },
     // 鏌ョ湅 缂栬緫
     tableRowClick(row, val) {
-      console.log(row)
       this.editConfig.visible = true
       this.editConfig.title = val
       this.editConfig.operationTypeId = this.params.id
+      this.editConfig.code = this.params.code
+      row.details.map((item)=>{
+        item.fromLocationId=item.fromLocation.jointName
+        item.toLocationId=item.toLocation.jointName
+      })
+      row.location={
+        value:row.location.id||row.location.value,
+        label:row.location.jointName||row.location.label
+      }
+      row.toLocation={
+        value:row.toLocation.id||row.toLocation.value,
+        label:row.toLocation.jointName||row.toLocation.label
+      }
+      row.locationID=row.location.jointName
+      row.locationId=row.location.value
+      
+      // row.tolocationId=row.tolocation.value
       this.editConfig.infomation = { ...row }
     },
     // 鏂板缓
     addBtnClick() {
       this.editConfig.title = "鏂板缓"
       this.addName = this.params.name
-      console.log(this.params, "ss鍒锋柊")
       this.editConfig.operationTypeId = this.params.id
       this.editConfig.code = this.params.code
-      this.editConfig.infomation = {}
+      this.editConfig.infomation = {
+        // location:{jointName:""}
+      }
       this.editConfig.visible = true
     },
     // 鐘舵��
     getStatus(val) {
-      return val === 1 ? "鑽夌" : val === 3 ? "灏辩华" : val === 4 ? "瀹屾垚" : ""
+      return val === 1 ? "鑽夌" : val === 3 ? "灏辩华" : val === 4 ? "瀹屾垚" : val === 5 ? "鍙栨秷" : ""
     },
     // 鍒犻櫎鎼滅储鐘舵��
     delSelectClick() {

--
Gitblit v1.8.0