diff --git a/klp-ui/src/utils/enum.js b/klp-ui/src/utils/enum.js index f91364f4..ea440f4f 100644 --- a/klp-ui/src/utils/enum.js +++ b/klp-ui/src/utils/enum.js @@ -8,7 +8,7 @@ export const MemoInputStorageKey = { licensePlate: 'licensePlate', // 车牌号 qualityStatus: 'qualityStatus', // 质量状态 trimmingRequirement: 'trimmingRequirement', // 钢卷修剪要求 - packingStatus: 'packingStatus', // 打包状态 + packingStatus: 'packingStatus', // 原料材质 packagingRequirement: 'packagingRequirement', // 打包要求 coilSpec: 'coilSpec', // 钢卷规格 coatingType: 'coatingType', // 钢卷镀层种类 diff --git a/klp-ui/src/views/aps/planSheet/PlanDetailForm.vue b/klp-ui/src/views/aps/planSheet/PlanDetailForm.vue index 0907fb70..0c070896 100644 --- a/klp-ui/src/views/aps/planSheet/PlanDetailForm.vue +++ b/klp-ui/src/views/aps/planSheet/PlanDetailForm.vue @@ -112,19 +112,26 @@ - + - + + + + - + + + + + diff --git a/klp-ui/src/views/wms/coil/components/AbnormalForm.vue b/klp-ui/src/views/wms/coil/components/AbnormalForm.vue index f53972bc..7f617ac5 100644 --- a/klp-ui/src/views/wms/coil/components/AbnormalForm.vue +++ b/klp-ui/src/views/wms/coil/components/AbnormalForm.vue @@ -5,25 +5,42 @@ - {{ dict.label }} + {{ + dict.label }} - - + + - - + +
+ + + + + + +
+ - {{ dict.label }} + {{ + dict.label }} - {{ dict.label }} + {{ + dict.label }} + + + + + @@ -48,7 +65,7 @@ export default { default: false } }, - dicts: ['coil_abnormal_code', 'coil_abnormal_position', 'coil_abnormal_degree', 'coil_abnormal_level'], + dicts: ['coil_abnormal_code', 'coil_abnormal_position', 'coil_abnormal_degree', 'sys_lines'], data() { return { rules: { diff --git a/klp-ui/src/views/wms/coil/components/ExceptionManager.vue b/klp-ui/src/views/wms/coil/components/ExceptionManager.vue new file mode 100644 index 00000000..ff7edd9f --- /dev/null +++ b/klp-ui/src/views/wms/coil/components/ExceptionManager.vue @@ -0,0 +1,203 @@ + + + + + \ No newline at end of file diff --git a/klp-ui/src/views/wms/coil/do/correct.vue b/klp-ui/src/views/wms/coil/do/correct.vue index 9a117487..1532866d 100644 --- a/klp-ui/src/views/wms/coil/do/correct.vue +++ b/klp-ui/src/views/wms/coil/do/correct.vue @@ -98,7 +98,7 @@ {{ item.trimmingRequirement }}
- 打包状态: + 原料材质: {{ item.packingStatus }}
@@ -204,11 +204,11 @@ :loading="item.picking" class="action-btn">修正 删除 - 异常 ({{ item.abnormalCount }}) - + -->
@@ -310,8 +310,8 @@
- - + + diff --git a/klp-ui/src/views/wms/coil/do/correntAll.vue b/klp-ui/src/views/wms/coil/do/correntAll.vue index 695c469c..4067115f 100644 --- a/klp-ui/src/views/wms/coil/do/correntAll.vue +++ b/klp-ui/src/views/wms/coil/do/correntAll.vue @@ -89,7 +89,7 @@ {{ item.trimmingRequirement }}
- 打包状态: + 原料材质: {{ item.packingStatus }}
@@ -384,8 +384,8 @@ - - + + diff --git a/klp-ui/src/views/wms/coil/do/packing.vue b/klp-ui/src/views/wms/coil/do/packing.vue index d36ca1f3..7299f423 100644 --- a/klp-ui/src/views/wms/coil/do/packing.vue +++ b/klp-ui/src/views/wms/coil/do/packing.vue @@ -95,8 +95,8 @@ - - + + @@ -165,8 +165,8 @@ - - + + diff --git a/klp-ui/src/views/wms/coil/do/search.vue b/klp-ui/src/views/wms/coil/do/search.vue index 0e9127b2..8f4900f3 100644 --- a/klp-ui/src/views/wms/coil/do/search.vue +++ b/klp-ui/src/views/wms/coil/do/search.vue @@ -92,8 +92,8 @@ - - + + diff --git a/klp-ui/src/views/wms/coil/do/ship.vue b/klp-ui/src/views/wms/coil/do/ship.vue index acae9867..f7dda135 100644 --- a/klp-ui/src/views/wms/coil/do/ship.vue +++ b/klp-ui/src/views/wms/coil/do/ship.vue @@ -88,8 +88,8 @@ - - + + diff --git a/klp-ui/src/views/wms/coil/do/warehousing.vue b/klp-ui/src/views/wms/coil/do/warehousing.vue index af725377..af20ff3d 100644 --- a/klp-ui/src/views/wms/coil/do/warehousing.vue +++ b/klp-ui/src/views/wms/coil/do/warehousing.vue @@ -76,8 +76,8 @@ - - + + @@ -136,11 +136,17 @@ - - + +
请先选择材料类型
+ + + + + + @@ -306,8 +312,8 @@ - - + + @@ -548,6 +554,10 @@ export default { }, }, methods: { + handleProductChange(value, obj) { + console.log(value, obj.material) + this.form.packingStatus = obj.material || '' + }, // 处理材料类型变化 handleMaterialTypeChange(value) { // 清空物品选择 diff --git a/klp-ui/src/views/wms/coil/merge.vue b/klp-ui/src/views/wms/coil/merge.vue index 1b8067e6..fc28345b 100644 --- a/klp-ui/src/views/wms/coil/merge.vue +++ b/klp-ui/src/views/wms/coil/merge.vue @@ -151,8 +151,8 @@
- - + + diff --git a/klp-ui/src/views/wms/coil/panels/base.vue b/klp-ui/src/views/wms/coil/panels/base.vue index d5f24467..bd7d6f9e 100644 --- a/klp-ui/src/views/wms/coil/panels/base.vue +++ b/klp-ui/src/views/wms/coil/panels/base.vue @@ -355,8 +355,8 @@ - - + + @@ -791,7 +791,7 @@ export default { { label: '毛重', prop: 'grossWeight' }, { label: '备注', prop: 'remark' }, { label: '质量状态', prop: 'qualityStatus' }, - { label: '打包状态', prop: 'packingStatus' }, + { label: '原料材质', prop: 'packingStatus' }, { label: '切边要求', prop: 'edgeRequirement' }, { label: '包装要求', prop: 'packagingRequirement' }, { label: '厂家', prop: 'itemManufacturer' }, diff --git a/klp-ui/src/views/wms/coil/panels/do.vue b/klp-ui/src/views/wms/coil/panels/do.vue index c9e248f4..046865f9 100644 --- a/klp-ui/src/views/wms/coil/panels/do.vue +++ b/klp-ui/src/views/wms/coil/panels/do.vue @@ -84,7 +84,7 @@ {{ item.trimmingRequirement }}
- 打包状态: + 原料材质: {{ item.packingStatus }}
@@ -410,13 +410,8 @@ - - - + + @@ -439,10 +434,9 @@ import { listPendingAction, startProcess, cancelAction, delPendingAction, addPen import { parseTime } from '@/utils/klp' import ProductInfo from '@/components/KLPService/Renderer/ProductInfo' import RawMaterialInfo from '@/components/KLPService/Renderer/RawMaterialInfo' -import { addCoilAbnormal } from '@/api/wms/coilAbnormal' import LabelRender from './LabelRender/index.vue' import StepSplit from './stepSplit.vue' -import AbnormalForm from '../components/AbnormalForm' +import ExceptionManager from '../components/ExceptionManager' import { getCoilTagPrintType } from '@/views/wms/coil/js/coilPrint' export default { @@ -467,7 +461,7 @@ export default { RawMaterialInfo, LabelRender, StepSplit, - AbnormalForm + ExceptionManager }, data() { return { @@ -503,16 +497,7 @@ export default { }, buttonLoading: false, exceptionDialogVisible: false, - exceptionForm: { - coilId: null, - position: null, - lengthCoord: null, - startPosition: 0, - endPosition: 0, - defectCode: null, - degree: null, - remark: null - }, + currentCoilId: null, tagSizeMap: { '2': { width: 100, @@ -930,27 +915,14 @@ export default { return '—' }, handleAddAbnormal(row) { - this.exceptionForm.coilId = row.coilId + this.currentCoilId = row.coilId + if (!row.coilId) { + this.$message.error('请先选择钢卷') + return + } + // 显示弹窗 this.exceptionDialogVisible = true }, - confirmException() { - this.$refs["abnormalForm"].validate(valid => { - if (valid) { - addCoilAbnormal({ - ...this.exceptionForm, - length: this.exceptionForm.endPosition - this.exceptionForm.startPosition, - }).then(response => { - this.$message.success('异常记录添加成功') - this.cancelException(); - // 重置表单 - this.getMaterialCoil() - }).catch(error => { - console.error('异常记录添加失败:', error) - this.$message.error('异常记录添加失败: ' + (error.message || error)) - }) - } - }); - }, handleAbnormal() { this.$router.push({ path: '/quality/detail', @@ -1386,4 +1358,16 @@ export default { } } } + + + +// 对话框底部样式 +.dialog-footer { + display: flex; + justify-content: center; + gap: 10px; + padding: 16px; + border-top: 1px solid #e4e7ed; + background-color: #fafafa; +} \ No newline at end of file diff --git a/klp-ui/src/views/wms/coil/panels/stepSplit.vue b/klp-ui/src/views/wms/coil/panels/stepSplit.vue index f4e6557b..ce68f51e 100644 --- a/klp-ui/src/views/wms/coil/panels/stepSplit.vue +++ b/klp-ui/src/views/wms/coil/panels/stepSplit.vue @@ -30,16 +30,28 @@ {{ coilInfo.warehouseName || '-' }} {{ coilInfo.materialType || '-' }} {{ coilInfo.netWeight || '-' }} T + {{ coilInfo.itemName || '-' }} + {{ coilInfo.specification || '-' }} + {{ coilInfo.material || '-' }} + {{ coilInfo.packingStatus || '-' }} + {{ coilInfo.netWeight || '-' }} T + + - - - + + + + + - +