✨ feat(mes): 修改库存冻结标识字段名称为 'frozen'
将库存相关的冻结标识字段从 'frozenFlag' 修改为 'frozen',以提高代码一致性和可读性。涉及多个数据对象和请求/响应对象的更新。pull/871/MERGE
parent
e6f05a0d52
commit
55845bded4
|
|
@ -8,7 +8,7 @@ export interface StockTakingPlanVO {
|
||||||
startTime?: string
|
startTime?: string
|
||||||
endTime?: string
|
endTime?: string
|
||||||
blindFlag?: boolean
|
blindFlag?: boolean
|
||||||
frozenFlag?: boolean
|
frozen?: boolean
|
||||||
status?: number
|
status?: number
|
||||||
remark?: string
|
remark?: string
|
||||||
createTime?: string
|
createTime?: string
|
||||||
|
|
|
||||||
|
|
@ -12,7 +12,7 @@ export interface StockTakingTaskVO {
|
||||||
planCode?: string
|
planCode?: string
|
||||||
planName?: string
|
planName?: string
|
||||||
blindFlag?: boolean
|
blindFlag?: boolean
|
||||||
frozenFlag?: boolean
|
frozen?: boolean
|
||||||
startTime?: string
|
startTime?: string
|
||||||
endTime?: string
|
endTime?: string
|
||||||
status?: number
|
status?: number
|
||||||
|
|
|
||||||
|
|
@ -69,8 +69,8 @@
|
||||||
</el-form-item>
|
</el-form-item>
|
||||||
</el-col>
|
</el-col>
|
||||||
<el-col :span="8">
|
<el-col :span="8">
|
||||||
<el-form-item label="冻结库存" prop="frozenFlag">
|
<el-form-item label="冻结库存" prop="frozen">
|
||||||
<el-switch v-model="formData.frozenFlag" :disabled="isDetail" />
|
<el-switch v-model="formData.frozen" :disabled="isDetail" />
|
||||||
</el-form-item>
|
</el-form-item>
|
||||||
</el-col>
|
</el-col>
|
||||||
<el-col :span="24">
|
<el-col :span="24">
|
||||||
|
|
@ -135,7 +135,7 @@ const formData = ref<StockTakingPlanVO>({
|
||||||
startTime: undefined,
|
startTime: undefined,
|
||||||
endTime: undefined,
|
endTime: undefined,
|
||||||
blindFlag: false,
|
blindFlag: false,
|
||||||
frozenFlag: false,
|
frozen: false,
|
||||||
remark: undefined
|
remark: undefined
|
||||||
})
|
})
|
||||||
const formRules = reactive({
|
const formRules = reactive({
|
||||||
|
|
@ -197,7 +197,7 @@ const resetForm = () => {
|
||||||
startTime: undefined,
|
startTime: undefined,
|
||||||
endTime: undefined,
|
endTime: undefined,
|
||||||
blindFlag: false,
|
blindFlag: false,
|
||||||
frozenFlag: false,
|
frozen: false,
|
||||||
remark: undefined
|
remark: undefined
|
||||||
}
|
}
|
||||||
formRef.value?.resetFields()
|
formRef.value?.resetFields()
|
||||||
|
|
|
||||||
|
|
@ -98,9 +98,9 @@
|
||||||
<dict-tag :type="DICT_TYPE.INFRA_BOOLEAN_STRING" :value="scope.row.blindFlag" />
|
<dict-tag :type="DICT_TYPE.INFRA_BOOLEAN_STRING" :value="scope.row.blindFlag" />
|
||||||
</template>
|
</template>
|
||||||
</el-table-column>
|
</el-table-column>
|
||||||
<el-table-column label="是否冻结库存" align="center" prop="frozenFlag" width="110">
|
<el-table-column label="是否冻结库存" align="center" prop="frozen" width="110">
|
||||||
<template #default="scope">
|
<template #default="scope">
|
||||||
<dict-tag :type="DICT_TYPE.INFRA_BOOLEAN_STRING" :value="scope.row.frozenFlag" />
|
<dict-tag :type="DICT_TYPE.INFRA_BOOLEAN_STRING" :value="scope.row.frozen" />
|
||||||
</template>
|
</template>
|
||||||
</el-table-column>
|
</el-table-column>
|
||||||
<el-table-column label="状态" align="center" prop="status" width="120">
|
<el-table-column label="状态" align="center" prop="status" width="120">
|
||||||
|
|
|
||||||
|
|
@ -90,8 +90,8 @@
|
||||||
</el-form-item>
|
</el-form-item>
|
||||||
</el-col>
|
</el-col>
|
||||||
<el-col :span="8">
|
<el-col :span="8">
|
||||||
<el-form-item label="是否冻结库存" prop="frozenFlag">
|
<el-form-item label="是否冻结库存" prop="frozen">
|
||||||
<el-switch v-model="formData.frozenFlag" :disabled="isDetail" />
|
<el-switch v-model="formData.frozen" :disabled="isDetail" />
|
||||||
</el-form-item>
|
</el-form-item>
|
||||||
</el-col>
|
</el-col>
|
||||||
<el-col :span="8">
|
<el-col :span="8">
|
||||||
|
|
@ -186,7 +186,7 @@ const formData = ref<StockTakingTaskVO>({
|
||||||
startTime: undefined,
|
startTime: undefined,
|
||||||
endTime: undefined,
|
endTime: undefined,
|
||||||
blindFlag: false,
|
blindFlag: false,
|
||||||
frozenFlag: false,
|
frozen: false,
|
||||||
remark: undefined
|
remark: undefined
|
||||||
})
|
})
|
||||||
const formRules = reactive({
|
const formRules = reactive({
|
||||||
|
|
@ -196,7 +196,7 @@ const formRules = reactive({
|
||||||
type: [{ required: true, message: '盘点类型不能为空', trigger: 'change' }],
|
type: [{ required: true, message: '盘点类型不能为空', trigger: 'change' }],
|
||||||
takingDate: [{ required: true, message: '盘点日期不能为空', trigger: 'change' }],
|
takingDate: [{ required: true, message: '盘点日期不能为空', trigger: 'change' }],
|
||||||
blindFlag: [{ 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' }]
|
userId: [{ required: true, message: '盘点人不能为空', trigger: 'change' }]
|
||||||
})
|
})
|
||||||
const formRef = ref() // 表单 Ref
|
const formRef = ref() // 表单 Ref
|
||||||
|
|
@ -260,7 +260,7 @@ const resetForm = () => {
|
||||||
startTime: undefined,
|
startTime: undefined,
|
||||||
endTime: undefined,
|
endTime: undefined,
|
||||||
blindFlag: false,
|
blindFlag: false,
|
||||||
frozenFlag: false,
|
frozen: false,
|
||||||
remark: undefined
|
remark: undefined
|
||||||
}
|
}
|
||||||
formRef.value?.resetFields()
|
formRef.value?.resetFields()
|
||||||
|
|
@ -275,7 +275,7 @@ const handlePlanChange = (plan?: StockTakingPlanVO) => {
|
||||||
formData.value.startTime = plan.startTime
|
formData.value.startTime = plan.startTime
|
||||||
formData.value.endTime = plan.endTime
|
formData.value.endTime = plan.endTime
|
||||||
formData.value.blindFlag = !!plan.blindFlag
|
formData.value.blindFlag = !!plan.blindFlag
|
||||||
formData.value.frozenFlag = !!plan.frozenFlag
|
formData.value.frozen = !!plan.frozen
|
||||||
}
|
}
|
||||||
|
|
||||||
/** 执行盘点 */
|
/** 执行盘点 */
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue