diff --git a/src/api/qc/qc.js b/src/api/qc/qc.js index e5de3ef..e712f6b 100644 --- a/src/api/qc/qc.js +++ b/src/api/qc/qc.js @@ -243,6 +243,7 @@ export const saveInspectionStandard = data => createAPI(`/qms/qc/saveInspectionS export const dataAcquisitionByItem = data => createAPI(`/qms/qc/dataAcquisitionByItem`,'post',data) export const getSiteAndBuByUserName2 = data => createAPI(`/qms/qc/getSiteAndBuByUserName2`,'post',data) export const cancelApproval = data => createAPI(`/qms/qc/cancelApproval`,'post',data) +export const rollbackToReview = data => createAPI(`/qms/qc/rollbackToReview`,'post',data) export const goUpItemQC = data => createAPI(`/qms/qc/goUpItemQC`,'post',data) export const goDownItemQC = data => createAPI(`/qms/qc/goDownItemQC`,'post',data) diff --git a/src/views/modules/qc/IQCResultEntry.vue b/src/views/modules/qc/IQCResultEntry.vue index 5a99f8c..e51829a 100644 --- a/src/views/modules/qc/IQCResultEntry.vue +++ b/src/views/modules/qc/IQCResultEntry.vue @@ -112,12 +112,14 @@ 查询 - {{ orderScope ? '待审提交' : '审核' }} - {{ auditMode ? '退回复核' : (orderScope ? '删除报告' : '取消审核') }} - {{ orderScope ? '退出待检' : '删除' }} - 任务重载 + 采购单验货、打样单验货(orderScope)= 待审提交/删除报告/退出待检,原验货任务页 = 待审提交/取消审核/退出待检, + 两者均走旧取消审核(已完成→待检验,清空结论与快照); + 只有验货审核窗口(auditMode)的「退回复核」走新后端(已完成→待审核,保留结论与明细), + 文案与请求口径共用 cancelApprovalLabel / rollbackToReviewMode,不会出现名字与行为不一致 --> + {{ orderScope ? '待审提交' : '待审提交' }} + {{ cancelApprovalLabel }} + {{ orderScope ? '退出待检' : '退出待检' }} + 模板重载 { this.submitData.submitList = this.IQCSelections - cancelApproval(this.submitData).then(({data}) => { + // 文案与请求口径共用 rollbackToReviewMode,避免按钮名字与实际操作不一致 + const submitRequest = this.rollbackToReviewMode ? rollbackToReview : cancelApproval + submitRequest(this.submitData).then(({data}) => { if (data && data.code === 0) { - // 回滚验货结果已在后端取消审核事务中一并执行,前端无需再调用 + // 退回复核保留验货申请结果(重新审核会覆盖写),取消审核则已在后端事务中一并回滚,前端无需再调用 this.getDataList() this.IQCSelections = [] this.$message({ diff --git a/src/views/modules/qc/IQCResultPoEntry.vue b/src/views/modules/qc/IQCResultPoEntry.vue index b93b52f..16a7831 100644 --- a/src/views/modules/qc/IQCResultPoEntry.vue +++ b/src/views/modules/qc/IQCResultPoEntry.vue @@ -3,9 +3,7 @@ 采购单验货:内容与「验货任务」(IQCResultEntry.vue) 完全一致,仅通过属性收紧数据范围与筛选框—— 1) order-scope="PO":只查采购订单(后端经 验货申请子表 关联 POHeader.order_type 判定); 2) qc-only:只看指派给登录 QC 的申请单 + 未认领的公共单(qc_operator='*'),看不到其它 QC 的内容; - 3) 去掉「质检员」筛选框、增加「PO」筛选框;按钮名称沿用 待审提交/删除报告/退出待检。 原「验货任务」页面不传这些属性,行为完全不变。 - 菜单注册:sys_menu 新增 url=qc/IQCResultPoEntry、menu_type='pc',并按新 menuId 配按钮权限码。 --> diff --git a/src/views/modules/qc/IQCResultSampleEntry.vue b/src/views/modules/qc/IQCResultSampleEntry.vue index 7088cd8..aa1ad2d 100644 --- a/src/views/modules/qc/IQCResultSampleEntry.vue +++ b/src/views/modules/qc/IQCResultSampleEntry.vue @@ -3,9 +3,6 @@ 打样单验货:内容与「验货任务」(IQCResultEntry.vue) 完全一致,只收紧数据范围与筛选框—— 1) order-scope="Sample":只查打样单(后端经 验货申请子表 关联 POHeader.order_type 判定); 2) 不传 qc-only:功能向所有有权限用户开放,不按登录 QC 隔离; - 3) 去掉「质检员」筛选框、增加「PO」筛选框;按钮名称沿用 待审提交/删除报告/退出待检。 - 原「验货任务」页面不传这些属性,行为完全不变。 - 菜单注册:sys_menu 新增 url=qc/IQCResultSampleEntry、menu_type='pc',并按新 menuId 配按钮权限码。 --> diff --git a/src/views/modules/srmPart/partInfoList.vue b/src/views/modules/srmPart/partInfoList.vue index 37df35b..3a3ceec 100644 --- a/src/views/modules/srmPart/partInfoList.vue +++ b/src/views/modules/srmPart/partInfoList.vue @@ -23,8 +23,11 @@ - - + + + 默认供应商: + @@ -467,6 +470,7 @@ import { checkSupplierPartByItemSku, addSupplierPartMoq } from '@/api/supplier/s import { listPoCurrentTierPrice } from '@/api/order/poOrder' import { startNewProductAudit } from '@/api/supplier/supplierPartNewProductAudit' import excel from '@/utils/excel-util.js' +import { fetchSupplierDetail, resolveSupplierShortFieldsFromDetail } from '@/utils/supplierChooselistHelper' import Chooselist from '@/views/modules/common/Chooselist_eam' import basicInfo from './com_part_BasicInfo' import specParams from './com_part_SpecParams' @@ -678,7 +682,8 @@ export default { serialNumber: 'partTableDefaultSupplierNo', tableId: 'partTable', tableName: '产品信息', - columnProp: 'defaultSupplierNo', + // 默认供应商列改为展示供应商简称(后端未维护简称时回退供应商编码),导出共用该列配置 - rqrq + columnProp: 'defaultSupplierShortName', headerAlign: 'center', align: 'center', columnLabel: '默认供应商', @@ -1594,6 +1599,7 @@ export default { this.basePickScene = scene || '' this.$nextTick(() => { let strVal = '' + let conSql = '' if (this.tagNo === 510) { strVal = this.currentpart.unit } @@ -1616,8 +1622,14 @@ export default { if (val === 520 && this.basePickScene === 'changeSupplier') { strVal = this.changeSupplierForm.targetSupplierNo } + // 查询条件场景:按站点过滤(与验货申请页一致);520 只按编码/全称匹配,而查询框里可能是回填的 + // 简称,预填会把列表筛空,因此不预填,需要时可在弹窗内的条件框手动筛 - rqrq + if (val === 520 && this.basePickScene === 'searchSupplier') { + strVal = '' + conSql = " and site = '" + this.$store.state.user.site + "'" + } - this.$refs.baseList.init(val, strVal?strVal:'') + this.$refs.baseList.init(val, strVal?strVal:'', conSql) }) }, @@ -1650,7 +1662,23 @@ export default { this.currentpart.codeNo = val.code_no } if (this.tagNo === 520) { - this.currentpart.defaultSupplierNo = val.supplier_no || '' + if (this.basePickScene === 'searchSupplier') { + // 查询条件按业务约定展示供应商简称:520 只返回编码与全称,需回查主数据取 c_short_npc; + // 先回填编码保证无简称时仍有可用筛选值,也不写 currentpart,避免把查询值带进新增/编辑表单 - rqrq + const supplierNo = (val.supplier_no || val.supplierNo || '').trim().toUpperCase() + this.searchData.defaultSupplierNo = supplierNo + if (supplierNo) { + fetchSupplierDetail(supplierNo, this.$store.state.user.site).then(detail => { + const { shortNpc } = resolveSupplierShortFieldsFromDetail(detail) + // 仅当期间用户没改动查询框时才把编码换成简称,避免异步回包覆盖手动输入 + if (shortNpc && this.searchData.defaultSupplierNo === supplierNo) { + this.searchData.defaultSupplierNo = shortNpc + } + }) + } + } else { + this.currentpart.defaultSupplierNo = val.supplier_no || '' + } } if (this.tagNo === 520 && this.basePickScene === 'changeSupplier') { const supplierNo = val.supplier_no || ''