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

模具 修bug

This commit is contained in:
xielue 2023-09-16 12:08:02 +08:00
parent dcd2014c8c
commit fc310dc2a0
11 changed files with 31 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/pages/Middle/Mes/MesBom/MesBom/Edit.vue
View File

@ -420,7 +420,7 @@ export default {
} }
} else { } else {
this.$mk.error(a.message); this.$mk.error(a.msg || a.message);
} }
@ -457,7 +457,7 @@ export default {
saveDetails(a.data.id); saveDetails(a.data.id);
} else { } else {
this.$mk.error(a.message); this.$mk.error(a.msg || a.message);
} }

2
src/pages/Middle/Mes/MesEnum/MesEnum/index.vue
View File

@ -388,7 +388,7 @@ export default {
this.$mk.success("保存成功"); this.$mk.success("保存成功");
this.reloadData(); this.reloadData();
} else { } else {
this.$mk.error(a.message); this.$mk.error(a.msg || a.message);
} }

2
src/pages/Middle/Mes/MesProcesses/MesProcesses/List.vue
View File

@ -534,7 +534,7 @@ export default {
this.$mk.success("保存成功"); this.$mk.success("保存成功");
this.reloadData(); this.reloadData();
} else { } else {
this.$mk.error(a.message); this.$mk.error(a.msg || a.message);
} }

2
src/pages/Middle/Mes/MesProductCustomAttribute/MesProductCustomAttribute/List.vue
View File

@ -461,7 +461,7 @@ export default {
this.$mk.success("保存成功"); this.$mk.success("保存成功");
this.reloadData(); this.reloadData();
} else { } else {
this.$mk.error(a.message); this.$mk.error(a.msg || a.message);
} }

4
src/pages/Middle/Mes/MesProductionOrder/MesProductionOrder/voucher.vue
View File

@ -810,7 +810,7 @@ export default {
this.dataId = null; this.dataId = null;
this.pageInit(); this.pageInit();
} else { } else {
this.$mk.error(a.message); this.$mk.error(a.msg || a.message);
} }
}); });
} }
@ -1071,7 +1071,7 @@ export default {
} else { } else {
this.$mk.error(a.message); this.$mk.error(a.msg || a.message);
} }

12
src/pages/Middle/Mold/MoldComponent/Edit.vue
View File

@ -198,7 +198,15 @@ export default {
this.formOptions.data = this.$mk.formatDetailData({ data: a.data[this.detailDataFieldName] }); this.formOptions.data = this.$mk.formatDetailData({ data: a.data[this.detailDataFieldName] });
this.detailsData = JSON.parse(JSON.stringify(a.data[this.detailDataFieldName].mold_component_processes || [])); let ds = a.data[this.detailDataFieldName].mold_component_processes || [];
ds.forEach(item=>{
if(!item.sort){
item.sort = 0;
}
})
this.detailsData = JSON.parse(JSON.stringify(ds));
this.detailsDataInit(); this.detailsDataInit();
}); });
@ -337,7 +345,7 @@ export default {
} }
} else { } else {
this.$mk.error(a.message); this.$mk.error(a.msg || a.message);
} }

2
src/pages/Middle/Mold/MoldOrder/Edit.vue
View File

@ -427,7 +427,7 @@ console.log(this.dataset.order_molds.fields)
} }
} else { } else {
this.$mk.error(a.message); this.$mk.error(a.msg || a.message);
} }

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

@ -738,7 +738,7 @@ export default {
} }
} else { } else {
this.$mk.error(a.message); this.$mk.error(a.msg || a.message);
} }

2
src/pages/Middle/Mold/MoldProductionOrder/Edit.vue
View File

@ -816,7 +816,7 @@ export default {
} }
} else { } else {
this.$mk.error(a.message); this.$mk.error(a.msg || a.message);
} }

2
src/pages/Middle/Mold/MoldProductionOrder/EditOld.vue
View File

@ -692,7 +692,7 @@ export default {
} }
} else { } else {
this.$mk.error(a.message); this.$mk.error(a.msg || a.message);
} }

14
src/pages/Middle/Mold/MoldScheme/Edit.vue
View File

@ -54,9 +54,6 @@
<vxe-column width="60"> <vxe-column width="60">
<template #default="{ row }"> <template #default="{ row }">
<div class="oplinks2"> <div class="oplinks2">
<a @click.stop="pageAdd2(row)" title="新增">
<a-icon class="icon" type="plus-circle" />
</a>
<a @click.stop="pageDelete2(row)" title="删除"> <a @click.stop="pageDelete2(row)" title="删除">
<a-icon class="icon" type="delete" /> <a-icon class="icon" type="delete" />
</a> </a>
@ -471,7 +468,11 @@ export default {
] ]
}); });
let ds2 = this.detailsData2.filter( (row) => { return row.id || (row.component_id && row.mes_processes_id) });
if(!ds2.length){
this.$mk.success("工序未设置，操作失败");
return;
}
postdata.mold_scheme_processes = this.$mk.getPostFieldValue({ postdata.mold_scheme_processes = this.$mk.getPostFieldValue({
rowFilter: (row) => { return row.id || (row.component_id && row.mes_processes_id) }, rowFilter: (row) => { return row.id || (row.component_id && row.mes_processes_id) },
dataId: this.getDataId_BigInt(), dataId: this.getDataId_BigInt(),
@ -484,11 +485,12 @@ export default {
{ field: 'component_id', type: 'bigint' }, { field: 'component_id', type: 'bigint' },
{ field: 'mes_processes_id', type: 'bigint' }, { field: 'mes_processes_id', type: 'bigint' },
{ field: 'create_uid', type: 'bigint' } { field: 'create_uid', type: 'bigint' }
] ]
}); });
// 提交数据 // 提交数据
this.$mk.post({ this.$mk.post({
url: action, url: action,
@ -505,7 +507,7 @@ export default {
} }
} else { } else {
this.$mk.error(a.message); this.$mk.error(a.msg || a.message);
} }