Jelajahi Sumber

fix: 添加条件判断以确保收款条件在生成收款计划时必填

xieyong 3 minggu lalu
induk
melakukan
6aa18004f8

+ 8 - 3
src/views/purchasingManage/purchaseOrder/components/addDialogNew.vue

@@ -1096,7 +1096,12 @@
             }
           ],
           paymentConditionName: [
-            { required: true, message: '请选择付款条件', trigger: 'change' }
+            {
+              // 仅当「生成付款计划表 = 是」时付款条件才必填;选否则不再校验
+              required: this.form.isGeneratePaymentPlan !== 0,
+              message: '请选择付款条件',
+              trigger: 'change'
+            }
           ],
           
         };
@@ -1159,7 +1164,7 @@
       generatePlanChange(val) {
         console.log(val)
         if(val == 0) {
- 
+          this.$refs.form?.clearValidate(['paymentConditionName']);
         } else {
           this.issueNumberChange(this.form.issueNumber);
           // this.$refs.paymentCollectionPlanRef?.setDiscountAmount(
@@ -2343,7 +2348,7 @@
 
       getValidate() {
 
-        if (!this.form.paymentConditionName) {
+        if (this.form.isGeneratePaymentPlan !== 0 && !this.form.paymentConditionName) {
           this.$message.error('付款条件不能为空');
         }
 

+ 9 - 3
src/views/saleManage/saleOrder/components/addDialogNew.vue

@@ -1129,7 +1129,12 @@
             }
           ],
           collectionConditionName: [
-            { required: true, message: '请选择收款条件', trigger: 'change' }
+            {
+              // 仅当「生成收款计划表 = 是」时收款条件才必填;选否则不再校验
+              required: this.form.isGenerateReceiptPlan !== 0,
+              message: '请选择收款条件',
+              trigger: 'change'
+            }
           ]
         };
       }
@@ -1199,7 +1204,8 @@
       generatePlanChange(val) {
         console.log(val)
         if(val == 0) {
- 
+          // 切到「否」时收款条件变为非必填,清掉已有的红字校验残留
+          this.$refs.form?.clearValidate(['collectionConditionName']);
         } else {
           this.issueNumberChange(this.form.issueNumber);
           // this.$refs.paymentCollectionPlanRef?.setDiscountAmount(
@@ -2050,7 +2056,7 @@
       getValidate() {
         console.log(this.form);
 
-        if (!this.form.collectionConditionName) {
+        if (this.form.isGenerateReceiptPlan !== 0 && !this.form.collectionConditionName) {
           this.$message.error('收款条件不能为空');
         }