diff --git a/klp-ui/src/components/KLPService/ContractSelect/index.vue b/klp-ui/src/components/KLPService/ContractSelect/index.vue index 8c5b26dc..9f7781f1 100644 --- a/klp-ui/src/components/KLPService/ContractSelect/index.vue +++ b/klp-ui/src/components/KLPService/ContractSelect/index.vue @@ -134,12 +134,14 @@ export default { }, set(val) { this.$emit('input', val); + if (val) { + localStorage.setItem('lastSelectedContractId', val); + } } } }, mounted() { if (this.mode == "today") { - // 从localstorage中获取合同列表 this.loadFromLocalStorage(); } else { this.loadContractList(); @@ -197,10 +199,23 @@ export default { this.contractList = this.contractList.filter((item, index, self) => index === self.findIndex(t => t.orderId === item.orderId) ); + // 上一次选择的合同放在列表第一位 + this.sortLastSelectedToFirst(); // 保存到localStorage this.saveToLocalStorage(); } }, + + // 将上一次选择的合同排到列表第一位 + sortLastSelectedToFirst() { + const lastId = localStorage.getItem('lastSelectedContractId'); + if (!lastId) return; + const index = this.contractList.findIndex(item => String(item.orderId) === String(lastId)); + if (index > 0) { + const [item] = this.contractList.splice(index, 1); + this.contractList.unshift(item); + } + }, // 打开选择弹窗 async openSelectDialog() { this.dialogVisible = true; diff --git a/klp-ui/src/views/crm/contract/selectConfig/index.vue b/klp-ui/src/views/crm/contract/selectConfig/index.vue new file mode 100644 index 00000000..98836bd6 --- /dev/null +++ b/klp-ui/src/views/crm/contract/selectConfig/index.vue @@ -0,0 +1,341 @@ + + + + + diff --git a/klp-ui/src/views/wms/anneal/plan/ctrl.vue b/klp-ui/src/views/wms/anneal/plan/ctrl.vue index 5a0c7728..eeaa9bd6 100644 --- a/klp-ui/src/views/wms/anneal/plan/ctrl.vue +++ b/klp-ui/src/views/wms/anneal/plan/ctrl.vue @@ -159,7 +159,7 @@ -
请为每条钢卷分配逻辑库区去向，未分配将无法完成。
+
请为每条钢卷分配逻辑库区去向和关联合同，未分配将无法完成。
@@ -170,6 +170,11 @@ + + +
确 定 @@ -234,11 +239,13 @@ import { listMaterialCoil } from "@/api/wms/coil"; import { listWarehouse } from '@/api/wms/warehouse' import WarehouseSelect from "@/components/KLPService/WarehouseSelect"; import { addAnnealOperateEvent } from "@/api/wms/annealOperateEvent"; +import ContractSelect from "@/components/KLPService/ContractSelect"; export default { name: "AnnealPlan", components: { - WarehouseSelect + WarehouseSelect, + ContractSelect }, data() { return { @@ -563,17 +570,18 @@ export default { submitComplete() { const locations = (this.completeCoils || []).map(item => ({ coilId: item.coilId, - warehouseId: item.warehouseId + warehouseId: item.warehouseId, + contractId: item.contractId, })); - const missing = locations.filter(item => !item.warehouseId); + const missing = locations.filter(item => !item.warehouseId || !item.contractId); if (missing.length > 0) { - this.$message.warning('请先为所有钢卷分配实际库位'); + this.$message.warning('请先为所有钢卷分配实际库位和关联合同'); return; } this.completeLoading = true; completeAnnealPlan({ planId: this.completePlanId, - locations: locations + locations: locations, }).then(() => { // anneal-todo: 新增操作事件 const targetFurnaceName = this.furnaceOptions.find(item => item.furnaceId === this.currentPlan.targetFurnaceId)?.furnaceName || ''; diff --git a/klp-ui/src/views/wms/coil/merge.vue b/klp-ui/src/views/wms/coil/merge.vue index a07fa2a4..5dde05a8 100644 --- a/klp-ui/src/views/wms/coil/merge.vue +++ b/klp-ui/src/views/wms/coil/merge.vue @@ -375,7 +375,6 @@ import AbnormalForm from './components/AbnormalForm'; import PlanSheetViewer from './components/PlanSheetViewer.vue'; import { generateCoilNoPrefix } from "@/utils/coil/coilNo"; import ContractSelect from "@/components/KLPService/ContractSelect"; -import { addCoilContractRel } from "@/api/wms/coilContractRel"; export default { name: 'MergeCoil', @@ -827,6 +826,12 @@ export default { return; } + // 验证合同 + if (!this.targetCoil.contractId) { + this.$message.error('请选择合同'); + return; + } + let loadingInstance = null; try { this.loading = true; @@ -840,6 +845,7 @@ export default { const mergeData = { ...this.targetCoil, + contractId: this.targetCoil.contractId || '', enterCoilNo: enterCoilNos, // 拼接的入场钢卷号 hasMergeSplit: 2, // 2表示合卷 abnormals: this.abnormals, @@ -859,16 +865,8 @@ export default { background: 'rgba(0, 0, 0, 0.7)' }); - const response = await mergeMaterialCoil(mergeData); + await mergeMaterialCoil(mergeData); - const coilId = response.data; - - if (this.targetCoil.contractId) { - addCoilContractRel({ - coilId: coilId, - contractId: this.targetCoil.contractId, - }) - } this.$message.success('合卷保存成功'); // 延迟返回，让用户看到成功提示 diff --git a/klp-ui/src/views/wms/coil/panels/stepSplit.vue b/klp-ui/src/views/wms/coil/panels/stepSplit.vue index 683e9027..da9a7dd7 100644 --- a/klp-ui/src/views/wms/coil/panels/stepSplit.vue +++ b/klp-ui/src/views/wms/coil/panels/stepSplit.vue @@ -393,7 +393,6 @@ import { generateCoilNoPrefix } from '@/utils/coil/coilNo' import ProductInfo from '@/components/KLPService/Renderer/ProductInfo' import RawMaterialInfo from '@/components/KLPService/Renderer/RawMaterialInfo' import ContractSelect from '@/components/KLPService/ContractSelect' -import { addCoilContractRel } from '@/api/wms/coilContractRel' export default { name: 'StepSplit', @@ -491,7 +490,8 @@ export default { materialType: [{ required: true, message: '请选择材料类型', trigger: 'change' }], itemId: [{ required: true, message: '请选择成品/原料', trigger: 'change' }], netWeight: [{ required: true, message: '请输入净重', trigger: 'blur' }], - warehouseId: [{ required: true, message: '请选择所在库位', trigger: 'change' }] + warehouseId: [{ required: true, message: '请选择所在库位', trigger: 'change' }], + contractId: [{ required: true, message: '请选择合同', trigger: 'change' }] }, buttonLoading: false, currentAction: {}, @@ -872,13 +872,6 @@ export default { } else { // 新增分条：调用创建接口 res = await createSpecialChild(this.coilId, this.actionId, splitData) - // 新增分条后，需要添加分条的合同关系 - if (this.splitForm.contractId) { - addCoilContractRel({ - coilId: res.data.coilId, - contractId: this.splitForm.contractId - }) - } } this.$message.success(this.splitForm.coilId ? '编辑分条成功' : '新增分条成功') diff --git a/klp-ui/src/views/wms/coil/split.vue b/klp-ui/src/views/wms/coil/split.vue index 54507a73..052d4b8c 100644 --- a/klp-ui/src/views/wms/coil/split.vue +++ b/klp-ui/src/views/wms/coil/split.vue @@ -378,7 +378,6 @@ import AbnormalForm from './components/AbnormalForm'; import PlanSheetViewer from './components/PlanSheetViewer.vue'; import { generateCoilNoPrefix } from "@/utils/coil/coilNo"; import ContractSelect from "@/components/KLPService/ContractSelect"; -import { addCoilContractRel } from "@/api/wms/coilContractRel"; export default { name: 'SplitCoil', @@ -748,6 +747,10 @@ export default { this.$message.error(`第${i + 1}个子卷的目标库区不能为空`); return; } + if (!item.contractId) { + this.$message.error(`第${i + 1}个子卷的合同不能为空`); + return; + } } const loadingInstance = this.$loading({ @@ -768,9 +771,10 @@ export default { hasMergeSplit: 1, // 1表示分条 newCoils: this.splitList.map(item => ({ ...item, - itemType: item.itemType || this.motherCoil.itemType, - itemId: item.itemId || this.motherCoil.itemId, - hasMergeSplit: 1 + itemType: item.itemType, + itemId: item.itemId, + hasMergeSplit: 1, + contractId: item.contractId, })) }; @@ -778,24 +782,6 @@ export default { if (response.code === 200) { this.$message.success('分条保存成功'); - // 拿到多个子卷的coilId - const newCoilIds = response.msg.split(','); - // 先构建所有的请求体，并移除合同为空为空的项 - const requests = newCoilIds.map((coilId, index) => ({ - coilId, - contractId: this.splitList[index].contractId - })) - .filter(req => req.contractId); - // 为每个子卷添加合同关联 - Promise.all(requests.map(async (req, index) => { - addCoilContractRel(req); - })); - - // 如果是从待操作列表进来的，标记操作为完成 - // if (this.actionId) { - // await completeAction(this.actionId, response.msg); - // } - // 延迟返回，让用户看到成功提示 setTimeout(() => { this.$router.back(); diff --git a/klp-ui/src/views/wms/coil/typing.vue b/klp-ui/src/views/wms/coil/typing.vue index 8293211b..8e8b9be4 100644 --- a/klp-ui/src/views/wms/coil/typing.vue +++ b/klp-ui/src/views/wms/coil/typing.vue @@ -400,7 +400,6 @@ import WarehouseSelect from "@/components/KLPService/WarehouseSelect"; import TimeInput from "@/components/TimeInput"; import AbnormalForm from './components/AbnormalForm'; import { generateCoilNoPrefix } from "@/utils/coil/coilNo"; -import { addCoilContractRel } from "@/api/wms/coilContractRel"; import ContractSelect from "@/components/KLPService/ContractSelect"; import L2MatchPanel from './panels/L2MatchPanel.vue' import DrMatchPanel from './panels/DrMatchPanel.vue'; @@ -522,6 +521,7 @@ export default { warehouseId: [ { required: true, message: '请选择逻辑库区', trigger: 'change' } ], + contractId: [{ required: true, message: '请选择合同', trigger: 'change' }] }, actionId: null, actionType: null, // 待操作类型，504/524 = 双机架 @@ -869,6 +869,8 @@ export default { // 构造更新数据（使用标准update接口，直接更新原记录） const updateData = { ...this.updateForm, + contractId: this.updateForm.contractId, + // 其他字段... coilId: this.currentInfo.coilId, enterCoilNo: this.currentInfo.enterCoilNo, supplierCoilNo: this.currentInfo.supplierCoilNo, @@ -877,23 +879,9 @@ export default { const response = await updateMaterialCoil({ ...updateData, actionId: this.actionId }); - // 更新完成后如果选定了合同，需要增加与合同的绑定关系 - const coilId = response.msg; - if (this.updateForm.contractId) { - await addCoilContractRel({ - coilId: coilId, - contractId: this.updateForm.contractId, - }); - } - if (response.code === 200) { this.$message.success('钢卷信息更新成功'); - // 如果是从待操作列表进来的，标记操作为完成 - // if (this.actionId) { - // await completeAction(this.actionId, response.msg); - // } - // 延迟返回 setTimeout(() => { this.$router.back();