From 5695037ffd7c49d23fa2f67b4d7c00891a727196 Mon Sep 17 00:00:00 2001
From: lideqin <694785430@qq.com>
Date: Mon, 11 Mar 2024 15:59:33 +0800
Subject: [PATCH] =?UTF-8?q?[update]=20=E4=BC=9A=E5=91=98=E7=AE=A1=E7=90=86?=
 =?UTF-8?q?-=E6=88=90=E5=91=98=E7=BB=B4=E6=8A=A4-=E6=96=B0=E5=A2=9E?=
 =?UTF-8?q?=E7=BC=96=E8=BE=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../modules/SafeguardStardsMemberModal.vue    | 28 ++++++++++++++++---
 1 file changed, 24 insertions(+), 4 deletions(-)

diff --git a/src/views/incomePayments/memberManage/modules/SafeguardStardsMemberModal.vue b/src/views/incomePayments/memberManage/modules/SafeguardStardsMemberModal.vue
index bf7fca4..08d927c 100644
--- a/src/views/incomePayments/memberManage/modules/SafeguardStardsMemberModal.vue
+++ b/src/views/incomePayments/memberManage/modules/SafeguardStardsMemberModal.vue
@@ -192,7 +192,7 @@
             </a-form-item>
           </a-col>
           <!--  incomePaysType 2 是合同·-->
-          <a-col :xl="12" :sm="24" v-if="incomePaysType === 2">
+          <a-col :xl="12" :sm="24" v-show="incomePaysType === 2">
             <a-form-item
               label="合同号"
               :labelCol="labelCol"
@@ -208,7 +208,7 @@
           </a-col>
         </a-row>
         <!--  incomePaysType 3  是收费通知·-->
-        <a-row :gutter="24" v-if="incomePaysType === 3">
+        <a-row :gutter="24" v-show="incomePaysType === 3">
           <a-col :xl="12" :sm="24">
             <a-form-item
               label="收费通知号"
@@ -547,13 +547,16 @@ export default {
         if (!err) {
           that.confirmLoading = true
           let httpurl = ''
+          const formData = Object.assign({}, values)
           if (!this.model.id) {
             httpurl += this.url.add
           } else {
             httpurl += this.url.edit
+            formData.id = this.model.id
           }
-          const formData = Object.assign(this.model, values)
-          console.log(formData)
+          formData.chargeNoticeId = formData.chargeNoticeId || ''
+          formData.chargeNoticeNo = formData.chargeNoticeNo || ''
+          formData.contractNo = formData.contractNo || ''
           formData.projectId = this.projectId
           formData.companyName = formData.companyId.companyName
           formData.companyId = formData.companyId.id
@@ -576,6 +579,23 @@ export default {
      *  来款方式
      * */
     changePaymentMethod(e) {
+      // 不清空，并且判断用v-if的话，切换来款方式从收费通知变成无，再改到收费通知，收费通知没选但是再次编辑的时候能回显最开始的
+      if (e.target.value === IncomeMethod.contract.value) {
+        // 是合同，清空收费通知号，收费通知
+        this.form.resetFields(['chargeNoticeNo', 'chargeNoticeId'])
+        this.validatorRules.chargeNoticeNo.rules[0].required = false
+        this.validatorRules.contractNum.rules[0].required = true
+      } else if (e.target.value === IncomeMethod.noticeOfCharge.value) {
+        // 是收费通知，清空合同号
+        this.form.resetFields(['contractNum'])
+        this.validatorRules.contractNum.rules[0].required = false
+        this.validatorRules.chargeNoticeNo.rules[0].required = true
+      } else {
+        // 是无，清空合同号和收费通知号
+        this.form.resetFields(['contractNum', 'chargeNoticeNo', 'chargeNoticeId'])
+        this.validatorRules.chargeNoticeNo.rules[0].required = false
+        this.validatorRules.contractNum.rules[0].required = false
+      }
       this.incomePaysType = e.target.value
     },
     /*