yudao
/
admin-vue3
mirror of https://gitee.com/yudaocode/yudao-ui-admin-vue3.git
3
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

✨ feat(mes): 更新质检标志字段，优化相关逻辑 

将多个类中的质检标志字段从 `iqcCheck` 和 `qcFlag` 更新为 `iqcCheckFlag` 和 `rqcCheckFlag`，以提高代码一致性和可读性。同时，更新相关逻辑以自动计算质量状态，确保系统在处理质检时的准确性。
pull/871/MERGE
YunaiV 2026-03-27 19:28:20 +08:00
parent f39c47a58b
commit 49b0de72df
5 changed files with 33 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/views/mes/wm/outsourcereceipt/OutsourceReceiptLineList.vue
View File

@ -33,9 +33,9 @@
<el-table-column label="单位" align="center" prop="unitName" width="80" /> <el-table-column label="单位" align="center" prop="unitName" width="80" />
<el-table-column label="入库数量" align="center" prop="quantity" width="100" /> <el-table-column label="入库数量" align="center" prop="quantity" width="100" />
<el-table-column label="批次号" align="center" prop="batchCode" min-width="120" /> <el-table-column label="批次号" align="center" prop="batchCode" min-width="120" />
<el-table-column label="是否检验" align="center" prop="iqcCheck" width="100"> <el-table-column label="是否检验" align="center" prop="iqcCheckFlag" width="100">
<template #default="scope"> <template #default="scope">
<dict-tag :type="DICT_TYPE.INFRA_BOOLEAN_STRING" :value="scope.row.iqcCheck" /> <dict-tag :type="DICT_TYPE.INFRA_BOOLEAN_STRING" :value="scope.row.iqcCheckFlag" />
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="质量状态" align="center" prop="qualityStatus" min-width="100"> <el-table-column label="质量状态" align="center" prop="qualityStatus" min-width="100">
@ -135,8 +135,8 @@
</el-row> </el-row>
<el-row> <el-row>
<el-col :span="8"> <el-col :span="8">
<el-form-item label="是否质检" prop="iqcCheck"> <el-form-item label="是否质检" prop="iqcCheckFlag">
<el-switch v-model="formData.iqcCheck" /> <el-switch v-model="formData.iqcCheckFlag" />
</el-form-item> </el-form-item>
</el-col> </el-col>
</el-row> </el-row>
@ -232,7 +232,7 @@ const formData = ref({
productionDate: undefined, productionDate: undefined,
expireDate: undefined, expireDate: undefined,
lotNumber: undefined, lotNumber: undefined,
iqcCheck: false, iqcCheckFlag: false,
remark: undefined remark: undefined
}) })
const formRules = reactive({ const formRules = reactive({
@ -291,7 +291,7 @@ const resetForm = () => {
productionDate: undefined, productionDate: undefined,
expireDate: undefined, expireDate: undefined,
lotNumber: undefined, lotNumber: undefined,
iqcCheck: false, iqcCheckFlag: false,
remark: undefined remark: undefined
} }
formRef.value?.resetFields() formRef.value?.resetFields()

12
src/views/mes/wm/productsales/ProductSalesLineList.vue
View File

@ -33,9 +33,9 @@
<el-table-column label="单位" align="center" prop="unitMeasureName" width="80" /> <el-table-column label="单位" align="center" prop="unitMeasureName" width="80" />
<el-table-column label="出库数量" align="center" prop="quantity" width="100" /> <el-table-column label="出库数量" align="center" prop="quantity" width="100" />
<el-table-column label="批次号" align="center" prop="batchCode" min-width="120" /> <el-table-column label="批次号" align="center" prop="batchCode" min-width="120" />
<el-table-column label="是否校验" align="center" prop="oqcCheck" width="100"> <el-table-column label="是否校验" align="center" prop="oqcCheckFlag" width="100">
<template #default="scope"> <template #default="scope">
<dict-tag :type="DICT_TYPE.INFRA_BOOLEAN_STRING" :value="scope.row.oqcCheck" /> <dict-tag :type="DICT_TYPE.INFRA_BOOLEAN_STRING" :value="scope.row.oqcCheckFlag" />
</template> </template>
</el-table-column> </el-table-column>
<el-table-column <el-table-column
@ -107,8 +107,8 @@
</el-row> </el-row>
<el-row> <el-row>
<el-col :span="8"> <el-col :span="8">
<el-form-item label="是否校验" prop="oqcCheck"> <el-form-item label="是否校验" prop="oqcCheckFlag">
<el-radio-group v-model="formData.oqcCheck"> <el-radio-group v-model="formData.oqcCheckFlag">
<el-radio :label="true">是</el-radio> <el-radio :label="true">是</el-radio>
<el-radio :label="false">否</el-radio> <el-radio :label="false">否</el-radio>
</el-radio-group> </el-radio-group>
@ -202,7 +202,7 @@ const formData = ref({
itemId: undefined, itemId: undefined,
quantity: undefined, quantity: undefined,
batchId: undefined, batchId: undefined,
oqcCheck: false, oqcCheckFlag: false,
remark: undefined remark: undefined
}) })
const formRules = reactive({ const formRules = reactive({
@ -255,7 +255,7 @@ const resetForm = () => {
itemId: undefined, itemId: undefined,
quantity: undefined, quantity: undefined,
batchId: undefined, batchId: undefined,
oqcCheck: false, oqcCheckFlag: false,
remark: undefined remark: undefined
} }
formRef.value?.resetFields() formRef.value?.resetFields()

14
src/views/mes/wm/returnissue/ReturnIssueLineList.vue
View File

@ -33,9 +33,9 @@
<el-table-column label="单位" align="center" prop="unitMeasureName" width="80" /> <el-table-column label="单位" align="center" prop="unitMeasureName" width="80" />
<el-table-column label="退料数量" align="center" prop="quantity" width="100" /> <el-table-column label="退料数量" align="center" prop="quantity" width="100" />
<el-table-column label="批次号" align="center" prop="batchNo" min-width="120" /> <el-table-column label="批次号" align="center" prop="batchNo" min-width="120" />
<el-table-column label="是否检测" align="center" prop="qcFlag" width="100"> <el-table-column label="是否检测" align="center" prop="rqcCheckFlag" width="100">
<template #default="scope"> <template #default="scope">
<dict-tag :type="DICT_TYPE.INFRA_BOOLEAN_STRING" :value="scope.row.qcFlag" /> <dict-tag :type="DICT_TYPE.INFRA_BOOLEAN_STRING" :value="scope.row.rqcCheckFlag" />
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="质量状态" align="center" prop="qualityStatus" width="100"> <el-table-column label="质量状态" align="center" prop="qualityStatus" width="100">
@ -107,8 +107,8 @@
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="8"> <el-col :span="8">
<el-form-item label="需要质检" prop="qcFlag"> <el-form-item label="需要质检" prop="rqcCheckFlag">
<el-switch v-model="formData.qcFlag" /> <el-switch v-model="formData.rqcCheckFlag" />
</el-form-item> </el-form-item>
</el-col> </el-col>
</el-row> </el-row>
@ -201,13 +201,13 @@ const formData = ref({
issueId: undefined as number | undefined, issueId: undefined as number | undefined,
itemId: undefined, itemId: undefined,
quantity: undefined, quantity: undefined,
qcFlag: false, rqcCheckFlag: false,
remark: undefined remark: undefined
}) })
const formRules = reactive({ const formRules = reactive({
itemId: [{ required: true, message: '物料不能为空', trigger: 'change' }], itemId: [{ required: true, message: '物料不能为空', trigger: 'change' }],
quantity: [{ required: true, message: '退料数量不能为空', trigger: 'blur' }], quantity: [{ required: true, message: '退料数量不能为空', trigger: 'blur' }],
qcFlag: [{ required: true, message: '需要质检不能为空', trigger: 'change' }] rqcCheckFlag: [{ required: true, message: '需要质检不能为空', trigger: 'change' }]
}) })
const formRef = ref() // 表单 Ref const formRef = ref() // 表单 Ref
@ -261,7 +261,7 @@ const resetForm = () => {
issueId: undefined, issueId: undefined,
itemId: undefined, itemId: undefined,
quantity: undefined, quantity: undefined,
qcFlag: false, rqcCheckFlag: false,
remark: undefined remark: undefined
} }
formRef.value?.resetFields() formRef.value?.resetFields()

14
src/views/mes/wm/returnsales/ReturnSalesLineList.vue
View File

@ -33,9 +33,9 @@
<el-table-column label="单位" align="center" prop="unitMeasureName" width="80" /> <el-table-column label="单位" align="center" prop="unitMeasureName" width="80" />
<el-table-column label="退货数量" align="center" prop="quantity" width="100" /> <el-table-column label="退货数量" align="center" prop="quantity" width="100" />
<el-table-column label="批次号" align="center" prop="batchCode" min-width="120" /> <el-table-column label="批次号" align="center" prop="batchCode" min-width="120" />
<el-table-column label="是否需要质检" align="center" prop="qcFlag"> <el-table-column label="是否需要质检" align="center" prop="rqcCheckFlag">
<template #default="scope"> <template #default="scope">
<dict-tag :type="DICT_TYPE.INFRA_BOOLEAN_STRING" :value="scope.row.qcFlag" /> <dict-tag :type="DICT_TYPE.INFRA_BOOLEAN_STRING" :value="scope.row.rqcCheckFlag" />
</template> </template>
</el-table-column> </el-table-column>
<el-table-column <el-table-column
@ -105,8 +105,8 @@
</el-row> </el-row>
<el-row> <el-row>
<el-col :span="8"> <el-col :span="8">
<el-form-item label="需要质检" prop="qcFlag"> <el-form-item label="需要质检" prop="rqcCheckFlag">
<el-switch v-model="formData.qcFlag" /> <el-switch v-model="formData.rqcCheckFlag" />
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="16"> <el-col :span="16">
@ -194,13 +194,13 @@ const formData = ref({
itemId: undefined, itemId: undefined,
quantity: undefined, quantity: undefined,
batchCode: undefined, batchCode: undefined,
qcFlag: true, rqcCheckFlag: true,
remark: undefined remark: undefined
}) })
const formRules = reactive({ const formRules = reactive({
itemId: [{ required: true, message: '物料不能为空', trigger: 'change' }], itemId: [{ required: true, message: '物料不能为空', trigger: 'change' }],
quantity: [{ required: true, message: '退货数量不能为空', trigger: 'blur' }], quantity: [{ required: true, message: '退货数量不能为空', trigger: 'blur' }],
qcFlag: [{ required: true, message: '需要质检不能为空', trigger: 'change' }] rqcCheckFlag: [{ required: true, message: '需要质检不能为空', trigger: 'change' }]
}) })
const formRef = ref() // 表单 Ref const formRef = ref() // 表单 Ref
@ -251,7 +251,7 @@ const resetForm = () => {
itemId: undefined, itemId: undefined,
quantity: undefined, quantity: undefined,
batchCode: undefined, batchCode: undefined,
qcFlag: false, rqcCheckFlag: false,
remark: undefined remark: undefined
} }
formRef.value?.resetFields() formRef.value?.resetFields()

14
src/views/mes/wm/salesnotice/SalesNoticeLineList.vue
View File

@ -11,9 +11,9 @@
<el-table-column label="单位" align="center" prop="unitMeasureName" width="80" /> <el-table-column label="单位" align="center" prop="unitMeasureName" width="80" />
<el-table-column label="批次号" align="center" prop="batchCode" min-width="120" /> <el-table-column label="批次号" align="center" prop="batchCode" min-width="120" />
<el-table-column label="发货数量" align="center" prop="quantity" width="100" /> <el-table-column label="发货数量" align="center" prop="quantity" width="100" />
<el-table-column label="是否检验" align="center" prop="oqcCheck" width="90"> <el-table-column label="是否检验" align="center" prop="oqcCheckFlag" width="90">
<template #default="scope"> <template #default="scope">
<dict-tag :type="DICT_TYPE.INFRA_BOOLEAN_STRING" :value="scope.row.oqcCheck" /> <dict-tag :type="DICT_TYPE.INFRA_BOOLEAN_STRING" :value="scope.row.oqcCheckFlag" />
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="备注" align="center" prop="remark" min-width="120" /> <el-table-column label="备注" align="center" prop="remark" min-width="120" />
@ -66,8 +66,8 @@
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="12"> <el-col :span="12">
<el-form-item label="是否检验" prop="oqcCheck"> <el-form-item label="是否检验" prop="oqcCheckFlag">
<el-switch v-model="formData.oqcCheck" /> <el-switch v-model="formData.oqcCheckFlag" />
</el-form-item> </el-form-item>
</el-col> </el-col>
</el-row> </el-row>
@ -144,7 +144,7 @@ const formData = ref({
itemId: undefined, itemId: undefined,
batchCode: undefined, batchCode: undefined,
quantity: undefined, quantity: undefined,
oqcCheck: true, oqcCheckFlag: true,
remark: undefined remark: undefined
}) })
const formRules = reactive({ const formRules = reactive({
@ -153,7 +153,7 @@ const formRules = reactive({
{ required: true, message: '发货数量不能为空', trigger: 'blur' }, { required: true, message: '发货数量不能为空', trigger: 'blur' },
{ type: 'number', min: 0.01, message: '发货数量必须大于0', trigger: 'blur' } { type: 'number', min: 0.01, message: '发货数量必须大于0', trigger: 'blur' }
], ],
oqcCheck: [{ required: true, message: '是否检验不能为空', trigger: 'change' }] oqcCheckFlag: [{ required: true, message: '是否检验不能为空', trigger: 'change' }]
}) })
const formRef = ref() const formRef = ref()
@ -201,7 +201,7 @@ const resetForm = () => {
itemId: undefined, itemId: undefined,
batchCode: undefined, batchCode: undefined,
quantity: undefined, quantity: undefined,
oqcCheck: true, oqcCheckFlag: true,
remark: undefined remark: undefined
} }
formRef.value?.resetFields() formRef.value?.resetFields()