From 35edfc24f49a499de7d72a0c223eb1749e3ef267 Mon Sep 17 00:00:00 2001
From: x_z <zrhdyxa@163.com>
Date: Tue, 23 Aug 2022 17:34:15 +0800
Subject: [PATCH] =?UTF-8?q?1.=E4=BF=AE=E5=A4=8D=E9=83=A8=E5=88=86bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/basic/BussinessTypeModify.vue      |  1 +
 src/views/warehouse/AdditionalOrder.vue      | 32 ++++++++++----------
 src/views/warehouse/DialogChangeNewOrder.vue |  5 +--
 src/views/warehouse/stockOrderDelSearch.vue  |  4 +--
 src/views/warehouse/stockOrderDelete.vue     |  2 ++
 5 files changed, 23 insertions(+), 21 deletions(-)

diff --git a/src/views/basic/BussinessTypeModify.vue b/src/views/basic/BussinessTypeModify.vue
index 454c86e..08109a4 100644
--- a/src/views/basic/BussinessTypeModify.vue
+++ b/src/views/basic/BussinessTypeModify.vue
@@ -258,6 +258,7 @@ export default {
         if (this.inputQuery.mainAction != null && this.inputQuery.mainAction != "") {
             this.getOrderType();
         }
+        console.log(this.inputQuery);
         this.getList();
         this.getStorage();
 
diff --git a/src/views/warehouse/AdditionalOrder.vue b/src/views/warehouse/AdditionalOrder.vue
index bbf1384..67f9899 100644
--- a/src/views/warehouse/AdditionalOrder.vue
+++ b/src/views/warehouse/AdditionalOrder.vue
@@ -4,7 +4,7 @@
             <el-form :inline="true" :model="filterQuery" class="query-form" size="mini">
                 <el-row>
                     <el-form-item class="query-form-item">
-                        <el-input v-model="filterQuery.orderId" placeholder="单号"></el-input>
+                        <el-input v-model="filterQuery.orderId" placeholder="单号" clearable></el-input>
                     </el-form-item>
 
                     <el-form-item class="query-form-item">
@@ -78,13 +78,13 @@
                         <span>{{ scope.row.actDate }}</span>
                     </template>
                 </el-table-column>
-                <el-table-column label="校验状态" prop="contrastStatus" width="120">
+<!--                <el-table-column label="状态" prop="contrastStatus" width="120">
                     <template slot-scope="scope">
-                        <el-tag :type="(scope.row.contrastStatus === 1) | statusFilterType">
+                        <el-tag :type="(scope.row.status === 1) | statusFilterType">
                             {{ erpCheckStatus[scope.row.contrastStatus] }}
                         </el-tag>
                     </template>
-                </el-table-column>
+                </el-table-column>-->
                 <el-table-column label="单据状态" prop="status" width="100">
                     <template slot-scope="scope">
                         <el-tag :type="(scope.row.status == 3) | statusFilterType">{{
@@ -122,7 +122,7 @@
                         <el-button
                             type="text"
                             size="small"
-                            @click.native.stop="deleteDialog(scope.row.id)"
+                            @click.native.stop="deleteDialog(scope.row.orderId)"
                         >删除
                         </el-button
                         >
@@ -319,11 +319,7 @@ export default {
             },
             addType: "edit",
             deleteData: {
-                id: ""
-            },
-            erpCheckStatus: {
-                1: "异常",
-                0: "正常"
+                orderId: ""
             },
             dialogTableVisible: false,
             formLoading: false,
@@ -419,14 +415,18 @@ export default {
 
         deleteOrders(data) {
             this.loading = true;
-            this.deleteData.id = data;
+            this.deleteData.orderId = data;
             deleteByOrderId(this.deleteData)
                 .then((response) => {
-                    this.getList();
-                    this.$message({
-                        type: "success",
-                        message: "删除成功！"
-                    });
+                    if (response.code === 20000) {
+                        this.getList();
+                        this.$message({
+                            type: "success",
+                            message: "删除成功！"
+                        });
+                    } else {
+                        this.$message.error(response.message);
+                    }
                 })
                 .catch(() => {
                 });
diff --git a/src/views/warehouse/DialogChangeNewOrder.vue b/src/views/warehouse/DialogChangeNewOrder.vue
index 007ae65..338c56d 100644
--- a/src/views/warehouse/DialogChangeNewOrder.vue
+++ b/src/views/warehouse/DialogChangeNewOrder.vue
@@ -252,7 +252,8 @@ export default {
             let products = [];
             this.detailList.forEach(item => {
                 let product = {
-                    relId: item.relId,
+                    nameCode: item.nameCode,
+                    uuidFk: item.uuidFk,
                     batchNo: item.batchNo
                 };
                 products.push(product);
@@ -264,7 +265,7 @@ export default {
                 }
             })
             let tQuery = {
-                stockOrderId: this.curRow.id,
+                orderId: this.curRow.orderId,
                 locStorageCode: this.formData.locStorageCode,
                 action: this.formData.action,
                 mainAction: this.formData.mainAction,
diff --git a/src/views/warehouse/stockOrderDelSearch.vue b/src/views/warehouse/stockOrderDelSearch.vue
index c549d00..7cbb00f 100644
--- a/src/views/warehouse/stockOrderDelSearch.vue
+++ b/src/views/warehouse/stockOrderDelSearch.vue
@@ -375,7 +375,6 @@ export default {
             idQuery: {
                 id: ""
             },
-            distributionVisible: false,
             detailFormRules: {
                 batchNo: [
                     {required: true, message: "请输入批次号", trigger: "blur"}
@@ -593,11 +592,10 @@ export default {
             if (this.$isNotBlank(row.id)) {
                 this.idQuery.id = row.id;
                 this.idQuery.formData = row;
-                this.distributionVisible = true;
             }
         },
         closeDialog(type) {
-            this.distributionVisible = false;
+            this.stockChangeVisible = false;
             this.getList();
             if (this.$isNotBlank(type)) {
                 this.detailList = [];
diff --git a/src/views/warehouse/stockOrderDelete.vue b/src/views/warehouse/stockOrderDelete.vue
index b5c5a70..dcf2a97 100644
--- a/src/views/warehouse/stockOrderDelete.vue
+++ b/src/views/warehouse/stockOrderDelete.vue
@@ -166,6 +166,8 @@
             :visible.sync="codeDetailVisible"
             width="80%"
             v-if="codeDetailVisible"
+            :close-on-click-modal="false"
+            :close-on-press-escape="false"
         >
             <codeReplace
                 :idQuery="idQuery"