【开发】 邮箱授权码不是必填 参会情况样式修改

src/views/financialManagement/arriveAndInvoicing/ArriveAndInvoivingList.vue

@@ -159,6 +159,8 @@
 
     <!--    审核缴费凭证-->
     <audit-proof-module ref="auditProof" @ok="modalFormOk"></audit-proof-module>
+    <!-- 会议审核的弹窗 -->
+    <audit-modal ref="auditModal" @ok="modalFormOk"></audit-modal>
 
   </div>
 </template>
@@ -176,6 +178,7 @@ import ProjectDetailModal from '../../../components/ProjectDetailModal'
 import BatchInvoicingModule from '../../packManagement/modules/BatchInvoicingModule'
 import { isAllEqual } from '../../../utils/util'
 import AuditProofModule from './modules/AuditProofModule'
+import AuditModal from '@views/incomePayments/meetManage/modules/AuditModal'
 
 export default {
   name: 'ArriveAndInvoivingList',
@@ -188,7 +191,8 @@ export default {
     SelectPrincipal,
     ProjectDetailModal,
     BatchInvoicingModule,
-    AuditProofModule
+    AuditProofModule,
+    AuditModal,
   },
   mixins: [JeroListMixin],
   data() {
@@ -430,6 +434,8 @@ export default {
       }
       // 会议项目使用原本会议缴费凭证的审核弹窗
       if (record.projectType === 3) {
+        this.$refs.auditModal.title = '审核凭证'
+        this.$refs.auditModal.open(record, false)
         return
       }
     },

src/views/incomePayments/meetManage/Attendance.vue

@@ -897,6 +897,9 @@ export default {
   .ant-col {
     display: flex;
   }
+  label {
+    flex-shrink: 0;
+  }
 }
 
 .ant-row {

src/views/system/modules/UserModal.vue

@@ -151,8 +151,9 @@
         </a-form-item>
 
         <a-form-item label="邮箱授权码" :labelCol="labelCol" :wrapperCol="wrapperCol">
+<!--          validatorRules.emailPassword-->
           <a-input-password placeholder="请输入邮箱授权码" @change="event => event.target.value = event.target.value.trim()"
-                            v-decorator="[ 'emailPassword', validatorRules.emailPassword]" :maxLength="50"/>
+                            v-decorator="[ 'emailPassword' ]" :maxLength="50"/>
         </a-form-item>
 
         <a-form-item label="手机号码" :labelCol="labelCol" :wrapperCol="wrapperCol">
@@ -538,7 +539,9 @@ export default {
           formData.phone = encrypt(that.rsaPublicKey, values.phone)
           formData.email = encrypt(that.rsaPublicKey, values.email)
           // 加密邮箱密码
-          formData.emailPassword = encrypt(that.rsaPublicKey, values.emailPassword)
+          if(values.emailPassword){
+            formData.emailPassword = encrypt(that.rsaPublicKey, values.emailPassword)
+          }
           //update-begin-author:taoyan date:2020710 for:多租户配置
           formData.relTenantIds = this.currentTenant.length > 0 ? this.currentTenant.join(',') : ''
           //update-end-author:taoyan date:2020710 for:多租户配置