From c8b453780300005529c2b96106d132dbbd778b54 Mon Sep 17 00:00:00 2001
From: anthonywj <yewenjie20@vip.qq.com>
Date: Fri, 12 May 2023 21:19:53 +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

---
 .../basic/busType/bussinessTypeModify.vue     | 21 +++++++++++++-----
 src/views/inout/DialogCreateOrder.vue         | 22 +++++++++++++++++++
 src/views/inout/DialogNewReviewOrder.vue      | 16 +++++++++-----
 3 files changed, 49 insertions(+), 10 deletions(-)

diff --git a/src/views/basic/busType/bussinessTypeModify.vue b/src/views/basic/busType/bussinessTypeModify.vue
index fc37f2c0..58186c31 100644
--- a/src/views/basic/busType/bussinessTypeModify.vue
+++ b/src/views/basic/busType/bussinessTypeModify.vue
@@ -354,6 +354,7 @@
             <el-col span="5">
               <el-select v-model="inputQuery.scanPreIn" style="width: 65%"
                          :disabled=" inputQuery.mainAction == 'WareHouseIn' || inputQuery.corpType !== 1 || inputQuery.advancePreIn==1 || inputQuery.vailInv==1"
+                         @change="outChange"
                          placeholder="是否启用">
                 <el-option label="是" :value="true"></el-option>
                 <el-option label="否" :value="false"></el-option>
@@ -374,6 +375,7 @@
             <el-col span="5">
               <el-select v-model="inputQuery.advancePreIn" style="width: 65%"
                          :disabled=" inputQuery.mainAction == 'WareHouseIn' || inputQuery.corpType !== 1 || inputQuery.scanPreIn==1 || inputQuery.vailInv==1"
+                         @change="outChange"
                          placeholder="是否启用">
                 <el-option label="是" :value="true"></el-option>
                 <el-option label="否" :value="false"></el-option>
@@ -388,21 +390,22 @@
 
           <el-row>
             <el-col span="5">
-              <span class="sptext">允许单据库存0库存出库</span>
+              <span class="sptext">禁止单据库存0库存出库</span>
             </el-col>
             <el-divider direction="vertical"></el-divider>
             <el-col span="5">
               <el-select v-model="inputQuery.vailInv" style="width: 65%"
                          :disabled=" inputQuery.mainAction!= 'WareHouseOut' || inputQuery.advancePreIn==1 || inputQuery.scanPreIn==1"
+                         @change="outChange"
                          placeholder="是否启用"
               >
-                <el-option label="启用" :value="true"></el-option>
-                <el-option label="不启用" :value="false"></el-option>
+                <el-option label="是" :value="true"></el-option>
+                <el-option label="否" :value="false"></el-option>
               </el-select>
             </el-col>
             <el-divider direction="vertical"></el-divider>
             <el-col span="13">
-              <span class="sptext">允许单据库存0库存出库</span>
+              <span class="sptext">禁止单据库存0库存出库</span>
             </el-col>
           </el-row>
           <el-divider></el-divider>
@@ -415,7 +418,7 @@
             <el-divider direction="vertical"></el-divider>
             <el-col span="5">
               <el-select v-model="inputQuery.spaceOut" style="width: 65%"
-                         :disabled=" inputQuery.mainAction!= 'WareHouseOut'"
+                         :disabled=" inputQuery.mainAction!= 'WareHouseOut'  || (!inputQuery.scanPreIn && !inputQuery.advancePreIn && !inputQuery.vailInv)"
               >
                 <el-option label="无" :value="0"></el-option>
                 <el-option label="整单按指定货位出库" :value="1"></el-option>
@@ -1341,6 +1344,14 @@ export default {
         this.inputQuery.backPreinType = 1;
       }
     },
+    //禁用库存出库
+    outChange() {
+      if (!this.inputQuery.scanPreIn && !this.inputQuery.scanPreIn && !this.inputQuery.scanPreIn) {
+        this.inputQuery.spaceOut = 0;
+      }
+    },
+
+
     //获取单据类型
     getOrderType() {
       this.orderTypeList = []
diff --git a/src/views/inout/DialogCreateOrder.vue b/src/views/inout/DialogCreateOrder.vue
index 018b72b7..16dba6b8 100644
--- a/src/views/inout/DialogCreateOrder.vue
+++ b/src/views/inout/DialogCreateOrder.vue
@@ -196,6 +196,7 @@
               <el-select
                 style="width: 90%"
                 v-model="checkPreInArray"
+                :disabled="corpOrderIdDisabled"
                 multiple
                 placeholder="请选入单据"
               >
@@ -950,6 +951,27 @@ export default {
           return;
         }
       }
+
+      if (this.curSpaceShow) {
+        if (this.$isBlank(this.orderFormData.curSpaceCode)) {
+          this.$message.warning("请选择当前货位！");
+          return;
+        }
+      }
+      if (this.preInSpaceShow) {
+        if (this.$isBlank(this.orderFormData.checkPreInSpaceCode)) {
+          this.$message.warning("请选择预验收出库货位！");
+          return;
+        }
+      }
+      if (this.preSpaceShow) {
+        if (this.$isBlank(this.orderFormData.preCurSpaceCode)) {
+          this.$message.warning("请选择寄售出库货位！");
+          return;
+        }
+      }
+
+
       if (this.$isBlank(this.orderFormData.corpOrderId)) {
         let date = new Date();
         this.orderFormData.corpOrderId =
diff --git a/src/views/inout/DialogNewReviewOrder.vue b/src/views/inout/DialogNewReviewOrder.vue
index 6687dadb..557c4274 100644
--- a/src/views/inout/DialogNewReviewOrder.vue
+++ b/src/views/inout/DialogNewReviewOrder.vue
@@ -316,10 +316,16 @@ export default {
                 });
             } else {
               this.$message.success("匹配成功！");
+              if (event == null) {
+              } else event.target.select();
+              this.$refs.inputRef.select();
             }
 
           } else {
             this.$message.error(response.message);
+            if (event == null) {
+            } else event.target.select();
+            this.$refs.inputRef.select();
           }
 
 
@@ -464,21 +470,21 @@ export default {
     window.sc = new A.KeyScaner(inputer);//传入要监听的DOM节点
     sc.onInput = function (text) {
       if (text.includes("delete")) {
-        that.vailQuery.code = "";
+        that.udiCode = "";
+        that.sictomText = "";
+        that.originCode = "";
         return;
       }
       if (that.sitcomScan) {
         let tempTxt = text;
         let str = tempTxt.replace(/[\r]/g, "");
         that.sictomText = that.sictomText + str;
-        that.vailQuery.code = that.sictomText;
+        that.udiCode = that.sictomText;
       } else {
-        that.vailQuery.code = text;
+        that.udiCode = text;
       }
     };
     inputer.focus();
-
-
   },
   created() {