From 6f2f490dc6533ad0479c2332ba755be08487d8d7 Mon Sep 17 00:00:00 2001 From: qiankanghui Date: Thu, 12 Nov 2026 14:03:16 +0800 Subject: [PATCH] =?UTF-8?q?=E9=80=89=E6=8B=A9=E4=BE=9B=E5=BA=94=E5=95=86?= =?UTF-8?q?=E5=8F=AF=E4=BE=9B=E7=89=A9=E6=96=99=E9=80=89=E6=8B=A9=E6=9D=A1?= =?UTF-8?q?=E4=BB=B6=E5=8A=A0=E4=B8=80=E4=B8=AA=E7=89=A9=E6=96=99=E7=BC=96?= =?UTF-8?q?=E7=A0=81=E6=9F=A5=E8=AF=A2=20=E9=87=87=E8=B4=AD=E8=AE=A2?= =?UTF-8?q?=E5=8D=95=E9=A1=B5=E9=9D=A2=E5=A2=9E=E5=8A=A0=E6=89=B9=E9=87=8F?= =?UTF-8?q?=E4=B8=8B=E8=BE=BE=E5=8A=9F=E8=83=BD=20=E9=AA=8C=E8=B4=A7?= =?UTF-8?q?=E7=94=B3=E8=AF=B7=E6=96=B0=E5=A2=9E=E8=AE=A2=E5=8D=95=E7=B1=BB?= =?UTF-8?q?=E5=9E=8B=E7=AD=9B=E9=80=89=E6=9D=A1=E4=BB=B6=20=E4=BE=9B?= =?UTF-8?q?=E5=BA=94=E5=95=86=E4=BB=B7=E6=A0=BC=E7=AE=A1=E7=90=86=E6=96=B0?= =?UTF-8?q?=E5=A2=9E=E5=AD=97=E6=AE=B5=E5=B1=9E=E6=80=A7=EF=BC=9A=E9=95=BF?= =?UTF-8?q?=EF=BC=8C=E5=AE=BD=EF=BC=8C=E9=AB=98=EF=BC=8C=E6=AF=9B=E9=87=8D?= =?UTF-8?q?=E3=80=81=E5=87=80=E9=87=8D=20=E4=BF=AE=E6=94=B9=E4=B8=80?= =?UTF-8?q?=E4=B8=AAsku=E5=AF=B9=E5=BA=94=E5=A4=9A=E4=B8=AA=E5=9F=BA?= =?UTF-8?q?=E5=87=86=E6=96=99=E5=8F=B7=E6=9D=83=E9=99=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/order/poOrder.js | 2 +- .../inspection/inspectionRequestList.vue | 178 ++++-------------- .../inspection/mySampleInspectionList.vue | 16 +- src/views/modules/order/poOrder.vue | 96 ++++++++-- .../modules/srmBaseInformation/srmPartSku.vue | 28 --- src/views/modules/srmPart/partInfoList.vue | 52 ++--- .../modules/supplier/supplierPartMoqPrice.vue | 116 +++++++++++- 7 files changed, 274 insertions(+), 214 deletions(-) diff --git a/src/api/order/poOrder.js b/src/api/order/poOrder.js index 010881d..315544b 100644 --- a/src/api/order/poOrder.js +++ b/src/api/order/poOrder.js @@ -25,7 +25,7 @@ export const closePoDetail = (data) => createAPI(`/pODetail/closePoDetail`, 'pos /** 打开 PO 订单行(已关闭 → 按验货数量恢复状态) */ export const openPoDetail = (data) => createAPI(`/pODetail/openPoDetail`, 'post', data) -/** 下达 PO 订单行(草稿 → 已下达) */ +/** 下达 PO 订单行(草稿 → 已下达):单行与「一键下达」共用,支持批量;传单元素数组即为单行 */ export const issuePoDetail = (data) => createAPI(`/pODetail/issuePoDetail`, 'post', data) /** 回滚 PO 订单行(已下达 → 草稿) */ diff --git a/src/views/modules/inspection/inspectionRequestList.vue b/src/views/modules/inspection/inspectionRequestList.vue index b84f1cc..b1fba73 100644 --- a/src/views/modules/inspection/inspectionRequestList.vue +++ b/src/views/modules/inspection/inspectionRequestList.vue @@ -3,6 +3,15 @@
+ + + + + 供应商编码 @@ -311,58 +320,11 @@
- {{ isEditDialogMode ? 'PO明细' : '批量选择PO' }} + PO明细
- -
- - - - - - - - -
- - to - -
-
- - 查询 - 查询 - -
-
- - -
+ +
- - - - - - - - - - - - - - - - - - - @@ -979,15 +876,10 @@ style="width: 100%; margin-top: 12px;" @selection-change="handleAddPoSelectionChange"> + - - - - - - - + - + - + + +
0) { + // 如果已有PO明细,构建排除列表(新增/编辑均适用,避免重复选择) + if (this.editPoDetailList && this.editPoDetailList.length > 0) { const excludePoItems = [] this.editPoDetailList.forEach(item => { // 优先使用 poNo 和 poItemNo(对应后端 order_no 和 item_no) @@ -2640,7 +2537,7 @@ export default { return } - if (!this.addFormData.requestNo) { + if (this.isEditDialogMode && !this.addFormData.requestNo) { this.$message.warning('申请单号为空,无法添加PO明细') return } @@ -3243,7 +3140,6 @@ export default { this.addPoPlannerDisplayFromChooser = '' this.poSupplierDialogVisible = false this.orderSupplierDialogVisible = false - this.loadPoList() this.fetchSupplierAddress(supplierNoVal) }, @@ -3635,19 +3531,19 @@ export default { this.handleSaveEdit() return } - console.log('开始保存,当前选择的PO列表:', this.selectedPoList) + console.log('开始保存,当前PO明细列表:', this.editPoDetailList) console.log('表单数据:', this.addFormData) this.$refs.addFormData.validate((valid) => { console.log('表单验证结果:', valid) if (valid) { - if (this.selectedPoList.length === 0) { - this.$message.warning('请至少选择一条PO明细') + if (this.editPoDetailList.length === 0) { + this.$message.warning('请至少添加一条PO明细') return } // 检查验货数量 - const hasInvalidQty = this.selectedPoList.some(item => !item.inspectQty || item.inspectQty <= 0) + const hasInvalidQty = this.editPoDetailList.some(item => !item.qty || item.qty <= 0) if (hasInvalidQty) { this.$message.warning('请填写有效的验货数量') return @@ -3664,14 +3560,14 @@ export default { inspectContract: this.addFormData.contact, inspectPhone: this.addFormData.inspectPhone || '', remark: '', - items: this.selectedPoList.map(item => ({ - orderNo: item.orderNo || item.order_ref1 || item.orderRef1, - itemNo: item.itemNo || item.item_no || item.order_ref2 || item.orderRef2, + items: this.editPoDetailList.map(item => ({ + orderNo: item.poNo || item.orderNo || item.order_ref1 || item.orderRef1, + itemNo: item.poItemNo || item.itemNo || item.item_no || item.orderRef2 || item.order_ref2, partNo: item.partNo, orderRef1: item.orderRef1, orderRef2: item.orderRef2, - qty: item.inspectQty, - shipMethod: item.shipMethod, + qty: item.qty, + shipMethod: item.shipMothod || item.shipMethod, crd: item.crd })) } diff --git a/src/views/modules/inspection/mySampleInspectionList.vue b/src/views/modules/inspection/mySampleInspectionList.vue index 8277f19..bec5510 100644 --- a/src/views/modules/inspection/mySampleInspectionList.vue +++ b/src/views/modules/inspection/mySampleInspectionList.vue @@ -4,7 +4,7 @@
- 供应商编码 + 供应商名称 @@ -16,6 +16,12 @@ + + + + + + 查询 重置 @@ -43,6 +49,8 @@ + + @@ -107,7 +115,9 @@ export default { supplierName: '', planStartDate: '', orderRef1: '', - item: '' + item: '', + partNo: '', + basePartNo: '' } } }, @@ -153,6 +163,8 @@ export default { this.searchData.planStartDate = '' this.searchData.orderRef1 = '' this.searchData.item = '' + this.searchData.partNo = '' + this.searchData.basePartNo = '' this.pageIndex = 1 this.getList() }, diff --git a/src/views/modules/order/poOrder.vue b/src/views/modules/order/poOrder.vue index e162e1d..016a023 100644 --- a/src/views/modules/order/poOrder.vue +++ b/src/views/modules/order/poOrder.vue @@ -34,6 +34,7 @@ 取消 同步运输周期 + 批量下达 新增 查看价格表 拆单到新PO @@ -924,12 +925,19 @@ @closed="resetSupplierPartDialog">
供应商:{{ supplierPartDialogSupplierNo }} + { - issuePoDetail(params).then(({ data }) => { - if (data && data.code === 0) { - this.$message.success('下达成功') - this.getDataList() + // 单行下达与一键下达共用同一接口,传单元素数组 + this.submitIssueRows([params], false) + }).catch(() => {}) + }, + + // 一键下达:对勾选行中处于「草稿」状态的订单行批量下达(与单行下达共用同一接口,一次请求) + handleBatchIssuePoOrder () { + const selected = this.syncSelection || [] + const draftRows = selected.filter(row => canIssuePoOrder(row.status)) + if (!draftRows.length) { + this.$message.warning('勾选的行中没有可下达(草稿)的订单行') + return + } + const paramsList = draftRows + .map(row => buildPoDetailActionParams(row, this.$store.state.user.site)) + .filter(params => params.id || (params.orderNo && params.site && params.itemNo != null)) + if (!paramsList.length) { + this.$message.error('无法识别勾选的订单行,请刷新后重试') + return + } + const skipped = selected.length - draftRows.length + let tip = `确定一键下达勾选的 ${draftRows.length} 行草稿订单?` + if (skipped > 0) { + tip += `(另有 ${skipped} 行非草稿状态将跳过)` + } + this.$confirm(tip, '提示', { type: 'warning' }).then(() => { + this.submitIssueRows(paramsList, true) + }).catch(() => {}) + }, + + /** + * 提交下达(单行/批量共用后端 /issuePoDetail,入参为数组): + * rows 为 [{id,orderNo,site,itemNo}] 数组,一次请求;后端逐行校验返回 summary(successCount/failCount/failDetails)。 + * isBatch=true 按成功/失败汇总提示并清空勾选,否则按单行结果提示。 + */ + submitIssueRows (rows, isBatch) { + this.batchIssuing = true + issuePoDetail(rows).then(({ data }) => { + if (data && data.code === 0) { + const s = (data.data && data.data.summary) || {} + const successCount = s.successCount || 0 + const failDetails = s.failDetails || [] + const failCount = s.failCount != null ? s.failCount : failDetails.length + if (!failCount) { + this.$message.success(isBatch ? `下达完成:成功 ${successCount} 行` : '下达成功') + } else if (isBatch) { + const reasonLines = failDetails.map(f => `${f.orderNo || ''} 行 ${f.itemNo != null ? f.itemNo : ''}:${f.reason || '下达失败'}`) + this.$message({ + type: successCount ? 'warning' : 'error', + dangerouslyUseHTMLString: true, + message: `下达完成:成功 ${successCount} 行,失败 ${failCount} 行
` + reasonLines.join('
') + }) } else { - this.$message.error((data && data.msg) || '下达失败') + this.$message.error((failDetails[0] && failDetails[0].reason) || '下达失败') } - }).catch(err => { - this.$message.error((err && err.message) || '下达失败') - }) - }).catch(() => {}) + if (isBatch) { + this.syncSelection = [] + if (this.$refs.poTable && this.$refs.poTable.clearSelection) { + this.$refs.poTable.clearSelection() + } + } + this.getDataList() + } else { + this.$message.error((data && data.msg) || '下达失败') + } + }).catch(err => { + this.$message.error((err && err.message) || '下达失败') + }).finally(() => { + this.batchIssuing = false + }) }, // 回滚:已下达 → 草稿(下达的逆操作,已发生验货/发货动作的行后端会拦截) @@ -4955,6 +5025,7 @@ export default { this.supplierPartDialogTargetRow = context === 'row' ? row : null this.supplierPartDialogSupplierNo = supplierNo this.supplierPartDialogSite = site + this.supplierPartDialogPartNoFilter = '' this.supplierPartDialogItemFilter = '' this.loadSupplierPartOptions() }, @@ -4970,6 +5041,7 @@ export default { const supplierCode = String((context === 'row' ? ((this.supplierPartDialogTargetRow && (this.supplierPartDialogTargetRow.supplierNo || this.supplierPartDialogTargetRow.supplier_no || this.supplierPartDialogTargetRow.supplierCode || this.supplierPartDialogTargetRow.supplier_code)) || supplierNo) : (context === 'addDetail' ? (this.addDetailForm.supplierNo || supplierNo) : (this.addForm.supplierNo || supplierNo))) || '').trim() + const partNo = (this.supplierPartDialogPartNoFilter || '').trim().toUpperCase() const item = (this.supplierPartDialogItemFilter || '').trim().toUpperCase() this.supplierPartDialogLoading = true this.supplierPartDialogRows = [] @@ -4977,6 +5049,7 @@ export default { site, supplierCode, active: 'Y', + partNo, item }).then(({ data }) => { if (data && data.code === 0) { @@ -4987,7 +5060,7 @@ export default { sku: item.sku || '' })) if (this.supplierPartDialogRows.length === 0) { - this.$message.warning(item ? `未查到 Item 匹配 ${item} 的可供物料` : '该供应商未维护供应商可供物料') + this.$message.warning((partNo || item) ? `未查到匹配条件的可供物料` : '该供应商未维护供应商可供物料') } return } @@ -5022,6 +5095,7 @@ export default { this.supplierPartDialogTargetRow = null this.supplierPartDialogSupplierNo = '' this.supplierPartDialogSite = '' + this.supplierPartDialogPartNoFilter = '' this.supplierPartDialogItemFilter = '' }, // 打开供应商可供物料价格表弹窗:按当前供应商 + 行物料编码查当前生效阶梯价 diff --git a/src/views/modules/srmBaseInformation/srmPartSku.vue b/src/views/modules/srmBaseInformation/srmPartSku.vue index 3d3b96d..e32825a 100644 --- a/src/views/modules/srmBaseInformation/srmPartSku.vue +++ b/src/views/modules/srmBaseInformation/srmPartSku.vue @@ -129,12 +129,6 @@ - - - - - - @@ -199,7 +193,6 @@ export default { deep: true, handler: function () { this.modalData.sku = (this.modalData.sku || '').toUpperCase() - this.modalData.basePartNo = (this.modalData.basePartNo || '').toUpperCase() } } }, @@ -243,7 +236,6 @@ export default { sku: '', remark: '', active: 'Y', - basePartNo: '', createBy: this.$store.state.user.name }, @@ -266,24 +258,6 @@ export default { fixed: '', columnWidth: 180 }, - { - userId: this.$store.state.user.name, - functionId: functionId, - serialNumber: 'srmPartSkuTableBasePartNo', - tableId: 'srmPartSkuTable', - tableName: 'SKU管理表', - columnProp: 'basePartNo', - headerAlign: 'center', - align: 'left', - columnLabel: '基准料号', - columnHidden: false, - columnImage: false, - columnSortable: false, - sortLv: 0, - status: true, - fixed: '', - columnWidth: 180 - }, { userId: this.$store.state.user.name, functionId: functionId, @@ -456,7 +430,6 @@ export default { sku: '', remark: '', active: 'Y', - basePartNo: '', createBy: this.$store.state.user.name } @@ -478,7 +451,6 @@ export default { sku: row.sku, remark: row.remark || '', active: row.active, - basePartNo: row.basePartNo || '', createBy: this.$store.state.user.name } diff --git a/src/views/modules/srmPart/partInfoList.vue b/src/views/modules/srmPart/partInfoList.vue index b8ef184..37df35b 100644 --- a/src/views/modules/srmPart/partInfoList.vue +++ b/src/views/modules/srmPart/partInfoList.vue @@ -595,7 +595,7 @@ export default { columnWidth: '100', columnHidden: false, columnImage: false, - columnSortable: false, + columnSortable: true, sortLv: 0, status: true, fixed: false @@ -649,7 +649,7 @@ export default { columnWidth: '120', columnHidden: false, columnImage: false, - columnSortable: false, + columnSortable: true, sortLv: 0, status: true, fixed: false @@ -667,7 +667,7 @@ export default { columnWidth: '120', columnHidden: false, columnImage: false, - columnSortable: false, + columnSortable: true, sortLv: 0, status: true, fixed: false @@ -905,8 +905,26 @@ export default { sortLv: 0, status: true, fixed: false + }, + { + userId: this.$store.state.user.name, + functionId: this.functionId, + serialNumber: 'partTableCreateDate', + tableId: 'partTable', + tableName: '产品信息', + columnProp: 'createDate', + headerAlign: 'center', + align: 'center', + columnLabel: '创建时间', + columnWidth: '150', + columnHidden: false, + columnImage: false, + columnSortable: true, + sortLv: 0, + status: true, + fixed: false } - // { + // { // userId: this.$store.state.user.name, // functionId: this.functionId, // serialNumber: 'partTableDepartmentName', @@ -1959,7 +1977,7 @@ export default { }) }, - // 冲突处理:基准料号已对应其他SKU时走“统一修改该基准料号下的SKU”;SKU 已被其他基准料号占用时仍人工维护拦截 + // 冲突处理:基准料号已对应其他SKU时走“统一修改该基准料号下的SKU”;方向A(SKU 已被其他基准料号占用)已放开,不再拦截 promptSkuBasePartNoConflict (data, sku, skipNavigation, basePartNo) { // 基准料号已对应其他SKU:本次目标就是把它们统一成新SKU,不存在占用风险,直接按统一修改处理 if (data.conflictType === 'BASE_PART_NO') { @@ -1982,29 +2000,11 @@ export default { return false }) } - const msg = `SKU ${sku} 已在 SKU 管理中维护基准料号 ${data.dbBasePartNo},与本次的基准料号不一致。` - if (skipNavigation) { - this.$message.error(`${msg}请先到 SKU 管理页手动维护后再指定。`) - return Promise.resolve(false) - } - this.$confirm( - `${msg}是否前往 SKU 管理页手动维护?前往后将不再保存本次新增。`, - 'SKU与基准料号冲突', - { - confirmButtonText: '是', - cancelButtonText: '否', - type: 'warning' - } - ).then(() => { - if (this.isAdd) { - this.partDialogVisible = false - } - this.$router.push({ name: 'srmBaseInformation-srmPartSku', query: { sku } }) - }).catch(() => {}) - return Promise.resolve(false) + // 方向A 已放开:后端不再产生 conflictType='SKU',其余情况直接放行继续保存/指定 - rqrq + return Promise.resolve(true) }, - // 按基准料号统一修改SKU(后端同步维护 part_sku:新增新SKU并清除原SKU的基准料号),成功返回 true 继续保存 + // 按基准料号统一修改SKU(后端按 part 表把该基准料号下所有物料 sku 统一),成功返回 true 继续保存 unifySkuByBasePartNo (sku, basePartNo) { return updateSkuByBasePartNo({ site: this.$store.state.user.site, diff --git a/src/views/modules/supplier/supplierPartMoqPrice.vue b/src/views/modules/supplier/supplierPartMoqPrice.vue index 71e6f30..12ab976 100644 --- a/src/views/modules/supplier/supplierPartMoqPrice.vue +++ b/src/views/modules/supplier/supplierPartMoqPrice.vue @@ -91,6 +91,11 @@ + + + + +