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 @@ + + @@ -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 @@ + + v-decorator="[ 'emailPassword' ]" :maxLength="50"/> @@ -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:多租户配置