diff --git a/src/views/contractManagement/revenueContract/modules/SelectProjectModule.vue b/src/views/contractManagement/revenueContract/modules/SelectProjectModule.vue index f3d43bf..bfb09fc 100644 --- a/src/views/contractManagement/revenueContract/modules/SelectProjectModule.vue +++ b/src/views/contractManagement/revenueContract/modules/SelectProjectModule.vue @@ -284,6 +284,7 @@ export default { this.queryParam = {} this.selectedRowKeys = [] this.visible = false + this.$emit('ok') }, handleOk() { if (this.selectedRowKeys.length <= 0) { @@ -304,7 +305,6 @@ export default { if (res.success) { this.$message.success(res.message) this.close() - this.$emit('ok') } else { this.$message.warn(res.message) } @@ -312,7 +312,6 @@ export default { }, handleCancel() { this.close() - this.$emit('ok') }, /** * 打开新增module diff --git a/src/views/contractManagement/revenueContract/modules/SelectWorkingGroupProjectModule.vue b/src/views/contractManagement/revenueContract/modules/SelectWorkingGroupProjectModule.vue index c5b2cdc..7384c2d 100644 --- a/src/views/contractManagement/revenueContract/modules/SelectWorkingGroupProjectModule.vue +++ b/src/views/contractManagement/revenueContract/modules/SelectWorkingGroupProjectModule.vue @@ -175,6 +175,7 @@ export default { this.queryParam = {} this.selectedRowKeys = [] this.visible = false + this.$emit('ok') }, handleOk() { if (this.selectedRowKeys.length <= 0) { diff --git a/src/views/projectManagement/modules/WorkingGroupMemberUnitModule.vue b/src/views/projectManagement/modules/WorkingGroupMemberUnitModule.vue index d549135..d54d5cd 100644 --- a/src/views/projectManagement/modules/WorkingGroupMemberUnitModule.vue +++ b/src/views/projectManagement/modules/WorkingGroupMemberUnitModule.vue @@ -214,6 +214,7 @@ import SelectContacts from '@comp/company/SelectContacts' import { getWorkingGroupListByNotCompany } from '../../../api/incomePaymentsApi' import { isRepeat } from '../../../utils/util' import { addZero } from '../../../utils/util' +import { money } from '../../../utils/validate' export default { name: 'WorkingGroupMemberUnitModule', @@ -302,7 +303,7 @@ export default { validateTrigger: 'change' }, receivableAmount: { - rules: [{ required: true, message: '请输入应收金额' }], + rules: [{ required: true, validator: this.checkMoney }], validateTrigger: 'blur' }, contractNum: { @@ -530,6 +531,22 @@ export default { } callback('请选择成员单位') }, + /** + * 校验金额格式 + * @param rules + * @param value + * @param callback + */ + checkMoney(rules, value, callback) { + if (value) { + if (money(value)) { + callback() + return + } + callback('请输入正确格式的金额') + } + callback('请输入应收金额') + }, /** * 在新增成功后重新获取联系人列表 */ diff --git a/src/views/statisticalReport/WholeInstituteStatisticsList.vue b/src/views/statisticalReport/WholeInstituteStatisticsList.vue index 87f9a2b..3061d56 100644 --- a/src/views/statisticalReport/WholeInstituteStatisticsList.vue +++ b/src/views/statisticalReport/WholeInstituteStatisticsList.vue @@ -90,7 +90,7 @@ bordered rowKey="id" :columns="columns" - :scroll="{x: 1100}" + :scroll="{x: 1200}" :dataSource="dataSource" :pagination="ipagination" :loading="loading" @@ -116,7 +116,7 @@ ref="footTable" rowKey="id" :columns="columnsFooter" - :scroll="{x: 1100}" + :scroll="{x: 1200}" :dataSource="footerDataSource" :showHeader="false" :pagination="false"