From c356ebfc46d6f98afb6eebc252db2db6718e25f2 Mon Sep 17 00:00:00 2001
From: zuozhengqing <a13193816592@163.com>
Date: 星期六, 28 十月 2023 15:58:18 +0800
Subject: [PATCH] Merge branch 'dev' of http://192.168.5.5:10010/r/web/WMS into dev

---
 src/views/overview/AddOverviewDialog.vue |   13 +++++++------
 1 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/src/views/overview/AddOverviewDialog.vue b/src/views/overview/AddOverviewDialog.vue
index 1b83e7d..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>
@@ -275,7 +275,7 @@
   updateOperation,
   updateStatus,
   deleteOperation,
-  getOperationType
+  getListTransfer
 } from "@/api/overview/overview"
 import { getCompanyList } from "@/api/common/other"
 export default {
@@ -357,7 +357,7 @@
     this.getLocationList()
     this.receiptType = this.editConfig.title === "鏌ョ湅" ? this.editConfig.infomation.operationTypeName : this.addName
     if (this.showOperationType) {
-      this.getOperationType()
+      this.getListTransfer()
     }
   },
   methods: {
@@ -374,6 +374,7 @@
     async getLocationList() {
       await getLocationList({
         keyWord: "",
+        jointName:this.editConfig.code,
         page: 0,
         pageSize: 0
       }).then((res) => {
@@ -384,8 +385,8 @@
       })
     },
     // 鑾峰彇浠撳簱绫诲瀷
-    async getOperationType() {
-      await getOperationType({
+    async getListTransfer() {
+      await getListTransfer({
         keyword: "",
         page: 0,
         pageSize: 0

--
Gitblit v1.8.0