diff --git a/klp-ui/src/views/wms/coil/do/correct.vue b/klp-ui/src/views/wms/coil/do/correct.vue index 496d135a..a1dd8a1a 100644 --- a/klp-ui/src/views/wms/coil/do/correct.vue +++ b/klp-ui/src/views/wms/coil/do/correct.vue @@ -347,6 +347,12 @@ + + + + + @@ -422,6 +428,7 @@ export default { RawMaterialSelect, CoilTraceResult, }, + dicts: ['coil_business_purpose'], data() { return { traceOpen: false, diff --git a/klp-ui/src/views/wms/coil/do/correntAll.vue b/klp-ui/src/views/wms/coil/do/correntAll.vue index 14fc321c..b10d8b82 100644 --- a/klp-ui/src/views/wms/coil/do/correntAll.vue +++ b/klp-ui/src/views/wms/coil/do/correntAll.vue @@ -421,6 +421,12 @@ + + + + + @@ -474,7 +480,7 @@ import { getCoilTagPrintType } from '@/views/wms/coil/js/coilPrint' export default { name: 'CorrentAllPage', - dicts: ['action_type', 'coil_quality_status'], + dicts: ['action_type', 'coil_quality_status', 'coil_business_purpose'], components: { LabelRender, WarehouseSelect, diff --git a/klp-ui/src/views/wms/coil/merge.vue b/klp-ui/src/views/wms/coil/merge.vue index d48a85de..c42985f7 100644 --- a/klp-ui/src/views/wms/coil/merge.vue +++ b/klp-ui/src/views/wms/coil/merge.vue @@ -222,6 +222,14 @@ + + + + + + @@ -305,7 +313,7 @@ export default { TimeInput, AbnormalForm }, - dicts: ['coil_quality_status', 'coil_abnormal_position', 'coil_abnormal_code', 'coil_abnormal_degree'], + dicts: ['coil_quality_status', 'coil_abnormal_position', 'coil_abnormal_code', 'coil_abnormal_degree', 'coil_business_purpose'], data() { const currentCoilNoPrefix = generateCoilNoPrefix() return { diff --git a/klp-ui/src/views/wms/coil/panels/base.vue b/klp-ui/src/views/wms/coil/panels/base.vue index 0390dfcc..963448b6 100644 --- a/klp-ui/src/views/wms/coil/panels/base.vue +++ b/klp-ui/src/views/wms/coil/panels/base.vue @@ -396,6 +396,12 @@ + + + + + @@ -1110,7 +1116,7 @@ export default { handlePreviewLabel(row) { this.labelRender.visible = true; const itemName = row.itemName || ''; - + this.labelRender.type = row.itemType === 'product' ? '3' : '2'; this.labelRender.data = { ...row, diff --git a/klp-ui/src/views/wms/coil/panels/stepSplit.vue b/klp-ui/src/views/wms/coil/panels/stepSplit.vue index 7dd476d1..c3c06ff2 100644 --- a/klp-ui/src/views/wms/coil/panels/stepSplit.vue +++ b/klp-ui/src/views/wms/coil/panels/stepSplit.vue @@ -173,6 +173,12 @@ + + + + + @@ -340,7 +346,7 @@ export default { ProductInfo, RawMaterialInfo, }, - dicts: ['coil_quality_status', 'coil_abnormal_position', 'coil_abnormal_code', 'coil_abnormal_degree'], + dicts: ['coil_quality_status', 'coil_abnormal_position', 'coil_abnormal_code', 'coil_abnormal_degree', 'coil_business_purpose'], data() { const currentCoilNoPrefix = generateCoilNoPrefix() return { diff --git a/klp-ui/src/views/wms/coil/split.vue b/klp-ui/src/views/wms/coil/split.vue index 20dd0f89..8afbf7d6 100644 --- a/klp-ui/src/views/wms/coil/split.vue +++ b/klp-ui/src/views/wms/coil/split.vue @@ -215,6 +215,12 @@ + + + + + @@ -321,7 +327,7 @@ export default { TimeInput, AbnormalForm }, - dicts: ['coil_quality_status', 'coil_abnormal_position', 'coil_abnormal_code', 'coil_abnormal_degree'], + dicts: ['coil_quality_status', 'coil_abnormal_position', 'coil_abnormal_code', 'coil_abnormal_degree', 'coil_business_purpose'], data() { const currentCoilNoPrefix = generateCoilNoPrefix() return { diff --git a/klp-ui/src/views/wms/coil/typing.vue b/klp-ui/src/views/wms/coil/typing.vue index 459f639a..b0456616 100644 --- a/klp-ui/src/views/wms/coil/typing.vue +++ b/klp-ui/src/views/wms/coil/typing.vue @@ -207,6 +207,13 @@ + + + + + + @@ -341,7 +348,7 @@ export default { TimeInput, AbnormalForm }, - dicts: ['coil_quality_status', 'coil_abnormal_position', 'coil_abnormal_code', 'coil_abnormal_degree'], + dicts: ['coil_quality_status', 'coil_abnormal_position', 'coil_abnormal_code', 'coil_abnormal_degree', 'coil_business_purpose'], data() { return { loading: false, @@ -685,11 +692,6 @@ export default { this.updateForm.productionDuration = data.productionDuration; this.updateForm.formattedDuration = this.formatDuration(data.productionDuration); } - - // 不再预加载物品列表,改为实时搜索 - - // 加载变更历史 - // this.loadHistory(); } } catch (error) { this.$message.error('加载钢卷信息失败'); @@ -767,67 +769,6 @@ export default { } }, - // 已移除 loadAllItems,改为实时搜索 - - // 已移除 loadItemList,改为实时搜索 - - // 实时搜索物品(后端搜索) - async searchItems(query) { - if (!this.updateForm.itemType) { - this.$message.warning('请先选择材料类型'); - return; - } - - // 如果没有输入,清空列表 - if (!query || query.trim() === '') { - if (this.updateForm.itemType === 'raw_material') { - this.rawMaterialList = []; - } else if (this.updateForm.itemType === 'product') { - this.productList = []; - } - return; - } - - try { - this.itemSearchLoading = true; - const searchQuery = query.trim(); - - if (this.updateForm.itemType === 'raw_material') { - // 后端搜索原材料(支持名称或规格模糊搜索) - const response = await listRawMaterialWithBom({ - pageNum: 1, - pageSize: 20, - rawMaterialName: searchQuery, - specification: searchQuery // 同时传入,后端会使用 OR 条件 - }); - if (response.code === 200) { - this.rawMaterialList = response.rows || []; - } - } else if (this.updateForm.itemType === 'product') { - // 后端搜索产品(支持名称或规格模糊搜索) - const response = await listProductWithBom({ - pageNum: 1, - pageSize: 20, - productName: searchQuery, - specification: searchQuery // 同时传入,后端会使用 OR 条件 - }); - if (response.code === 200) { - this.productList = response.rows || []; - } - } - } catch (error) { - console.error('搜索物品失败', error); - this.$message.error('搜索失败,请重试'); - } finally { - this.itemSearchLoading = false; - } - }, - - // 物品选择变化 - handleItemChange(itemId) { - // 物品选择变化处理 - }, - // 加载变更历史 async loadHistory() { if (!this.currentInfo.enterCoilNo) {