From dd9467279ac4f18bf6d08560c4dea74e80b89bdd Mon Sep 17 00:00:00 2001
From: x_z <zrhdyxa@163.com>
Date: Thu, 28 Apr 2022 16:02:55 +0800
Subject: [PATCH] =?UTF-8?q?1.=E4=BF=AE=E6=94=B9=E5=8D=95=E6=8D=AE=E7=B1=BB?=
 =?UTF-8?q?=E5=9E=8B=E5=BC=B9=E7=AA=97=E9=A1=B5=E9=9D=A2=E6=A0=B7=E5=BC=8F?=
 =?UTF-8?q?=EF=BC=8C=E7=BC=A9=E5=B0=8F=E5=BC=B9=E7=AA=97=E6=AF=94=E4=BE=8B?=
 =?UTF-8?q?=202.=E4=BF=AE=E5=A4=8D=E8=80=97=E6=9D=90=E5=AD=97=E5=85=B8?=
 =?UTF-8?q?=E9=A1=B5=E9=9D=A2=E7=BC=96=E8=BE=91=E6=97=A0=E6=95=88=E9=97=AE?=
 =?UTF-8?q?=E9=A2=98=203.=E5=BE=85=E5=A4=84=E7=90=86=E5=8D=95=E6=8D=AE?=
 =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E5=8F=82=E6=95=B0=E8=B0=83=E6=95=B4=EF=BC=8C?=
 =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E6=97=A0=E6=B3=95=E6=9F=A5=E8=AF=A2=E5=88=B0?=
 =?UTF-8?q?=E6=95=B0=E6=8D=AE=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/BussinessType.vue        |  2 +-
 src/views/basic/BussinessTypeModify.vue  |  5 ++++-
 src/views/basic/UdiInfoManage.vue        | 23 ++++++++++++++++++-----
 src/views/warehouse/ioNewOrder.vue       |  2 +-
 src/views/warehouse/stockOrderSearch.vue |  2 +-
 5 files changed, 25 insertions(+), 9 deletions(-)

diff --git a/src/views/basic/BussinessType.vue b/src/views/basic/BussinessType.vue
index 025260b..6d89944 100644
--- a/src/views/basic/BussinessType.vue
+++ b/src/views/basic/BussinessType.vue
@@ -103,7 +103,7 @@
             <el-dialog
                 title="编辑扫码单据类型"
                 :visible.sync="modifyDialogVisible"
-                width="70%"
+                width="50%"
                 :close-on-click-modal="false"
                 :close-on-press-escape="false"
                 v-if="modifyDialogVisible"
diff --git a/src/views/basic/BussinessTypeModify.vue b/src/views/basic/BussinessTypeModify.vue
index 0b5f303..e86f859 100644
--- a/src/views/basic/BussinessTypeModify.vue
+++ b/src/views/basic/BussinessTypeModify.vue
@@ -116,12 +116,15 @@
                 </div>
             </el-col>
 
+        </el-row>
+
+        <el-row :gutter="20" class="el-row" type="flex">
             <el-col :span="12" class="el-col">
                 <div class="text item" style="margin-top: 6px">
                     <el-checkbox v-model="inputQuery.enable">启用单据类型</el-checkbox>
                     <el-checkbox v-model="inputQuery.genUnit" :disabled="inputQuery.corpType !=2">允许手动输入客户信息
                     </el-checkbox>
-                    <el-checkbox v-model="inputQuery.secCheckEnable">是否二次校验</el-checkbox>
+                    <el-checkbox v-model="inputQuery.secCheckEnable">是否二次复核</el-checkbox>
                 </div>
             </el-col>
         </el-row>
diff --git a/src/views/basic/UdiInfoManage.vue b/src/views/basic/UdiInfoManage.vue
index 091a9b2..8563be2 100644
--- a/src/views/basic/UdiInfoManage.vue
+++ b/src/views/basic/UdiInfoManage.vue
@@ -619,7 +619,7 @@
                     </el-col>
                     <el-col :span="3" class="el-col">
                         <el-form-item prop="name">
-                            <el-checkbox :disabled="!checked" v-model="editQuery.isDisable" class="text item itemTag"
+                            <el-checkbox :disabled="!checked" v-model="editQuery.disable" class="text item itemTag"
                                          @change="diableChange"
                             >是否禁用
                             </el-checkbox>
@@ -832,15 +832,22 @@ export default {
         },
         diableChange() {
             let query = {
-                relId: this.editQuery.id
+                relId: this.editQuery.id,
+                isDisable: this.editQuery.disable
             }
+            console.log(this.editQuery)
             disableUdi(query)
                 .then((response) => {
                     if (response.code != 20000) {
-                        this.editQuery.isDisable = false;
+                        this.editQuery.disable = false;
                         this.$message.error(response.message);
+                    } else {
+                        if (this.editQuery.disable){
+                            this.$message.success("已禁用");
+                        } else {
+                            this.$message.success("已取消禁用");
+                        }
                     }
-
                 })
                 .catch(() => {
                     this.loading = false;
@@ -850,11 +857,17 @@ export default {
         onAddSubmit() {
             this.checked = false;
             this.relevanceEdit = {
+                id: this.editQuery.id,
+                diType: this.editQuery.diType,
+                versionNumber: this.editQuery.versionNumber,
                 zxxsbzbhsydysl: this.editQuery.zxxsbzbhsydysl,
                 uuid: this.editQuery.uuid,
                 isUseDy: this.editQuery.isUseDy,
                 thirdId: this.editQuery.thirdId,
-                manufactory: this.editQuery.manufactory
+                manufactory: this.editQuery.manufactory,
+                isDisable: this.editQuery.isDisable,
+                sptm: this.editQuery.sptm,
+                ybbm: this.editQuery.ybbm
             };
             if (this.isUseDyValue === true) {
                 this.relevanceEdit.isUseDy = 1;
diff --git a/src/views/warehouse/ioNewOrder.vue b/src/views/warehouse/ioNewOrder.vue
index f365eee..08faada 100644
--- a/src/views/warehouse/ioNewOrder.vue
+++ b/src/views/warehouse/ioNewOrder.vue
@@ -221,7 +221,7 @@ export default {
                 id: "",
                 mainAction: null,
                 status: 1,
-                receiveStatus: 0,
+                receiveStatus: null,
                 action: null,
                 page: 1,
                 limit: 20
diff --git a/src/views/warehouse/stockOrderSearch.vue b/src/views/warehouse/stockOrderSearch.vue
index 279af25..76a3ab8 100644
--- a/src/views/warehouse/stockOrderSearch.vue
+++ b/src/views/warehouse/stockOrderSearch.vue
@@ -776,7 +776,7 @@
             },
             getStockOrderDetailList(row) {
                 if (this.$isNotBlank(row)) {
-                    this.detailQuery.orderIdFk = row.orderId;
+                    this.detailQuery.orderId = row.orderId;
                 }
                 this.detailLoading = true;
                 stockOrderDetail(this.detailQuery)