From 545e8b206914ab9d7efbda38a89b642b02588adc Mon Sep 17 00:00:00 2001
From: x_z <zrhdyxa@163.com>
Date: Mon, 12 Dec 2022 18:08:06 +0800
Subject: [PATCH] =?UTF-8?q?1.=E4=BF=AE=E6=94=B9=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 |  4 ++--
 src/views/basic/invWarehouse.vue        | 22 +++++++++++--------
 src/views/inout/IOAddOrder.vue          | 28 ++++++++++++++-----------
 3 files changed, 31 insertions(+), 23 deletions(-)

diff --git a/src/views/basic/BussinessTypeModify.vue b/src/views/basic/BussinessTypeModify.vue
index 4c85732..654827e 100644
--- a/src/views/basic/BussinessTypeModify.vue
+++ b/src/views/basic/BussinessTypeModify.vue
@@ -256,7 +256,7 @@
                     </el-checkbox>
                     <el-checkbox v-model="inputQuery.scanPreIn" :disabled="inputQuery.corpType!='2'">出库时必须校验预验收库存
                     </el-checkbox>
-                    <el-checkbox v-model="inputQuery.vailInv" :disabled="inputQuery.mainAction!='WareHouseOut'">是否允许无库存出库
+                    <el-checkbox v-model="inputQuery.vailInv" :disabled="inputQuery.mainAction!='WareHouseOut'">是否只允许有库存产品出库
                     </el-checkbox>
                     <el-checkbox v-model="inputQuery.codeFillCheck">采集UDI码时进行三期校验
                     </el-checkbox>
@@ -579,7 +579,7 @@ export default {
         ,
         //获取单据类型
         getOrderType() {
-            
+
             this.orderTypeList = [];
             let query = {
                 mainAction: this.inputQuery.mainAction,
diff --git a/src/views/basic/invWarehouse.vue b/src/views/basic/invWarehouse.vue
index cb01c64..125be46 100644
--- a/src/views/basic/invWarehouse.vue
+++ b/src/views/basic/invWarehouse.vue
@@ -353,7 +353,7 @@
             </div>
 
         </el-dialog>
-        
+
         <!--添加单据类型弹窗---->
  <!--添加单据类型弹窗-->
  <el-dialog
@@ -388,7 +388,7 @@
                         </el-button
                         >
                     </template>
-                 
+
                 </el-table-column>
             </el-table>
             <div slot="footer" class="dialog-footer">
@@ -1103,9 +1103,9 @@ export default {
                             }
                             this.$message.success("操作成功");
                             this.formVisible = false;
-                           
+
                             if (this.formName !== "edit") {
-                              
+
                                 if (response.data && response.data.id) {
                                     data.id = response.data.id;
                                     if (this.pidData) {
@@ -1144,7 +1144,6 @@ export default {
                     this.subFormVisible = false;
                 } else {
                     this.$message.error(response.message);
-                    this.subFormVisible = false;
                 }
             }).catch(() => {
                 this.subFormVisible = false;
@@ -1309,6 +1308,7 @@ export default {
         },
         changeLevel(row) {
             this.formData.pcode = null;
+            this.formData.spUse = false;
             //TODO
             this.getParentInv(this.formData.level);
         },
@@ -1439,7 +1439,7 @@ export default {
                 var action=obj.toString();
                 this.bussinessTypeQuery.ids=action;
             }
-           
+
             this.bussinessTypeQuery.code=this.busQuery.code;
             getJoinBussinessType(this.bussinessTypeQuery).then((res) => {
                 this.selectBussinessTypeList = [];
@@ -1540,12 +1540,16 @@ export default {
                 this.getBussinessType(1,action);
         },
         selsectBussinessType(row){
+            if (this.currentRow.id !== row.id) {
+                this.$message.error("请先选择需要操作的分库！");
+                return;
+            }
           var busQuery = {
                       code: this.currentCode,
                       page: 1,
                       limit: 50
-                  }
-           
+                  };
+
           warehouseBussinessTypeList(busQuery).then((res) => {
                   this.userBussinessTypeList = res.data.list;
               }).catch((error) => {
@@ -1596,7 +1600,7 @@ export default {
                         limit: 50
                     }
                     warehouseBussinessTypeList(busQuery).then((res) => {
-                     
+
                         this.userBussinessTypeList = res.data.list || [];
                     }).catch((error) => {
                     });
diff --git a/src/views/inout/IOAddOrder.vue b/src/views/inout/IOAddOrder.vue
index 6d93cca..350e704 100644
--- a/src/views/inout/IOAddOrder.vue
+++ b/src/views/inout/IOAddOrder.vue
@@ -651,7 +651,7 @@ export default {
                 code: this.formData.code.trim(),
             }
             enterCodeWeb(tQuery).then((response) => {
-             
+
                 if (response.code === 20000) {
                     this.$refs.inputRef.focus();
                     this.$refs.inputRef.select();
@@ -700,7 +700,7 @@ export default {
             });
         },
         addCode(event) {
-        
+
             this.originCode = "";
             this.sictomText = "";
             this.formData.corpOrderId = this.formData.corpOrderId.trim();
@@ -765,7 +765,7 @@ export default {
 
         },
         addCodeSubmit(tQuery) {
-          
+
             addOrderWeb(tQuery).then((response) => {
                 if (response.code === 20000) {
                     this.idQuery.id = response.data.orderId;
@@ -834,10 +834,14 @@ export default {
 
 
                     } else {
-                        this.$message({
-                            type: 'error',
-                            message: "提交失败！" + this.editTitle,
-                            customClass: 'messageIndex'
+                        this.$alert(response.message, '提示', {
+                            confirmButtonText: '确定',
+                            type: 'warning',
+                            closeOnClickModal: true,
+                            callback: action => {
+                                this.$refs.inputRef.focus();
+                                this.$refs.inputRef.select();
+                            }
                         });
                     }
                 }
@@ -930,7 +934,7 @@ export default {
             }
             getLocalJoinByUser(query)
                 .then((response) => {
-                        
+
                         this.busTypes = response.data.list || [];
                         if (this.formData.action != null) {
                             this.curAction = this.getActionItem(this.formData.action);
@@ -968,7 +972,7 @@ export default {
         }
         ,
         findMethod(query) {
-          
+
             this.fromOptions = [];
             let cQuery = {
                 key: query,
@@ -1099,7 +1103,7 @@ export default {
         }
         ,
         actionChange(item) {
-    
+
             this.curAction = this.getActionItem(item);
             this.findMethod();
 
@@ -1223,11 +1227,11 @@ export default {
     }
     ,
     created() {
-        
+
         this.formData.code = '';
         this.formData.actDate = new Date();
         this.codeArray = [];
-       
+
         this.getStorage(this.formData.action);
 
         if (this.$isNotBlank(this.idQuery.id)) {