Mes
/
middle-admin-ant
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

模具 优化

This commit is contained in:
xielue 2023-09-19 18:44:53 +08:00
parent cc064770f1
commit 62c177a286
1 changed files with 15 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
src/pages/Middle/Mold/MoldProductionOrder/Detail.vue
View File

@ -466,11 +466,17 @@ export default {
} }
} }
}); });
if (this.departmentId && item.production_type != 2) {
if (!info.data.mold_production_order_component_processes.length) {
return;
}
}
keys.push(key); keys.push(key);
infos.push(info); infos.push(info);
}) })
this.collapseActiveKey = keys; this.collapseActiveKey = keys;
@ -845,14 +851,14 @@ export default {
let departments = []; let departments = [];
this.detailsData2.forEach(item => { this.detailsData2.forEach(item => {
if (item.department_detail && item.department_detail.name && !departments.filter(a=>a.id == item.department_detail.id + "").length) { if (item.department_detail && item.department_detail.name && !departments.filter(a => a.id == item.department_detail.id + "").length) {
departments.push({ departments.push({
id: item.department_detail.id + "", id: item.department_detail.id + "",
name: item.department_detail.name name: item.department_detail.name
}) })
} }
}) })
departments.forEach((department, index) => { departments.forEach((department, index) => {
let details2 = JSON.parse(JSON.stringify(this.detailsData2)); let details2 = JSON.parse(JSON.stringify(this.detailsData2));
@ -885,9 +891,9 @@ export default {
item.plan_complete_time = this.getDateValueString(item.plan_complete_time); item.plan_complete_time = this.getDateValueString(item.plan_complete_time);
item.send_time = this.getDateValueString(item.send_time); item.send_time = this.getDateValueString(item.send_time);
item.complete_time = this.getDateValueString(item.complete_time); item.complete_time = this.getDateValueString(item.complete_time);
item.progress = (item.progress || 0) +"%"; item.progress = (item.progress || 0) + "%";
ds2.push(item); ds2.push(item);
}); });
let groups = []; //按部件进行分组 let groups = []; //按部件进行分组
component_line_list.forEach(component_line => { component_line_list.forEach(component_line => {
@ -908,7 +914,7 @@ export default {
item.plan_complete_time = this.getDateValueString(item.plan_complete_time); item.plan_complete_time = this.getDateValueString(item.plan_complete_time);
item.send_time = this.getDateValueString(item.send_time); item.send_time = this.getDateValueString(item.send_time);
item.complete_time = this.getDateValueString(item.complete_time); item.complete_time = this.getDateValueString(item.complete_time);
item.production_type = item.production_type == 1 ?'正常布产' :'委外布产'; item.production_type = item.production_type == 1 ? '正常布产' : '委外布产';
if (item.component_line == component_line) { if (item.component_line == component_line) {
d1.push(item); d1.push(item);
} }
@ -925,7 +931,7 @@ export default {
group.d2 = d2; group.d2 = d2;
groups.push(group); groups.push(group);
}) })
let ele2 = JSON.parse(JSON.stringify(settings.printTemplateDepartment)); let ele2 = JSON.parse(JSON.stringify(settings.printTemplateDepartment));
let ele3 = JSON.parse(JSON.stringify(settings.printTemplateProgress)); let ele3 = JSON.parse(JSON.stringify(settings.printTemplateProgress));
@ -941,7 +947,7 @@ export default {
ele2.options.top += addedHeight; ele2.options.top += addedHeight;
ele3.options.top += addedHeight; ele3.options.top += addedHeight;
template.panels[0].printElements.push(ele2) template.panels[0].printElements.push(ele2)
template.panels[0].printElements.push(ele3) template.panels[0].printElements.push(ele3)