From 74e1938d3cd3bbc9b75357861c938a1d15feb34c Mon Sep 17 00:00:00 2001 From: odjbin <1042039504@qq.com> Date: Sun, 23 Jun 2024 01:02:27 +0800 Subject: [PATCH 1/3] =?UTF-8?q?fix=20:=20=E4=BF=AE=E6=94=B9=E5=88=86?= =?UTF-8?q?=E6=91=8A=E6=B1=87=E6=80=BB=E9=87=91=E9=A2=9D=E5=B1=95=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/DetailComponent/AllocationSummaryDetail.vue | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/components/DetailComponent/AllocationSummaryDetail.vue b/src/components/DetailComponent/AllocationSummaryDetail.vue index 2df5099..ba8c4bc 100644 --- a/src/components/DetailComponent/AllocationSummaryDetail.vue +++ b/src/components/DetailComponent/AllocationSummaryDetail.vue @@ -24,7 +24,8 @@ - {{ toThousands(scope.row.afterTax) }} + + {{ scope.row.afterTax }} @@ -70,7 +71,7 @@ const getSummaries = (param) => { return prev } }, 0)}` - sums[index] = toThousands(sums[index]) + // sums[index] = toThousands(sums[index]) } else { sums[index] = '-' } From 1efe8c4aaf932db84a2aabc4a88b870363de75c4 Mon Sep 17 00:00:00 2001 From: odjbin <1042039504@qq.com> Date: Sun, 23 Jun 2024 12:04:22 +0800 Subject: [PATCH 2/3] =?UTF-8?q?fix=20:=20=E4=BF=AE=E5=A4=8D=E9=A1=B9?= =?UTF-8?q?=E7=9B=AE=E5=AE=9E=E6=96=BD-=E5=8F=B0=E8=B4=A6=E5=9F=BA?= =?UTF-8?q?=E7=A1=80=E4=BF=A1=E6=81=AF=E5=B1=95=E7=A4=BA=E5=8F=8A=E8=A1=A8?= =?UTF-8?q?=E6=A0=BC=E6=9B=B4=E6=96=B0=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/project-manage/index.js | 6 + src/api/workflow/process-user.js | 2 +- .../AllocationSummaryDetail.vue | 2 +- .../implementation/account.vue | 128 +++++++++++++++--- .../implementation/updateTable.vue | 43 +++--- .../workflow/process/common/UserPicker.vue | 5 +- 6 files changed, 138 insertions(+), 48 deletions(-) diff --git a/src/api/project-manage/index.js b/src/api/project-manage/index.js index ef1cd84..c457e8d 100644 --- a/src/api/project-manage/index.js +++ b/src/api/project-manage/index.js @@ -152,3 +152,9 @@ export const updateLedger = (data) => { data: data }); }; +export const searchUpdateLedgerData = (projectId) => { + return request({ + url: `/workflow/mosr/expense/ledger/${projectId}`, + method: "get" + }); +}; diff --git a/src/api/workflow/process-user.js b/src/api/workflow/process-user.js index fd623f9..733d39c 100644 --- a/src/api/workflow/process-user.js +++ b/src/api/workflow/process-user.js @@ -22,7 +22,7 @@ export function getDepartmentTree() { method: 'get' }) } -export function getMosrDept(params) { +export function getMosrUser(params) { return request({ url: '/admin/mosr/user/choose', method: 'get', diff --git a/src/components/DetailComponent/AllocationSummaryDetail.vue b/src/components/DetailComponent/AllocationSummaryDetail.vue index ba8c4bc..ccd1b78 100644 --- a/src/components/DetailComponent/AllocationSummaryDetail.vue +++ b/src/components/DetailComponent/AllocationSummaryDetail.vue @@ -1,6 +1,6 @@ 导出 - diff --git a/src/views/project-management/implementation/account.vue b/src/views/project-management/implementation/account.vue index f6fa102..fa6a2e9 100644 --- a/src/views/project-management/implementation/account.vue +++ b/src/views/project-management/implementation/account.vue @@ -12,32 +12,105 @@