From 8950a523c4c103d3ae0ece1db3b43a17cb8a34e0 Mon Sep 17 00:00:00 2001 From: "zangch@mesnac.com" Date: Mon, 16 Mar 2026 08:56:40 +0800 Subject: [PATCH] =?UTF-8?q?refactor:=20=E6=9B=BF=E6=8D=A2=E7=89=A9?= =?UTF-8?q?=E6=96=99=E9=80=89=E6=8B=A9=E7=BB=84=E4=BB=B6=E5=B9=B6=E4=BF=AE?= =?UTF-8?q?=E6=AD=A3=E5=AD=97=E6=AE=B5=E6=98=A0=E5=B0=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 直接选物料组件，不用销售物料组件 --- src/views/wms/wmsShippingBill/edit.vue | 22 +++++++++++----------- src/views/wms/wmsShippingBill/todo.vue | 10 +++++----- 2 files changed, 16 insertions(+), 16 deletions(-) diff --git a/src/views/wms/wmsShippingBill/edit.vue b/src/views/wms/wmsShippingBill/edit.vue index d463c0e..3311746 100644 --- a/src/views/wms/wmsShippingBill/edit.vue +++ b/src/views/wms/wmsShippingBill/edit.vue @@ -315,7 +315,7 @@ - + @@ -450,7 +450,7 @@ import type { CustomerContactVO } from '@/api/oa/crm/customerContact/types'; import { getCrmSupplierInfoList } from '@/api/oa/crm/crmSupplierInfo'; import { listUser } from '@/api/system/user'; import type { UserQuery } from '@/api/system/user/types'; -import SaleMaterialSelect from '@/components/SaleMaterialSelect/index.vue'; +import MaterialSelect from '@/components/MaterialSelect/index.vue'; import SubmitVerify from '@/components/Process/submitVerify.vue'; import ApprovalRecord from '@/components/Process/approvalRecord.vue'; import ApprovalButton from '@/components/Process/approvalButton.vue'; @@ -609,7 +609,7 @@ const selectedContract = ref(null); const detailsList = ref([]); // ERP物料选择组件引用 -const saleMaterialSelectRef = ref(); +const materialSelectRef = ref(); // WMS物料选择对话框 const wmsMaterialDialog = reactive({ visible: false }); @@ -695,7 +695,7 @@ const syncMaterialSourceTypeByDetails = () => { } const hasErpMaterial = detailsList.value.some((item) => item.materialSourceType === '1'); const hasWmsMaterial = detailsList.value.some((item) => item.materialSourceType === '2'); - // Why：项目自动生成的发货草稿物料属于 ERP 物料，页面回显后默认切到 ERP， + // 项目自动生成的发货草稿物料属于 ERP 物料，页面回显后默认切到 ERP， // 用户继续点“新增物料”时才能沿用当前草稿的物料语义，而不是误切回 WMS 选料 if (hasErpMaterial && !hasWmsMaterial) { materialSourceType.value = '1'; @@ -779,7 +779,7 @@ const prepareTaskVariables = async () => { proxy?.$modal.msgError('请选择抄送人员'); return false; } - // Why：抄送人员不落库，只在到货确认节点审批时作为流程变量传递 + // 抄送人员不落库，只在到货确认节点审批时作为流程变量传递 taskVariables.value = { tManagerId }; return true; }; @@ -944,7 +944,7 @@ const handleAddDetail = () => { } if (materialSourceType.value === '1') { // ERP物料选择 - saleMaterialSelectRef.value?.open(); + materialSelectRef.value?.open(); } else { // WMS物料选择 wmsMaterialDialog.visible = true; @@ -964,20 +964,20 @@ const erpMaterialSelectCallBack = (materials: any[]) => { shippingBillId: form.value.shippingBillId, materialSourceType: '1', // ERP物料 erpMaterialId: material.materialId, - // Why：项目自动生成的 ERP 草稿明细同时带有 erpMaterialId 与 materielId， + // 项目自动生成的 ERP 草稿明细同时带有 erpMaterialId 与 materielId， // 手动新增 ERP 物料时保持同一口径，后续保存、回显和扩展处理才不会出现字段缺失 materielId: material.materialId, wmsMaterialId: undefined, materialCode: material.materialCode, materialName: material.materialName, - materielSpecification: material.specificationModel, + materielSpecification: material.materialModel, batchNumber: undefined, - unitPrice: material.unitPrice || 0, + unitPrice: material.purchasePrice || 0, shippingStockAmount: 1, unitId: material.unitId, unitName: material.unitName, - totalPrice: material.unitPrice || 0, - remark: undefined + totalPrice: material.purchasePrice || 0, + remark: material.remark }); } }); diff --git a/src/views/wms/wmsShippingBill/todo.vue b/src/views/wms/wmsShippingBill/todo.vue index 9db3fa4..e9817a9 100644 --- a/src/views/wms/wmsShippingBill/todo.vue +++ b/src/views/wms/wmsShippingBill/todo.vue @@ -37,9 +37,9 @@