bug修改

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>

src/views/warehouse/IOErrorOrder.vue

@@ -81,27 +81,27 @@
 
             </el-table-column>
             <el-table-column label="往来单位" prop="fromCorp" width="220">
-                <template slot-scope="scope">
+<!--                <template slot-scope="scope">-->
-                    <p v-if="scope.row.fromCorp == null">
+                <!--                    <p v-if="scope.row.fromCorp == null">-->
-                        <el-button
+                <!--                        <el-button-->
-                            type="primary"
+                <!--                            type="primary"-->
-                            size="mini"
+                <!--                            size="mini"-->
-                            @click.native.stop="handleUnitClick(scope.row)"
+                <!--                            @click.native.stop="handleUnitClick(scope.row)"-->
-                        >选择往来单位
+                <!--                        >选择往来单位-->
-                        </el-button
+                <!--                        </el-button-->
-                        >
+                <!--                        >-->
-                    </p>
+                <!--                    </p>-->
-                    <p v-if="scope.row.fromCorp !== null">
+                <!--                    <p v-if="scope.row.fromCorp !== null">-->
-                        <el-button
+                <!--                        <el-button-->
-                            type="primary"
+                <!--                            type="primary"-->
-                            size="mini"
+                <!--                            size="mini"-->
-                            @click.native.stop="handleUnitClick(scope.row)"
+                <!--                            @click.native.stop="handleUnitClick(scope.row)"-->
-                        >{{ scope.row.fromCorp }}
+                <!--                        >{{ scope.row.fromCorp }}-->
-                        </el-button
+                <!--                        </el-button-->
-                        >
+                <!--                        >-->
-                    </p>
+                <!--                    </p>-->
 
-                </template>
+                <!--                </template>-->
 
             </el-table-column>
             <el-table-column label="创建时间" prop="actDate" show-overflow-tooltip>

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%;

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: '确定',

src/views/warehouse/stockOrderEditor.vue

@@ -534,18 +534,18 @@ export default {
             },
             distributionVisible: false,
             detailFormRules: {
-                batchNo: [
+                // batchNo: [
-                    {required: true, message: "请输入批次号", trigger: "blur"}
+                //     {required: true, message: "请输入批次号", trigger: "blur"}
-                ],
+                // ],
-                productDate: [
+                // productDate: [
-                    {required: true, message: "请输入生产日期", trigger: "blur"}
+                //     {required: true, message: "请输入生产日期", trigger: "blur"}
-                ],
+                // ],
-                expireDate: [
+                // expireDate: [
-                    {required: true, message: "请输入失效日期", trigger: "blur"}
+                //     {required: true, message: "请输入失效日期", trigger: "blur"}
-                ],
+                // ],
-                sweepCount: [
+                // sweepCount: [
-                    {required: true, message: "请输入扫码数量", trigger: "blur"}
+                //     {required: true, message: "请输入扫码数量", trigger: "blur"}
-                ]
+                // ]
             },
             detailFormVisible: false,
             detailFormData: {},