From be7daa58eee1911ba392c122c2d1a0beeaaac985 Mon Sep 17 00:00:00 2001
From: dzc <2388224167@qq.com>
Date: Mon, 7 Apr 2025 14:59:38 +0800
Subject: [PATCH 1/9] =?UTF-8?q?feat:=E6=99=BA=E8=83=BD=E6=9F=9C=E5=95=86?=
=?UTF-8?q?=E5=93=81=E6=89=8B=E5=8A=A8=E4=B8=8A=E6=9E=B6=20feat:=E5=A2=9E?=
=?UTF-8?q?=E5=8A=A0=E6=90=9C=E7=B4=A2=E6=9D=A1=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/api/hard/hard-spu-repertory.ts | 4 ++--
src/views/hard/hard-order/index.vue | 2 +-
src/views/hard/hard-spu-repertory/index.vue | 6 +++---
3 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/src/api/hard/hard-spu-repertory.ts b/src/api/hard/hard-spu-repertory.ts
index 4519dc6..6b65e91 100644
--- a/src/api/hard/hard-spu-repertory.ts
+++ b/src/api/hard/hard-spu-repertory.ts
@@ -1,8 +1,8 @@
import request from "/@/utils/request"
-export function select(query?: Object) {
+export function pageJoin(query?: Object) {
return request({
- url: "/hard/hard-spu-repertory/select",
+ url: "/hard/hard-spu-repertory/page-join",
method: "get",
params: query,
})
diff --git a/src/views/hard/hard-order/index.vue b/src/views/hard/hard-order/index.vue
index 0399ef1..01d6d7e 100644
--- a/src/views/hard/hard-order/index.vue
+++ b/src/views/hard/hard-order/index.vue
@@ -10,7 +10,7 @@
-
+
diff --git a/src/views/hard/hard-spu-repertory/index.vue b/src/views/hard/hard-spu-repertory/index.vue
index 4a2f989..839ccc1 100644
--- a/src/views/hard/hard-spu-repertory/index.vue
+++ b/src/views/hard/hard-spu-repertory/index.vue
@@ -67,7 +67,7 @@
+
+
diff --git a/src/views/hard/hard-spu/form.vue b/src/views/hard/hard-spu/form.vue
index f4b8625..7d61d5d 100644
--- a/src/views/hard/hard-spu/form.vue
+++ b/src/views/hard/hard-spu/form.vue
@@ -10,7 +10,7 @@
- 商品层数
+ 放置层数
From c2013471ff88b66cab85ee66206d1f93e27aca64 Mon Sep 17 00:00:00 2001
From: dzc <2388224167@qq.com>
Date: Mon, 7 Apr 2025 19:55:27 +0800
Subject: [PATCH 5/9] 11
---
src/views/hard/hard-spu-repertory/index.vue | 4 +---
src/views/hard/hard-spu/form.vue | 2 +-
src/views/hard/hard-spu/index.vue | 5 +++++
3 files changed, 7 insertions(+), 4 deletions(-)
diff --git a/src/views/hard/hard-spu-repertory/index.vue b/src/views/hard/hard-spu-repertory/index.vue
index 0458e03..aa397d5 100644
--- a/src/views/hard/hard-spu-repertory/index.vue
+++ b/src/views/hard/hard-spu-repertory/index.vue
@@ -85,9 +85,7 @@
-
- {{ row.hardDoorNumber }}
-
+ {{ row.hardDoorNumber }}层
diff --git a/src/views/hard/hard-spu/form.vue b/src/views/hard/hard-spu/form.vue
index 7d61d5d..362dfa4 100644
--- a/src/views/hard/hard-spu/form.vue
+++ b/src/views/hard/hard-spu/form.vue
@@ -101,7 +101,7 @@ const form = reactive({
salesCount: 0,
repertoryCount: 0,
sort: 0,
- hardDoorNumber: "",
+ hardDoorNumber: 1,
status: "1",
isDefault: "0",
})
diff --git a/src/views/hard/hard-spu/index.vue b/src/views/hard/hard-spu/index.vue
index 485dfc5..04d38ff 100644
--- a/src/views/hard/hard-spu/index.vue
+++ b/src/views/hard/hard-spu/index.vue
@@ -42,6 +42,11 @@
{{ row.merchantName }}
+
+
+ {{ row.hardDoorNumber }}层
+
+
{{ row.hardName }}
From c1ab44b7a14ff88ec08d42e592e8a4079a26ee4a Mon Sep 17 00:00:00 2001
From: weiwei
Date: Mon, 7 Apr 2025 20:48:13 +0800
Subject: [PATCH 6/9] =?UTF-8?q?=E6=B5=8B=E8=AF=95bug=E4=BF=AE=E6=94=B9?=
=?UTF-8?q?=E5=92=8C=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/api/supermarketerp/smErpSupplier.ts | 2 +-
src/components/Select/SelectHandlerUser.vue | 4 ++++
src/components/Select/SelectSupplier.vue | 4 ++++
src/components/processDrawer/types.ts | 1 +
src/hooks/smProcessTableAction.ts | 1 +
src/views/canteenDailyDishes/index.vue | 2 +-
.../components/linkCodeDialog.vue | 19 ++++++++++++++++---
.../purchaseManagement/smErpCgDd/index.vue | 19 +++++++++++++++++--
8 files changed, 45 insertions(+), 7 deletions(-)
diff --git a/src/api/supermarketerp/smErpSupplier.ts b/src/api/supermarketerp/smErpSupplier.ts
index 7471456..b3c9ddb 100644
--- a/src/api/supermarketerp/smErpSupplier.ts
+++ b/src/api/supermarketerp/smErpSupplier.ts
@@ -40,7 +40,7 @@ export function putObj(obj?: Object) {
}
// 获取货商下拉列表
-export function getSupplierSimpleAll(params: any): any {
+export function getSupplierSimpleAll(params?: any): any {
return request({
url: "/supermarket/smErpSupplier/selectSimpleAll",
method: "get",
diff --git a/src/components/Select/SelectHandlerUser.vue b/src/components/Select/SelectHandlerUser.vue
index c8025b6..8c723bf 100644
--- a/src/components/Select/SelectHandlerUser.vue
+++ b/src/components/Select/SelectHandlerUser.vue
@@ -1,5 +1,7 @@
+ {{ state.options.find((item: any) => item.id == selectId)?.nameWithMobile }}
(), {
placeholder: "请选择",
+ isDisplayName: false,
})
const queryForm = reactive({})
diff --git a/src/components/Select/SelectSupplier.vue b/src/components/Select/SelectSupplier.vue
index fb69b6c..7327c5b 100644
--- a/src/components/Select/SelectSupplier.vue
+++ b/src/components/Select/SelectSupplier.vue
@@ -1,5 +1,7 @@
+ {{ state.options.find((item: any) => item.supplierId == selectId)?.supplierName }}
(), {
placeholder: "请选择",
+ isDisplayName: false,
})
const queryForm = reactive({})
diff --git a/src/components/processDrawer/types.ts b/src/components/processDrawer/types.ts
index b9c96ce..a9fa916 100644
--- a/src/components/processDrawer/types.ts
+++ b/src/components/processDrawer/types.ts
@@ -12,6 +12,7 @@ export interface TaskData {
taskId: string
processInstanceId: string
flowId: string
+ nodeId?: string
}
export interface TaskSubmitParam {
diff --git a/src/hooks/smProcessTableAction.ts b/src/hooks/smProcessTableAction.ts
index 4f3fe9f..56ebb6a 100644
--- a/src/hooks/smProcessTableAction.ts
+++ b/src/hooks/smProcessTableAction.ts
@@ -36,6 +36,7 @@ export function useSmProcessTableAction(
processFormState.showForm = false
processFormState.formId = undefined
processFormState.formDisabled = true
+ fetchList()
}
// 点击开始处理
const deal = (row: tableRow) => {
diff --git a/src/views/canteenDailyDishes/index.vue b/src/views/canteenDailyDishes/index.vue
index e2c5446..1f1e151 100644
--- a/src/views/canteenDailyDishes/index.vue
+++ b/src/views/canteenDailyDishes/index.vue
@@ -226,7 +226,7 @@ const getDishByType = async () => {
// foodData.breakfast = r.dailyMenuVOS
break
case 2:
- foodData.lunch = r.dailyMenuVOS.filter((v: any, index: number) => index < 15)
+ foodData.lunch = r.dailyMenuVOS.filter((v: any, index: number) => index < 11)
break
case 3:
// foodData.dinner = r.dailyMenuVOS
diff --git a/src/views/supermarketerp/components/linkCodeDialog.vue b/src/views/supermarketerp/components/linkCodeDialog.vue
index 5297e64..ea2ad8f 100644
--- a/src/views/supermarketerp/components/linkCodeDialog.vue
+++ b/src/views/supermarketerp/components/linkCodeDialog.vue
@@ -51,9 +51,21 @@
-
-
-
+
+
+ {{ displayPrice(row.purchasePrice) }}
+
+
+
+
+ {{ displayPrice(row.unitPrice) }}
+
+
+
+
+ {{ displayPrice(row.totalAmount) }}
+
+
@@ -71,6 +83,7 @@ import { ref } from "vue"
import { VxeTableEvents } from "vxe-table"
import { getSimpleUserAll } from "/@/api/admin/user"
import { useDict } from "/@/hooks/dict"
+import { displayPrice } from "/@/utils/formatMoney"
const { check_status } = useDict("check_status")
const linkCodeDialogVisible = defineModel()
diff --git a/src/views/supermarketerp/purchaseManagement/smErpCgDd/index.vue b/src/views/supermarketerp/purchaseManagement/smErpCgDd/index.vue
index 6a69e95..7c0116c 100644
--- a/src/views/supermarketerp/purchaseManagement/smErpCgDd/index.vue
+++ b/src/views/supermarketerp/purchaseManagement/smErpCgDd/index.vue
@@ -50,14 +50,29 @@
- 详情
+
+ 详情
+
编辑
删除
-
+
开始处理
From 32d60d2f628dc30b3782c330e7bbf038521cde45 Mon Sep 17 00:00:00 2001
From: weiwei
Date: Mon, 7 Apr 2025 21:12:47 +0800
Subject: [PATCH 7/9] =?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../purchaseManagement/smErpCgBack/index.vue | 21 ++++++++++++++++---
.../smErpRetailBack/index.vue | 19 +++++++++++++++--
.../smErpRetailDelivery/index.vue | 19 +++++++++++++++--
.../supermarketerp/stockTaking/index.vue | 19 +++++++++++++++--
4 files changed, 69 insertions(+), 9 deletions(-)
diff --git a/src/views/supermarketerp/purchaseManagement/smErpCgBack/index.vue b/src/views/supermarketerp/purchaseManagement/smErpCgBack/index.vue
index 7b970dd..97cde84 100644
--- a/src/views/supermarketerp/purchaseManagement/smErpCgBack/index.vue
+++ b/src/views/supermarketerp/purchaseManagement/smErpCgBack/index.vue
@@ -75,12 +75,20 @@
-
+
- 详情
+
+ 详情
+
删除
-
+
开始处理
diff --git a/src/views/supermarketerp/retailManagement/smErpRetailBack/index.vue b/src/views/supermarketerp/retailManagement/smErpRetailBack/index.vue
index bab99ec..0b2573a 100644
--- a/src/views/supermarketerp/retailManagement/smErpRetailBack/index.vue
+++ b/src/views/supermarketerp/retailManagement/smErpRetailBack/index.vue
@@ -80,7 +80,15 @@
- 详情
+
+ 详情
+
删除
-
+
开始处理
diff --git a/src/views/supermarketerp/retailManagement/smErpRetailDelivery/index.vue b/src/views/supermarketerp/retailManagement/smErpRetailDelivery/index.vue
index 4663e34..1c321ca 100644
--- a/src/views/supermarketerp/retailManagement/smErpRetailDelivery/index.vue
+++ b/src/views/supermarketerp/retailManagement/smErpRetailDelivery/index.vue
@@ -80,7 +80,15 @@
- 详情
+
+ 详情
+
删除
-
+
开始处理
diff --git a/src/views/supermarketerp/stockTaking/index.vue b/src/views/supermarketerp/stockTaking/index.vue
index 3df88e0..3df5e60 100644
--- a/src/views/supermarketerp/stockTaking/index.vue
+++ b/src/views/supermarketerp/stockTaking/index.vue
@@ -68,10 +68,25 @@
- 详情
+
+ 详情
+
编辑
删除
-
+
开始处理
From 86f1d09c4db1e78e69bc2e8a96dac98eb4164fc3 Mon Sep 17 00:00:00 2001
From: dzc <2388224167@qq.com>
Date: Tue, 8 Apr 2025 10:13:06 +0800
Subject: [PATCH 8/9] =?UTF-8?q?feat:=E8=AE=A2=E5=8D=95=E7=8A=B6=E6=80=81?=
=?UTF-8?q?=E6=90=9C=E7=B4=A2=E6=9D=A1=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/views/hard/hard-order/index.vue | 3 +++
1 file changed, 3 insertions(+)
diff --git a/src/views/hard/hard-order/index.vue b/src/views/hard/hard-order/index.vue
index 01d6d7e..f59305f 100644
--- a/src/views/hard/hard-order/index.vue
+++ b/src/views/hard/hard-order/index.vue
@@ -21,6 +21,9 @@
+
+
+
From 70847847d5c02c3055144ea5b7780e5e205fd652 Mon Sep 17 00:00:00 2001
From: weiwei
Date: Tue, 8 Apr 2025 14:13:04 +0800
Subject: [PATCH 9/9] =?UTF-8?q?=E6=89=B9=E9=87=8F=E5=AE=A1=E6=89=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/api/flow/task/index.ts | 9 +++
src/views/admin/system/user/batchDeal.vue | 70 +++++++++++++++++++++++
src/views/admin/system/user/index.vue | 21 +++----
3 files changed, 88 insertions(+), 12 deletions(-)
create mode 100644 src/views/admin/system/user/batchDeal.vue
diff --git a/src/api/flow/task/index.ts b/src/api/flow/task/index.ts
index 17adb63..5306ab6 100644
--- a/src/api/flow/task/index.ts
+++ b/src/api/flow/task/index.ts
@@ -107,6 +107,15 @@ export function completeTask(param: Object) {
})
}
+// 批量完成任务
+export function batchCompleteTask(param: Object) {
+ return request({
+ url: "/task/task/batchCompleteTask",
+ method: "post",
+ data: param,
+ })
+}
+
// 完成任务
export function transferTask(param: Object) {
return request({
diff --git a/src/views/admin/system/user/batchDeal.vue b/src/views/admin/system/user/batchDeal.vue
new file mode 100644
index 0000000..12be85b
--- /dev/null
+++ b/src/views/admin/system/user/batchDeal.vue
@@ -0,0 +1,70 @@
+
+
+
+
+ 拒绝
+ 提交
+ 取消
+
+
+
+
+
diff --git a/src/views/admin/system/user/index.vue b/src/views/admin/system/user/index.vue
index 150607c..64c5547 100644
--- a/src/views/admin/system/user/index.vue
+++ b/src/views/admin/system/user/index.vue
@@ -198,6 +198,9 @@
+
+
+
@@ -214,6 +217,7 @@ import ProcessDrawer from "/@/components/processDrawer/index.vue"
const UserForm = defineAsyncComponent(() => import("./form.vue"))
const FaceManage = defineAsyncComponent(() => import("./face-manage.vue"))
const PopoverInput = defineAsyncComponent(() => import("/@/components/PopoverInput/index.vue"))
+const BatchDeal = defineAsyncComponent(() => import("./batchDeal.vue"))
const { t } = useI18n()
@@ -227,6 +231,7 @@ const draggableDepTreeRef = ref() // 树组件ref引用
const activeName = ref("2")
const tabItems = ref([{}])
const processDrawerRef = ref()
+const batchDealRef = ref()
// 多选rows
const selectObjs = ref([]) as any
@@ -284,16 +289,8 @@ const deal = (row: any) => {
// 批量开始处理
const doBatchDeal = () => {
if (!selectObjs.value.length) return useMessage().warning("流程id不存在")
- const processIds = []
- for (const i of selectObjs.value) {
- for (const j of state.dataList!) {
- if (i == j.id) {
- processIds.push(j.processId)
- break
- }
- }
- }
- if (!processIds.length) return useMessage().warning("流程id不存在")
+ const processIds = selectObjs.value.filter((item: any) => item.processId).map((item: any) => item.processId)
+ batchDealRef.value.openDialog(processIds)
}
// 审批提交事件
@@ -312,8 +309,8 @@ const handleSelectable = (row: any) => {
}
// 多选事件
-const handleSelectionChange = (objs: { userId: string }[]) => {
- selectObjs.value = objs.map(({ userId }) => userId)
+const handleSelectionChange = (objs: { userId: string; processId: string | null }[]) => {
+ selectObjs.value = objs.map(({ userId, processId }) => ({ userId, processId }))
multiple.value = !objs.length
}