diff --git a/klp-ui/src/api/wms/coil.js b/klp-ui/src/api/wms/coil.js index d8404abc..c3de8f3c 100644 --- a/klp-ui/src/api/wms/coil.js +++ b/klp-ui/src/api/wms/coil.js @@ -49,7 +49,8 @@ export function addMaterialCoil(data) { export function updateMaterialCoil(data) { // 对data进行预处理，将currentCoilNo去除首位的空格 - const payload = { + // 将saleName和contractNo剔除防止覆盖 + const { saleName, contractNo, ...payload} = { ...data, currentCoilNo: data.currentCoilNo.trim(), } @@ -63,7 +64,8 @@ export function updateMaterialCoil(data) { // 简单更新钢卷物料表 export function updateMaterialCoilSimple(data) { // 对data进行预处理，将currentCoilNo去除首位的空格 - const payload = { + // 将saleName和contractNo剔除防止覆盖 + const { saleName, contractNo, ...payload} = { ...data, currentCoilNo: data.currentCoilNo.trim(), } diff --git a/klp-ui/src/components/CoilSelector/index.vue b/klp-ui/src/components/CoilSelector/index.vue index c47df2cf..6b904538 100644 --- a/klp-ui/src/components/CoilSelector/index.vue +++ b/klp-ui/src/components/CoilSelector/index.vue @@ -83,19 +83,26 @@ - + + + + + + + + 全选当前卷 显示钢卷地图 显示订单详情 - -
+
搜索 重置
- + 长度告警 @@ -15,16 +15,24 @@ --> - + - + @@ -83,13 +91,14 @@ - + - + @@ -99,6 +108,7 @@ + diff --git a/klp-ui/src/views/wms/coil/panels/base.vue b/klp-ui/src/views/wms/coil/panels/base.vue index 1310ae0f..1314e5ba 100644 --- a/klp-ui/src/views/wms/coil/panels/base.vue +++ b/klp-ui/src/views/wms/coil/panels/base.vue @@ -83,6 +83,14 @@ @keyup.enter.native="handleQuery" /> + + + + + + + + 全部 @@ -136,13 +144,11 @@ 导出全部 - + + 按实际库区排序 @@ -187,6 +193,7 @@ + @@ -223,7 +230,7 @@ - + @@ -402,111 +409,219 @@ @pagination="getList" />
- - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
请先选择材料类型
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
请先选择材料类型
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+ + 保存合同 +
+ + +
确 定 @@ -848,9 +963,12 @@ import { getCoilTagPrintType } from '@/views/wms/coil/js/coilPrint'; import DragResizeBox from '@/components/DragResizeBox/index.vue'; import ProcessFlow from '../components/ProcessFlow.vue'; import WarehouseTree from '@/components/KLPService/WarehouseTree/index.vue'; +import TimeInput from "@/components/TimeInput"; +import ContractSelect from "@/components/KLPService/ContractSelect"; import { listDeliveryWaybillDetail, delDeliveryWaybillDetail } from "@/api/wms/deliveryWaybillDetail"; import { listDeliveryPlan } from "@/api/wms/deliveryPlan"; import { addCoilQualityRejudge } from "@/api/wms/coilQualityRejudge"; +import { listCoilContractRel, addCoilContractRel, updateCoilContractRel } from "@/api/wms/coilContractRel"; export default { name: "MaterialCoil", @@ -874,6 +992,8 @@ export default { ProcessFlow, DragResizeBox, WarehouseTree, + TimeInput, + ContractSelect, }, dicts: ['product_coil_status', 'coil_material', 'coil_itemname', 'coil_manufacturer', 'coil_quality_status', 'wms_next_warehouse', 'coil_business_purpose'], props: { @@ -1006,6 +1126,8 @@ export default { }, // 按钮loading buttonLoading: false, + contractLoading: false, + contractRelId: null, showProcessFlow: false, // 遮罩层 loading: true, @@ -1245,9 +1367,7 @@ export default { }, }, created() { - if (this.showExportTime) { - this.getUserList(); - } + this.getUserList(); if (this.useWarehouseIds) { this.warehouseIds = this.warehouseOptions.map(item => item.value).join(','); } @@ -1725,6 +1845,25 @@ export default { this.$set(this.productionTimeForm, 'formattedDuration', ''); } }, + // 计算表单中的生产耗时 + calculateFormProductionDuration() { + const { productionStartTime, productionEndTime } = this.form; + if (productionStartTime && productionEndTime) { + const start = new Date(productionStartTime).getTime(); + const end = new Date(productionEndTime).getTime(); + if (end < start) { + this.form.productionDuration = ''; + this.form.formattedDuration = ''; + } else { + const durationMs = end - start; + this.form.productionDuration = Math.round(durationMs / (1000 * 60)); + this.form.formattedDuration = this.formatDuration(durationMs); + } + } else { + this.form.productionDuration = ''; + this.form.formattedDuration = ''; + } + }, // 处理生产时间提交 submitProductionTimeForm() { this.$refs.productionTimeForm.validate((valid) => { @@ -1986,6 +2125,45 @@ export default { this.open = false; this.reset(); }, + loadContractRel(coilId) { + if (!coilId) { + this.contractRelId = null; + this.$set(this.form, 'contractId', null); + return; + } + listCoilContractRel({ coilId }).then(res => { + const rows = res.rows || []; + if (rows.length > 0) { + this.contractRelId = rows[0].relId; + this.$set(this.form, 'contractId', rows[0].contractId); + } else { + this.contractRelId = null; + this.$set(this.form, 'contractId', null); + } + }); + }, + saveContractRel() { + this.contractLoading = true; + listCoilContractRel({ coilId: this.form.coilId }).then(res => { + const rows = res.rows || []; + if (rows.length > 0) { + return updateCoilContractRel({ + relId: rows[0].relId, + coilId: this.form.coilId, + contractId: this.form.contractId + }); + } else { + return addCoilContractRel({ + coilId: this.form.coilId, + contractId: this.form.contractId + }); + } + }).then(() => { + this.$message.success('合同绑定保存成功'); + }).finally(() => { + this.contractLoading = false; + }); + }, // 表单重置 reset() { this.form = { @@ -2013,6 +2191,15 @@ export default { materialType: '原料', temperGrade: undefined, coatingType: undefined, + qualityStatus: undefined, + actualLength: undefined, + actualWidth: undefined, + scheduleThickness: undefined, + productionStartTime: undefined, + productionEndTime: undefined, + productionDuration: undefined, + formattedDuration: undefined, + contractId: undefined, }; this.resetForm("form"); }, @@ -2072,6 +2259,12 @@ export default { } } + if (this.form.productionDuration) { + this.form.formattedDuration = this.formatDuration(this.form.productionDuration * 60 * 1000); + } + + this.loadContractRel(coilId); + this.open = true; this.title = "修改钢卷物料"; }); @@ -2178,6 +2371,12 @@ export default { } } + if (this.form.productionDuration) { + this.form.formattedDuration = this.formatDuration(this.form.productionDuration * 60 * 1000); + } + + this.loadContractRel(coilId); + this.open = true; this.title = "修改钢卷物料"; }); diff --git a/klp-ui/src/views/wms/report/abnormal.vue b/klp-ui/src/views/wms/report/abnormal.vue index b5f0e4d4..9e62b3b1 100644 --- a/klp-ui/src/views/wms/report/abnormal.vue +++ b/klp-ui/src/views/wms/report/abnormal.vue @@ -41,14 +41,15 @@ - + + + + + + - 查询 @@ -57,14 +58,8 @@ 导出产出钢卷(多行) 导出消耗钢卷(多行) - - diff --git a/klp-ui/src/views/wms/report/delivery.vue b/klp-ui/src/views/wms/report/delivery.vue index 6f863dbb..c1235ec6 100644 --- a/klp-ui/src/views/wms/report/delivery.vue +++ b/klp-ui/src/views/wms/report/delivery.vue @@ -38,6 +38,15 @@ + + + + + + + 查询 导出 diff --git a/klp-ui/src/views/wms/report/template/action.vue b/klp-ui/src/views/wms/report/template/action.vue index f033308d..ca78e029 100644 --- a/klp-ui/src/views/wms/report/template/action.vue +++ b/klp-ui/src/views/wms/report/template/action.vue @@ -99,6 +99,12 @@ + + + + + + 查询 @@ -541,7 +553,7 @@ export default { '材质属性': ['material', 'manufacturer', 'surfaceTreatmentDesc', 'zincLayer', 'packingStatus', 'temperGrade', 'coatingType', 'chromePlateCoilNo'], '用途': ['purpose', 'businessPurpose'], '状态': ['qualityStatus', 'statusDesc', 'isRelatedToOrderText'], - '其他': ['itemName', 'itemId', 'packagingRequirement', 'trimmingRequirement', 'transferType', 'saleName', 'remark', 'team'], + '其他': ['itemName', 'itemId', 'packagingRequirement', 'trimmingRequirement', 'transferType', 'contractNo', 'saleName', 'remark', 'team'], }, queryParams: { startTime: start,