From ed6471bb48335555c7fb9977de4733d9624351bd Mon Sep 17 00:00:00 2001
From: x_z <zrhdyxa@163.com>
Date: Wed, 18 May 2022 18:28:54 +0800
Subject: [PATCH] =?UTF-8?q?1.=E4=BF=AE=E5=A4=8D=E5=90=AF=E7=94=A8=E5=A4=9A?=
 =?UTF-8?q?=E4=B8=AA=E7=AC=AC=E4=B8=89=E6=96=B9=E7=B3=BB=E7=BB=9F=E6=97=B6?=
 =?UTF-8?q?=EF=BC=8C=E7=AC=AC=E4=B8=89=E6=96=B9=E7=B3=BB=E7=BB=9F=E5=AD=97?=
 =?UTF-8?q?=E6=AE=B5=E5=9B=9E=E6=98=BE=E5=92=8C=E6=9F=A5=E8=AF=A2=E9=94=99?=
 =?UTF-8?q?=E8=AF=AF=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/thrsys/ThrInvWarehouse.vue | 49 ++++++++++++++++++++--------
 1 file changed, 36 insertions(+), 13 deletions(-)

diff --git a/src/views/thrsys/ThrInvWarehouse.vue b/src/views/thrsys/ThrInvWarehouse.vue
index 8a5cedb..475c55f 100644
--- a/src/views/thrsys/ThrInvWarehouse.vue
+++ b/src/views/thrsys/ThrInvWarehouse.vue
@@ -18,14 +18,12 @@
                     </el-select>
                 </el-form-item>
                 <el-form-item class="query-form-item">
-                    <el-select v-model="query.thirdSysFk" placeholder="请选择第三方系统" @change="sysChange">
+                    <el-select v-model="query.thirdSysFk" placeholder="请选择第三方系统" @change="thirdSysFkChange(query.thirdSysFk)">
                         <el-option
                             v-for="item in thirdSys"
-                            :key="item.value"
+                            :key="item.thirdId"
                             :label="item.thirdName"
-                            :value="item.thirdId">
-                            <span style="float: left">{{ item.thirdName }}</span>
-                            <span style="float: right; color: #8492a6; font-size: 13px">{{ item.thirdId }}</span>
+                            :value="item.thirdName">
                         </el-option>
                     </el-select>
                 </el-form-item>
@@ -74,11 +72,7 @@
                 <!--                        <span>{{ enableMap[scope.row.isDefault] }}</span>-->
                 <!--                    </template>-->
                 <!--                </el-table-column>-->
-                <el-table-column prop="thirdSysFk" label="第三方系统名称">
-                    <template slot-scope="scope">
-                        <span v-for="item in thirdSys" :key="item.thirdId">{{item.thirdName}}</span>
-                    </template>
-                </el-table-column>
+                <el-table-column prop="thirdName" label="第三方系统名称"></el-table-column>
 
                 <el-table-column label="操作" fixed="right">
                     <template slot-scope="scope">
@@ -217,7 +211,7 @@
                         <el-option
                             v-for="item in thirdSys"
                             :key="item.thirdId"
-                            :lable="item.thirdId"
+                            :lable="item.thirdName"
                             :value="item.thirdName"
                         >
                         </el-option>
@@ -372,7 +366,7 @@ export default {
             this.query = {
                 name: "",
                 status: "",
-                thirdSysFk: ""
+                thirdSysFk: null
             };
             this.getList();
         },
@@ -381,11 +375,15 @@ export default {
         },
         getList() {
             this.loading = true;
+            if (this.query.thirdSysFk != null) {
+                this.getQueryThirdSysFk(this.query.thirdSysFk);
+            }
             filterThrList(this.query)
                 .then((response) => {
                     this.loading = false;
                     this.mergeList = response.data.list || [];
                     this.treeList = response.data.tree_list || [];
+                    this.getQueryThirdSysFkName(this.query.thirdSysFk);
                 })
                 .catch(() => {
                     this.loading = false;
@@ -393,6 +391,20 @@ export default {
                     this.treeList = [];
                 });
         },
+        getQueryThirdSysFk(){
+            this.thirdSys.forEach((item) => {
+                if (item.thirdName == this.query.thirdSysFk) {
+                    this.query.thirdSysFk = item.thirdId;
+                }
+            })
+        },
+        getQueryThirdSysFkName(){
+            this.thirdSys.forEach((item) => {
+                if (item.thirdId == this.query.thirdSysFk) {
+                    this.query.thirdSysFk = item.thirdName;
+                }
+            })
+        },
         // 刷新表单
         resetForm() {
             if (this.$refs["dataForm"]) {
@@ -419,6 +431,13 @@ export default {
             this.formData = JSON.parse(JSON.stringify(formJson));
             if (formName === "edit") {
                 this.formData = Object.assign({}, data);
+                if (this.formData.thirdSysFk != null) {
+                    this.thirdSys.forEach((item) => {
+                        if (item.thirdId == this.formData.thirdSysFk) {
+                            this.formData.thirdSysFk = item.thirdName;
+                        }
+                    })
+                }
                 this.node = node;
             } else {
                 this.formData.code = no;
@@ -562,7 +581,6 @@ export default {
             getBasicThirdSys(query)
                 .then((response) => {
                     this.thirdSys = response.data.list || [];
-                    this.query.thirdSysFk = this.thirdSys[0].thirdId;
                 })
                 .catch(() => {
                     this.loading = false;
@@ -574,9 +592,11 @@ export default {
                 this.$message.warning("请选择需要下载的第三方系统");
                 return;
             }
+            this.getQueryThirdSysFk();
             let params = {
                 thirdSysFk: this.query.thirdSysFk
             }
+            this.getQueryThirdSysFkName();
             download(params).then((res) => {
                 if (res.code == 20000) {
                     this.$message.success("下载完成");
@@ -587,6 +607,9 @@ export default {
             }).catch((error) => {
                 this.$message.error("下载失败");
             })
+        },
+        thirdSysFkChange(thirdSysFk) {
+            console.log(thirdSysFk);
         }
     },
     filters: {