diff --git a/src/api/mes/wm/stocktaking/plan/index.ts b/src/api/mes/wm/stocktaking/plan/index.ts
index e4c9f8551..68d1021fe 100644
--- a/src/api/mes/wm/stocktaking/plan/index.ts
+++ b/src/api/mes/wm/stocktaking/plan/index.ts
@@ -8,7 +8,7 @@ export interface StockTakingPlanVO {
startTime?: string
endTime?: string
blindFlag?: boolean
- frozenFlag?: boolean
+ frozen?: boolean
status?: number
remark?: string
createTime?: string
diff --git a/src/api/mes/wm/stocktaking/task/index.ts b/src/api/mes/wm/stocktaking/task/index.ts
index 24b5f6117..133b81538 100644
--- a/src/api/mes/wm/stocktaking/task/index.ts
+++ b/src/api/mes/wm/stocktaking/task/index.ts
@@ -12,7 +12,7 @@ export interface StockTakingTaskVO {
planCode?: string
planName?: string
blindFlag?: boolean
- frozenFlag?: boolean
+ frozen?: boolean
startTime?: string
endTime?: string
status?: number
diff --git a/src/views/mes/wm/stocktaking/plan/StockTakingPlanForm.vue b/src/views/mes/wm/stocktaking/plan/StockTakingPlanForm.vue
index 1399a2616..a2dff4fd2 100644
--- a/src/views/mes/wm/stocktaking/plan/StockTakingPlanForm.vue
+++ b/src/views/mes/wm/stocktaking/plan/StockTakingPlanForm.vue
@@ -69,8 +69,8 @@
-
-
+
+
@@ -135,7 +135,7 @@ const formData = ref({
startTime: undefined,
endTime: undefined,
blindFlag: false,
- frozenFlag: false,
+ frozen: false,
remark: undefined
})
const formRules = reactive({
@@ -197,7 +197,7 @@ const resetForm = () => {
startTime: undefined,
endTime: undefined,
blindFlag: false,
- frozenFlag: false,
+ frozen: false,
remark: undefined
}
formRef.value?.resetFields()
diff --git a/src/views/mes/wm/stocktaking/plan/index.vue b/src/views/mes/wm/stocktaking/plan/index.vue
index 649c6f68c..53c9794d4 100644
--- a/src/views/mes/wm/stocktaking/plan/index.vue
+++ b/src/views/mes/wm/stocktaking/plan/index.vue
@@ -98,9 +98,9 @@
-
+
-
+
diff --git a/src/views/mes/wm/stocktaking/task/StockTakingForm.vue b/src/views/mes/wm/stocktaking/task/StockTakingForm.vue
index 19284b6d2..e050b8859 100644
--- a/src/views/mes/wm/stocktaking/task/StockTakingForm.vue
+++ b/src/views/mes/wm/stocktaking/task/StockTakingForm.vue
@@ -90,8 +90,8 @@
-
-
+
+
@@ -186,7 +186,7 @@ const formData = ref({
startTime: undefined,
endTime: undefined,
blindFlag: false,
- frozenFlag: false,
+ frozen: false,
remark: undefined
})
const formRules = reactive({
@@ -196,7 +196,7 @@ const formRules = reactive({
type: [{ required: true, message: '盘点类型不能为空', trigger: 'change' }],
takingDate: [{ required: true, message: '盘点日期不能为空', trigger: 'change' }],
blindFlag: [{ required: true, message: '是否盲盘不能为空', trigger: 'change' }],
- frozenFlag: [{ required: true, message: '是否冻结库存不能为空', trigger: 'change' }],
+ frozen: [{ required: true, message: '是否冻结库存不能为空', trigger: 'change' }],
userId: [{ required: true, message: '盘点人不能为空', trigger: 'change' }]
})
const formRef = ref() // 表单 Ref
@@ -260,7 +260,7 @@ const resetForm = () => {
startTime: undefined,
endTime: undefined,
blindFlag: false,
- frozenFlag: false,
+ frozen: false,
remark: undefined
}
formRef.value?.resetFields()
@@ -275,7 +275,7 @@ const handlePlanChange = (plan?: StockTakingPlanVO) => {
formData.value.startTime = plan.startTime
formData.value.endTime = plan.endTime
formData.value.blindFlag = !!plan.blindFlag
- formData.value.frozenFlag = !!plan.frozenFlag
+ formData.value.frozen = !!plan.frozen
}
/** 执行盘点 */