diff --git a/src/api/mes/wm/stocktaking/task/index.ts b/src/api/mes/wm/stocktaking/task/index.ts
index 2081936bf..a33d38d8e 100644
--- a/src/api/mes/wm/stocktaking/task/index.ts
+++ b/src/api/mes/wm/stocktaking/task/index.ts
@@ -13,11 +13,9 @@ export interface StockTakingTaskVO {
planName?: string
blindFlag?: boolean
frozenFlag?: boolean
- snapshotTime?: string
startTime?: string
endTime?: string
status?: number
- adjustedFlag?: boolean
remark?: string
createTime?: string
}
@@ -47,12 +45,8 @@ export const StockTakingApi = {
return await request.delete({ url: '/mes/wm/stocktaking-task/delete?id=' + id })
},
- startStockTaking: async (data: StockTakingTaskActionReqVO) => {
- return await request.put({ url: '/mes/wm/stocktaking-task/start', data })
- },
-
- finishStockTaking: async (data: StockTakingTaskActionReqVO) => {
- return await request.put({ url: '/mes/wm/stocktaking-task/finish', data })
+ submitStockTaking: async (data: StockTakingTaskActionReqVO) => {
+ return await request.put({ url: '/mes/wm/stocktaking-task/submit', data })
},
cancelStockTaking: async (data: StockTakingTaskActionReqVO) => {
diff --git a/src/views/mes/wm/stocktaking/task/StockTakingForm.vue b/src/views/mes/wm/stocktaking/task/StockTakingForm.vue
index 66662b9da..fc92c88fd 100644
--- a/src/views/mes/wm/stocktaking/task/StockTakingForm.vue
+++ b/src/views/mes/wm/stocktaking/task/StockTakingForm.vue
@@ -48,6 +48,30 @@
+
+
+
+
+
+
+
+
+
+
({
userId: undefined,
userNickname: undefined,
planId: undefined,
+ startTime: undefined,
+ endTime: undefined,
blindFlag: false,
frozenFlag: false,
remark: undefined
@@ -140,6 +167,7 @@ const formData = ref({
const formRules = reactive({
code: [{ required: true, message: '任务编码不能为空', trigger: 'blur' }],
name: [{ required: true, message: '任务名称不能为空', trigger: 'blur' }],
+ planId: [{ required: true, message: '盘点方案不能为空', trigger: 'change' }],
type: [{ required: true, message: '盘点类型不能为空', trigger: 'change' }],
takingDate: [{ required: true, message: '盘点日期不能为空', trigger: 'change' }],
blindFlag: [{ required: true, message: '是否盲盘不能为空', trigger: 'change' }],
@@ -200,6 +228,8 @@ const resetForm = () => {
userId: undefined,
userNickname: undefined,
planId: undefined,
+ startTime: undefined,
+ endTime: undefined,
blindFlag: false,
frozenFlag: false,
remark: undefined
@@ -213,6 +243,8 @@ const handlePlanChange = (plan?: StockTakingPlanVO) => {
return
}
formData.value.type = plan.type
+ formData.value.startTime = plan.startTime
+ formData.value.endTime = plan.endTime
formData.value.blindFlag = !!plan.blindFlag
formData.value.frozenFlag = !!plan.frozenFlag
}