From a56913828acf8243e48fa5bea9e449e100619229 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=83=91=E6=98=8E=E6=A2=81?= <2429105222@qq.com>
Date: Thu, 9 Mar 2023 09:32:28 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=B8=9A=E5=8A=A1bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/basic/product/productUdiType.vue    | 14 +++++++++-----
 src/views/inout/DialogSelectInvProduct.vue    | 19 ++++++++++++++++++-
 src/views/inout/receive/DialogNewReceive.vue  |  1 +
 .../purchase/purOrder/purOrderEditDialog.vue  |  4 +---
 .../purchase/purPlan/purPlanEditDialog.vue    |  8 +++-----
 5 files changed, 32 insertions(+), 14 deletions(-)

diff --git a/src/views/basic/product/productUdiType.vue b/src/views/basic/product/productUdiType.vue
index 5324ce78..6b3ea6c8 100644
--- a/src/views/basic/product/productUdiType.vue
+++ b/src/views/basic/product/productUdiType.vue
@@ -205,8 +205,15 @@ export default {
       }
     },
     forInvSubmit() {    // 新增，编辑---提交
-      this.$refs["dataForm"].validate(valid => {
-        if (valid) {
+
+      if(this.subData.parentCode==null){
+        this.$message.error("上级菜单不能为空");
+        return
+      }
+      if(this.subData.name==null){
+        this.$message.error("名称不能为空！");
+        return
+      }
           if(this.subData.id!=null){
             uodateBasicHospType(this.subData).then((response) => {
               if (response.code == 20000) {
@@ -232,9 +239,6 @@ export default {
               this.subFormVisible = false;
             });
           }
-        }
-      });
-      this.getList();
     },
 
     /** 查询菜单下拉树结构 */
diff --git a/src/views/inout/DialogSelectInvProduct.vue b/src/views/inout/DialogSelectInvProduct.vue
index d40b58a7..6f0e8bc9 100644
--- a/src/views/inout/DialogSelectInvProduct.vue
+++ b/src/views/inout/DialogSelectInvProduct.vue
@@ -78,6 +78,10 @@ export default {
       type: Object,
       required: true,
     },
+    codeArray: {
+      type: Object,
+      required: true,
+    },
     orderQuery: {},
     type: {     //1.领用选入，2：业务单据选入
       type: Object,
@@ -181,7 +185,20 @@ export default {
         this.$message.error('未选择产品');
         return;
       }
-      let ids = [];
+      var ids = [];
+      if(this.codeArray.length>0){
+        for(var i=0;i<this.codeArray.length;i++){
+             ids.push(this.codeArray[i].relIdFk);
+        }
+      }
+      if(ids.length>0){
+        for(var i=0;i<ids.length;i++){
+          if(ids[i]==this.selection.relIdFk){
+            this.$message.error("该产品已录入！");
+            return
+          }
+        }
+      }
       selection.forEach((obj, index) => {
         let data = {
           relId: obj.relIdFk,
diff --git a/src/views/inout/receive/DialogNewReceive.vue b/src/views/inout/receive/DialogNewReceive.vue
index cf4e515a..98fa54ea 100644
--- a/src/views/inout/receive/DialogNewReceive.vue
+++ b/src/views/inout/receive/DialogNewReceive.vue
@@ -149,6 +149,7 @@
       <dialogInvProduct
         :closeDialog="closeDialogC2"
         :invQueryData="formData"
+        :codeArray="codeArray"
         :type="1"
       ></dialogInvProduct>
     </el-dialog>
diff --git a/src/views/purchase/purOrder/purOrderEditDialog.vue b/src/views/purchase/purOrder/purOrderEditDialog.vue
index 5f9939fe..5ad40dd4 100644
--- a/src/views/purchase/purOrder/purOrderEditDialog.vue
+++ b/src/views/purchase/purOrder/purOrderEditDialog.vue
@@ -279,8 +279,6 @@ export default {
             let tMessage = status === '1' ? '保存' : '提交';
             this.loading = true;
           this.formData.id=this.pId;
-          this.formData.invCode=this.$store.getters.locInvCode
-          this.formData.deptCode=this.$store.getters.locDeptCode
             let tQuery = {
                 editStatus: status,
                 purOrderEntity: this.formData,
@@ -316,7 +314,7 @@ export default {
           this.thisData.stockOrderLists = this.codeArray;
         },
       setDeptCode(obj){
-            this.formData.deptCode= this.subInvList.find(item => item.code == obj).parentId;
+            this.formData.deptCode= this.invCodeList.find(item => item.code == obj).parentId;
         },
         closeDialogC2() {
             this.selectProductVisible = false;
diff --git a/src/views/purchase/purPlan/purPlanEditDialog.vue b/src/views/purchase/purPlan/purPlanEditDialog.vue
index f76f877d..4b0905c3 100644
--- a/src/views/purchase/purPlan/purPlanEditDialog.vue
+++ b/src/views/purchase/purPlan/purPlanEditDialog.vue
@@ -277,9 +277,7 @@ export default {
         submitFunction(status) {
             let tMessage = status === '1' ? '保存' : '提交';
             this.loading = true;
-          this.formData.id=this.pId;
-          this.formData.invCode=this.$store.getters.locInvCode
-          this.formData.deptCode=this.$store.getters.locDeptCode
+            this.formData.id=this.pId;
             let tQuery = {
                 editStatus: status,
                 purPlanEntity: this.formData,
@@ -314,8 +312,8 @@ export default {
           }
           this.thisData.stockOrderLists = this.codeArray;
         },
-      setDeptCode(obj){
-            this.formData.deptCode= this.subInvList.find(item => item.code == obj).parentId;
+        setDeptCode(obj){
+            this.formData.deptCode= this.invCodeList.find(item => item.code == obj).parentId;
         },
         closeDialogC2() {
             this.selectProductVisible = false;