diff --git a/src/views/businessManagement/modules/BusinessManagementModule.vue b/src/views/businessManagement/modules/BusinessManagementModule.vue index 411eead..d01951d 100644 --- a/src/views/businessManagement/modules/BusinessManagementModule.vue +++ b/src/views/businessManagement/modules/BusinessManagementModule.vue @@ -307,7 +307,7 @@ export default { checkDutyCode(rules, value, callback) { if (value) { if (!dutyCode(value)) { - callback('请输入15位、18位数字和大写英文字母') + callback('请输入15位、18位的信用代码') return } if (!this.model.id) { diff --git a/src/views/contractManagement/expenditureContract/modules/ExpenditureContractModule.vue b/src/views/contractManagement/expenditureContract/modules/ExpenditureContractModule.vue index b2b54ac..43c453c 100644 --- a/src/views/contractManagement/expenditureContract/modules/ExpenditureContractModule.vue +++ b/src/views/contractManagement/expenditureContract/modules/ExpenditureContractModule.vue @@ -602,6 +602,7 @@ export default { calculateOutstandingAmount() { if (this.accountsReceivableNum !== null && this.amountReceivedNum !== null) { this.model.outstandingAmount = Number(this.accountsReceivableNum) - Number(this.amountReceivedNum) + this.model.outstandingAmount = this.model.outstandingAmount.toFixed(2) if (this.model.outstandingAmount === 0) { this.model.accountStatus = '3' } else if (this.model.outstandingAmount > 0 && this.model.outstandingAmount < Number(this.accountsReceivableNum)) { diff --git a/src/views/contractManagement/revenueContract/modules/RevenueContractModule.vue b/src/views/contractManagement/revenueContract/modules/RevenueContractModule.vue index d45afb2..52c3284 100644 --- a/src/views/contractManagement/revenueContract/modules/RevenueContractModule.vue +++ b/src/views/contractManagement/revenueContract/modules/RevenueContractModule.vue @@ -663,6 +663,7 @@ export default { calculateOutstandingAmount() { if (this.accountsReceivableNum !== null && this.amountReceivedNum !== null) { this.model.outstandingAmount = Number(this.accountsReceivableNum) - Number(this.amountReceivedNum) + this.model.outstandingAmount = this.model.outstandingAmount.toFixed(2) // 未收金额 === 0，已付全款状态 if (this.model.outstandingAmount <= 0) { this.model.accountStatus = '3' diff --git a/src/views/contractManagement/revenueContract/modules/SelectProjectModule.vue b/src/views/contractManagement/revenueContract/modules/SelectProjectModule.vue index af92e37..9daafe7 100644 --- a/src/views/contractManagement/revenueContract/modules/SelectProjectModule.vue +++ b/src/views/contractManagement/revenueContract/modules/SelectProjectModule.vue @@ -69,7 +69,7 @@ :columns="columns" :dataSource="dataSource" :pagination="false" - :loading="loading" + :loading="confirmLoading" :rowSelection="{selectedRowKeys: selectedRowKeys, onChange: onSelectChange}" @change="handleTableChange" class="j-table-force-nowrap"> @@ -292,6 +292,7 @@ export default { this.$message.warn('请选择项目后再提交关联') return } + this.confirmLoading = true let submitData = [] let projectItem this.selectedRowKeys.forEach(item => { @@ -309,6 +310,8 @@ export default { } else { this.$message.warn(res.message) } + }).finally(() => { + this.confirmLoading = false }) }, handleCancel() { diff --git a/src/views/contractManagement/revenueContract/modules/SelectWorkingGroupProjectModule.vue b/src/views/contractManagement/revenueContract/modules/SelectWorkingGroupProjectModule.vue index 03da34c..2955cee 100644 --- a/src/views/contractManagement/revenueContract/modules/SelectWorkingGroupProjectModule.vue +++ b/src/views/contractManagement/revenueContract/modules/SelectWorkingGroupProjectModule.vue @@ -50,7 +50,7 @@ :columns="columns" :dataSource="dataSource" :pagination="false" - :loading="loading" + :loading="confirmLoading" :rowSelection="{selectedRowKeys: selectedRowKeys, onChange: onSelectChange}" @change="handleTableChange" class="j-table-force-nowrap"> @@ -74,7 +74,7 @@ { @@ -201,6 +202,8 @@ export default { } else { this.$message.warn(res.message) } + }).finally(() => { + this.confirmLoading = false }) }, handleCancel() { @@ -219,6 +222,13 @@ export default { return ( option.componentOptions.children[0].text.toLowerCase().indexOf(input.toLowerCase()) >= 0 ) + }, + /** + * 新增完成后关闭两个对话框 + */ + addOk() { + this.close() + this.$emit('ok') } } } diff --git a/src/views/dashboard/Analysis.vue b/src/views/dashboard/Analysis.vue index 755cbb7..be7cf78 100644 --- a/src/views/dashboard/Analysis.vue +++ b/src/views/dashboard/Analysis.vue @@ -93,11 +93,17 @@
个人统计（前10）
-
+ +
科室统计（前10）
-
+ +
@@ -105,11 +111,17 @@
工作组统计（前10）
-
+ +
企业统计（前10）
-
+ +
@@ -173,7 +185,7 @@ export default { position: 'center', formatter: function (params) { return params.name.length > 8 ? params.name.substr(0, 8) + '...' : params.name - }, + } }, emphasis: { label: { @@ -226,6 +238,9 @@ export default { * 初始化个人统计echarts */ initPersonalStatisticsEcharts() { + if (this.personalData.length === 0) { + return + } let strData = JSON.stringify(this.personalData) strData = strData.replaceAll('principalName', 'name').replaceAll('comeAllMoney', 'value') let arr = JSON.parse(strData) @@ -248,6 +263,9 @@ export default { * 初始化科室统计echarts */ initDepartStatisticsEcharts() { + if (this.departData.length === 0) { + return + } let strData = JSON.stringify(this.departData) strData = strData.replaceAll('departName', 'name').replaceAll('comeAllMoney', 'value') let arr = JSON.parse(strData) @@ -270,6 +288,9 @@ export default { * 初始化工作组统计echarts */ initWorkingGroupStatisticsEcharts() { + if (this.workingGroupData.length === 0) { + return + } let strData = JSON.stringify(this.workingGroupData) strData = strData.replaceAll('workGroup', 'name').replaceAll('comeAllMoney', 'value') let arr = JSON.parse(strData) @@ -292,6 +313,9 @@ export default { * 初始化企业统计echarts */ initCompanyStatisticsEcharts() { + if (this.companyData.length === 0) { + return + } let strData = JSON.stringify(this.companyData) strData = strData.replaceAll('chargeCompanyName', 'name').replaceAll('comeAllMoney', 'value') let arr = JSON.parse(strData) diff --git a/src/views/dataNetworkDiskManagement/committee/CommitteeMaintenance.vue b/src/views/dataNetworkDiskManagement/committee/CommitteeMaintenance.vue index 0460315..d51d829 100644 --- a/src/views/dataNetworkDiskManagement/committee/CommitteeMaintenance.vue +++ b/src/views/dataNetworkDiskManagement/committee/CommitteeMaintenance.vue @@ -44,13 +44,13 @@
@@ -190,10 +190,52 @@ export default { scopedSlots: { customRender: 'action' } } ], - dataSource: [] + dataSource: [], + expandedRowKeys: [], // 展开数据的id } }, methods: { + loadData(arg) { + if (!this.url.list) { + this.$message.error('请设置url.list属性!') + return + } + //加载数据 若传入参数1则加载第一页的内容 + if (arg === 1) { + this.ipagination.current = 1 + } + // 清除展开的行id + this.expandedRowKeys = [] + var params = this.getQueryParams()//查询条件 + this.loading = true + getAction(this.url.list, params).then((res) => { + if (res.success) { + //update-begin---author:zhangyafei Date:20201118 for：适配不分页的数据列表------------ + this.dataSource = res.result.records || res.result + // 表格有数据则需要展开 + if (this.dataSource.length > 0) { + this.dataSource.forEach(item => { + this.expandedRowKeys.push(item.id) + }) + this.$forceUpdate() + } + if (res.result.total) { + this.ipagination.total = res.result.total + //清空列表选中 + this.onClearSelected() + } else { + this.ipagination.total = 0 + } + //update-end---author:zhangyafei Date:20201118 for：适配不分页的数据列表------------ + } + if (res.code === 510) { + this.$message.warning(res.message) + } + this.loading = false + }).finally(() => { + this.loading = false + }) + }, // 下拉框的搜索 filterOption(input, option) { return ( diff --git a/src/views/packManagement/modules/BatchIncomePaymentModule.vue b/src/views/packManagement/modules/BatchIncomePaymentModule.vue index 19dcc9d..c45ad7e 100644 --- a/src/views/packManagement/modules/BatchIncomePaymentModule.vue +++ b/src/views/packManagement/modules/BatchIncomePaymentModule.vue @@ -46,10 +46,10 @@ class="j-table-force-nowrap"> - - - 文件维护 - 会议维护 - 复制 - 编辑 - 删除 +
@@ -170,7 +172,8 @@ export default { width: 300, scopedSlots: { customRender: 'action' } } - ] + ], + operateData: [] // 进行操作权限校验时使用的数据 } }, methods: { @@ -196,19 +199,6 @@ export default { } else { this.ipagination.total = 0 } - // 判断登录用户是否为负责人B - this.dataSource.forEach((item, index) => { - // （负责人B不可操作） - checkoutWorkingGroupPrincipal({ id: item.id }).then(res => { - // 不可操作则置否 - if (res.success) { - item.canOperate = true - } else { - item.canOperate = false - } - this.$set(this.dataSource, index, item) - }) - }) //update-end---author:zhangyafei Date:20201118 for：适配不分页的数据列表------------ } if (res.code === 510) { @@ -216,6 +206,34 @@ export default { } }).finally(() => { this.loading = false + // 判断登录用户是否为负责人B + if (this.dataSource.length > 0) { + for (let index = 0; index < this.dataSource.length; index++) { + this.checkWorkingGroupPrincipal(index).then((res) => { + res.showOperate = true + this.$set(this.dataSource, index, res) + }) + } + } + }) + }, + /** + * 判断登录用户是否为负责人B + */ + checkWorkingGroupPrincipal(index) { + let item = this.dataSource[index] + // （负责人B不可操作） + return new Promise(resolve => { + checkoutWorkingGroupPrincipal({ id: item.id }).then(res => { + // 不可操作则置否 + if (res.success) { + item.canOperate = true + } else { + item.canOperate = false + } + }).finally(() => { + resolve(item) + }) }) }, /** diff --git a/src/views/projectManagement/modules/GeneralProjectModule.vue b/src/views/projectManagement/modules/GeneralProjectModule.vue index 2474902..5ccd3ca 100644 --- a/src/views/projectManagement/modules/GeneralProjectModule.vue +++ b/src/views/projectManagement/modules/GeneralProjectModule.vue @@ -139,10 +139,10 @@ -