From c07fcf502515f324d8c7ad1081180556541b89e1 Mon Sep 17 00:00:00 2001
From: anthonywj <yewenjie20@vip.qq.com>
Date: Tue, 16 Aug 2022 10:51:26 +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/warehouse/DialogSelectErpOrder.vue |  4 --
 src/views/warehouse/IOErrorOrder.vue         | 40 ++++++++++----------
 src/views/warehouse/addHosOrder.vue          | 15 +++++++-
 src/views/warehouse/addOrder.vue             |  9 ++++-
 src/views/warehouse/stockOrderEditor.vue     | 24 ++++++------
 5 files changed, 54 insertions(+), 38 deletions(-)

diff --git a/src/views/warehouse/DialogSelectErpOrder.vue b/src/views/warehouse/DialogSelectErpOrder.vue
index e666587..7fbd649 100644
--- a/src/views/warehouse/DialogSelectErpOrder.vue
+++ b/src/views/warehouse/DialogSelectErpOrder.vue
@@ -56,10 +56,6 @@
                             >导入比对
                             </el-button
                             >
-
-                            <!-- <el-button type="primary" icon="search" @click="combineErps"
-                              >合并下载</el-button
-                            > -->
                         </el-button-group>
                     </el-form-item>
                 </el-row>
diff --git a/src/views/warehouse/IOErrorOrder.vue b/src/views/warehouse/IOErrorOrder.vue
index 119d7fa..c454939 100644
--- a/src/views/warehouse/IOErrorOrder.vue
+++ b/src/views/warehouse/IOErrorOrder.vue
@@ -81,27 +81,27 @@
 
             </el-table-column>
             <el-table-column label="往来单位" prop="fromCorp" width="220">
-                <template slot-scope="scope">
-                    <p v-if="scope.row.fromCorp == null">
-                        <el-button
-                            type="primary"
-                            size="mini"
-                            @click.native.stop="handleUnitClick(scope.row)"
-                        >选择往来单位
-                        </el-button
-                        >
-                    </p>
-                    <p v-if="scope.row.fromCorp !== null">
-                        <el-button
-                            type="primary"
-                            size="mini"
-                            @click.native.stop="handleUnitClick(scope.row)"
-                        >{{ scope.row.fromCorp }}
-                        </el-button
-                        >
-                    </p>
+<!--                <template slot-scope="scope">-->
+                <!--                    <p v-if="scope.row.fromCorp == null">-->
+                <!--                        <el-button-->
+                <!--                            type="primary"-->
+                <!--                            size="mini"-->
+                <!--                            @click.native.stop="handleUnitClick(scope.row)"-->
+                <!--                        >选择往来单位-->
+                <!--                        </el-button-->
+                <!--                        >-->
+                <!--                    </p>-->
+                <!--                    <p v-if="scope.row.fromCorp !== null">-->
+                <!--                        <el-button-->
+                <!--                            type="primary"-->
+                <!--                            size="mini"-->
+                <!--                            @click.native.stop="handleUnitClick(scope.row)"-->
+                <!--                        >{{ scope.row.fromCorp }}-->
+                <!--                        </el-button-->
+                <!--                        >-->
+                <!--                    </p>-->
 
-                </template>
+                <!--                </template>-->
 
             </el-table-column>
             <el-table-column label="创建时间" prop="actDate" show-overflow-tooltip>
diff --git a/src/views/warehouse/addHosOrder.vue b/src/views/warehouse/addHosOrder.vue
index d356795..3444be6 100644
--- a/src/views/warehouse/addHosOrder.vue
+++ b/src/views/warehouse/addHosOrder.vue
@@ -784,12 +784,22 @@ export default {
 
                         });
                     } else if (response.code == 507) {
-                        this.editTitle = response.message;
                         this.editOriginCodeVisible = true;
+                        this.editTitle = response.message;
                         this.formData.produceDate = response.data.produceDate;
                         this.formData.expireDate = response.data.expireDate;
                         this.formData.batchNo = response.data.batchNo;
                         this.formData.serialNo = response.data.serialNo;
+
+                        this.$message({
+                            type: 'error',
+                            message: "提交失败！" + this.editTitle,
+                            customClass: 'messageIndex'
+                        });
+
+                        // this.$message.error("提交失败！" + this.editTitle);
+
+
                     } else {
                         this.$alert(response.message, '提示', {
                             confirmButtonText: '确定',
@@ -1204,6 +1214,9 @@ export default {
 
 
 <style>
+.messageIndex {
+    z-index: 9999 !important;
+}
 
 .ao-text {
     width: 100%;
diff --git a/src/views/warehouse/addOrder.vue b/src/views/warehouse/addOrder.vue
index 973e105..c3674c6 100644
--- a/src/views/warehouse/addOrder.vue
+++ b/src/views/warehouse/addOrder.vue
@@ -547,7 +547,7 @@ export default {
                     } else if (response.code == 508) {
                         this.originCode = "";
                         this.formData.code = "01" + response.data.nameCode;
-                        this.originCode =this.formData.code ;
+                        this.originCode = this.formData.code;
                         // this.$confirm("当前商品条码对应产品信息：\n" +
                         //     "DI标识:" + response.data.nameCode + "\n" +
                         //     "产品名称：" + response.data.cpmctymc + "\n" +
@@ -685,6 +685,13 @@ export default {
                         this.formData.expireDate = response.data.expireDate;
                         this.formData.batchNo = response.data.batchNo;
                         this.formData.serialNo = response.data.serialNo;
+
+                        this.$message({
+                            type: 'error',
+                            message: "提交失败！" + this.editTitle,
+                            customClass: 'messageIndex'
+                        });
+
                     } else {
                         this.$alert(response.message, '提示', {
                             confirmButtonText: '确定',
diff --git a/src/views/warehouse/stockOrderEditor.vue b/src/views/warehouse/stockOrderEditor.vue
index ec8da7c..2a3999c 100644
--- a/src/views/warehouse/stockOrderEditor.vue
+++ b/src/views/warehouse/stockOrderEditor.vue
@@ -534,18 +534,18 @@ export default {
             },
             distributionVisible: false,
             detailFormRules: {
-                batchNo: [
-                    {required: true, message: "请输入批次号", trigger: "blur"}
-                ],
-                productDate: [
-                    {required: true, message: "请输入生产日期", trigger: "blur"}
-                ],
-                expireDate: [
-                    {required: true, message: "请输入失效日期", trigger: "blur"}
-                ],
-                sweepCount: [
-                    {required: true, message: "请输入扫码数量", trigger: "blur"}
-                ]
+                // batchNo: [
+                //     {required: true, message: "请输入批次号", trigger: "blur"}
+                // ],
+                // productDate: [
+                //     {required: true, message: "请输入生产日期", trigger: "blur"}
+                // ],
+                // expireDate: [
+                //     {required: true, message: "请输入失效日期", trigger: "blur"}
+                // ],
+                // sweepCount: [
+                //     {required: true, message: "请输入扫码数量", trigger: "blur"}
+                // ]
             },
             detailFormVisible: false,
             detailFormData: {},