From 014bb14170308d4ac67d3f8bc1283c332ac1486f Mon Sep 17 00:00:00 2001 From: qsh <> Date: Fri, 25 Oct 2024 10:27:36 +0800 Subject: [PATCH 1/4] sc --- src/views/Clue/Order/Comp/SchoolSettle.vue | 13 ++++++++++++- src/views/MiniMall/MallSet/Comp/SupplierSet.vue | 1 + 2 files changed, 13 insertions(+), 1 deletion(-) diff --git a/src/views/Clue/Order/Comp/SchoolSettle.vue b/src/views/Clue/Order/Comp/SchoolSettle.vue index 7af0098..d12f4d4 100644 --- a/src/views/Clue/Order/Comp/SchoolSettle.vue +++ b/src/views/Clue/Order/Comp/SchoolSettle.vue @@ -248,6 +248,16 @@ {{ settleAmount }} + + + @@ -270,7 +280,7 @@ import { getPlaceList } from '@/api/school/place' import { getClassTypeList } from '@/api/school/class' import * as SettleApi from '@/api/clue/settle' -import { dateFormatter } from '@/utils/formatTime' +import { dateFormatter, formatDate } from '@/utils/formatTime' import { removeNullField } from '@/utils/index' const message = useMessage() // 消息弹窗 @@ -395,6 +405,7 @@ function batchSettle() { showDailog.value = true form.value = { settlementIds: selectList.value.map((it) => it.settlementId), + settlementDate: formatDate(new Date()), reamrk: undefined } settleAmount.value = selectList.value.reduce((pre, cur) => pre + cur.settlementMoney, 0) diff --git a/src/views/MiniMall/MallSet/Comp/SupplierSet.vue b/src/views/MiniMall/MallSet/Comp/SupplierSet.vue index f35ac9d..d4274d1 100644 --- a/src/views/MiniMall/MallSet/Comp/SupplierSet.vue +++ b/src/views/MiniMall/MallSet/Comp/SupplierSet.vue @@ -17,6 +17,7 @@ + Date: Mon, 28 Oct 2024 14:46:13 +0800 Subject: [PATCH 2/4] sc --- src/views/Clue/Order/Comp/DialogOrder.vue | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/src/views/Clue/Order/Comp/DialogOrder.vue b/src/views/Clue/Order/Comp/DialogOrder.vue index 0de9770..656d59d 100644 --- a/src/views/Clue/Order/Comp/DialogOrder.vue +++ b/src/views/Clue/Order/Comp/DialogOrder.vue @@ -61,14 +61,15 @@ - + - + + From b8bc124162bcb409969d4b556f0eb5b558d7aff7 Mon Sep 17 00:00:00 2001 From: qsh <> Date: Tue, 29 Oct 2024 16:58:44 +0800 Subject: [PATCH 3/4] sc --- src/views/Home/CloseRate.vue | 2 - .../Home/Comp/DialogSalerReportDetail.vue | 0 src/views/Home/SalesReport.vue | 161 ++++++++++++++++++ 3 files changed, 161 insertions(+), 2 deletions(-) create mode 100644 src/views/Home/Comp/DialogSalerReportDetail.vue create mode 100644 src/views/Home/SalesReport.vue diff --git a/src/views/Home/CloseRate.vue b/src/views/Home/CloseRate.vue index ef6620a..f03d6c6 100644 --- a/src/views/Home/CloseRate.vue +++ b/src/views/Home/CloseRate.vue @@ -102,8 +102,6 @@ function totalSort(pre, cur) { } function monthSort(pre, cur, idx) { - console.log(idx) - return ( Number(pre.monthClueSignRateReportList[idx].rate) - Number(cur.monthClueSignRateReportList[idx].rate) diff --git a/src/views/Home/Comp/DialogSalerReportDetail.vue b/src/views/Home/Comp/DialogSalerReportDetail.vue new file mode 100644 index 0000000..e69de29 diff --git a/src/views/Home/SalesReport.vue b/src/views/Home/SalesReport.vue new file mode 100644 index 0000000..ef08abd --- /dev/null +++ b/src/views/Home/SalesReport.vue @@ -0,0 +1,161 @@ + + + + + From fa39fd8492d2d10d4b5528dd444008d8e01d155e Mon Sep 17 00:00:00 2001 From: qsh <> Date: Tue, 29 Oct 2024 17:51:08 +0800 Subject: [PATCH 4/4] sc --- src/views/Clue/Set/Comp/DialogSource.vue | 118 ++++++++++++++++++----- 1 file changed, 94 insertions(+), 24 deletions(-) diff --git a/src/views/Clue/Set/Comp/DialogSource.vue b/src/views/Clue/Set/Comp/DialogSource.vue index 9c3c337..02c22a1 100644 --- a/src/views/Clue/Set/Comp/DialogSource.vue +++ b/src/views/Clue/Set/Comp/DialogSource.vue @@ -7,30 +7,81 @@ :rules="formRules" label-width="80px" > - - - - - - - - - - - - 启用 - 禁用 - - - - - + + + + + + + + + + + + + + + + + + + + 总价 + 单价 + + + + + + + + 启用 + 禁用 + + + + + + + + + + + 线索成本 + + 添加年份 + + + + + + + + +