From d46cc1d8bfe04523a1602512e555d714a8745ab4 Mon Sep 17 00:00:00 2001
From: x_z <zrhdyxa@163.com>
Date: Mon, 1 Aug 2022 11:40:36 +0800
Subject: [PATCH 1/5] =?UTF-8?q?1.=E4=BF=AE=E6=94=B9=E6=90=9C=E7=B4=A2?=
 =?UTF-8?q?=E6=A1=86=E6=8F=90=E7=A4=BA=E4=BF=A1=E6=81=AF=202.=E5=88=87?=
 =?UTF-8?q?=E6=8D=A2=E5=8D=95=E6=8D=AE=E7=B1=BB=E5=9E=8B=E5=90=8C=E6=AD=A5?=
 =?UTF-8?q?=E6=B8=85=E7=A9=BA=E5=BE=80=E6=9D=A5=E4=BF=A1=E6=81=AF=203.?=
 =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E7=82=B9=E5=87=BB=E7=A9=BA=E7=99=BD=E5=A4=84?=
 =?UTF-8?q?=E5=85=B3=E9=97=AD=E5=BC=B9=E7=AA=97=E7=9A=84=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/basic/invWarehouse.vue           |  9 +++++----
 src/views/userManage/customerManage.vue    |  2 +-
 src/views/userManage/userAccountManage.vue | 11 ++---------
 src/views/warehouse/addHosOrder.vue        |  3 +++
 src/views/warehouse/addOrder.vue           |  1 +
 5 files changed, 12 insertions(+), 14 deletions(-)

diff --git a/src/views/basic/invWarehouse.vue b/src/views/basic/invWarehouse.vue
index 330eb9b..77c2927 100644
--- a/src/views/basic/invWarehouse.vue
+++ b/src/views/basic/invWarehouse.vue
@@ -677,7 +677,7 @@
             <el-form :inline="true" :model="thirdSubQuery" class="query-form" size="mini">
                 <el-form-item class="query-form-item">
                     <el-input
-                        v-model="thirdSubQuery.key"
+                        v-model="thirdSubQuery.name"
                         clearable
                         placeholder="分库名称"
                         style="width: 400px"
@@ -858,7 +858,7 @@ export default {
             },
             thirdSubQuery: {
                 parentId: null,
-                key: null,
+                name: null,
                 page: 1,
                 limit: 10,
                 thirdSysFk: "thirdId",
@@ -1599,10 +1599,11 @@ export default {
         },
 
         intentSubSelect(row) {
-
             if (row != null) {
                 this.thirdSubQuery.parentId = this.superRow.code;
-                this.thirdSubQuery.thirdSysFk = row.sysId;
+                if (row.sysId != null && row.sysId != undefined) {
+                    this.thirdSubQuery.thirdSysFk = row.sysId;
+                }
             }
             this.thrSubWarehouseData = [];
             this.thrSubWareHouseVisible = true;
diff --git a/src/views/userManage/customerManage.vue b/src/views/userManage/customerManage.vue
index 859a8dd..a24cafc 100644
--- a/src/views/userManage/customerManage.vue
+++ b/src/views/userManage/customerManage.vue
@@ -6,7 +6,7 @@
                     <el-input
                         style="width: 400px"
                         v-model="filterQuery.companyName"
-                        placeholder="客户名称"
+                        placeholder="企业名称"
                     ></el-input>
                 </el-form-item>
 
diff --git a/src/views/userManage/userAccountManage.vue b/src/views/userManage/userAccountManage.vue
index 8bbac1a..f91c602 100644
--- a/src/views/userManage/userAccountManage.vue
+++ b/src/views/userManage/userAccountManage.vue
@@ -96,6 +96,8 @@
             :before-close="hideForm"
             width="70%"
             top="5vh"
+            :close-on-click-modal="false"
+            :close-on-press-escape="false"
         >
             <el-form :model="formData" :rules="formRules" ref="dataForm">
                 <el-row :gutter="20" class="el-row" type="flex">
@@ -363,13 +365,6 @@ export default {
             }
         },
         formSubmit() {
-            console.log(
-                this.formData.userName +
-                "--222---" +
-                this.formData.employeeName +
-                this.formData.userFlag +
-                this.formData.id
-            );
             this.$refs["dataForm"].validate((valid) => {
                 if (valid) {
                     this.formLoading = true;
@@ -388,7 +383,6 @@ export default {
                         userName: this.formData.userName,
                         employeeName: this.formData.employeeName,
                     };
-                    console.log(savequery.id + "---");
                     authAdminSave(savequery, this.formName).then((response) => {
                         this.formLoading = false;
                         if (response.code !== 20000) {
@@ -410,7 +404,6 @@ export default {
                         this.resetForm();
                     });
                 } else {
-                    console.log("参数错误");
                 }
             });
         },
diff --git a/src/views/warehouse/addHosOrder.vue b/src/views/warehouse/addHosOrder.vue
index baa8079..dd9c15e 100644
--- a/src/views/warehouse/addHosOrder.vue
+++ b/src/views/warehouse/addHosOrder.vue
@@ -1024,6 +1024,9 @@ export default {
             this.$set(this.formData, "outChangeEnable", this.curAction.ullageFill);
             this.$set(this.formData, "codeFillCheck", this.curAction.codeFillCheck);
 
+            this.formData.fromCorp = null;
+            this.formData.fromSubInvCode = null;
+
             // this.formData.vailIn = this.curAction.vailInv;
             // this.formData.preCheck = this.curAction.scanPreIn;
             // this.formData.outChangeEnable = this.curAction.ullageFill;
diff --git a/src/views/warehouse/addOrder.vue b/src/views/warehouse/addOrder.vue
index 97efb68..f05c416 100644
--- a/src/views/warehouse/addOrder.vue
+++ b/src/views/warehouse/addOrder.vue
@@ -833,6 +833,7 @@ export default {
             this.curAction = this.getActionItem(item);
             this.$set(this.formData, "codeFillCheck", this.curAction.codeFillCheck);
             // this.formData.locStorageCode = this.curAction.storageCode;
+            this.formData.fromCorp = null;
         },
         //绑定数据
         bindRl(val) {

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 2/5] =?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,
             };

From b4b6e58cf98eccaa2572aaa491eb43d68c6b3bc6 Mon Sep 17 00:00:00 2001
From: x_z <zrhdyxa@163.com>
Date: Wed, 3 Aug 2022 17:34:28 +0800
Subject: [PATCH 3/5] =?UTF-8?q?1.=E4=BF=AE=E5=A4=8D=E5=BC=82=E5=B8=B8?=
 =?UTF-8?q?=E5=8D=95=E6=8D=AE=E8=AF=A6=E6=83=85=E6=95=B0=E9=87=8F=E6=98=BE?=
 =?UTF-8?q?=E7=A4=BA=E9=94=99=E8=AF=AF=E9=97=AE=E9=A2=98=202.=E4=BF=AE?=
 =?UTF-8?q?=E5=A4=8D=E4=B8=80=E4=BA=9B=E9=A1=B5=E9=9D=A2=E7=9A=84=E5=88=86?=
 =?UTF-8?q?=E9=A1=B5bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/inventory/invPreInProducts.vue    | 3 +--
 src/views/warehouse/IOCheckErrOrder.vue     | 4 ++--
 src/views/warehouse/errorCode.vue           | 2 +-
 src/views/warehouse/stockOrderDelSearch.vue | 4 +---
 src/views/warehouse/stockOrderNew.vue       | 2 ++
 src/views/warehouse/stockOrderSearch.vue    | 4 +---
 6 files changed, 8 insertions(+), 11 deletions(-)

diff --git a/src/views/inventory/invPreInProducts.vue b/src/views/inventory/invPreInProducts.vue
index 0c27593..d6ddc9f 100644
--- a/src/views/inventory/invPreInProducts.vue
+++ b/src/views/inventory/invPreInProducts.vue
@@ -207,6 +207,7 @@ export default {
         },
         onSubmit() {
             this.loading = true;
+            this.filterQuery.page = 1;
             this.getList();
         },
         handleSizeChange(val) {
@@ -233,7 +234,6 @@ export default {
             this.filterQuery.customerId = store.getters.customerId;
             filterProducts(this.filterQuery)
                 .then((response) => {
-                    console.log(response)
                     this.loading = false;
                     this.showSup = response.data.showSup;
                     this.list = response.data.list || [];
@@ -311,7 +311,6 @@ export default {
                 });
         },
         findMethod(query) {
-            console.log(query);
             this.fromOptions = [];
             let cQuery = {
                 key: query,
diff --git a/src/views/warehouse/IOCheckErrOrder.vue b/src/views/warehouse/IOCheckErrOrder.vue
index 7e2e8a5..7c47f02 100644
--- a/src/views/warehouse/IOCheckErrOrder.vue
+++ b/src/views/warehouse/IOCheckErrOrder.vue
@@ -308,13 +308,13 @@
                 ></el-table-column>
                 <el-table-column
                     label="单据数量"
-                    prop="reCount"
+                    prop="erpCount"
                     width="100"
                     :show-overflow-tooltip="true"
                 ></el-table-column>
                 <el-table-column
                     label="实际数量"
-                    prop="erpCount"
+                    prop="reCount"
                     width="100"
                     :show-overflow-tooltip="true"
                 ></el-table-column>
diff --git a/src/views/warehouse/errorCode.vue b/src/views/warehouse/errorCode.vue
index a11868d..ced106c 100644
--- a/src/views/warehouse/errorCode.vue
+++ b/src/views/warehouse/errorCode.vue
@@ -232,6 +232,7 @@ export default {
                 path: "",
                 query: this.query,
             });
+            this.query.page = 1;
             this.getCodeList();
         },
         handleSizeChange(val) {
@@ -280,7 +281,6 @@ export default {
         getCodeList() {
             this.loading = true;
             this.query.orderId = this.idQuery.id;
-            console.log(this.idQuery.id)
             errorCodeList(this.query) //查找该单号下的所有条码
                 .then((response) => {
                     this.loading = false;
diff --git a/src/views/warehouse/stockOrderDelSearch.vue b/src/views/warehouse/stockOrderDelSearch.vue
index 34497ec..20a48f4 100644
--- a/src/views/warehouse/stockOrderDelSearch.vue
+++ b/src/views/warehouse/stockOrderDelSearch.vue
@@ -689,9 +689,7 @@ export default {
                 .then((response) => {
                     this.detailLoading = false;
                     this.detailList = response.data.list || [];
-                    /*this.detailList.forEach(data => {
-                       data['edit'] = false;
-                    });*/
+                    this.detailTotal = response.data.total;
                 })
                 .catch(() => {
                     this.detailLoading = false;
diff --git a/src/views/warehouse/stockOrderNew.vue b/src/views/warehouse/stockOrderNew.vue
index 1f2eab9..c842466 100644
--- a/src/views/warehouse/stockOrderNew.vue
+++ b/src/views/warehouse/stockOrderNew.vue
@@ -600,6 +600,7 @@ export default {
                 this.query.startTime = null;
                 this.query.endTime = null;
             }
+            this.query.page = 1;
             this.getList();
             if (this.query.status === "502") {
                 this.haveNewDistributionVisible = true;
@@ -702,6 +703,7 @@ export default {
                 .then((response) => {
                     this.detailLoading = false;
                     this.detailList = response.data.list || [];
+                    this.detailTotal = response.data.total;
                 })
                 .catch(() => {
                     this.detailLoading = false;
diff --git a/src/views/warehouse/stockOrderSearch.vue b/src/views/warehouse/stockOrderSearch.vue
index e6e9e35..b2e8eca 100644
--- a/src/views/warehouse/stockOrderSearch.vue
+++ b/src/views/warehouse/stockOrderSearch.vue
@@ -618,7 +618,6 @@ export default {
         },
         handleEdit(index, row) {
             this.currentCheckIndex = index;
-            console.log(this.currentCheckIndex)
         },
         handleSave(index, row) {
             this.currentCheckIndex = -1;
@@ -635,7 +634,6 @@ export default {
             row.forEach((item) => {
                 _this.multipId.push(item.id);
             })
-            console.log(this.multipId);
         },
         batchSetParams(flag, type) {
             if (flag == '1' && type == 'salesListNo') {
@@ -807,9 +805,9 @@ export default {
             this.detailLoading = true;
             stockOrderDetail(this.detailQuery)
                 .then((response) => {
-                    console.log(response)
                     this.detailLoading = false;
                     this.detailList = response.data.list || [];
+                    this.detailTotal = response.data.total;
                 })
                 .catch(() => {
                     this.detailLoading = false;

From 1da604bf23b82e12074a66a907bb31eb7245c07d Mon Sep 17 00:00:00 2001
From: x_z <zrhdyxa@163.com>
Date: Wed, 3 Aug 2022 18:26:07 +0800
Subject: [PATCH 4/5] =?UTF-8?q?1.=E5=88=87=E6=8D=A2=E5=8D=95=E6=8D=AE?=
 =?UTF-8?q?=E7=B1=BB=E5=9E=8B=E4=B8=8D=E6=B8=85=E9=99=A4=E5=BE=80=E6=9D=A5?=
 =?UTF-8?q?=E5=8D=95=E4=BD=8D=E6=95=B0=E6=8D=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/warehouse/addOrder.vue | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/views/warehouse/addOrder.vue b/src/views/warehouse/addOrder.vue
index f05c416..752842d 100644
--- a/src/views/warehouse/addOrder.vue
+++ b/src/views/warehouse/addOrder.vue
@@ -431,6 +431,7 @@ export default {
                 action: this.formData.billType,
                 locStorageCode: this.formData.locStorageCode,
                 preCheck: this.formData.preCheck,
+                fromCorp: this.formData.fromCorp
             }
 
             submitOrderWeb(tQuery)
@@ -833,7 +834,7 @@ export default {
             this.curAction = this.getActionItem(item);
             this.$set(this.formData, "codeFillCheck", this.curAction.codeFillCheck);
             // this.formData.locStorageCode = this.curAction.storageCode;
-            this.formData.fromCorp = null;
+            // this.formData.fromCorp = null;
         },
         //绑定数据
         bindRl(val) {

From 83d7e374478a8239f59192ef9a5d65e95c35982c Mon Sep 17 00:00:00 2001
From: anthonywj <yewenjie20@vip.qq.com>
Date: Fri, 5 Aug 2022 15:11:40 +0800
Subject: [PATCH 5/5] =?UTF-8?q?=E5=95=86=E5=93=81=E6=9D=A1=E7=A0=81?=
 =?UTF-8?q?=E8=BD=ACUDI=E7=A0=81bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/warehouse/addHosOrder.vue | 1 +
 src/views/warehouse/addOrder.vue    | 1 +
 2 files changed, 2 insertions(+)

diff --git a/src/views/warehouse/addHosOrder.vue b/src/views/warehouse/addHosOrder.vue
index dd9c15e..002b3ed 100644
--- a/src/views/warehouse/addHosOrder.vue
+++ b/src/views/warehouse/addHosOrder.vue
@@ -639,6 +639,7 @@ export default {
                     } else if (response.code == 508) {
                         this.originCode = "";
                         this.formData.code = "01" + response.data.nameCode;
+                        this.originCode =this.formData.code ;
                     } else {
                         this.$alert(response.message, '提示', {
                             confirmButtonText: '确定',
diff --git a/src/views/warehouse/addOrder.vue b/src/views/warehouse/addOrder.vue
index 752842d..807d9e7 100644
--- a/src/views/warehouse/addOrder.vue
+++ b/src/views/warehouse/addOrder.vue
@@ -542,6 +542,7 @@ export default {
                     } else if (response.code == 508) {
                         this.originCode = "";
                         this.formData.code = "01" + response.data.nameCode;
+                        this.originCode =this.formData.code ;
                         // this.$confirm("当前商品条码对应产品信息：\n" +
                         //     "DI标识:" + response.data.nameCode + "\n" +
                         //     "产品名称：" + response.data.cpmctymc + "\n" +