From a72db9307d141c252112050ac38ab8e637378ef8 Mon Sep 17 00:00:00 2001 From: qsh <> Date: Sun, 1 Sep 2024 12:22:07 +0800 Subject: [PATCH 1/4] sc --- src/views/Clue/Order/Comp/DialogOrder.vue | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/src/views/Clue/Order/Comp/DialogOrder.vue b/src/views/Clue/Order/Comp/DialogOrder.vue index d596168..0de9770 100644 --- a/src/views/Clue/Order/Comp/DialogOrder.vue +++ b/src/views/Clue/Order/Comp/DialogOrder.vue @@ -191,11 +191,17 @@ function getFields() { }) getOrderFieldList().then((data) => { - const arr = useCrudSchemas(data).allSchemas.detailSchema - arr.forEach((it) => { + const list = useCrudSchemas(data).allSchemas.detailSchema + const arr = [] + list.forEach((it) => { if (it.label.includes('日期')) { it.dateFormat = 'YYYY-MM-DD' } + if (it.field == 'receivedMoney') { + checkPermi(['clue:order:return-list']) && arr.push(it) + } else { + arr.push(it) + } }) if (arr.length % 2 != 0) { arr.push({}) From 0673721ad701f47334d375f944d8e88d0340fab2 Mon Sep 17 00:00:00 2001 From: qsh <> Date: Wed, 4 Sep 2024 17:36:06 +0800 Subject: [PATCH 2/4] sc --- src/api/clue/settle.js | 5 ++ src/views/Clue/Order/Comp/MallSettle.vue | 70 +++++++++++++++++++--- src/views/Clue/Order/Comp/Reback.vue | 22 ++++++- src/views/Clue/Order/Comp/SchoolSettle.vue | 70 +++++++++++++++++++--- 4 files changed, 150 insertions(+), 17 deletions(-) diff --git a/src/api/clue/settle.js b/src/api/clue/settle.js index d9e5609..bcee0ca 100644 --- a/src/api/clue/settle.js +++ b/src/api/clue/settle.js @@ -24,3 +24,8 @@ export const getMallSettleDetail = async (id) => { export const batchSaveSettle = async (data) => { return await request.post({ url: '/admin-api/crm/sign-settlement/batch/save', data }) } + +// 修改结算 +export const updateSettle = async (data) => { + return await request.post({ url: '/admin-api/crm/sign-settlement/update/money', data }) +} diff --git a/src/views/Clue/Order/Comp/MallSettle.vue b/src/views/Clue/Order/Comp/MallSettle.vue index 5acd2c1..0f429e2 100644 --- a/src/views/Clue/Order/Comp/MallSettle.vue +++ b/src/views/Clue/Order/Comp/MallSettle.vue @@ -157,16 +157,38 @@ - + + + - + + + @@ -199,6 +221,18 @@ + + + { + message.success('修改成功') + getList() + }) + .finally(() => { + row.edit = false + }) + } else { + row.edit = true + } +} + const selectList = ref([]) function handleSelectionChange(val) { selectList.value = [...val] diff --git a/src/views/Clue/Order/Comp/Reback.vue b/src/views/Clue/Order/Comp/Reback.vue index 9cd273a..555ebed 100644 --- a/src/views/Clue/Order/Comp/Reback.vue +++ b/src/views/Clue/Order/Comp/Reback.vue @@ -218,9 +218,24 @@ + > + + { message.success('修改成功') diff --git a/src/views/Clue/Order/Comp/SchoolSettle.vue b/src/views/Clue/Order/Comp/SchoolSettle.vue index 3ff02ee..670ce95 100644 --- a/src/views/Clue/Order/Comp/SchoolSettle.vue +++ b/src/views/Clue/Order/Comp/SchoolSettle.vue @@ -158,16 +158,38 @@ - + + + - + + + @@ -200,6 +222,18 @@ + + + { + message.success('修改成功') + getList() + }) + .finally(() => { + row.edit = false + }) + } else { + row.edit = true + } +} + function getSummaries(param) { const { columns } = param const sums = [] From 05405138944cae517c746b3985b44e54376ebeb1 Mon Sep 17 00:00:00 2001 From: qsh <> Date: Wed, 4 Sep 2024 17:57:38 +0800 Subject: [PATCH 3/4] sc --- src/views/Clue/Order/Comp/MallSettle.vue | 1 + src/views/Clue/Order/Comp/SchoolSettle.vue | 1 + 2 files changed, 2 insertions(+) diff --git a/src/views/Clue/Order/Comp/MallSettle.vue b/src/views/Clue/Order/Comp/MallSettle.vue index 0f429e2..3117194 100644 --- a/src/views/Clue/Order/Comp/MallSettle.vue +++ b/src/views/Clue/Order/Comp/MallSettle.vue @@ -227,6 +227,7 @@ v-if="row.settlementState == '待结算'" type="primary" text + v-hasPermi="['clue:order:settle-update']" @click="handleUpdate(row)" > {{ row.edit ? '保存' : '修改' }} diff --git a/src/views/Clue/Order/Comp/SchoolSettle.vue b/src/views/Clue/Order/Comp/SchoolSettle.vue index 670ce95..7af0098 100644 --- a/src/views/Clue/Order/Comp/SchoolSettle.vue +++ b/src/views/Clue/Order/Comp/SchoolSettle.vue @@ -228,6 +228,7 @@ v-if="row.settlementState == '待结算'" type="primary" text + v-hasPermi="['clue:order:settle-update']" @click="handleUpdate(row)" > {{ row.edit ? '保存' : '修改' }} From cc5648414ea12edcac03e57fbe3446e9a0d203e2 Mon Sep 17 00:00:00 2001 From: qsh <> Date: Thu, 5 Sep 2024 15:32:39 +0800 Subject: [PATCH 4/4] sc --- src/views/Clue/Order/Comp/Reback.vue | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/views/Clue/Order/Comp/Reback.vue b/src/views/Clue/Order/Comp/Reback.vue index 555ebed..e7180ac 100644 --- a/src/views/Clue/Order/Comp/Reback.vue +++ b/src/views/Clue/Order/Comp/Reback.vue @@ -312,7 +312,7 @@ import DialogBatchAudit from './DialogBatchAudit.vue' import { removeNullField } from '@/utils' import { useAppStore } from '@/store/modules/app' -import { dateFormatter } from '@/utils/formatTime' +import { dateFormatter, formatDate } from '@/utils/formatTime' const userStore = useUserStore() const message = useMessage() // 消息弹窗 @@ -454,7 +454,7 @@ async function handleUpdate(row) { companyProfit: row.companyProfit, personProfit: row.personProfit, isPayoff: row.isPayoffValue, - applyTime: row.applyTime + applyTime: formatDate(row.applyTime) }) .then(() => { message.success('修改成功')