From 1ab27496b04f5a6bf148a997615bb670eacff0c1 Mon Sep 17 00:00:00 2001
From: fengachen <373943794@qq.com>
Date: Fri, 17 Dec 2021 20:37:47 +0800
Subject: [PATCH] =?UTF-8?q?=E3=80=90=E5=BC=80=E5=8F=91=E3=80=91=20?=
 =?UTF-8?q?=E9=82=AE=E7=AE=B1=E6=8E=88=E6=9D=83=E7=A0=81=E4=B8=8D=E6=98=AF?=
 =?UTF-8?q?=E5=BF=85=E5=A1=AB=20=E5=8F=82=E4=BC=9A=E6=83=85=E5=86=B5?=
 =?UTF-8?q?=E6=A0=B7=E5=BC=8F=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../arriveAndInvoicing/ArriveAndInvoivingList.vue         | 8 +++++++-
 src/views/incomePayments/meetManage/Attendance.vue        | 3 +++
 src/views/system/modules/UserModal.vue                    | 7 +++++--
 3 files changed, 15 insertions(+), 3 deletions(-)

diff --git a/src/views/financialManagement/arriveAndInvoicing/ArriveAndInvoivingList.vue b/src/views/financialManagement/arriveAndInvoicing/ArriveAndInvoivingList.vue
index 31d956e..cc3fe1d 100644
--- a/src/views/financialManagement/arriveAndInvoicing/ArriveAndInvoivingList.vue
+++ b/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
       }
     },
diff --git a/src/views/incomePayments/meetManage/Attendance.vue b/src/views/incomePayments/meetManage/Attendance.vue
index 4dff0aa..29002d2 100644
--- a/src/views/incomePayments/meetManage/Attendance.vue
+++ b/src/views/incomePayments/meetManage/Attendance.vue
@@ -897,6 +897,9 @@ export default {
   .ant-col {
     display: flex;
   }
+  label {
+    flex-shrink: 0;
+  }
 }
 
 .ant-row {
diff --git a/src/views/system/modules/UserModal.vue b/src/views/system/modules/UserModal.vue
index feebe5b..5dda5d1 100644
--- a/src/views/system/modules/UserModal.vue
+++ b/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:多租户配置