diff --git a/src/views/modules/erf/components/expApplyForm.vue b/src/views/modules/erf/components/expApplyForm.vue index 0e57e0f..b710361 100644 --- a/src/views/modules/erf/components/expApplyForm.vue +++ b/src/views/modules/erf/components/expApplyForm.vue @@ -127,7 +127,19 @@ - + + + + + + + +
- 经理审批全部通过后,将由选定的计划员负责排产 + 经理审批全部通过后,任意选定的计划员均可排产
@@ -704,7 +705,7 @@ export default { techManagerName: '', prodManagerIds: [], qualityManagerIds: [], - plannerId: null + plannerIds: [] }, prodManagerList: [], // 生产经理候选列表 qualityManagerList: [], // 质量经理候选列表 @@ -1008,7 +1009,14 @@ export default { techManagerName: data.techManager.managerName, prodManagerIds: defaultProdManagerIds, qualityManagerIds: defaultQualityManagerIds, - plannerId: this.plannerList.length === 1 ? this.plannerList[0].userId : null + plannerIds: (() => { + // 默认选中Joyce;若无Joyce则单人列表时默认全选 + const joyce = this.plannerList.find(p => + p.userDisplay && p.userDisplay.toLowerCase().includes('joyce') + ) + if (joyce) return [joyce.userId] + return this.plannerList.length === 1 ? [this.plannerList[0].userId] : [] + })() } // 显示弹窗 @@ -1038,8 +1046,8 @@ export default { this.$message.warning('请至少选择一位质量经理') return } - if (!this.submitData.plannerId) { - this.$message.warning('请选择计划员') + if (!this.submitData.plannerIds || this.submitData.plannerIds.length === 0) { + this.$message.warning('请至少选择一位计划员') return } @@ -1051,7 +1059,7 @@ export default { techManagerId: this.submitData.techManagerId, prodManagerIds: this.submitData.prodManagerIds, qualityManagerIds: this.submitData.qualityManagerIds, - plannerUserId: this.submitData.plannerId + plannerUserIds: this.submitData.plannerIds }).then(({data}) => { this.submitLoading = false if (data && data.code === 0) {