From f7db0f89dd138641ac47bfcec23f49c174c8a11d Mon Sep 17 00:00:00 2001 From: zhaoxiao Date: Fri, 18 Nov 2022 10:36:02 +0800 Subject: [PATCH 1/7] =?UTF-8?q?add=20=E6=89=93=E5=8C=85=E6=B7=BB=E5=8A=A0?= =?UTF-8?q?=E6=89=93=E5=8C=85=E8=B4=9F=E8=B4=A3=E4=BA=BA=E5=AD=97=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/packManagement/PackCompanyList.vue | 11 +++++++++-- .../modules/PackCompanyModule.vue | 17 +++++++++++++++-- 2 files changed, 24 insertions(+), 4 deletions(-) diff --git a/src/views/packManagement/PackCompanyList.vue b/src/views/packManagement/PackCompanyList.vue index a60515f..00ec08e 100644 --- a/src/views/packManagement/PackCompanyList.vue +++ b/src/views/packManagement/PackCompanyList.vue @@ -45,7 +45,7 @@ bordered rowKey="id" :columns="columns" - :scroll="{x: 1500}" + :scroll="{x: 1600}" :dataSource="dataSource" :pagination="ipagination" :loading="loading" @@ -86,7 +86,7 @@ ref="footTable" :rowKey="record=>record.id" :columns="columnsFooter" - :scroll="{x: 1500}" + :scroll="{x: 1600}" :dataSource="footerDataSource" :showHeader="false" :pagination="false" @@ -139,6 +139,13 @@ const defaultTableColumns = [ dataIndex: 'packContactTemporaryName', scopedSlots: { customRender: 'nameText' } }, + { + title: '打包负责人', + align: 'center', + width: 140, + dataIndex: 'packPrincipalName', + scopedSlots: { customRender: 'nameText' } + }, { title: '打包费用总计', align: 'center', diff --git a/src/views/packManagement/modules/PackCompanyModule.vue b/src/views/packManagement/modules/PackCompanyModule.vue index db0fa3e..0fb41e6 100644 --- a/src/views/packManagement/modules/PackCompanyModule.vue +++ b/src/views/packManagement/modules/PackCompanyModule.vue @@ -66,6 +66,14 @@ + + + + + + @@ -104,10 +112,11 @@ import SelectContacts from '../../../components/company/SelectContacts' import JYearDate from '../../../components/jero/JYearDate' import { money } from '../../../utils/validate' import { addZero } from '../../../utils/util' +import SelectPrincipal from '@comp/company/SelectPrincipal.vue' export default { name: 'PackCompanyModule', - components: { CompanySelect, SelectContacts, JYearDate }, + components: { CompanySelect, SelectContacts, JYearDate, SelectPrincipal }, data() { return { title: '操作', @@ -157,6 +166,10 @@ export default { packContactId: { rules: [{ required: true, message: '请选择打包联系人' }], validateTrigger: 'change' + }, + packPrincipalId: { + rules: [{ required: true, message: '请选择打包负责人' }], + validateTrigger: 'change' } }, initContact: null, // 编辑回显的企业联系人信息 @@ -192,7 +205,7 @@ export default { this.model = Object.assign({}, record) this.visible = true this.$nextTick(() => { - this.form.setFieldsValue(pick(this.model, 'company', 'companyContactId', 'packYear', 'packChargeTotal', 'packContactId', 'packChargeRemark', 'remark')) + this.form.setFieldsValue(pick(this.model, 'company', 'companyContactId', 'packYear', 'packChargeTotal', 'packContactId', 'packChargeRemark', 'remark', 'packPrincipalId')) }) }, close() { From 07c2d567e09ab2e5d7d4b801b6b680539ce61b75 Mon Sep 17 00:00:00 2001 From: fengachen <373943794@qq.com> Date: Fri, 18 Nov 2022 11:27:07 +0800 Subject: [PATCH 2/7] =?UTF-8?q?=E3=80=90=E4=BF=AE=E6=94=B9=E3=80=91?= =?UTF-8?q?=E7=99=BE=E5=88=86=E6=AF=94=E6=98=BE=E7=A4=BA=E7=9A=84bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/utils/formatMoney.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/utils/formatMoney.js b/src/utils/formatMoney.js index 2277f99..f4d396d 100644 --- a/src/utils/formatMoney.js +++ b/src/utils/formatMoney.js @@ -10,7 +10,7 @@ export function formatMoney(money) { point = num.substring(num.indexOf('.')) num = parseInt(num) }else { - point = '.00' + // point = '.00' } // 循环添加逗号 From 0b37c1f2f41ab4afc920fc4afb733e3de200d713 Mon Sep 17 00:00:00 2001 From: zhaoxiao Date: Fri, 18 Nov 2022 11:49:51 +0800 Subject: [PATCH 3/7] =?UTF-8?q?=E5=8E=BB=E6=8E=89=E6=89=93=E5=8C=85?= =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E6=89=93=E5=8C=85=E8=B4=9F=E8=B4=A3=E4=BA=BA?= =?UTF-8?q?=E5=AD=97=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/packManagement/PackCompanyList.vue | 18 +++++------ .../modules/PackCompanyModule.vue | 32 ++++++++++--------- 2 files changed, 26 insertions(+), 24 deletions(-) diff --git a/src/views/packManagement/PackCompanyList.vue b/src/views/packManagement/PackCompanyList.vue index 00ec08e..65aae51 100644 --- a/src/views/packManagement/PackCompanyList.vue +++ b/src/views/packManagement/PackCompanyList.vue @@ -45,7 +45,7 @@ bordered rowKey="id" :columns="columns" - :scroll="{x: 1600}" + :scroll="{x: 1500}" :dataSource="dataSource" :pagination="ipagination" :loading="loading" @@ -86,7 +86,7 @@ ref="footTable" :rowKey="record=>record.id" :columns="columnsFooter" - :scroll="{x: 1600}" + :scroll="{x: 1500}" :dataSource="footerDataSource" :showHeader="false" :pagination="false" @@ -139,13 +139,13 @@ const defaultTableColumns = [ dataIndex: 'packContactTemporaryName', scopedSlots: { customRender: 'nameText' } }, - { - title: '打包负责人', - align: 'center', - width: 140, - dataIndex: 'packPrincipalName', - scopedSlots: { customRender: 'nameText' } - }, + // { + // title: '打包负责人', + // align: 'center', + // width: 140, + // dataIndex: 'packPrincipalName', + // scopedSlots: { customRender: 'nameText' } + // }, { title: '打包费用总计', align: 'center', diff --git a/src/views/packManagement/modules/PackCompanyModule.vue b/src/views/packManagement/modules/PackCompanyModule.vue index 0fb41e6..32da3c9 100644 --- a/src/views/packManagement/modules/PackCompanyModule.vue +++ b/src/views/packManagement/modules/PackCompanyModule.vue @@ -66,14 +66,14 @@ - - - - - - + + + + + + + + @@ -112,11 +112,13 @@ import SelectContacts from '../../../components/company/SelectContacts' import JYearDate from '../../../components/jero/JYearDate' import { money } from '../../../utils/validate' import { addZero } from '../../../utils/util' -import SelectPrincipal from '@comp/company/SelectPrincipal.vue' +// import SelectPrincipal from '@comp/company/SelectPrincipal.vue' export default { name: 'PackCompanyModule', - components: { CompanySelect, SelectContacts, JYearDate, SelectPrincipal }, + components: { CompanySelect, SelectContacts, JYearDate, + // SelectPrincipal + }, data() { return { title: '操作', @@ -167,10 +169,10 @@ export default { rules: [{ required: true, message: '请选择打包联系人' }], validateTrigger: 'change' }, - packPrincipalId: { - rules: [{ required: true, message: '请选择打包负责人' }], - validateTrigger: 'change' - } + // packPrincipalId: { + // rules: [{ required: true, message: '请选择打包负责人' }], + // validateTrigger: 'change' + // } }, initContact: null, // 编辑回显的企业联系人信息 initPackContact: null // 编辑回显的打包联系人信息 @@ -205,7 +207,7 @@ export default { this.model = Object.assign({}, record) this.visible = true this.$nextTick(() => { - this.form.setFieldsValue(pick(this.model, 'company', 'companyContactId', 'packYear', 'packChargeTotal', 'packContactId', 'packChargeRemark', 'remark', 'packPrincipalId')) + this.form.setFieldsValue(pick(this.model, 'company', 'companyContactId', 'packYear', 'packChargeTotal', 'packContactId', 'packChargeRemark', 'remark')) }) }, close() { From b96f65459c48c3129c282738aae26c6e66ac3a36 Mon Sep 17 00:00:00 2001 From: zhaoxiao Date: Fri, 18 Nov 2022 13:36:20 +0800 Subject: [PATCH 4/7] =?UTF-8?q?Revert=20"=E5=8E=BB=E6=8E=89=E6=89=93?= =?UTF-8?q?=E5=8C=85=E6=B7=BB=E5=8A=A0=E6=89=93=E5=8C=85=E8=B4=9F=E8=B4=A3?= =?UTF-8?q?=E4=BA=BA=E5=AD=97=E6=AE=B5"?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This reverts commit 0b37c1f2f41ab4afc920fc4afb733e3de200d713. --- src/views/packManagement/PackCompanyList.vue | 18 +++++------ .../modules/PackCompanyModule.vue | 32 +++++++++---------- 2 files changed, 24 insertions(+), 26 deletions(-) diff --git a/src/views/packManagement/PackCompanyList.vue b/src/views/packManagement/PackCompanyList.vue index 65aae51..00ec08e 100644 --- a/src/views/packManagement/PackCompanyList.vue +++ b/src/views/packManagement/PackCompanyList.vue @@ -45,7 +45,7 @@ bordered rowKey="id" :columns="columns" - :scroll="{x: 1500}" + :scroll="{x: 1600}" :dataSource="dataSource" :pagination="ipagination" :loading="loading" @@ -86,7 +86,7 @@ ref="footTable" :rowKey="record=>record.id" :columns="columnsFooter" - :scroll="{x: 1500}" + :scroll="{x: 1600}" :dataSource="footerDataSource" :showHeader="false" :pagination="false" @@ -139,13 +139,13 @@ const defaultTableColumns = [ dataIndex: 'packContactTemporaryName', scopedSlots: { customRender: 'nameText' } }, - // { - // title: '打包负责人', - // align: 'center', - // width: 140, - // dataIndex: 'packPrincipalName', - // scopedSlots: { customRender: 'nameText' } - // }, + { + title: '打包负责人', + align: 'center', + width: 140, + dataIndex: 'packPrincipalName', + scopedSlots: { customRender: 'nameText' } + }, { title: '打包费用总计', align: 'center', diff --git a/src/views/packManagement/modules/PackCompanyModule.vue b/src/views/packManagement/modules/PackCompanyModule.vue index 32da3c9..0fb41e6 100644 --- a/src/views/packManagement/modules/PackCompanyModule.vue +++ b/src/views/packManagement/modules/PackCompanyModule.vue @@ -66,14 +66,14 @@ - - - - - - - - + + + + + + @@ -112,13 +112,11 @@ import SelectContacts from '../../../components/company/SelectContacts' import JYearDate from '../../../components/jero/JYearDate' import { money } from '../../../utils/validate' import { addZero } from '../../../utils/util' -// import SelectPrincipal from '@comp/company/SelectPrincipal.vue' +import SelectPrincipal from '@comp/company/SelectPrincipal.vue' export default { name: 'PackCompanyModule', - components: { CompanySelect, SelectContacts, JYearDate, - // SelectPrincipal - }, + components: { CompanySelect, SelectContacts, JYearDate, SelectPrincipal }, data() { return { title: '操作', @@ -169,10 +167,10 @@ export default { rules: [{ required: true, message: '请选择打包联系人' }], validateTrigger: 'change' }, - // packPrincipalId: { - // rules: [{ required: true, message: '请选择打包负责人' }], - // validateTrigger: 'change' - // } + packPrincipalId: { + rules: [{ required: true, message: '请选择打包负责人' }], + validateTrigger: 'change' + } }, initContact: null, // 编辑回显的企业联系人信息 initPackContact: null // 编辑回显的打包联系人信息 @@ -207,7 +205,7 @@ export default { this.model = Object.assign({}, record) this.visible = true this.$nextTick(() => { - this.form.setFieldsValue(pick(this.model, 'company', 'companyContactId', 'packYear', 'packChargeTotal', 'packContactId', 'packChargeRemark', 'remark')) + this.form.setFieldsValue(pick(this.model, 'company', 'companyContactId', 'packYear', 'packChargeTotal', 'packContactId', 'packChargeRemark', 'remark', 'packPrincipalId')) }) }, close() { From 132f434be36e0257eef34ded343a8747a42021ad Mon Sep 17 00:00:00 2001 From: zhaoxiao Date: Mon, 21 Nov 2022 10:16:48 +0800 Subject: [PATCH 5/7] =?UTF-8?q?=E4=BC=9A=E8=AE=AE=E8=AF=A6=E6=83=85?= =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E6=98=AF=E5=90=A6=E6=89=93=E5=8C=85=E7=9A=84?= =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E6=9D=A1=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/incomePayments/meetManage/Attendance.vue | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/src/views/incomePayments/meetManage/Attendance.vue b/src/views/incomePayments/meetManage/Attendance.vue index 470b4f9..5379f61 100644 --- a/src/views/incomePayments/meetManage/Attendance.vue +++ b/src/views/incomePayments/meetManage/Attendance.vue @@ -197,6 +197,13 @@ dictCode="guest_type"/> + + + + + + Date: Mon, 21 Nov 2022 13:44:48 +0800 Subject: [PATCH 6/7] =?UTF-8?q?=E9=A6=96=E9=A1=B5=E3=80=81=E7=BB=9F?= =?UTF-8?q?=E8=AE=A1--=E6=89=80=E6=9C=89=E7=9A=84=E3=80=90=E5=90=88?= =?UTF-8?q?=E5=90=8C=E9=87=91=E9=A2=9D=E3=80=91=20=E4=BF=AE=E6=94=B9?= =?UTF-8?q?=E6=88=90=20=E3=80=90=E5=B9=B4=E5=BA=A6=E5=BE=85=E7=A1=AE?= =?UTF-8?q?=E6=94=B6=E9=87=91=E9=A2=9D=E3=80=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/dashboard/AllMoneyTenEcharts.vue | 8 ++++---- src/views/dashboard/Analysis.vue | 8 ++++---- src/views/dashboard/DepartmentTotalEcharts.vue | 6 +++--- src/views/dashboard/IncomeSortEcharts.vue | 9 ++++++++- src/views/dashboard/SingleMonthEcharts.vue | 6 +++--- src/views/dashboard/SingleMonthTotalEcharts.vue | 6 +++--- src/views/dashboard/ThreeYearEcharts.vue | 2 +- .../statisticalReport/WholeInstituteStatisticsList.vue | 2 +- src/views/statisticalReport/WholePaymentsStatistics.vue | 2 +- .../departmentAllStatistics/DepartmentAllStatistics.vue | 2 +- .../IndividualPaymentStatisticsDetail.vue | 2 +- .../IndividualPaymentStatisticsList.vue | 2 +- .../ProjectPaymentStatisticsList.vue | 2 +- .../EnterprisePaymentStatisticsDetail.vue | 2 +- .../EnterprisePaymentStatisticsList.vue | 2 +- .../WorkingGroupPaymentStatisticsDetail.vue | 2 +- .../WorkingGroupPaymentStatisticsList.vue | 2 +- 17 files changed, 36 insertions(+), 29 deletions(-) diff --git a/src/views/dashboard/AllMoneyTenEcharts.vue b/src/views/dashboard/AllMoneyTenEcharts.vue index 374a1f7..abf42e1 100644 --- a/src/views/dashboard/AllMoneyTenEcharts.vue +++ b/src/views/dashboard/AllMoneyTenEcharts.vue @@ -1,7 +1,7 @@ diff --git a/src/views/dashboard/DepartmentTotalEcharts.vue b/src/views/dashboard/DepartmentTotalEcharts.vue index 3e11f13..4973696 100644 --- a/src/views/dashboard/DepartmentTotalEcharts.vue +++ b/src/views/dashboard/DepartmentTotalEcharts.vue @@ -111,7 +111,7 @@ export default { this.initEcharts(res.result) // 将接口数据 转化成表格数据形式 let tableData = [ - {indexName: '合同金额'}, + {indexName: '年度待确收金额'}, {indexName: '确认收入金额'}, {indexName: '完成比例'} ] @@ -274,7 +274,7 @@ export default { }, series: [ { - name: '合同金额', + name: '年度待确收金额', data: this.echartsData.allMoney, type: 'bar', barMaxWidth: 30, @@ -302,7 +302,7 @@ export default { /** * 计算百分比 * @param num1 确收金额 - * @param num2 合同金额 + * @param num2 年度待确收金额 * */ calcPercent(num1,num2){ let pointNo = Number(num1) / Number(num2) * 100 diff --git a/src/views/dashboard/IncomeSortEcharts.vue b/src/views/dashboard/IncomeSortEcharts.vue index 1893f03..4758114 100644 --- a/src/views/dashboard/IncomeSortEcharts.vue +++ b/src/views/dashboard/IncomeSortEcharts.vue @@ -165,7 +165,7 @@ export default { this.initEcharts(res.result) // 将接口数据 转化成表格数据形式 let tableData = [ - {indexName: typeEnum[this.activeIndex] !== 2 ? '合同金额' : '确收金额'}, + {indexName: typeEnum[this.activeIndex] !== 2 ? '年度待确收金额' : '确收金额'}, {indexName: '百分比'} ] dataSource.map((item, index) => { @@ -403,4 +403,11 @@ export default { font-weight: bold; background: rgb(245, 245, 246); } + +/*列表自适应超出隐藏*/ +.table-text { + white-space: nowrap; + overflow: hidden; + text-overflow: ellipsis; +} \ No newline at end of file diff --git a/src/views/dashboard/SingleMonthEcharts.vue b/src/views/dashboard/SingleMonthEcharts.vue index b9f2261..0cb7bc2 100644 --- a/src/views/dashboard/SingleMonthEcharts.vue +++ b/src/views/dashboard/SingleMonthEcharts.vue @@ -137,7 +137,7 @@ export default { let dataSource = res.result // 树形结构的数据 ，修改成table可以直接展示的数据，默认只有四行数据 let tableData = [ - // {indexName: '合同金额'}, + // {indexName: '年度待确收金额'}, {indexName: '确认收入金额'}, {indexName: '开票金额'}, {indexName: '到账金额'}, @@ -147,7 +147,7 @@ export default { let keyItem = MonthData.find(ele => Number(ele.value) === (index + 1)) if (keyItem) { let key = keyItem.key - // tableData[0][key] = item.allMoney // 合同金额 + // tableData[0][key] = item.allMoney // 年度待确收金额 tableData[0][key] = item.confirmAmount // 确认收入金额 tableData[1][key] = item.billMoney // 开票金额 tableData[2][key] = item.comeAllMoney // 到账金额 @@ -264,7 +264,7 @@ export default { }, series: [ // { - // name: '合同金额', + // name: '年度待确收金额', // type: 'line', // showSymbol: false, // symbol: 'circle', diff --git a/src/views/dashboard/SingleMonthTotalEcharts.vue b/src/views/dashboard/SingleMonthTotalEcharts.vue index 8339680..b420257 100644 --- a/src/views/dashboard/SingleMonthTotalEcharts.vue +++ b/src/views/dashboard/SingleMonthTotalEcharts.vue @@ -129,7 +129,7 @@ export default { let dataSource = res.result // 树形结构的数据 ，修改成table可以直接展示的数据，默认只有四行数据 let tableData = [ - // {indexName: '合同金额'}, + // {indexName: '年度待确收金额'}, {indexName: '确认收入金额'}, {indexName: '开票金额'}, {indexName: '到账金额'}, @@ -139,7 +139,7 @@ export default { let keyItem = MonthDataTotal.find(ele => Number(ele.value) === (index + 1)) if (keyItem) { let key = keyItem.key - // tableData[0][key] = item.allMoney // 合同金额 + // tableData[0][key] = item.allMoney // 年度待确收金额 tableData[0][key] = item.confirmAmount // 确认收入金额 tableData[1][key] = item.billMoney // 开票金额 tableData[2][key] = item.comeAllMoney // 到账金额 @@ -250,7 +250,7 @@ export default { }, series: [ // { - // name: '合同金额', + // name: '年度待确收金额', // type: 'line', // showSymbol: false, // symbol: 'circle', diff --git a/src/views/dashboard/ThreeYearEcharts.vue b/src/views/dashboard/ThreeYearEcharts.vue index b723d07..53878d4 100644 --- a/src/views/dashboard/ThreeYearEcharts.vue +++ b/src/views/dashboard/ThreeYearEcharts.vue @@ -1,7 +1,7 @@