fix: 修改付款条件和付款计划相关字段名称

src/views/purchasingManage/purchaseOrder/components/addDialogNew.vue

@@ -253,26 +253,26 @@
             >
             </el-date-picker>
           </el-form-item>
-          <!-- <el-form-item label="付款条件" prop="collectionConditionName">
+          <el-form-item label="付款条件" prop="paymentConditionName">
             <el-input
               clearable
               readonly
-              v-model="form.collectionConditionName"
+              v-model="form.paymentConditionName"
               @click.native="handlePaymentConditionBtn"
               placeholder="请输入"
             />
-          </el-form-item> -->
+          </el-form-item>
           <el-form-item prop="orderFiles" label="附件">
             <fileMain v-model="form.orderFiles"></fileMain>
           </el-form-item>
         </el-col>
         <el-col :span="8">
-          <!-- <el-form-item label="生成付款计划表" prop="isGenerateReceiptPlan">
-            <el-radio-group v-model="form.isGenerateReceiptPlan" @change="generatePlanChange">
+          <el-form-item label="生成付款计划表" prop="isGeneratePaymentPlan">
+            <el-radio-group v-model="form.isGeneratePaymentPlan" @change="generatePlanChange">
               <el-radio :label="1">是</el-radio>
               <el-radio :label="0">否</el-radio>
             </el-radio-group>
-          </el-form-item> -->
+          </el-form-item>
           <el-form-item label="交易方式" prop="transactionMode">
             <el-select
               v-model="form.transactionMode"
@@ -365,7 +365,7 @@
             </el-input>
           </el-form-item>
           <el-form-item
-             v-if="form.isGenerateReceiptPlan != 0"
+             v-if="form.isGeneratePaymentPlan != 0"
             label="期数"
             prop="issueNumber"
           >
@@ -616,7 +616,7 @@
           </el-form-item>
         </el-col>
       </el-row>
-      <div v-if="form.isGenerateReceiptPlan != 0">
+      <div v-if="form.isGeneratePaymentPlan != 0">
         <headerTitle
           title="付款计划"
           style="margin-top: 30px"
@@ -872,7 +872,7 @@
         saleType: '',
         saleTypeName: '',
         totalAmount: '',
-        isGenerateReceiptPlan: 1,
+        isGeneratePaymentPlan: 0,
         settlementMode: '4',
         settlementModeName: '分期付款',
         partaUnifiedSocialCreditCode: '',
@@ -982,13 +982,16 @@
         return this.isUpdate ? this.requirementSourceType : this.requirementSourceType.filter(item => item.value !== '8');
       },
       rules() {
-        let isRequired = this.isRequired;
+        let isRequired = true;
         // console.log(this.isRequired);
 
         return {
           deliveryDate: [
             { required: true, message: '请选择交货日期', trigger: 'change' }
           ],
+          isGeneratePaymentPlan: [
+            { required: true, message: '请选择是否生成付款计划表', trigger: 'change' }
+          ],
           purchasePlanName: [
             {
               required: this.OutValidate.includes(this.form.sourceType),
@@ -1026,8 +1029,8 @@
           partaLinkName: [
             {
               required: isRequired,
-              message: '请选择供应商联系人',
-              trigger: 'change'
+              message: '请输入采购方联系人',
+              trigger: ['change', 'blur']
             }
           ],
           acceptUnpack: [
@@ -1044,7 +1047,7 @@
             {
               required: isRequired,
               pattern: isRequired ? telReg : null,
-              message: '请输入供应商联系电话',
+              message: '请输入采购方电话',
               trigger: 'blur'
             }
           ],
@@ -1055,7 +1058,7 @@
           partbLinkName: [
             {
               required: isRequired,
-              message: '请输入供采购方联系人',
+              message: '请输入供应商联系人',
               trigger: 'change'
             }
           ],
@@ -1063,7 +1066,7 @@
             {
               required: isRequired,
               pattern: isRequired ? telReg : null,
-              message: '请输入供采购方联系电话',
+              message: '请输入供应商联系电话',
               trigger: 'blur'
             }
           ],
@@ -1104,8 +1107,8 @@
     methods: {
       changeReceiveTerms(row, index) {
         console.log('changeReceiveTerms~~~', row)
-        this.form.collectionConditionId = row.id;
-        this.form.collectionConditionName = row.name;
+        this.form.paymentConditionId = row.id;
+        this.form.paymentConditionName = row.name;
         console.log('changeReceiveTerms!!!', this.form)
         this.$forceUpdate()
       },
@@ -2171,7 +2174,7 @@
             })
           }
           this.form.contractStartDate = formatDate(new Date(), 'yyyy-MM-dd');
-          // this.form.isGenerateReceiptPlan = +this.isGenReceiptPlan;
+          // this.form.isGeneratePaymentPlan = +this.isGenReceiptPlan;
         } else {
           this.isUpdate = true;
           await this.getpurchaseorderDetail(row.id);
@@ -2201,7 +2204,7 @@
         this.visible = true;
         this.isUpdate = false;
         this.form.relationType = 4;
-        // this.form.isGenerateReceiptPlan = +this.isGenReceiptPlan;
+        // this.form.isGeneratePaymentPlan = +this.isGenReceiptPlan;
         this.changeContract(row);
       },
       handleGoodsList() {
@@ -2271,7 +2274,7 @@
           }),
         ]
 
-        if(this.form.isGenerateReceiptPlan != 0) {
+        if(this.form.isGeneratePaymentPlan != 0) {
           arr.push(new Promise((resolve, reject) => {
             this.$refs.paymentCollectionPlanRef.validateForm((valid) => {
               if (!valid) {
@@ -2374,14 +2377,14 @@
             sourceTypeName: this.requirementSourceType.find(
               (val) => val.value == this.form.sourceType
             )?.label,
-            receiptPaymentList: this.form.isGenerateReceiptPlan == 0 ? [] : 
+            receiptPaymentList: this.form.isGeneratePaymentPlan == 0 ? [] : 
               this.$refs?.paymentCollectionPlanRef?.getTableValue() || [],
             endSettlementDate: this.form.settlementDate?.length ? this.form.settlementDate[1] : '',
             startSettlementDate: this.form.settlementDate?.length ? this.form.settlementDate[0] : ''
           });
 
 
-          if(this.form.isGenerateReceiptPlan != 0) {
+          if(this.form.isGeneratePaymentPlan != 0) {
             const ratioSum = commitData.receiptPaymentList.reduce((acc, cur) => acc + +cur.ratio, 0);
           // if(+ratioSum != 100){
           //   this.$message.error('比例合计必须为100%');
@@ -2551,12 +2554,12 @@
         let dateRange = [];
         if(this.form.settlementMode == 1) {
           dateRange = this.transformDaysFun(this.form.settlementDate, v);
-          this.$refs.paymentCollectionPlanRef.defaultList(this.form.settlementMode, v, dateRange); 
+          this.$refs.paymentCollectionPlanRef?.defaultList(this.form.settlementMode, v, dateRange); 
         } else if(this.form.settlementMode == 2) {
           dateRange = this.transformMonthFun(this.form.settlementDate, v);
-          this.$refs.paymentCollectionPlanRef.defaultList(this.form.settlementMode, v, dateRange);
+          this.$refs.paymentCollectionPlanRef?.defaultList(this.form.settlementMode, v, dateRange);
         } else {
-          this.$refs.paymentCollectionPlanRef.defaultList(this.form.settlementMode, v);
+          this.$refs.paymentCollectionPlanRef?.defaultList(this.form.settlementMode, v);
         }
       },
       transformDaysFun(date) {