From 2d33e0c0fb91fbf58f7d7f415d56dffd96d6263b Mon Sep 17 00:00:00 2001
From: zuozhengqing <a13193816592@163.com>
Date: 星期一, 23 十月 2023 14:07:40 +0800
Subject: [PATCH] Merge branch 'dev' of http://192.168.5.5:10010/r/web/WMS into dev

---
 src/views/overview/AddOverviewDialog.vue |    5 +++--
 1 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/views/overview/AddOverviewDialog.vue b/src/views/overview/AddOverviewDialog.vue
index c101f61..19c0ba2 100644
--- a/src/views/overview/AddOverviewDialog.vue
+++ b/src/views/overview/AddOverviewDialog.vue
@@ -144,7 +144,7 @@
                     style="width: 90%"
                     :disabled="!showFooter"
                   >
-                    <el-option v-for="item in toLocationOptions" :key="item.id" :label="item.name" :value="item.id">
+                    <el-option v-for="item in toLocationOptions" :key="item.id" :label="item.jointName" :value="item.id">
                     </el-option>
                   </el-select>
                 </el-form-item>
@@ -158,7 +158,7 @@
                     style="width: 90%"
                     :disabled="!showFooter"
                   >
-                    <el-option v-for="item in toLocationOptions" :key="item.id" :label="item.name" :value="item.id">
+                    <el-option v-for="item in toLocationOptions" :key="item.id" :label="item.jointName" :value="item.id">
                     </el-option>
                   </el-select>
                 </el-form-item>
@@ -374,6 +374,7 @@
     async getLocationList() {
       await getLocationList({
         keyWord: "",
+        jointName:this.editConfig.code,
         page: 0,
         pageSize: 0
       }).then((res) => {

--
Gitblit v1.8.0