From 4a1862e3decddd341d930e03d5cdbf757a4c0038 Mon Sep 17 00:00:00 2001
From: fengchenchen <fengchenchen@syxysoft.com>
Date: Sat, 12 Feb 2022 17:10:33 +0800
Subject: [PATCH] =?UTF-8?q?=E3=80=90update=E3=80=912022-02-11=E5=8F=8D?=
 =?UTF-8?q?=E9=A6=88=E9=97=AE=E9=A2=98=E7=9A=84=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/standardsAssociation/BasicInfo.vue  |  4 ++
 .../CertificateManagement.vue                 |  6 +--
 .../PaymentInfo/CertificateInfo.vue           |  5 +++
 .../memberInfo/CertificateInfo.vue            |  2 +-
 .../memberInfo/modules/MemberInfoModal.vue    |  2 +-
 .../VinCertificateModal.vue                   | 40 ++++++++++++++-----
 src/views/user/alteration/Alteration.vue      |  4 +-
 7 files changed, 47 insertions(+), 16 deletions(-)

diff --git a/src/views/standardsAssociation/BasicInfo.vue b/src/views/standardsAssociation/BasicInfo.vue
index 62fb8ce..d2ab53b 100644
--- a/src/views/standardsAssociation/BasicInfo.vue
+++ b/src/views/standardsAssociation/BasicInfo.vue
@@ -5,6 +5,10 @@
        <div class="panel-cell">
          <div class="title">秘书处信息</div>
          <div class="content">
+           <div class="info-row">
+             <span class="label-span">挂靠单位：</span>
+             <span class="value-span">中国汽车技术研究中心有限公司标准化研究所</span>
+           </div>
            <div class="info-row">
              <span class="label-span">地址：</span>
              <span class="value-span">{{ secretariatInfo.address }}</span>
diff --git a/src/views/standardsAssociation/CertificateManagement.vue b/src/views/standardsAssociation/CertificateManagement.vue
index f52a984..5e1b171 100644
--- a/src/views/standardsAssociation/CertificateManagement.vue
+++ b/src/views/standardsAssociation/CertificateManagement.vue
@@ -149,7 +149,7 @@
             <a-tag v-if="certificateStatus==0" color="#c37e00">待支付</a-tag>
             <a-tag v-if="certificateStatus==1" color="#40835e">已绑定</a-tag>
             <a-tag v-if="certificateStatus==2" color="#40835e">已支付</a-tag>
-            <a-tag v-if="certificateStatus==3" color="#40835e">已缴费</a-tag>
+            <a-tag v-if="certificateStatus==3" color="#40835e">支付已审核</a-tag>
             <a-tag v-if="certificateStatus==4" color="#40835e">正常使用</a-tag>
             <a-tag v-if="certificateStatus==5" color="#8a8c8e">已失效</a-tag>
             <a-tag v-if="certificateStatus==6" color="#8a8c8e">已驳回</a-tag>
@@ -245,7 +245,7 @@ export default {
           dataIndex: 'certificationDate'
         },
         {
-          title: '生效时间',
+          title: '生效日期',
           align: 'center',
           dataIndex: 'effectDate',
           customRender: function(text) {
@@ -253,7 +253,7 @@ export default {
           }
         },
         {
-          title: '失效时间',
+          title: '失效日期',
           align: 'center',
           dataIndex: 'invalidDate',
           customRender: function(text) {
diff --git a/src/views/standardsAssociation/PaymentInfo/CertificateInfo.vue b/src/views/standardsAssociation/PaymentInfo/CertificateInfo.vue
index 83462ec..c2c2a65 100644
--- a/src/views/standardsAssociation/PaymentInfo/CertificateInfo.vue
+++ b/src/views/standardsAssociation/PaymentInfo/CertificateInfo.vue
@@ -204,6 +204,11 @@ export default {
               align: 'center',
               dataIndex: 'billNumber'
             },
+            {
+              title: '关联证书代码',
+              align: 'center',
+              dataIndex: 'code'
+            },
             {
               title: '缴费类型',
               align: 'center',
diff --git a/src/views/standardsAssociation/memberInfo/CertificateInfo.vue b/src/views/standardsAssociation/memberInfo/CertificateInfo.vue
index 82125e9..1ad496a 100644
--- a/src/views/standardsAssociation/memberInfo/CertificateInfo.vue
+++ b/src/views/standardsAssociation/memberInfo/CertificateInfo.vue
@@ -142,7 +142,7 @@ export default {
             } else if (text === 2) {
               return '已支付'
             } else if (text === 3) {
-              return '已缴费'
+              return '支付已审核'
             } else if (text === 4) {
               return '正常使用'
             } else if (text === 5) {
diff --git a/src/views/standardsAssociation/memberInfo/modules/MemberInfoModal.vue b/src/views/standardsAssociation/memberInfo/modules/MemberInfoModal.vue
index ebc6603..55c7327 100644
--- a/src/views/standardsAssociation/memberInfo/modules/MemberInfoModal.vue
+++ b/src/views/standardsAssociation/memberInfo/modules/MemberInfoModal.vue
@@ -1148,7 +1148,7 @@ export default {
             } else if (text === 2) {
               return '已支付'
             } else if (text === 3) {
-              return '已缴费'
+              return '支付已审核'
             } else if (text === 4) {
               return '正常使用'
             } else if (text === 5) {
diff --git a/src/views/standardsAssociation/memberManagementModule/VinCertificateModal.vue b/src/views/standardsAssociation/memberManagementModule/VinCertificateModal.vue
index 96e3c18..9ea8f3e 100644
--- a/src/views/standardsAssociation/memberManagementModule/VinCertificateModal.vue
+++ b/src/views/standardsAssociation/memberManagementModule/VinCertificateModal.vue
@@ -49,7 +49,7 @@
                 <span v-if="model.certificateStatus==0" class="certificate  status-0">待支付</span>
                 <span v-if="model.certificateStatus==1" class="certificate  status-1">已绑定</span>
                 <span v-if="model.certificateStatus==2" class="certificate  status-1">已支付</span>
-                <span v-if="model.certificateStatus==3" class="certificate  status-1">已缴费</span>
+                <span v-if="model.certificateStatus==3" class="certificate  status-1">支付已审核</span>
                 <span v-if="model.certificateStatus==4" class="certificate  status-1">正常使用</span>
                 <span v-if="model.certificateStatus==5" class="certificate  status-2">已失效</span>
                 <span v-if="model.certificateStatus==6" class="certificate  status-2">已驳回</span>
@@ -496,7 +496,7 @@
             </a-row>
             <a-row>
               <a-col :span="12">
-                <a-form-item label="生效时间" :labelCol="labelCol" :wrapperCol="wrapperCol">
+                <a-form-item label="生效日期" :labelCol="labelCol" :wrapperCol="wrapperCol">
                   <j-date
                     date-format="YYYY-MM-DD"
                     placeholder="请选择生效日期"
@@ -636,6 +636,7 @@
                   v-decorator="['code',validatorRules.clientCode]"
                 ></a-input>
               </a-form-item>
+              <span class="apply-code-notice">一次申请仅能输入一个证书代码</span>
             </a-col>
           </a-row>
           <a-row v-if="selectType == '1' ">
@@ -682,7 +683,8 @@
     <template v-if="pageType == 6">
       <a-spin :spinning="confirmLoading">
         <a-form :form="form">
-          当前用户已使用免费制作证书权益。可付费制作其他证书。
+<!--          当前用户已使用免费制作证书权益。可付费制作其他证书。-->
+          <span class="apply-notice">*申请提示* 尊敬的会员您好！您已完成2张证书的办理业务，第3张证书起，将执行付费办理，费用标准：5000元/张。请在本页提交“新增申请”后，前往“证书缴费”办理相关费用。</span>
           <a-divider orientation="left">
             申请信息
           </a-divider>
@@ -706,6 +708,7 @@
                   v-decorator="['code',validatorRules.clientCode]"
                 ></a-input>
               </a-form-item>
+              <span class="apply-code-notice">一次申请仅能输入一个证书代码</span>
             </a-col>
           </a-row>
 
@@ -1059,6 +1062,7 @@
                 <a-input :maxLength="50" :disabled="selectTypeDisabled" v-model="freeCertificate.code"
                          placeholder="请输入证书代码"></a-input>
               </a-form-item>
+              <span class="apply-code-notice">一次申请仅能输入一个证书代码</span>
             </a-col>
           </a-row>
 
@@ -1347,6 +1351,7 @@
                   v-decorator="['code',validatorRules.clientCode, {initialValue: model.code}]">
                 </a-input>
               </a-form-item>
+              <span class="apply-code-notice">一次申请仅能输入一个证书代码</span>
             </a-col>
           </a-row>
 
@@ -1368,8 +1373,9 @@
 
           <a-row>
             <a-col :span="12">
-              <a-form-item label="生效时间" :labelCol="labelCol" :wrapperCol="wrapperCol">
+              <a-form-item label="生效日期" :labelCol="labelCol" :wrapperCol="wrapperCol">
                 <j-date
+                  disabled
                   date-format="YYYY-MM-DD"
                   placeholder="请选择生效日期"
                   v-model="checkEffectDate"
@@ -1381,6 +1387,7 @@
             <a-col :span="12">
               <a-form-item label="失效日期" :labelCol="labelCol" :wrapperCol="wrapperCol">
                 <j-date
+                  disabled
                   date-format="YYYY-MM-DD"
                   placeholder="请选择失效日期"
                   v-decorator="['invalidDate',validatorRules.invalidDate]"
@@ -1458,6 +1465,7 @@
                 <a-form-item label=" 证书代码" :labelCol="labelCol" :wrapperCol="wrapperCol">
                   <a-input :maxLength="50" disabled v-model="model.code" placeholder="请输入证书代码"></a-input>
                 </a-form-item>
+                <span class="apply-code-notice">一次申请仅能输入一个证书代码</span>
               </a-col>
             </a-row>
 
@@ -1675,6 +1683,7 @@
                   v-decorator="['code',validatorRules.clientCode]"
                 ></a-input>
               </a-form-item>
+              <span class="apply-code-notice">一次申请仅能输入一个证书代码</span>
             </a-col>
           </a-row>
           <a-row v-if="selectType == '1' ">
@@ -1737,6 +1746,7 @@
                   v-decorator="['code',validatorRules.clientCode]"
                 ></a-input>
               </a-form-item>
+              <span class="apply-code-notice">一次申请仅能输入一个证书代码</span>
             </a-col>
           </a-row>
 
@@ -2086,6 +2096,7 @@
               <a-form-item label=" 证书代码" :labelCol="labelCol" :wrapperCol="wrapperCol">
                 <a-input :maxLength="50" disabled v-model="freeCertificate.code" placeholder="请输入证书代码"></a-input>
               </a-form-item>
+              <span class="apply-code-notice">一次申请仅能输入一个证书代码</span>
             </a-col>
           </a-row>
 
@@ -2366,6 +2377,7 @@
                 <a-input :maxLength="50" v-decorator="['code',validatorRules.clientCode]"
                          placeholder="请输入证书代码"></a-input>
               </a-form-item>
+              <span class="apply-code-notice">一次申请仅能输入一个证书代码</span>
             </a-col>
           </a-row>
 
@@ -2387,7 +2399,7 @@
 
           <a-row>
             <a-col :span="12">
-              <a-form-item label="生效时间" :labelCol="labelCol" :wrapperCol="wrapperCol">
+              <a-form-item label="生效日期" :labelCol="labelCol" :wrapperCol="wrapperCol">
                 <j-date
                   date-format="YYYY-MM-DD"
                   placeholder="请选择生效日期"
@@ -2767,7 +2779,7 @@ export default {
         //   dataIndex: 'applyDate'
         // },
         {
-          title: '生效时间',
+          title: '生效日期',
           align: 'center',
           dataIndex: 'effectDate',
           customRender: function(text) {
@@ -2779,7 +2791,7 @@ export default {
           }
         },
         {
-          title: '失效时间',
+          title: '失效日期',
           align: 'center',
           dataIndex: 'invalidDate',
           customRender: function(text) {
@@ -2917,7 +2929,7 @@ export default {
         },
         effectDate: {
           rules: [{
-            required: true, message: '请输入生效日期!'
+            required: true, message: '请选择生效日期'
           }]
         },
         invalidDate: { rules: [{ required: true, validator: this.checkInvalidDate }] },
@@ -3069,7 +3081,7 @@ export default {
 
     checkInvalidDate(rule, value, callback) {
       if (value === undefined || value === '' || value == null) {
-        callback(new Error('请输入失效日期'))
+        callback(new Error('请选择失效日期'))
       }
       console.log(value + ' :' + this.checkEffectDate)
       var ck = this.checkEffectDate
@@ -4327,4 +4339,14 @@ export default {
   transform: translateY(10px);
 }
 
+.apply-notice{
+  color: #f5222d;
+}
+.apply-code-notice{
+  color: #f5222d;
+  position: absolute;
+  bottom: 4px;
+  left: 25%
+}
+
 </style>
diff --git a/src/views/user/alteration/Alteration.vue b/src/views/user/alteration/Alteration.vue
index 4cd8d33..820bd9c 100644
--- a/src/views/user/alteration/Alteration.vue
+++ b/src/views/user/alteration/Alteration.vue
@@ -195,7 +195,7 @@ export default {
               if (this.$route.query.isFirstLogin === 'true') {
                 that.FirstPhoneLogin(that.temporaryUserInfo).then(res => {
                   if (res.code === 200) {
-                    that.FirstPhoneLogin(that.temporaryUserInfo)
+                    // that.FirstPhoneLogin(that.temporaryUserInfo)
                     // 进入首页
                     this.$router.push({ path: '/' }).catch(() => {
                     })
@@ -420,4 +420,4 @@ export default {
     background: none;
   }
 }
-</style>
\ No newline at end of file
+</style>