diff --git a/src/api/productionSchedulingPlan/basic.js b/src/api/productionSchedulingPlan/basic.js index ca7b525..bcbc77d 100644 --- a/src/api/productionSchedulingPlan/basic.js +++ b/src/api/productionSchedulingPlan/basic.js @@ -193,7 +193,7 @@ export const updateMainProducer = row => { // 非同炉(槽)因素 增删改查 export const getListDifferentFurnaceTank = (current, size, params) => { return request({ - url: '/blade-scheduling/differentFurnaceTank/page', + url: '/blade-scheduling/sameTrough/page', method: 'get', params: { ...params, @@ -204,7 +204,7 @@ export const getListDifferentFurnaceTank = (current, size, params) => { }; export const removeDifferentFurnaceTank = ids => { return request({ - url: '/blade-scheduling/differentFurnaceTank/remove', + url: '/blade-scheduling/sameTrough/remove', method: 'post', params: { ids, @@ -214,7 +214,7 @@ export const removeDifferentFurnaceTank = ids => { export const addDifferentFurnaceTank = row => { return request({ - url: '/blade-scheduling/differentFurnaceTank/save', + url: '/blade-scheduling/sameTrough/save', method: 'post', data: row, }); @@ -222,7 +222,7 @@ export const addDifferentFurnaceTank = row => { export const updateDifferentFurnaceTank = row => { return request({ - url: '/blade-scheduling/differentFurnaceTank/update', + url: '/blade-scheduling/sameTrough/update', method: 'post', data: row, }); @@ -379,4 +379,13 @@ export const getDetailSintTempCurve = params => { method: 'get', params: params, }); +}; + +// 获取证书类型列表数据/personAbility/selectCertificateList +export const getSelectCertificateList = params => { + return request({ + url: '/personAbility/selectCertificateList', + method: 'get', + params: params, + }); }; \ No newline at end of file diff --git a/src/views/productionSchedulingPlan/basic/personnelCapacity.vue b/src/views/productionSchedulingPlan/basic/personnelCapacity.vue index 49fc7a1..69312c7 100644 --- a/src/views/productionSchedulingPlan/basic/personnelCapacity.vue +++ b/src/views/productionSchedulingPlan/basic/personnelCapacity.vue @@ -35,6 +35,7 @@ import { removePersonAbility, addPersonAbility, updatePersonAbility, + getSelectCertificateList, } from '@/api/productionSchedulingPlan/basic'; export default { components: {}, @@ -206,6 +207,41 @@ export default { labelWidth: 180, type: 'number', }, + { + label: '生产标识', + prop: 'productIdent', + search: false, + sortable: true, + span: 12, + // labelWidth: 180, + }, + { + label: '证书类型', + prop: 'certificateId', + search: true, + sortable: true, + span: 12, + type: 'select', + hide:true, + filterable: true, + dicUrl: '/blade-scheduling/personAbility/selectCertificateList', + props: { + label: 'name', + value: 'id', + }, + change: (val, row) => { + this.onChangeData(val.item, 'certificateId'); + }, + }, + { + label: '证书类型', + prop: 'certificateName', + search: true, + sortable: true, + span: 12, + display:false, + }, + ], }, @@ -231,8 +267,15 @@ export default { if (val && type == 'craftId') { this.form.craftName = val.caName; } + if(val && type == 'certificateId'){ + this.form.certificateName = val.name; + } }, rowSave(row, done, loading) { + if(row.productIdent != ''&&row.certificateId == ''){ + loading(); + return this.$message.error('请选择证书类型') + } addPersonAbility(row).then( () => { this.onLoad(this.page); @@ -249,6 +292,11 @@ export default { ); }, rowUpdate(row, index, done, loading) { + console.log(row,row.productIdent != ''&&(row.certificateId == ''||row.certificateId == undefined)); + if(row.productIdent != ''&&(row.certificateId == ''||row.certificateId == undefined)){ + loading(); + return this.$message.error('请选择证书类型') + } updatePersonAbility(row).then( () => { this.onLoad(this.page); diff --git a/src/views/productionSchedulingPlan/schedulingDashboard/container.vue b/src/views/productionSchedulingPlan/schedulingDashboard/container.vue index 32b5583..0b2e931 100644 --- a/src/views/productionSchedulingPlan/schedulingDashboard/container.vue +++ b/src/views/productionSchedulingPlan/schedulingDashboard/container.vue @@ -407,6 +407,10 @@
  • 数量: {{ tooltipData.makeQty || '-' }} +
  • +
  • + 计划人员: + {{ tooltipData.teamMembers || '-' }}
  • 计划开始: @@ -1088,6 +1092,7 @@ export default { makeQty: firstTask.makeQty, productIdent: firstTask.productIdent, priorityAps: firstTask.priorityAps, + teamMembers:firstTask.teamMembers, }); }