From 02124ae3ab89b2072703fd64b21d614726137597 Mon Sep 17 00:00:00 2001
From: fengachen <373943794@qq.com>
Date: Thu, 24 Mar 2022 17:15:46 +0800
Subject: [PATCH] =?UTF-8?q?=E3=80=90=E4=BF=AE=E6=94=B9=E3=80=91=E8=BF=9E?=
 =?UTF-8?q?=E8=B0=83=E4=BC=9A=E5=91=98=E6=96=B0=E5=A2=9E=E7=BC=B4=E8=B4=B9?=
 =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E5=AD=97=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../PaymentInfo/modules/PaymentInfoModal.vue  | 94 +++++++++++--------
 1 file changed, 57 insertions(+), 37 deletions(-)

diff --git a/src/views/standardsAssociation/PaymentInfo/modules/PaymentInfoModal.vue b/src/views/standardsAssociation/PaymentInfo/modules/PaymentInfoModal.vue
index ef4be28..0b8399f 100644
--- a/src/views/standardsAssociation/PaymentInfo/modules/PaymentInfoModal.vue
+++ b/src/views/standardsAssociation/PaymentInfo/modules/PaymentInfoModal.vue
@@ -413,23 +413,19 @@
             </template>
             <!-- 证书附件-->
             <template slot="certificateImg" slot-scope="text, record">
-              <div class="certificate-img" >
-                <a-form-item :colon='false' :labelCol="labelCol" :wrapperCol="wrapperCol" v-if="record.certificate === '世界制造厂识别代号(WMI)证书' ">
+              <div class="certificate-img">
+                <a-form-item
+                  :colon='false'
+                  :labelCol="labelCol"
+                  :wrapperCol="wrapperCol"
+                  class="transalte-y-10"
+                >
                   <j-image-upload
                     isLessThan5M
                     :number="1"
-                    :disabled="checkFlag||detailFlag"
+                    :disabled="checkFlag||detailFlag|| (!!record.chargeType && record.chargeType === 2) ||( !!record.certificateStatus && record.certificateStatus === 1) || record.certificateStatus === 2 || record.certificateStatus === 3"
                     bizPath="payment"
-                    v-decorator="['certificateImgWmi',  validatorRules.certificateImg]">
-                  </j-image-upload>
-                </a-form-item>
-                <a-form-item :colon='false' :labelCol="labelCol" :wrapperCol="wrapperCol" v-if="record.certificate === '企业名称代号证书' ">
-                  <j-image-upload
-                    isLessThan5M
-                    :number="1"
-                    :disabled="checkFlag||detailFlag"
-                    bizPath="payment"
-                    v-decorator="['certificateImgVin',  validatorRules.certificateImg]">
+                    v-decorator="['certificateImg'+record.index,  validatorRules.certificateImg]">
                   </j-image-upload>
                 </a-form-item>
               </div>
@@ -449,42 +445,25 @@
             </template>
             <!-- 生效日期-->
             <template  slot="effectDate" slot-scope="text, record">
-              <a-form-item :colon='false'   v-if="record.certificate === '企业名称代号证书' " class="transalte-y-10">
+              <a-form-item :colon='false'   class="transalte-y-10">
                 <j-date
                   :disabled="checkFlag||detailFlag|| (!!record.chargeType && record.chargeType === 2) ||( !!record.certificateStatus && record.certificateStatus === 1) || record.certificateStatus === 2 || record.certificateStatus === 3"
-                  date-format="YYYY-MM-DD HH:mm:ss"
+                  date-format="YYYY-MM-DD"
+                  v-model="record.effectDate"
                   placeholder="请选择生效日期"
-                  v-decorator="['effectDataVin',validatorRules.effectDate]"
-                  :trigger-change="true"
-                  style="width: 100%"/>
-              </a-form-item>
-              <a-form-item :colon='false'     v-if="record.certificate === '世界制造厂识别代号(WMI)证书' " class="transalte-y-10">
-                <j-date
-                  :disabled="checkFlag||detailFlag|| (!!record.chargeType && record.chargeType === 2) ||( !!record.certificateStatus && record.certificateStatus === 1) || record.certificateStatus === 2 || record.certificateStatus === 3"
-                  date-format="YYYY-MM-DD HH:mm:ss"
-                  placeholder="请选择生效日期"
-                  v-decorator="['effectDataWmi',validatorRules.effectDate]"
+                  v-decorator="['effectDate'+record.index,validatorRules.effectDate]"
                   :trigger-change="true"
                   style="width: 100%"/>
               </a-form-item>
             </template>
             <!-- 失效日期-->
             <template  slot="invalidDate" slot-scope="text, record">
-              <a-form-item :colon='false'   v-if="record.certificate === '企业名称代号证书' " class="transalte-y-10">
+              <a-form-item :colon='false'    class="transalte-y-10">
                 <j-date
                   :disabled="checkFlag||detailFlag|| (!!record.chargeType && record.chargeType === 2) ||( !!record.certificateStatus && record.certificateStatus === 1) || record.certificateStatus === 2 || record.certificateStatus === 3"
-                  date-format="YYYY-MM-DD HH:mm:ss"
+                  date-format="YYYY-MM-DD"
                   placeholder="请选择失效日期"
-                  v-decorator="['invalidDateVin',validatorRules.invalidDate]"
-                  :trigger-change="true"
-                  style="width: 100%"/>
-              </a-form-item>
-              <a-form-item :colon='false'  v-if="record.certificate === '世界制造厂识别代号(WMI)证书' " class="transalte-y-10">
-                <j-date
-                  :disabled="checkFlag||detailFlag|| (!!record.chargeType && record.chargeType === 2) ||( !!record.certificateStatus && record.certificateStatus === 1) || record.certificateStatus === 2 || record.certificateStatus === 3"
-                  date-format="YYYY-MM-DD HH:mm:ss"
-                  placeholder="请选择失效日期"
-                  v-decorator="['invalidDateWmi',validatorRules.invalidDate]"
+                  v-decorator="['invalidDate'+record.index,validatorRules.invalidDate]"
                   :trigger-change="true"
                   style="width: 100%"/>
               </a-form-item>
@@ -1156,6 +1135,21 @@ export default {
               this.model.certificate.push(this.dataSource[this.selectedRowKeys[i]])
             }
           }
+          // 将证书附件 生效时间 失效时间 绑定在对应的证书上
+          if (this.model.certificate.length > 0) {
+            this.model.certificate.forEach((item, index) => {
+              if (index === 0) {
+                item.certificateImg = values.certificateImg1
+                item.effectDate = values.effectDate1
+                item.invalidDate = values.invalidDate1
+              }
+              if (index === 1) {
+                item.certificateImg = values.certificateImg2
+                item.effectDate = values.effectDate2
+                item.invalidDate = values.invalidDate2
+              }
+            })
+          }
           this.model.certificatesNum = this.selectedRowKeys.length
           const formData = Object.assign(this.model, values)
           if (this.typeFlag) {
@@ -1214,6 +1208,21 @@ export default {
               this.model.certificate.push(this.dataSource[this.selectedRowKeys[i]])
             }
           }
+          // 将证书附件 生效时间 失效时间 绑定在对应的证书上
+          if (this.model.certificate.length > 0) {
+            this.model.certificate.forEach((item, index) => {
+              if (index === 0) {
+                item.certificateImg = values.certificateImg1
+                item.effectDate = values.effectDate1
+                item.invalidDate = values.invalidDate1
+              }
+              if (index === 1) {
+                item.certificateImg = values.certificateImg2
+                item.effectDate = values.effectDate2
+                item.invalidDate = values.invalidDate2
+              }
+            })
+          }
           this.model.certificatesNum = this.selectedRowKeys.length
           const formData = Object.assign(this.model, values)
           // 客户要去掉网员服务费字段，但是后端没有去掉校验，所以前端写死
@@ -1413,6 +1422,17 @@ export default {
                 if (value.id) {
                   this.selectedRowKeys.push(value.key)
                 }
+                // 回显 证书附件 生效日期 失效日期
+                if (index === 0) {
+                  this.$nextTick(() => {
+                    this.form.setFieldsValue({ 'certificateImg1': value.certificateImg, 'effectDate1': value.effectDate, 'invalidDate1': value.invalidDate })
+                  })
+                }
+                if (index === 1) {
+                  this.$nextTick(() => {
+                    this.form.setFieldsValue({ 'certificateImg2': value.certificateImg, 'effectDate2': value.effectDate, 'invalidDate2': value.invalidDate })
+                  })
+                }
               })
             } else {
               this.dataSource = source