超市入库审批结构调整

src/hooks/smProcessTableAction.ts

@@ -1,24 +1,15 @@
-import { Ref } from "vue"
 import { useMessage } from "./message"
 
-type tableRow = { id: string | undefined; checkStatus: number | string | undefined; processInstanceId: string | undefined | null }
+export type tableRow = { id: string | undefined; checkStatus: number | string | undefined; processInstanceId: string | undefined | null }
 type ICreate = () => void
 type IEdit = (row: tableRow) => void
-type IFormClose = () => void
-type IDeal = (row: tableRow) => void
-type ITaskSubmitEvent = () => void
+type IClose = () => void
 
 // 采购流程（补货申请、采购订单、采购入库、采购退货、零售出库、零售退货） 表格操作列行为hook
-export function useSmProcessTableAction(
-	processFormState: { formId: string | undefined; formDisabled: boolean; showForm: boolean },
-	processDrawerRef: Ref<any>,
-	fetchList: () => void,
-): {
+export function useSmProcessTableAction(processFormState: { formId: string | undefined; formDisabled: boolean; showForm: boolean }): {
 	create: ICreate
 	edit: IEdit
-	formClose: IFormClose
-	deal: IDeal
-	taskSubmitEvent: ITaskSubmitEvent
+	close: IClose
 } {
 	// 点击新增
 	const create: ICreate = () => {
@@ -32,27 +23,15 @@ export function useSmProcessTableAction(
 		processFormState.showForm = true
 	}
 	// 表单关闭
-	const formClose: IFormClose = () => {
+	const close: IClose = () => {
 		processFormState.showForm = false
 		processFormState.formId = undefined
 		processFormState.formDisabled = true
-		fetchList()
-	}
-	// 点击开始处理
-	const deal = (row: tableRow) => {
-		if (!row.processInstanceId) return useMessage().warning("流程id不存在")
-		processDrawerRef.value.openProcessDrawer(row)
-	}
-	// 审批提交事件
-	const taskSubmitEvent = () => {
-		fetchList()
 	}
 
 	return {
 		create,
 		edit,
-		formClose,
-		deal,
-		taskSubmitEvent,
+		close,
 	}
 }

src/views/supermarketerp/purchaseManagement/smErpCgBack/index.vue

@@ -137,7 +137,7 @@ import { fetchList, delObjs } from "/@/api/supermarketerp/smErpInventoryRecords"
 import { useMessage, useMessageBox } from "/@/hooks/message"
 import { useDict } from "/@/hooks/dict"
 import ProcessDrawer from "/@/components/processDrawer/index.vue"
-import { useSmProcessTableAction } from "/@/hooks/smProcessTableAction"
+import { tableRow, useSmProcessTableAction } from "/@/hooks/smProcessTableAction"
 
 const SmForm = defineAsyncComponent(() => import("./form.vue"))
 
@@ -185,7 +185,22 @@ const selectionChangHandle = (objs: { id: string }[]) => {
 	multiple.value = !objs.length
 }
 
-const { create, edit, formClose, deal, taskSubmitEvent } = useSmProcessTableAction(processFormState, processDrawerRef, getDataList)
+const { create, edit, close } = useSmProcessTableAction(processFormState)
+
+const formClose = () => {
+	close()
+	getDataList()
+}
+
+// 点击开始处理
+const deal = (row: tableRow) => {
+	if (!row.processInstanceId) return useMessage().warning("流程id不存在")
+	processDrawerRef.value && processDrawerRef.value.openProcessDrawer(row)
+}
+// 审批提交事件
+const taskSubmitEvent = () => {
+	getDataList()
+}
 
 // 删除操作
 const handleDelete = async (ids: string[]) => {

src/views/supermarketerp/purchaseManagement/smErpCgDd/index.vue

@@ -98,8 +98,8 @@ import { fetchList, delObjs } from "/@/api/supermarketerp/smErpCgDd"
 import { useMessage, useMessageBox } from "/@/hooks/message"
 import { useDict } from "/@/hooks/dict"
 import ProcessDrawer from "/@/components/processDrawer/index.vue"
-import { useSmProcessTableAction } from "/@/hooks/smProcessTableAction"
 import { getSupplierSimpleAll } from "/@/api/supermarketerp/smErpSupplier"
+import { tableRow, useSmProcessTableAction } from "/@/hooks/smProcessTableAction"
 
 const SmForm = defineAsyncComponent(() => import("./form.vue"))
 
@@ -143,7 +143,22 @@ const selectionChangHandle = (objs: { id: string }[]) => {
 	multiple.value = !objs.length
 }
 
-const { create, edit, formClose, deal, taskSubmitEvent } = useSmProcessTableAction(processFormState, processDrawerRef, getDataList)
+const { create, edit, close } = useSmProcessTableAction(processFormState)
+
+const formClose = () => {
+	close()
+	getDataList()
+}
+
+// 点击开始处理
+const deal = (row: tableRow) => {
+	if (!row.processInstanceId) return useMessage().warning("流程id不存在")
+	processDrawerRef.value && processDrawerRef.value.openProcessDrawer(row)
+}
+// 审批提交事件
+const taskSubmitEvent = () => {
+	getDataList()
+}
 
 // 删除操作
 const handleDelete = async (ids: string[]) => {

src/views/supermarketerp/purchaseManagement/smErpCgInventory/index.vue

@@ -132,8 +132,8 @@ import { fetchList, delObjs } from "/@/api/supermarketerp/smErpInventoryRecords"
 import { useMessage, useMessageBox } from "/@/hooks/message"
 import { useDict } from "/@/hooks/dict"
 import ProcessDrawer from "/@/components/processDrawer/index.vue"
-import { useSmProcessTableAction } from "/@/hooks/smProcessTableAction"
 import { displayPrice } from "/@/utils/formatMoney"
+import { useSmProcessTableAction } from "/@/hooks/smProcessTableAction"
 
 const SmForm = defineAsyncComponent(() => import("./form.vue"))
 
@@ -181,7 +181,12 @@ const selectionChangHandle = (objs: { id: string }[]) => {
 	multiple.value = !objs.length
 }
 
-const { create, edit, formClose, deal, taskSubmitEvent } = useSmProcessTableAction(processFormState, processDrawerRef, getDataList)
+const { create, edit, close } = useSmProcessTableAction(processFormState)
+
+const formClose = () => {
+	close()
+	getDataList()
+}
 
 // 删除操作
 const handleDelete = async (ids: string[]) => {

src/views/supermarketerp/purchaseManagement/smErpCgPlan/index.vue

@@ -116,7 +116,7 @@ import { fetchList, delObjs } from "/@/api/supermarketerp/smErpCgPlan"
 import { useMessage, useMessageBox } from "/@/hooks/message"
 import { useDict } from "/@/hooks/dict"
 import ProcessDrawer from "/@/components/processDrawer/index.vue"
-import { useSmProcessTableAction } from "/@/hooks/smProcessTableAction"
+import { tableRow, useSmProcessTableAction } from "/@/hooks/smProcessTableAction"
 
 const SmForm = defineAsyncComponent(() => import("./form.vue"))
 
@@ -161,7 +161,22 @@ const selectionChangHandle = (objs: { id: string }[]) => {
 	multiple.value = !objs.length
 }
 
-const { create, edit, formClose, deal, taskSubmitEvent } = useSmProcessTableAction(processFormState, processDrawerRef, getDataList)
+const { create, edit, close } = useSmProcessTableAction(processFormState)
+
+const formClose = () => {
+	close()
+	getDataList()
+}
+
+// 点击开始处理
+const deal = (row: tableRow) => {
+	if (!row.processInstanceId) return useMessage().warning("流程id不存在")
+	processDrawerRef.value && processDrawerRef.value.openProcessDrawer(row)
+}
+// 审批提交事件
+const taskSubmitEvent = () => {
+	getDataList()
+}
 
 // 删除操作
 const handleDelete = async (ids: string[]) => {

src/views/supermarketerp/retailManagement/smErpRetailBack/index.vue

@@ -137,7 +137,7 @@ import { fetchList, delObjs } from "/@/api/supermarketerp/smErpInventoryRecords"
 import { useMessage, useMessageBox } from "/@/hooks/message"
 import { useDict } from "/@/hooks/dict"
 import ProcessDrawer from "/@/components/processDrawer/index.vue"
-import { useSmProcessTableAction } from "/@/hooks/smProcessTableAction"
+import { tableRow, useSmProcessTableAction } from "/@/hooks/smProcessTableAction"
 
 const SmForm = defineAsyncComponent(() => import("./form.vue"))
 
@@ -185,7 +185,22 @@ const selectionChangHandle = (objs: { id: string }[]) => {
 	multiple.value = !objs.length
 }
 
-const { create, edit, formClose, deal, taskSubmitEvent } = useSmProcessTableAction(processFormState, processDrawerRef, getDataList)
+const { create, edit, close } = useSmProcessTableAction(processFormState)
+
+const formClose = () => {
+	close()
+	getDataList()
+}
+
+// 点击开始处理
+const deal = (row: tableRow) => {
+	if (!row.processInstanceId) return useMessage().warning("流程id不存在")
+	processDrawerRef.value && processDrawerRef.value.openProcessDrawer(row)
+}
+// 审批提交事件
+const taskSubmitEvent = () => {
+	getDataList()
+}
 
 // 删除操作
 const handleDelete = async (ids: string[]) => {

src/views/supermarketerp/retailManagement/smErpRetailDelivery/index.vue

@@ -141,8 +141,8 @@ import { fetchList, delObjs } from "/@/api/supermarketerp/smErpInventoryRecords"
 import { useMessage, useMessageBox } from "/@/hooks/message"
 import { useDict } from "/@/hooks/dict"
 import ProcessDrawer from "/@/components/processDrawer/index.vue"
-import { useSmProcessTableAction } from "/@/hooks/smProcessTableAction"
 import { displayPrice } from "/@/utils/formatMoney"
+import { tableRow, useSmProcessTableAction } from "/@/hooks/smProcessTableAction"
 
 const SmForm = defineAsyncComponent(() => import("./form.vue"))
 
@@ -190,7 +190,22 @@ const selectionChangHandle = (objs: { id: string }[]) => {
 	multiple.value = !objs.length
 }
 
-const { create, edit, formClose, deal, taskSubmitEvent } = useSmProcessTableAction(processFormState, processDrawerRef, getDataList)
+const { create, edit, close } = useSmProcessTableAction(processFormState)
+
+const formClose = () => {
+	close()
+	getDataList()
+}
+
+// 点击开始处理
+const deal = (row: tableRow) => {
+	if (!row.processInstanceId) return useMessage().warning("流程id不存在")
+	processDrawerRef.value && processDrawerRef.value.openProcessDrawer(row)
+}
+// 审批提交事件
+const taskSubmitEvent = () => {
+	getDataList()
+}
 
 // 删除操作
 const handleDelete = async (ids: string[]) => {

src/views/supermarketerp/stockTaking/index.vue

@@ -108,7 +108,7 @@ import { useMessage, useMessageBox } from "/@/hooks/message"
 import { useDict } from "/@/hooks/dict"
 import { fetchList } from "/@/api/supermarketerp/smErpInventoryRecords"
 import ProcessDrawer from "/@/components/processDrawer/index.vue"
-import { useSmProcessTableAction } from "/@/hooks/smProcessTableAction"
+import { tableRow, useSmProcessTableAction } from "/@/hooks/smProcessTableAction"
 
 const SmForm = defineAsyncComponent(() => import("./form.vue"))
 
@@ -156,7 +156,22 @@ const selectionChangHandle = (objs: { id: string }[]) => {
 	multiple.value = !objs.length
 }
 
-const { create, edit, formClose, deal, taskSubmitEvent } = useSmProcessTableAction(processFormState, processDrawerRef, getDataList)
+const { create, edit, close } = useSmProcessTableAction(processFormState)
+
+const formClose = () => {
+	close()
+	getDataList()
+}
+
+// 点击开始处理
+const deal = (row: tableRow) => {
+	if (!row.processInstanceId) return useMessage().warning("流程id不存在")
+	processDrawerRef.value && processDrawerRef.value.openProcessDrawer(row)
+}
+// 审批提交事件
+const taskSubmitEvent = () => {
+	getDataList()
+}
 
 // 删除操作
 const handleDelete = async (ids: string[]) => {