From 37c5c043458921a6c7d1afb4885b47219aa0f198 Mon Sep 17 00:00:00 2001
From: wangwei <1610949092@qq.com>
Date: Thu, 16 Mar 2023 16:58:54 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/purchase/purArrival/purArrivalEditDialog.vue | 10 +++++++++-
 .../purchase/purDelivery/purDeliverySelectProduct.vue  |  2 +-
 .../purReturned/DialogSelectReturnedInvProduct.vue     |  2 +-
 .../purchase/purReturned/purReturnedEditDialog.vue     |  2 +-
 4 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/src/views/purchase/purArrival/purArrivalEditDialog.vue b/src/views/purchase/purArrival/purArrivalEditDialog.vue
index 26419ad..a1daee4 100644
--- a/src/views/purchase/purArrival/purArrivalEditDialog.vue
+++ b/src/views/purchase/purArrival/purArrivalEditDialog.vue
@@ -267,6 +267,7 @@ export default {
         1: "预入库",
         2: "普通采购",
       },
+      acount:null,
       orderEditor: true,
       sOptions: [],
       sValue: [],
@@ -297,6 +298,7 @@ export default {
 
       this.tableCountChange(this.currentRow);
 
+
       this.$refs["dataForm"].validate(valid => {
         if (valid) {
           if (this.codeArray.length < 1) {
@@ -304,7 +306,9 @@ export default {
             return;
           }
           if (status === '2') {
-
+            if (this.acount == "" || this.acount == null) {
+              return this.$message.error("到货数量不能为空！");
+            }
             if (this.formData.billDate == "" || this.formData.billDate == null) {
               return this.$message.error("单据日期不能为空！");
             }
@@ -318,6 +322,9 @@ export default {
             }
           }
           if (status == "1") {
+            if (this.formData.invCode== "" || this.formData.invCode == null) {
+              return this.$message.error("到货仓库不能为空！");
+            }
             this.submitFunction(status);
           } else {
             let tip = "是否确定提交订单?";
@@ -428,6 +435,7 @@ export default {
     tableCountChange(row) {
       if (this.$isNotBlank(row)) {
         updateDetail(this.currentRow);
+        this.acount=row.arrivalCount;
       }
     },
     tableRowClassName({row, rowIndex}) {
diff --git a/src/views/purchase/purDelivery/purDeliverySelectProduct.vue b/src/views/purchase/purDelivery/purDeliverySelectProduct.vue
index 0cd8d28..5043a67 100644
--- a/src/views/purchase/purDelivery/purDeliverySelectProduct.vue
+++ b/src/views/purchase/purDelivery/purDeliverySelectProduct.vue
@@ -275,7 +275,7 @@ export default {
     },
     getList() {
       this.loading = true;
-      this.listQuery.customerId =this.customerId;
+      //this.listQuery.customerId =this.customerId;
       filterCompanyProductRelevance(this.listQuery)
         .then((response) => {
           this.loading = false;
diff --git a/src/views/purchase/purReturned/DialogSelectReturnedInvProduct.vue b/src/views/purchase/purReturned/DialogSelectReturnedInvProduct.vue
index 1b4d21e..3600f0b 100644
--- a/src/views/purchase/purReturned/DialogSelectReturnedInvProduct.vue
+++ b/src/views/purchase/purReturned/DialogSelectReturnedInvProduct.vue
@@ -193,7 +193,7 @@ export default {
         productName: this.multipleSelection.cpmctymc,
         count: 1,
         orderIdFk: this.pId,
-        supId: this.multipleSelection.customerId,
+        supId: this.customerId,
         zczbhhzbapzbh: this.multipleSelection.zczbhhzbapzbh
       };
       addOrderDetail(tQuery).then((response) => {
diff --git a/src/views/purchase/purReturned/purReturnedEditDialog.vue b/src/views/purchase/purReturned/purReturnedEditDialog.vue
index 368342a..f786eda 100644
--- a/src/views/purchase/purReturned/purReturnedEditDialog.vue
+++ b/src/views/purchase/purReturned/purReturnedEditDialog.vue
@@ -148,7 +148,7 @@
         :purType="1"
         :pId="pId"
         :data="thisData"
-        :customer-id="formData.supId"
+        :customerId="formData.supId"
         :inv-code="formData.invCode"
       ></purOrderProducts>
     </el-dialog>