feat(mes): 更新退货检验单相关字段,优化数据结构和逻辑

pull/871/MERGE
YunaiV 2026-03-26 22:38:27 +08:00
parent be159c7070
commit 3c1d5eb01a
4 changed files with 27 additions and 11 deletions

View File

@ -13,7 +13,7 @@ export interface WmReturnIssueLineVO {
batchId?: number batchId?: number
qcFlag?: boolean qcFlag?: boolean
qualityStatus?: number qualityStatus?: number
ipqcId?: number rqcId?: number
remark?: string remark?: string
} }

View File

@ -9,9 +9,11 @@ export interface WmReturnSalesLineVO {
itemName?: string itemName?: string
specification?: string specification?: string
unitMeasureName?: string unitMeasureName?: string
quantityReturned: number quantity: number
batchId?: number batchId: number
batchCode?: string batchCode: string
qcFlag: boolean
rqcId: number
qualityStatus?: number qualityStatus?: number
remark?: string remark?: string
} }

View File

@ -261,7 +261,7 @@ const resetForm = () => {
issueId: undefined, issueId: undefined,
itemId: undefined, itemId: undefined,
quantity: undefined, quantity: undefined,
qcFlag: false, // TODO @AI qcFlag: false,
remark: undefined remark: undefined
} }
formRef.value?.resetFields() formRef.value?.resetFields()

View File

@ -33,6 +33,11 @@
<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">
<template #default="scope">
<dict-tag :type="DICT_TYPE.INFRA_BOOLEAN_STRING" :value="scope.row.qcFlag" />
</template>
</el-table-column>
<el-table-column <el-table-column
v-if="isUpdate || isStock" v-if="isUpdate || isStock"
label="操作" label="操作"
@ -82,9 +87,9 @@
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="8"> <el-col :span="8">
<el-form-item label="退货数量" prop="quantityReturned"> <el-form-item label="退货数量" prop="quantity">
<el-input-number <el-input-number
v-model="formData.quantityReturned" v-model="formData.quantity"
:precision="2" :precision="2"
:min="0" :min="0"
controls-position="right" controls-position="right"
@ -99,7 +104,12 @@
</el-col> </el-col>
</el-row> </el-row>
<el-row> <el-row>
<el-col :span="24"> <el-col :span="8">
<el-form-item label="需要质检" prop="qcFlag">
<el-switch v-model="formData.qcFlag" />
</el-form-item>
</el-col>
<el-col :span="16">
<el-form-item label="备注" prop="remark"> <el-form-item label="备注" prop="remark">
<el-input v-model="formData.remark" type="textarea" placeholder="请输入备注" /> <el-input v-model="formData.remark" type="textarea" placeholder="请输入备注" />
</el-form-item> </el-form-item>
@ -121,6 +131,7 @@
</template> </template>
<script setup lang="ts"> <script setup lang="ts">
import { DICT_TYPE } from '@/utils/dict'
import { WmReturnSalesLineApi, WmReturnSalesLineVO } from '@/api/mes/wm/returnsales/line' import { WmReturnSalesLineApi, WmReturnSalesLineVO } from '@/api/mes/wm/returnsales/line'
import MdItemSelect from '@/views/mes/md/item/components/MdItemSelect.vue' import MdItemSelect from '@/views/mes/md/item/components/MdItemSelect.vue'
import ReturnSalesDetailList from './ReturnSalesDetailList.vue' import ReturnSalesDetailList from './ReturnSalesDetailList.vue'
@ -181,13 +192,15 @@ const formData = ref({
id: undefined, id: undefined,
returnId: undefined as number | undefined, returnId: undefined as number | undefined,
itemId: undefined, itemId: undefined,
quantityReturned: undefined, quantity: undefined,
batchCode: undefined, batchCode: undefined,
qcFlag: true,
remark: undefined remark: undefined
}) })
const formRules = reactive({ const formRules = reactive({
itemId: [{ required: true, message: '物料不能为空', trigger: 'change' }], itemId: [{ required: true, message: '物料不能为空', trigger: 'change' }],
quantityReturned: [{ required: true, message: '退货数量不能为空', trigger: 'blur' }] quantity: [{ required: true, message: '退货数量不能为空', trigger: 'blur' }],
qcFlag: [{ required: true, message: '需要质检不能为空', trigger: 'change' }]
}) })
const formRef = ref() // Ref const formRef = ref() // Ref
@ -236,8 +249,9 @@ const resetForm = () => {
id: undefined, id: undefined,
returnId: undefined, returnId: undefined,
itemId: undefined, itemId: undefined,
quantityReturned: undefined, quantity: undefined,
batchCode: undefined, batchCode: undefined,
qcFlag: false,
remark: undefined remark: undefined
} }
formRef.value?.resetFields() formRef.value?.resetFields()