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
}
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 @@
- 详情
+
+ 详情
+
编辑
删除
-
+
开始处理