From 8aca9b7fcec5cc0aee5a7f85f15f21da89e7176b Mon Sep 17 00:00:00 2001
From: anthonywj <yewenjie20@vip.qq.com>
Date: Wed, 27 Jul 2022 16:08:41 +0800
Subject: [PATCH] =?UTF-8?q?bug=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/basic/BasicEntrutsRece.vue               |  2 +-
 src/views/basic/BussinessTypeThird.vue             |  8 ++++----
 src/views/basic/basicCompanyProducts.vue           |  2 +-
 src/views/thrsys/SysUdimsConfig.vue                | 10 +++++++++-
 src/views/warehouse/addOrder.vue                   |  1 -
 src/views/warehouse/stockOrderEditDistribution.vue |  1 -
 6 files changed, 15 insertions(+), 9 deletions(-)

diff --git a/src/views/basic/BasicEntrutsRece.vue b/src/views/basic/BasicEntrutsRece.vue
index 023835e..7adc99d 100644
--- a/src/views/basic/BasicEntrutsRece.vue
+++ b/src/views/basic/BasicEntrutsRece.vue
@@ -247,7 +247,7 @@ export default {
                 this.$message.error("请输入接受委托人！");
                 return;
             }
-            insertEntrustRece(this.inputQuery)
+            updateEntrustRece(this.inputQuery)
                 .then((response) => {
                     this.loading = false;
                     this.cancelDialog();
diff --git a/src/views/basic/BussinessTypeThird.vue b/src/views/basic/BussinessTypeThird.vue
index d1a87f5..38f6b13 100644
--- a/src/views/basic/BussinessTypeThird.vue
+++ b/src/views/basic/BussinessTypeThird.vue
@@ -29,7 +29,7 @@
                         <el-button type="primary" icon="el-icon-refresh" @click="onReset"></el-button>
                         <el-button type="primary" icon="search" @click="search">查询</el-button>
                         <el-button type="primary" icon="search" @click="handleAddClick"
-                                   :disabled="!configParms.typeBus"
+                                   :disabled="!configParms.typeThird"
                         >新增
                         </el-button
                         >
@@ -58,7 +58,7 @@
                         <el-button
                             type="text"
                             size="small"
-                            :disabled="!configParms.typeBus"
+                            :disabled="!configParms.typeThird"
                             @click.native.stop="handleDeleteClick(scope.row)"
                         >删除
                         </el-button
@@ -78,7 +78,7 @@
                 <modifyDialog :inputQuery="inputQuery"></modifyDialog>
                 <div style="text-align: center">
                     <el-button type="primary" size="small" icon="search" @click="onAddSubmit"
-                               :disabled="!configParms.typeBus"
+                               :disabled="!configParms.typeThird"
                     >提交
                     </el-button
                     >
@@ -100,7 +100,7 @@
                 <modifyDialog :inputQuery="inputQuery"></modifyDialog>
                 <div style="text-align: center">
                     <el-button type="primary" size="small" icon="search" @click="onModifySubmit"
-                               :disabled="!configParms.typeBus"
+                               :disabled="!configParms.typeThird"
                     >提交
                     </el-button
                     >
diff --git a/src/views/basic/basicCompanyProducts.vue b/src/views/basic/basicCompanyProducts.vue
index e67f095..0f19129 100644
--- a/src/views/basic/basicCompanyProducts.vue
+++ b/src/views/basic/basicCompanyProducts.vue
@@ -152,7 +152,7 @@
                             v-if="isSpCombine"
                             type="text"
                             size="small"
-                            :disabled="scope.row.thirdId==scope.row.nameCode  || scope.row.thirdId==null || scope.row.nameCode==null || scope.row.lockStatus===3"
+                            :disabled="scope.row.thirdId===scope.row.nameCode  || scope.row.thirdId==null || scope.row.nameCode==null || scope.row.lockStatus===3"
                             @click.native.stop="splitSelectUdi(scope.row)"
                         >拆分产品
                         </el-button>
diff --git a/src/views/thrsys/SysUdimsConfig.vue b/src/views/thrsys/SysUdimsConfig.vue
index 6dc3f4f..d4af4b8 100644
--- a/src/views/thrsys/SysUdimsConfig.vue
+++ b/src/views/thrsys/SysUdimsConfig.vue
@@ -196,6 +196,7 @@
                             <el-button
                                 type="text"
                                 size="small"
+                                :disabled="configQuery.downstreamEnable"
                                 @click.native="remveBus(scope.$index, scope.row)"
                             >移除
                             </el-button
@@ -380,7 +381,14 @@ export default {
             var selectData = this.multipleSelection;
             selectData.forEach((obj) => {
                 obj.outChange = false;
-                this.checkedBusTypes.push(obj);
+                let isPut = true;
+                for (let i = 0; i < this.checkedBusTypes.length; i++) {
+                    if (this.checkedBusTypes[i].action == obj.action) {
+                        isPut = false;
+                    }
+                }
+                if (isPut)
+                    this.checkedBusTypes.push(obj);
             });
             this.addBusDialogVisible = false;
         },
diff --git a/src/views/warehouse/addOrder.vue b/src/views/warehouse/addOrder.vue
index c4ead24..97efb68 100644
--- a/src/views/warehouse/addOrder.vue
+++ b/src/views/warehouse/addOrder.vue
@@ -574,7 +574,6 @@ export default {
             });
         },
         addCode(event) {
-            debugger
             console.log(this.formData)
             console.log(this.storageList)
             if (event == null) {
diff --git a/src/views/warehouse/stockOrderEditDistribution.vue b/src/views/warehouse/stockOrderEditDistribution.vue
index 8e5a035..ab7262c 100644
--- a/src/views/warehouse/stockOrderEditDistribution.vue
+++ b/src/views/warehouse/stockOrderEditDistribution.vue
@@ -575,7 +575,6 @@ export default {
                 this.thisData.stockOrderLists = this.codeArray;
                 this.thisData.formData = this.formData;
                 let item = this.getActionItem(this.formData.billType);
-                debugger
                 if (item.mainAction == 'WareHouseOut' && this.formData.noInvOut != true) {
                     this.invQueryData = {
                         locStorageCode: this.formData.locStorageCode,