diff --git a/SC-boot/linkage-scm/src/main/resources/mapper/messageCenter/MessageCenterMapper.xml b/SC-boot/linkage-scm/src/main/resources/mapper/messageCenter/MessageCenterMapper.xml index 21cf8089..b8fd6f56 100644 --- a/SC-boot/linkage-scm/src/main/resources/mapper/messageCenter/MessageCenterMapper.xml +++ b/SC-boot/linkage-scm/src/main/resources/mapper/messageCenter/MessageCenterMapper.xml @@ -913,8 +913,11 @@ GROUP BY - - + + + + + @@ -922,22 +925,40 @@ GROUP BY diff --git a/SC-web/src/views/dashboard/admin/components/SaleTodayList.vue b/SC-web/src/views/dashboard/admin/components/SaleTodayList.vue index 2071f083..9ef5dbaa 100644 --- a/SC-web/src/views/dashboard/admin/components/SaleTodayList.vue +++ b/SC-web/src/views/dashboard/admin/components/SaleTodayList.vue @@ -11,6 +11,8 @@ + + @@ -75,11 +77,15 @@ export default { FFullName: "所有部门", Number: "合计", amout: 0, + bangdan: 0, + settlement: 0, collectionamounts: 0, notCollectionAmounts: 0, }; this.list.map((val) => { listCount.amout = round(listCount.amout+ val.amout) ; + listCount.bangdan = listCount.bangdan + val.bangdan; + listCount.settlement = round(listCount.settlement + val.settlement); listCount.collectionamounts = round(listCount.collectionamounts+val.collectionamounts); listCount.notCollectionAmounts = round(listCount.notCollectionAmounts + val.notCollectionAmounts); return val;