|
|
@ -598,6 +598,25 @@ |
|
|
可多选,所有选中的质量经理都必须审批通过后才会流转到计划员排产 |
|
|
可多选,所有选中的质量经理都必须审批通过后才会流转到计划员排产 |
|
|
</div> |
|
|
</div> |
|
|
</el-form-item> |
|
|
</el-form-item> |
|
|
|
|
|
|
|
|
|
|
|
<!-- 计划员 --> |
|
|
|
|
|
<el-form-item label="计划员" required> |
|
|
|
|
|
<el-select class="manager-select" |
|
|
|
|
|
v-model="submitData.plannerId" |
|
|
|
|
|
placeholder="请选择计划员" |
|
|
|
|
|
style="width: 100%" |
|
|
|
|
|
clearable> |
|
|
|
|
|
<el-option |
|
|
|
|
|
v-for="planner in plannerList" |
|
|
|
|
|
:key="planner.userId" |
|
|
|
|
|
:label="planner.userDisplay || planner.username" |
|
|
|
|
|
:value="planner.userId"> |
|
|
|
|
|
</el-option> |
|
|
|
|
|
</el-select> |
|
|
|
|
|
<div style="margin-top: 1px; color: #909399; font-size: 12px"> |
|
|
|
|
|
经理审批全部通过后,将由选定的计划员负责排产 |
|
|
|
|
|
</div> |
|
|
|
|
|
</el-form-item> |
|
|
</el-form> |
|
|
</el-form> |
|
|
|
|
|
|
|
|
<div slot="footer" class="dialog-footer"> |
|
|
<div slot="footer" class="dialog-footer"> |
|
|
@ -684,10 +703,12 @@ export default { |
|
|
techManagerId: null, |
|
|
techManagerId: null, |
|
|
techManagerName: '', |
|
|
techManagerName: '', |
|
|
prodManagerIds: [], |
|
|
prodManagerIds: [], |
|
|
qualityManagerIds: [] |
|
|
|
|
|
|
|
|
qualityManagerIds: [], |
|
|
|
|
|
plannerId: null |
|
|
}, |
|
|
}, |
|
|
prodManagerList: [], // 生产经理候选列表 |
|
|
prodManagerList: [], // 生产经理候选列表 |
|
|
qualityManagerList: [], // 质量经理候选列表 |
|
|
qualityManagerList: [], // 质量经理候选列表 |
|
|
|
|
|
plannerList: [], // 计划员候选列表 |
|
|
|
|
|
|
|
|
// 流程状态数据 |
|
|
// 流程状态数据 |
|
|
flowStatus: { |
|
|
flowStatus: { |
|
|
@ -943,9 +964,10 @@ export default { |
|
|
buNo: row.buNo |
|
|
buNo: row.buNo |
|
|
}).then(({data}) => { |
|
|
}).then(({data}) => { |
|
|
if (data && data.code === 0) { |
|
|
if (data && data.code === 0) { |
|
|
// 设置生产经理和质量经理列表 |
|
|
|
|
|
|
|
|
// 设置生产经理、质量经理、计划员列表 |
|
|
this.prodManagerList = data.prodManagers || [] |
|
|
this.prodManagerList = data.prodManagers || [] |
|
|
this.qualityManagerList = data.qualityManagers || [] |
|
|
this.qualityManagerList = data.qualityManagers || [] |
|
|
|
|
|
this.plannerList = data.planners || [] |
|
|
// 根据事业部设置默认生产经理(使用user_display模糊匹配) |
|
|
// 根据事业部设置默认生产经理(使用user_display模糊匹配) |
|
|
const defaultProdManagerIds = [] |
|
|
const defaultProdManagerIds = [] |
|
|
if (row.buDesc === 'RFID') { |
|
|
if (row.buDesc === 'RFID') { |
|
|
@ -985,7 +1007,8 @@ export default { |
|
|
techManagerId: data.techManager.managerId, |
|
|
techManagerId: data.techManager.managerId, |
|
|
techManagerName: data.techManager.managerName, |
|
|
techManagerName: data.techManager.managerName, |
|
|
prodManagerIds: defaultProdManagerIds, |
|
|
prodManagerIds: defaultProdManagerIds, |
|
|
qualityManagerIds: defaultQualityManagerIds |
|
|
|
|
|
|
|
|
qualityManagerIds: defaultQualityManagerIds, |
|
|
|
|
|
plannerId: this.plannerList.length === 1 ? this.plannerList[0].userId : null |
|
|
} |
|
|
} |
|
|
|
|
|
|
|
|
// 显示弹窗 |
|
|
// 显示弹窗 |
|
|
@ -1015,6 +1038,10 @@ export default { |
|
|
this.$message.warning('请至少选择一位质量经理') |
|
|
this.$message.warning('请至少选择一位质量经理') |
|
|
return |
|
|
return |
|
|
} |
|
|
} |
|
|
|
|
|
if (!this.submitData.plannerId) { |
|
|
|
|
|
this.$message.warning('请选择计划员') |
|
|
|
|
|
return |
|
|
|
|
|
} |
|
|
|
|
|
|
|
|
this.submitLoading = true |
|
|
this.submitLoading = true |
|
|
|
|
|
|
|
|
@ -1023,7 +1050,8 @@ export default { |
|
|
applyNo: this.submitData.applyNo, |
|
|
applyNo: this.submitData.applyNo, |
|
|
techManagerId: this.submitData.techManagerId, |
|
|
techManagerId: this.submitData.techManagerId, |
|
|
prodManagerIds: this.submitData.prodManagerIds, |
|
|
prodManagerIds: this.submitData.prodManagerIds, |
|
|
qualityManagerIds: this.submitData.qualityManagerIds |
|
|
|
|
|
|
|
|
qualityManagerIds: this.submitData.qualityManagerIds, |
|
|
|
|
|
plannerUserId: this.submitData.plannerId |
|
|
}).then(({data}) => { |
|
|
}).then(({data}) => { |
|
|
this.submitLoading = false |
|
|
this.submitLoading = false |
|
|
if (data && data.code === 0) { |
|
|
if (data && data.code === 0) { |
|
|
|