diff --git a/src/api/sampleTracking/sampleTracking.js b/src/api/sampleTracking/sampleTracking.js index 2d65644..6c2d33e 100644 --- a/src/api/sampleTracking/sampleTracking.js +++ b/src/api/sampleTracking/sampleTracking.js @@ -18,7 +18,6 @@ export const exportProofTracking = data => createAPI('/sampleTracking/proofTrack export const oneKeyCreateProofTracking = data => createAPI('/sampleTracking/proofTracking/oneKeyCreate', 'POST', data) export const oneKeyUpdateProofTracking = data => createAPI('/sampleTracking/proofTracking/oneKeyUpdate', 'POST', data) export const createProofTrackingRecord = data => createAPI('/sampleTracking/proofTracking/createProofRecord', 'POST', data) -export const batchUpdateProofTrackingPlan = data => createAPI('/sampleTracking/proofTracking/batchUpdatePlan', 'POST', data) export const updateProofTrackingProcess = data => createAPI('/sampleTracking/proofTracking/updateProcess', 'POST', data) export const updateProofTrackingComments = data => createAPI('/sampleTracking/proofTracking/updateComments', 'POST', data) export const finishProofTracking = data => createAPI('/sampleTracking/proofTracking/finishProofing', 'POST', data) @@ -26,7 +25,6 @@ export const deleteProofTracking = data => createAPI('/sampleTracking/proofTrack export const queryProofTrackingProcessHistory = data => createAPI('/sampleTracking/proofTracking/processHistory', 'POST', data) export const queryProofTrackingBuProcessConfig = data => createAPI('/sampleTracking/proofTracking/buProcessConfig/list', 'POST', data) export const saveProofTrackingBuProcessConfig = data => createAPI('/sampleTracking/proofTracking/buProcessConfig/save', 'POST', data) -export const deleteProofTrackingBuProcessConfig = data => createAPI('/sampleTracking/proofTracking/buProcessConfig/delete', 'POST', data) export const queryProofTrackingProcessColumns = data => createAPI('/sampleTracking/proofTracking/processColumns/list', 'POST', data) export const queryProofTrackingProcessColumnsManage = data => createAPI('/sampleTracking/proofTracking/processColumns/manageList', 'POST', data) export const saveProofTrackingProcessColumnsManage = data => createAPI('/sampleTracking/proofTracking/processColumns/manageSave', 'POST', data) diff --git a/src/views/modules/eam/eamProjectInfo.vue b/src/views/modules/eam/eamProjectInfo.vue index a6ce18b..58a8edb 100644 --- a/src/views/modules/eam/eamProjectInfo.vue +++ b/src/views/modules/eam/eamProjectInfo.vue @@ -562,7 +562,10 @@ - SQE-ME + + * + SQE-ME + @@ -578,7 +581,7 @@ - * + * PE @@ -1266,6 +1269,14 @@ import {updateColumnSize} from "../../../api/table"; isAlphaOrAntennaBu () { return this.isAlphaBu || this.isAntennaBu }, + // buy-in-sell 在历史配置里存在 buy-in-shell 写法,校验时统一兼容两种值。 + isBuyInSellProjectCategory () { + if (this.modalData.projectCategory === null || this.modalData.projectCategory === undefined) { + return false + } + let projectCategoryText = String(this.modalData.projectCategory).trim().toLowerCase() + return projectCategoryText === 'buy-in-sell' || projectCategoryText === 'buy-in-shell' + }, // RF/Alpha / 天线 / 硬标,分类字段不要求手工选择。 isDryWetTypeOptionalBu () { return this.isAlphaOrAntennaBu || this.isHardtagBu || this.isRfBu @@ -4095,7 +4106,13 @@ import {updateColumnSize} from "../../../api/table"; this.$message.warning('请输入QC!') return } - if (this.modalData.peEngineer === '' || this.modalData.peEngineer == null) { + // buy-in-sell/shell 分类改为 SQE 必填、PE 选填,其他分类保持 PE 必填。 + if (this.isBuyInSellProjectCategory) { + if (this.modalData.sqemeEngineer === '' || this.modalData.sqemeEngineer == null) { + this.$message.warning('请输入SQE!') + return + } + } else if (this.modalData.peEngineer === '' || this.modalData.peEngineer == null) { this.$message.warning('请输入PE!') return } @@ -4941,6 +4958,9 @@ import {updateColumnSize} from "../../../api/table"; if (this.modalData.sqeeeEngineer) { this.modalData.sqeeeEngineerName = this.getUserDisplayName(this.modalData.sqeeeEngineer) } + // 新增产品弹窗的 BU 为只读,不会触发 BU change 事件,这里主动按 BU 加载项目分类下拉。 + let addPartBuNo = this.getBuNoByJoinedValue(this.modalData.bu) + this.loadModalProjectCategory(addPartBuNo, this.modalData.projectCategory, this.modalData.site) this.syncBusinessSearchSite(this.modalData.site) this.modalDisableFlag = true this.modalPartDisableFlag = true @@ -5035,6 +5055,9 @@ import {updateColumnSize} from "../../../api/table"; if (this.modalData.sqeeeEngineer) { this.modalData.sqeeeEngineerName = this.getUserDisplayName(this.modalData.sqeeeEngineer) } + // 编辑产品同样是只读 BU,保持与新增产品一致的项目分类加载行为。 + let editPartBuNo = this.getBuNoByJoinedValue(this.modalData.bu) + this.loadModalProjectCategory(editPartBuNo, this.modalData.projectCategory, this.modalData.site) this.syncBusinessSearchSite(this.modalData.site) this.modalDisableFlag = true this.modalPartDisableFlag = true diff --git a/src/views/modules/sampleTracking/projectProofTracking.vue b/src/views/modules/sampleTracking/projectProofTracking.vue index b226222..eef9d30 100644 --- a/src/views/modules/sampleTracking/projectProofTracking.vue +++ b/src/views/modules/sampleTracking/projectProofTracking.vue @@ -59,8 +59,6 @@ 一键创建 - 新增打样 同步项目物料到NPI 同步打样到NPI @@ -73,9 +71,13 @@ @click="openBuProcessConfigDialog" >事业部进度设置 默认进度设置 - + @@ -94,7 +96,7 @@ @row-click="rowClick" style="width: 100%; margin-top: 8px" > - +