From f45b159864ad79f326884ab3644269ef9eb7ee9d Mon Sep 17 00:00:00 2001
From: zuozhengqing <a13193816592@163.com>
Date: 星期四, 04 一月 2024 11:49:16 +0800
Subject: [PATCH] 出入库bug修复,调整仓库位置字段绑定,编辑时列表绑定源位置

---
 src/views/overview/AddOverviewDialog.vue |    8 +++++---
 src/views/overview/OverviewListView.vue  |    6 +++---
 2 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/src/views/overview/AddOverviewDialog.vue b/src/views/overview/AddOverviewDialog.vue
index 70433e6..24a2468 100644
--- a/src/views/overview/AddOverviewDialog.vue
+++ b/src/views/overview/AddOverviewDialog.vue
@@ -468,7 +468,9 @@
     },
     workType: {
       type: Number,
-      default: 1
+      default: function() {  
+        return JSON.parse(window.sessionStorage.getItem('paramsData')).workType|| 1; 
+      }
     },
     addName: {
       type: String,
@@ -559,12 +561,12 @@
     }
     this.getLogisticCompanyList()
     this.formInfo()
-  },
-  mounted(){
     setTimeout(() => {
       this.$refs.tableView.setLocationList(this.editConfig.infomation.location.label)
     }, 100);
   },
+  mounted(){
+  },
   methods: {
     formInfo() {
       this.objCode.type = this.workType === 1 ? "鍏ュ簱缂栫爜" : this.workType === 2 ? "鍑哄簱缂栫爜" : "璋冩嫧缂栫爜"
diff --git a/src/views/overview/OverviewListView.vue b/src/views/overview/OverviewListView.vue
index d25c0ca..ed00252 100644
--- a/src/views/overview/OverviewListView.vue
+++ b/src/views/overview/OverviewListView.vue
@@ -247,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 || []
@@ -275,7 +275,7 @@
       })
       row.location={
         value:row.location.id||row.location.value,
-        label:row.location.jointName||row.location.jointName
+        label:row.location.jointName||row.location.label
       }
       row.locationID=row.location.jointName
       row.locationId=row.location.value

--
Gitblit v1.8.0