From 7a0c579c0cce5ae4420e2a9efe1e0cb913020deb Mon Sep 17 00:00:00 2001
From: x_z <zrhdyxa@163.com>
Date: Wed, 3 Aug 2022 08:41:28 +0800
Subject: [PATCH] =?UTF-8?q?1.=E4=BF=AE=E5=A4=8Dbug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/basic/BasicEntrutsReceModify.vue     |  2 +-
 src/views/basic/BussinessTypeThird.vue         | 12 ++++++++++--
 src/views/inventory/InvPreInProductsDetail.vue |  7 +++++--
 src/views/inventory/InvProducts.vue            |  3 +++
 src/views/inventory/InvProductsDetail.vue      |  7 +++++--
 src/views/inventory/invPreInProducts.vue       |  2 ++
 src/views/inventory/supInvProducts.vue         |  1 +
 src/views/thrsys/ThrProductsCheck.vue          |  2 +-
 8 files changed, 28 insertions(+), 8 deletions(-)

diff --git a/src/views/basic/BasicEntrutsReceModify.vue b/src/views/basic/BasicEntrutsReceModify.vue
index b684c6a..3baeccf 100644
--- a/src/views/basic/BasicEntrutsReceModify.vue
+++ b/src/views/basic/BasicEntrutsReceModify.vue
@@ -324,7 +324,6 @@ export default {
         },
 
         entrustSubInvChange() {
-
             let query = {
                 code: this.inputQuery.entrustSubInv,
             }
@@ -358,6 +357,7 @@ export default {
 
         this.getList();
         this.getStorage();
+
         // if (this.$isNotBlank(this.inputQuery.entrustInv)) {
         //     this.findEntrustSubInvByInv();
         // }
diff --git a/src/views/basic/BussinessTypeThird.vue b/src/views/basic/BussinessTypeThird.vue
index 8948082..526e825 100644
--- a/src/views/basic/BussinessTypeThird.vue
+++ b/src/views/basic/BussinessTypeThird.vue
@@ -41,10 +41,9 @@
 
       <el-table v-loading="loading" :data="list" style="width: 100%">
         <el-table-column label="序号" type="index" width="55"></el-table-column>
-
         <el-table-column label="单据类型名称" prop="name"></el-table-column>
         <el-table-column label="单据类型代码" prop="action"></el-table-column>
-        <el-table-column label="第三方系统" prop="thirdSys"></el-table-column>
+        <el-table-column label="第三方系统" prop="thirdSysName"></el-table-column>
         <el-table-column label="备注" prop="remark"></el-table-column>
         <el-table-column label="操作" width="100" fixed="right">
           <template slot-scope="scope">
@@ -195,6 +194,15 @@ export default {
           .then((response) => {
             this.loading = false;
             this.list = response.data.list || [];
+              if (this.list.length > 0) {
+                  this.list.forEach(item => {
+                      this.thirdSys.forEach(third => {
+                          if (item.thirdSys === third.thirdId) {
+                              item.thirdSysName = third.thirdName;
+                          }
+                      })
+                  })
+              }
             this.total = response.data.total || 0;
           })
           .catch(() => {
diff --git a/src/views/inventory/InvPreInProductsDetail.vue b/src/views/inventory/InvPreInProductsDetail.vue
index d335a0c..b9b0ef1 100644
--- a/src/views/inventory/InvPreInProductsDetail.vue
+++ b/src/views/inventory/InvPreInProductsDetail.vue
@@ -48,7 +48,7 @@
 
             <el-form-item>
                 <el-button-group>
-                    <el-button type="primary" icon="search" @click="getCodeList"
+                    <el-button type="primary" icon="search" @click="search"
                     >查询
                     </el-button
                     >
@@ -180,7 +180,10 @@ export default {
             this.query.page = val;
             this.getCodeList();
         },
-
+        search() {
+            this.query.page = 1;
+            this.getCodeList();
+        },
         getCodeList() {
             this.loading = true;
             this.query.productIdFk = this.idQuery.relIdFk;
diff --git a/src/views/inventory/InvProducts.vue b/src/views/inventory/InvProducts.vue
index bacd266..fada904 100644
--- a/src/views/inventory/InvProducts.vue
+++ b/src/views/inventory/InvProducts.vue
@@ -143,6 +143,8 @@
             :visible.sync="codeDetailVisible"
             width="85%"
             v-if="codeDetailVisible"
+            :close-on-click-modal="false"
+            :close-on-press-escape="false"
         >
             <codeDetail
                 :idQuery="idQuery"
@@ -241,6 +243,7 @@ export default {
         },
         onSubmit() {
             this.loading = true;
+            this.filterQuery.page = 1;
             this.getList();
         },
         handleSizeChange(val) {
diff --git a/src/views/inventory/InvProductsDetail.vue b/src/views/inventory/InvProductsDetail.vue
index 9591f1b..bf2c76c 100644
--- a/src/views/inventory/InvProductsDetail.vue
+++ b/src/views/inventory/InvProductsDetail.vue
@@ -82,7 +82,7 @@
 
             <el-form-item>
                 <el-button-group>
-                    <el-button type="primary" icon="search" @click="getCodeList"
+                    <el-button type="primary" icon="search" @click="search"
                     >查询
                     </el-button
                     >
@@ -220,7 +220,10 @@ export default {
             this.query.page = val;
             this.getCodeList();
         },
-
+        search() {
+            this.query.page = 1;
+            this.getCodeList();
+        },
         getCodeList() {
             this.loading = true;
             this.query.productIdFk = this.idQuery.relIdFk;
diff --git a/src/views/inventory/invPreInProducts.vue b/src/views/inventory/invPreInProducts.vue
index bdd291a..0c27593 100644
--- a/src/views/inventory/invPreInProducts.vue
+++ b/src/views/inventory/invPreInProducts.vue
@@ -121,6 +121,8 @@
             :visible.sync="codeDetailVisible"
             width="85%"
             v-if="codeDetailVisible"
+            :close-on-click-modal="false"
+            :close-on-press-escape="false"
         >
             <codeDetail
                 :idQuery="idQuery"
diff --git a/src/views/inventory/supInvProducts.vue b/src/views/inventory/supInvProducts.vue
index 5ae550a..f695d2c 100644
--- a/src/views/inventory/supInvProducts.vue
+++ b/src/views/inventory/supInvProducts.vue
@@ -157,6 +157,7 @@ export default {
     },
     onSubmit() {
       this.loading = true;
+      this.filterQuery.page = 1;
       this.getList();
     },
     handleSizeChange(val) {
diff --git a/src/views/thrsys/ThrProductsCheck.vue b/src/views/thrsys/ThrProductsCheck.vue
index ac8f165..351edc3 100644
--- a/src/views/thrsys/ThrProductsCheck.vue
+++ b/src/views/thrsys/ThrProductsCheck.vue
@@ -208,7 +208,7 @@ export default {
                 registerNo: null,
                 manufactory: null,
                 name: "",
-                thirdSys: null,
+                thirdSys: this.thirdSys[0].thirdId,
                 page: 1,
                 limit: 20,
             };