From 57da4e34d0847768d0f3900ab9639de957455dc4 Mon Sep 17 00:00:00 2001 From: zhaoxiao Date: Sun, 26 Sep 2021 13:54:42 +0800 Subject: [PATCH] =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E8=AF=A6=E6=83=85=EF=BC=8C?= =?UTF-8?q?=E9=A6=96=E9=A1=B5=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/assets/imgs/meeting_project_selected.png | Bin 1265 -> 2976 bytes src/components/ProjectDetailModal.vue | 14 +++- .../modules/RevenueContractModule.vue | 2 + src/views/dashboard/Analysis.vue | 10 ++- src/views/mailManagement/BillMail.vue | 17 +++-- .../WorkingGroupProjectManagement.vue | 67 ++++++++++++------ .../WholeInstituteStatisticsList.vue | 6 +- .../IndividualPaymentStatisticsDetail.vue | 6 +- .../ProjectPaymentStatisticsList.vue | 13 +++- .../EnterprisePaymentStatisticsDetail.vue | 6 +- 10 files changed, 99 insertions(+), 42 deletions(-) diff --git a/src/assets/imgs/meeting_project_selected.png b/src/assets/imgs/meeting_project_selected.png index 54983896cfe174a00bb7856860e2bca791f1e711..dc3060f796d7a44751064b3f0c1d02caea19b4f2 100644 GIT binary patch delta 2958 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 Ef^uu7c>n+a delta 1233 zcmZ1={*iNnK|RZAPZ!6KinzD8yz_;_WmrFamUm8j<2fz0*=2Rv^_pg`77g9I8<(ie zb`tNr!rQ&d%Z@2_ir(sF{YM@g>EGk*@yMp((HG?nI-!C&yH-E(SeN-MtbEx5CPnEE z*5k*cPw)G@-+q4aTTh!LVLE<0dNKnWe@W=x%JlLB3pW)%`qJRKKX32c;&=1T-97iNo;}RF z?Cia*J2sj!S^S^u!M{s(LtwY`>}&?Rg|mH`f6A_?PN)xmvf^8F5xZQ~gK2s8L67Qx zExaXWZYJ}#LW)Q1zM#S9=MD$X?E2?7P3Vkn&d0f>a}ORlCiY(`At|0?Mx?oI^VEc_ zr0)FdrEJ2&+%qJu_p2q;JunS5G2C=?JB!a7ZbswR%hERp`S|91JR1tsdxS~t*x5QY z&4X8tgx!b=bOq}&Uz?#iBl-r{Z1a$d^+%3@lxRh9E>qif=-4K$Su-LI9N7`+x?cO> znPXuQ``2};iHR8)=7nASs;W9eA`&R+Wnh`dwrAUlF10q0%(Mrgsxxlh;9AYSDkCZJ zH1~`d;v4>S37yf&`8l;R)MVp^hR(vv`4@jm7ke2PZUS;Pv*?2ipB6ta)U{ri8|V-7 z)h}KfBV;wfva`ZmVUn&O3qExNJ-TtjQ*n?-PwR(FO-M@YX7M@09bvMb#h5$VBp&EL zAf*lotn2q*bUZr+bW%!p8Y@sociQqPKpl+2kC)Zwbfis5NK5WcQ>zcXc;t|nFZYZa z;!J7Re9u34IZ11l#LY#s8aitg6VmQ(S(JS}PNVqqXNxL1dRY~|KwQv250FthaU z^feoTLR^KFqa(x&HtMsSSu;DVq|!;$w3JlHwc=T-n2<_WbLC zqw-M?TFs^g~L^L{R@Ry%g8p5a{iO|}jF(V6iQQXY+qAALVAlwQvGWt0D1 z)z7BP#edhHZ+pM|KxWtR { if (res.success) { diff --git a/src/views/contractManagement/revenueContract/modules/RevenueContractModule.vue b/src/views/contractManagement/revenueContract/modules/RevenueContractModule.vue index 86732c5..33ae394 100644 --- a/src/views/contractManagement/revenueContract/modules/RevenueContractModule.vue +++ b/src/views/contractManagement/revenueContract/modules/RevenueContractModule.vue @@ -451,6 +451,8 @@ export default { let record record = res.result this.isSaved = true + // 获取合同号 + this.contractNum = record.contractNum // 处理企业信息回显 record.signedCompany = { id: record.signedCompanyId, diff --git a/src/views/dashboard/Analysis.vue b/src/views/dashboard/Analysis.vue index d77b57e..808c9f0 100644 --- a/src/views/dashboard/Analysis.vue +++ b/src/views/dashboard/Analysis.vue @@ -144,12 +144,16 @@ export default { legend: { type: 'plain', orient: 'vertical', + width: 20, right: 10, top: 20, bottom: 20, itemGap: 30, // 图例间距 - itemWidth: 15, - data: ['Search Engine', 'Direct', 'Email', 'Union Ads', 'Video Ads', 'Search Engine1', 'Direct1', 'Email1', 'Union Ads1', 'Video Ads1'] + itemWidth: 13, + data: ['Search Engine', 'Direct', 'Email', 'Union Ads', 'Video Ads', 'Search Engine1', 'Direct1', 'Email1', 'Union Ads1', 'Video Ads1'], + formatter: function (name) { + return name.length > 7 ? name.substr(0, 7) + '...' : name + } }, tooltip: { trigger: 'item' @@ -398,7 +402,6 @@ export default { } .item-left { - width: 60%; padding-left: 15px; height: 100%; padding-top: 45px; @@ -409,6 +412,7 @@ export default { } .item-right { + flex-shrink: 0; padding-right: 10px; cursor: pointer; max-height: 105px; diff --git a/src/views/mailManagement/BillMail.vue b/src/views/mailManagement/BillMail.vue index c774ba1..b422bdd 100644 --- a/src/views/mailManagement/BillMail.vue +++ b/src/views/mailManagement/BillMail.vue @@ -76,13 +76,10 @@ class="j-table-force-nowrap" @change="handleTableChange"> -