Merge remote-tracking branch 'origin/change20220412' into change0706

# Conflicts:
#	src/views/standardsAssociation/memberManagementModule/VinCertificateModal.vue

src/config/router.config.js

@@ -158,7 +158,7 @@ export const routerData = [
           keepAlive: false,
           internalOrExternal: false,
           componentName: 'BasicInfo',
-          title: '基本信息'
+          title: '管理员信息'
         },
         name: 'standardsAssociation-BasicInfo',
         path: '/standardsAssociation/BasicInfo',

src/views/standardsAssociation/PaymentInfo/modules/CertificatePaymentInfoModal.vue

@@ -123,11 +123,11 @@
               </a-form-item>
             </a-col>
             <a-col :span="12" v-if="invoiceRequirementsFlag">
-              <a-form-item label="关联付款发票名称" :labelCol="labelCol" :wrapperCol="wrapperCol">
+              <a-form-item label="付款单位发票抬头" :labelCol="labelCol" :wrapperCol="wrapperCol">
                 <a-input
                   :disabled="checkFlag||detailFlag"
                   v-decorator="['headerName',validatorRules.headerName]"
-                  :trigger-change="true" placeholder="请输入关联付款发票名称"></a-input>
+                  :trigger-change="true" placeholder="请输入付款单位发票抬头"></a-input>
               </a-form-item>
             </a-col>
 
@@ -353,7 +353,7 @@ export default {
         },
         headerName: {
           rules: [
-            { required: true, message: '请输入关联付款发票名称' },
+            { required: true, message: '请输入付款单位发票抬头' },
             { min: 1, max: 50, message: '长度不超过50个字符' }
           ],
           validateTrigger: 'blur'

src/views/standardsAssociation/PaymentInfo/modules/PaymentInfoModal.vue

@@ -106,7 +106,7 @@
               <tr>
                 <th>费用类型</th>
                 <th>缴费时长</th>
-                <th>缴费类型</th>
+                <th>会员类型</th>
                 <th>缴费金额</th>
               </tr>
               <tr>
@@ -348,18 +348,19 @@
                   dictCode="invoice_requirements"
                   placeholder="请选择发票" />
               </a-form-item>
+              <span v-if="!invoiceRequirementsFlag" class="other-notice">本选项不提供任何形式的发票凭证</span>
             </a-col>
           </a-row>
           <template v-if="invoiceRequirementsFlag">
             <a-row>
               <a-col :span="12">
-                <a-form-item label="关联付款发票名称" :labelCol="labelCol" :wrapperCol="wrapperCol">
+                <a-form-item label="付款单位发票抬头" :labelCol="labelCol" :wrapperCol="wrapperCol">
                   <a-input
                     :disabled="checkFlag||detailFlag"
                     v-decorator="['headerName',{ rules: validatorRules.headerName.rules, initialValue:headerName,validateTrigger: 'blur',},]"
                     :trigger-change="true"
                     @change="event => event.target.value = event.target.value.trim()"
-                    placeholder="请输入关联付款发票名称"
+                    placeholder="请输入付款单位发票抬头"
                     :maxLength="50"></a-input>
                 </a-form-item>
               </a-col>
@@ -843,7 +844,7 @@ export default {
         },
         paymentType: {
           rules: [{
-            required: true, message: '请选择缴费类型'
+            required: true, message: '请选择会员类型'
           }],
           validateTrigger: ['blur', 'change']
         },
@@ -889,7 +890,7 @@ export default {
         paymentRecord1: { rules: [{ required: true, message: '请上传打包协议' }] },
         headerName: {
           rules: [
-            { required: true, message: '请输入关联付款发票名称', validateTrigger: 'blur' },
+            { required: true, message: '请输入付款单位发票抬头', validateTrigger: 'blur' },
             { min: 1, max: 50, message: '长度不超过50个字符' }
           ],
           validateTrigger: 'blur'
@@ -968,7 +969,7 @@ export default {
           scopedSlots: { customRender: 'payTime' }
         },
         {
-          title: '缴费类型',
+          title: '会员类型',
           dataIndex: 'paymentType',
           width: '20%',
           align: 'center',
@@ -1766,6 +1767,8 @@ export default {
       } else {
         this.paymentMethodFlag = false
       }
+      let invoiceRequirements = this.form.getFieldValue('invoiceRequirements')
+      invoiceRequirements && this.invoiceRequirementsChange(invoiceRequirements)
       this.isCash = value
     },
     /*
@@ -2009,4 +2012,11 @@ export default {
   position: absolute;
   top: 8px;
 }
+// 发票选择无 增加样式
+.other-notice{
+  color: #f5222d;
+  position: absolute;
+  bottom: 4px;
+  left: 25%
+}
 </style>

src/views/standardsAssociation/memberInfo/MemberInfo.vue

@@ -157,10 +157,10 @@
           </a-form-item>
         </a-col>
       </a-row>
-      <!--联系人信息-->
+      <!--企业管理员信息-->
       <div class="row clearfix">
         <div class="column">
-          <p class="member-panel-title">联系人信息</p>
+          <p class="member-panel-title">企业管理员信息</p>
         </div>
       </div>
       <a-row :span="24" class="label-width-row">
@@ -224,11 +224,11 @@
       </div>
       <a-row :span="24" class="label-width-row">
         <a-col :span="8">
-          <a-form-item label="关联付款发票名称" :labelCol="labelCol" :wrapperCol="wrapperCol">
+          <a-form-item label="付款单位发票抬头" :labelCol="labelCol" :wrapperCol="wrapperCol">
             <a-input
               :maxLength="50"
               v-decorator="['invoiceInfo', validatorRules.invoiceInfo]"
-              placeholder="请输入关联付款发票名称"></a-input>
+              placeholder="请输入付款单位发票抬头"></a-input>
           </a-form-item>
         </a-col>
         <a-col :span="8">
@@ -394,7 +394,7 @@ export default {
         },
         headerName: {
           rules: [
-            { required: true, message: '请输入关联付款发票名称' },
+            { required: true, message: '请输入付款单位发票抬头' },
             { min: 1, max: 50, message: '长度不超过50个字符' }
           ]
         },
@@ -519,7 +519,7 @@ export default {
             { min: 1, max: 50, message: '邮编不超过50个字符' }
           ]
         },
-        invoiceInfo: { rules: [{ required: true, message: '请输入关联付款发票名称' }], validateTrigger: 'blur' },
+        invoiceInfo: { rules: [{ required: true, message: '请输入付款单位发票抬头' }], validateTrigger: 'blur' },
         invoiceAddress: { rules: [{ required: true, message: '请输入单位地址' }], validateTrigger: 'blur' },
         invoicePhone: { rules: [{ required: true, validator: this.handleInvoicePhoneCheck }], validateTrigger: 'blur' },
         depositBank: { rules: [{ required: true, message: '请输入开户银行' }], validateTrigger: 'blur' },

src/views/standardsAssociation/memberInfo/modules/MemberInfoModal.vue

@@ -222,7 +222,7 @@
                   <div class="row clearfix">
                     <div class="col-md-5 column">
                       <p></p>
-                      <b><p>联系人信息</p></b>
+                      <b><p>企业管理员信息</p></b>
                       <p>--------------------------------------------------</p>
                     </div>
                   </div>
@@ -648,7 +648,7 @@
                   <div class="row clearfix">
                     <div class="col-md-5 column">
                       <p></p>
-                      <b><p>联系人信息</p></b>
+                      <b><p>企业管理员信息</p></b>
                       <p>--------------------------------------------------</p>
                     </div>
                   </div>
@@ -1296,7 +1296,7 @@ export default {
         },
         headerName: {
           rules: [
-            { required: true, message: '请输入关联付款发票名称' },
+            { required: true, message: '请输入付款单位发票抬头' },
             { min: 1, max: 50, message: '长度不超过50个字符' }
           ]
         },

src/views/standardsAssociation/register/Register.vue

@@ -1,6 +1,6 @@
 <template>
   <a-card style="width: 100%;height: 100%;text-align: left;">
-    <div class="back-head"><span @click="goBack"><img src="~@/assets/logo.png" alt="logo"></span>汽车标准化工作平台-注册会员</div>
+    <div class="back-head"><span @click="goBack"><img src="~@/assets/logo.png" alt="logo"></span>中汽标协会员注册</div>
     <div class="register-box">
       <div class="register-content">
         <div class="register">
@@ -172,8 +172,8 @@
                   </a-form-item>
                 </a-col>
               </a-row>
-              <!--联系人信息start-->
+              <!--企业管理员信息start-->
-              <div class="info"><span></span>联系人信息</div>
+              <div class="info"><span></span>企业管理员信息</div>
               <a-row>
                 <a-col :span="12">
                   <a-form-item label="联系人" :labelCol="labelColTemp" :wrapperCol="wrapperColTemp">
@@ -219,13 +219,13 @@
                   </a-form-item>
                 </a-col>
               </a-row>
-              <!--联系人信息start-->
+              <!--企业管理员信息start-->
               <div class="info"><span></span>发票信息</div>
               <a-row>
                 <a-col :span="12">
-                  <a-form-item label="关联付款发票名称" :labelCol="labelColTemp" :wrapperCol="wrapperColTemp">
+                  <a-form-item label="付款单位发票抬头" :labelCol="labelColTemp" :wrapperCol="wrapperColTemp">
                     <a-input @change="event => event.target.value = event.target.value.trim()"
-                             v-decorator="[ 'invoiceInfo', validatorRules.invoiceInfo]" placeholder="请输入关联付款发票名称"
+                             v-decorator="[ 'invoiceInfo', validatorRules.invoiceInfo]" placeholder="请输入付款单位发票抬头"
                              :maxLength="50"></a-input>
                   </a-form-item>
                 </a-col>
@@ -269,7 +269,7 @@
                   </a-form-item>
                 </a-col>
               </a-row>
-              <!--联系人信息start-->
+              <!--企业管理员信息start-->
               <div class="info"><span></span>入会申请表</div>
               <a-row>
                 <a-col :span="12">
@@ -395,7 +395,7 @@ export default {
         email: { rules: [{ required: true, validator: this.handleLinkmanEmailCheck }], validateTrigger: 'blur' },
         address: { rules: [{ required: true, message: '请输入通讯地址' }], validateTrigger: 'blur' },
         postcode: { rules: [{ required: true, validator: this.handlePostcodeCheck }], validateTrigger: 'blur' },
-        invoiceInfo: { rules: [{ required: true, message: '请输入关联付款发票名称' }], validateTrigger: 'blur' },
+        invoiceInfo: { rules: [{ required: true, message: '请输入付款单位发票抬头' }], validateTrigger: 'blur' },
         taxNo: { rules: [{ required: true, validator: this.handleTaxNoCheck }], validateTrigger: 'blur' },
         invoiceAddress: { rules: [{ required: true, message: '请输入单位地址' }], validateTrigger: 'blur' },
         invoicePhone: { rules: [{ required: true, validator: this.handleInvoicePhoneCheck }], validateTrigger: 'blur' },