From cf0c5b437d5b4f7c4fe8ac19761772f21a2c0995 Mon Sep 17 00:00:00 2001
From: fengachen <373943794@qq.com>
Date: Thu, 24 Mar 2022 14:14:43 +0800
Subject: [PATCH] =?UTF-8?q?=E3=80=90=E5=8F=98=E6=9B=B4=E3=80=91=E4=BC=9A?=
 =?UTF-8?q?=E5=91=98=E7=BC=B4=E8=B4=B9=20=E6=96=B0=E5=A2=9E=E8=AF=81?=
 =?UTF-8?q?=E4=B9=A6=20=E5=A2=9E=E5=8A=A0=E6=9C=89=E6=95=88=E6=9C=9F=20?=
 =?UTF-8?q?=E5=A4=B1=E6=95=88=E6=97=A5=E6=9C=9F=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  | 68 +++++++++++++++++--
 .../VinCertificateModal.vue                   | 23 +++++++
 2 files changed, 86 insertions(+), 5 deletions(-)

diff --git a/src/views/standardsAssociation/PaymentInfo/modules/PaymentInfoModal.vue b/src/views/standardsAssociation/PaymentInfo/modules/PaymentInfoModal.vue
index 0dd46f5..ef4be28 100644
--- a/src/views/standardsAssociation/PaymentInfo/modules/PaymentInfoModal.vue
+++ b/src/views/standardsAssociation/PaymentInfo/modules/PaymentInfoModal.vue
@@ -377,6 +377,7 @@
           <a-table
             :pagination=false
             bordered
+            :scroll="{x:true}"
             :data-source="dataSource"
             :columns="columns"
             :row-selection="{ selectedRowKeys: selectedRowKeys, onChange: onSelectChange,getCheckboxProps: getCheckboxProps }">
@@ -446,6 +447,48 @@
               </a-select>
               <span v-else> — </span>
             </template>
+            <!-- 生效日期-->
+            <template  slot="effectDate" slot-scope="text, record">
+              <a-form-item :colon='false'   v-if="record.certificate === '企业名称代号证书' " 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="['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]"
+                  :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">
+                <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="['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]"
+                  :trigger-change="true"
+                  style="width: 100%"/>
+              </a-form-item>
+            </template>
           </a-table>
           <div style="position: relative;top: 20px;" v-if="certificatesNum>0">
             <a-row>
@@ -792,38 +835,53 @@ export default {
       dataSource: [],
       count: 2,
       // 证书列表
+      // 证书列表
       columns: [
         {
           title: '序号',
           dataIndex: 'index',
-          width: '10%',
+          width: 80,
           align: 'center'
         },
         {
           title: '证书类型',
           dataIndex: 'certificate',
-          width: '20%',
+          width: 160,
           align: 'center',
           scopedSlots: { customRender: 'certificate' }
         },
         {
           title: '证书代码',
           dataIndex: 'certificate_code',
-          width: '30%',
+          width: 160,
           scopedSlots: { customRender: 'code' },
           align: 'center'
         },
         {
           title: '备案通知书',
           dataIndex: 'recordNotice',
-          width: '30%',
+          width: 160,
           scopedSlots: { customRender: 'recordNotice' },
           align: 'center'
         },
+        {
+          title: '生效日期',
+          dataIndex: 'effectDate',
+          width: 200,
+          align: 'center',
+          scopedSlots: { customRender: 'effectDate' }
+        },
+        {
+          title: '失效日期',
+          dataIndex: 'invalidDate',
+          width: 200,
+          align: 'center',
+          scopedSlots: { customRender: 'invalidDate' }
+        },
         {
           title: '证书附件',
           dataIndex: 'text',
-          width: '30%',
+          width: 160,
           align: 'center',
           scopedSlots: { customRender: 'certificateImg' }
         }
diff --git a/src/views/standardsAssociation/memberManagementModule/VinCertificateModal.vue b/src/views/standardsAssociation/memberManagementModule/VinCertificateModal.vue
index 20fb209..20adc35 100644
--- a/src/views/standardsAssociation/memberManagementModule/VinCertificateModal.vue
+++ b/src/views/standardsAssociation/memberManagementModule/VinCertificateModal.vue
@@ -850,6 +850,29 @@
               </a-form-item>
             </a-col>
           </a-row>
+          <a-row v-if="freeCertificate.code">
+            <a-col :span="12">
+              <a-form-item label="生效日期" :labelCol="labelCol" :wrapperCol="wrapperCol">
+                <j-date
+                  date-format="YYYY-MM-DD"
+                  placeholder="请选择生效日期"
+                  v-model="checkEffectDate"
+                  v-decorator="['effectDate',validatorRules.effectDate]"
+                  :trigger-change="true"
+                  style="width: 100%"/>
+              </a-form-item>
+            </a-col>
+            <a-col :span="12">
+              <a-form-item label="失效日期" :labelCol="labelCol" :wrapperCol="wrapperCol">
+                <j-date
+                  date-format="YYYY-MM-DD"
+                  placeholder="请选择失效日期"
+                  v-decorator="['invalidDate',validatorRules.invalidDate]"
+                  :trigger-change="true"
+                  style="width: 100%"/>
+              </a-form-item>
+            </a-col>
+          </a-row>
           <a-divider orientation="left">
             缴费信息
           </a-divider>