diff --git a/src/api/supermarketerp/common.ts b/src/api/supermarketerp/common.ts index 115f4a2..6b212f1 100644 --- a/src/api/supermarketerp/common.ts +++ b/src/api/supermarketerp/common.ts @@ -4,7 +4,9 @@ import request from "/@/utils/request" // type:2 获取采购订单编号 // type:3 获取采购入库编号 // type:4 获取采购退货编号 -export function getPlanCode(params: { type: 1 | 2 | 3 | 4 }) { +// type:5 获取零售出库编号 +// type:4 获取零售退货编号 +export function getPlanCode(params: { type: 1 | 2 | 3 | 4 | 5 | 6 }) { return request({ url: "/supermarket/sm/common/getSequence", method: "get", diff --git a/src/api/supermarketerp/smErpInventoryRecords.ts b/src/api/supermarketerp/smErpInventoryRecords.ts index 49db3e5..f1657a9 100644 --- a/src/api/supermarketerp/smErpInventoryRecords.ts +++ b/src/api/supermarketerp/smErpInventoryRecords.ts @@ -1,4 +1,5 @@ import request from "/@/utils/request" + export function fetchList(query?: Object) { return request({ url: "/supermarket/smErpInventoryRecords/page", diff --git a/src/views/flow/task/handler/agree.vue b/src/components/taskDrawer/agree.vue similarity index 100% rename from src/views/flow/task/handler/agree.vue rename to src/components/taskDrawer/agree.vue diff --git a/src/components/taskDrawer/index.vue b/src/components/taskDrawer/index.vue new file mode 100644 index 0000000..4279c3d --- /dev/null +++ b/src/components/taskDrawer/index.vue @@ -0,0 +1,123 @@ + + + diff --git a/src/views/flow/task/handler/refuse.vue b/src/components/taskDrawer/refuse.vue similarity index 100% rename from src/views/flow/task/handler/refuse.vue rename to src/components/taskDrawer/refuse.vue diff --git a/src/views/flow/task/handler/transfer.vue b/src/components/taskDrawer/transfer.vue similarity index 100% rename from src/views/flow/task/handler/transfer.vue rename to src/components/taskDrawer/transfer.vue diff --git a/src/components/taskDrawer/types.ts b/src/components/taskDrawer/types.ts new file mode 100644 index 0000000..50b91d3 --- /dev/null +++ b/src/components/taskDrawer/types.ts @@ -0,0 +1,24 @@ +// First let's create types for our form data +export interface FlowFormItem { + id: string + type: string + props: { + value: any + [key: string]: any + } +} + +export interface TaskData { + processName: string + taskId: string + processInstanceId: string + flowId: string +} + +export interface TaskSubmitParam { + paramMap: Record + taskId: string + taskLocalParamMap: { + approveDesc: string + } +} diff --git a/src/views/flow/task/handler/types.ts b/src/views/flow/task/handler/types.ts deleted file mode 100644 index 32cbeeb..0000000 --- a/src/views/flow/task/handler/types.ts +++ /dev/null @@ -1,22 +0,0 @@ -// First let's create types for our form data -export interface FlowFormItem { - id: string - type: string - props: { - value: any - [key: string]: any - } -} - -export interface TaskData { - taskId: string - nodeId: string -} - -export interface TaskSubmitParam { - paramMap: Record - taskId: string - taskLocalParamMap: { - approveDesc: string - } -} \ No newline at end of file diff --git a/src/views/flow/task/pending.vue b/src/views/flow/task/pending.vue index 5296a68..5c64ea4 100644 --- a/src/views/flow/task/pending.vue +++ b/src/views/flow/task/pending.vue @@ -52,73 +52,35 @@ - - - - - - - - - - - - - - - + +