From fc310dc2a01be7254435fd622d18e4b1ddb24fe1 Mon Sep 17 00:00:00 2001 From: xielue Date: Sat, 16 Sep 2023 12:08:02 +0800 Subject: [PATCH] =?UTF-8?q?=E6=A8=A1=E5=85=B7=20=E4=BF=AEbug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/pages/Middle/Mes/MesBom/MesBom/Edit.vue | 4 ++-- src/pages/Middle/Mes/MesEnum/MesEnum/index.vue | 2 +- .../Mes/MesProcesses/MesProcesses/List.vue | 2 +- .../MesProductCustomAttribute/List.vue | 2 +- .../MesProductionOrder/voucher.vue | 4 ++-- src/pages/Middle/Mold/MoldComponent/Edit.vue | 12 ++++++++++-- src/pages/Middle/Mold/MoldOrder/Edit.vue | 2 +- .../Middle/Mold/MoldProductionOrder/Detail.vue | 2 +- .../Middle/Mold/MoldProductionOrder/Edit.vue | 2 +- .../Mold/MoldProductionOrder/EditOld.vue | 2 +- src/pages/Middle/Mold/MoldScheme/Edit.vue | 18 ++++++++++-------- 11 files changed, 31 insertions(+), 21 deletions(-) diff --git a/src/pages/Middle/Mes/MesBom/MesBom/Edit.vue b/src/pages/Middle/Mes/MesBom/MesBom/Edit.vue index 44672ae..ce4fbfb 100644 --- a/src/pages/Middle/Mes/MesBom/MesBom/Edit.vue +++ b/src/pages/Middle/Mes/MesBom/MesBom/Edit.vue @@ -420,7 +420,7 @@ export default { } } else { - this.$mk.error(a.message); + this.$mk.error(a.msg || a.message); } @@ -457,7 +457,7 @@ export default { saveDetails(a.data.id); } else { - this.$mk.error(a.message); + this.$mk.error(a.msg || a.message); } diff --git a/src/pages/Middle/Mes/MesEnum/MesEnum/index.vue b/src/pages/Middle/Mes/MesEnum/MesEnum/index.vue index 244f489..6486082 100644 --- a/src/pages/Middle/Mes/MesEnum/MesEnum/index.vue +++ b/src/pages/Middle/Mes/MesEnum/MesEnum/index.vue @@ -388,7 +388,7 @@ export default { this.$mk.success("保存成功"); this.reloadData(); } else { - this.$mk.error(a.message); + this.$mk.error(a.msg || a.message); } diff --git a/src/pages/Middle/Mes/MesProcesses/MesProcesses/List.vue b/src/pages/Middle/Mes/MesProcesses/MesProcesses/List.vue index a2563bc..95c3b75 100644 --- a/src/pages/Middle/Mes/MesProcesses/MesProcesses/List.vue +++ b/src/pages/Middle/Mes/MesProcesses/MesProcesses/List.vue @@ -534,7 +534,7 @@ export default { this.$mk.success("保存成功"); this.reloadData(); } else { - this.$mk.error(a.message); + this.$mk.error(a.msg || a.message); } diff --git a/src/pages/Middle/Mes/MesProductCustomAttribute/MesProductCustomAttribute/List.vue b/src/pages/Middle/Mes/MesProductCustomAttribute/MesProductCustomAttribute/List.vue index afc568e..5ea7900 100644 --- a/src/pages/Middle/Mes/MesProductCustomAttribute/MesProductCustomAttribute/List.vue +++ b/src/pages/Middle/Mes/MesProductCustomAttribute/MesProductCustomAttribute/List.vue @@ -461,7 +461,7 @@ export default { this.$mk.success("保存成功"); this.reloadData(); } else { - this.$mk.error(a.message); + this.$mk.error(a.msg || a.message); } diff --git a/src/pages/Middle/Mes/MesProductionOrder/MesProductionOrder/voucher.vue b/src/pages/Middle/Mes/MesProductionOrder/MesProductionOrder/voucher.vue index 605907e..1a8aa07 100644 --- a/src/pages/Middle/Mes/MesProductionOrder/MesProductionOrder/voucher.vue +++ b/src/pages/Middle/Mes/MesProductionOrder/MesProductionOrder/voucher.vue @@ -810,7 +810,7 @@ export default { this.dataId = null; this.pageInit(); } else { - this.$mk.error(a.message); + this.$mk.error(a.msg || a.message); } }); } @@ -1071,7 +1071,7 @@ export default { } else { - this.$mk.error(a.message); + this.$mk.error(a.msg || a.message); } diff --git a/src/pages/Middle/Mold/MoldComponent/Edit.vue b/src/pages/Middle/Mold/MoldComponent/Edit.vue index 32db459..a51f733 100644 --- a/src/pages/Middle/Mold/MoldComponent/Edit.vue +++ b/src/pages/Middle/Mold/MoldComponent/Edit.vue @@ -198,7 +198,15 @@ export default { 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(); }); @@ -337,7 +345,7 @@ export default { } } else { - this.$mk.error(a.message); + this.$mk.error(a.msg || a.message); } diff --git a/src/pages/Middle/Mold/MoldOrder/Edit.vue b/src/pages/Middle/Mold/MoldOrder/Edit.vue index 0d8bcdb..265d159 100644 --- a/src/pages/Middle/Mold/MoldOrder/Edit.vue +++ b/src/pages/Middle/Mold/MoldOrder/Edit.vue @@ -427,7 +427,7 @@ console.log(this.dataset.order_molds.fields) } } else { - this.$mk.error(a.message); + this.$mk.error(a.msg || a.message); } diff --git a/src/pages/Middle/Mold/MoldProductionOrder/Detail.vue b/src/pages/Middle/Mold/MoldProductionOrder/Detail.vue index baaf8ce..14f85ba 100644 --- a/src/pages/Middle/Mold/MoldProductionOrder/Detail.vue +++ b/src/pages/Middle/Mold/MoldProductionOrder/Detail.vue @@ -738,7 +738,7 @@ export default { } } else { - this.$mk.error(a.message); + this.$mk.error(a.msg || a.message); } diff --git a/src/pages/Middle/Mold/MoldProductionOrder/Edit.vue b/src/pages/Middle/Mold/MoldProductionOrder/Edit.vue index d57d220..d78ab7c 100644 --- a/src/pages/Middle/Mold/MoldProductionOrder/Edit.vue +++ b/src/pages/Middle/Mold/MoldProductionOrder/Edit.vue @@ -816,7 +816,7 @@ export default { } } else { - this.$mk.error(a.message); + this.$mk.error(a.msg || a.message); } diff --git a/src/pages/Middle/Mold/MoldProductionOrder/EditOld.vue b/src/pages/Middle/Mold/MoldProductionOrder/EditOld.vue index 30fa156..23fb621 100644 --- a/src/pages/Middle/Mold/MoldProductionOrder/EditOld.vue +++ b/src/pages/Middle/Mold/MoldProductionOrder/EditOld.vue @@ -692,7 +692,7 @@ export default { } } else { - this.$mk.error(a.message); + this.$mk.error(a.msg || a.message); } diff --git a/src/pages/Middle/Mold/MoldScheme/Edit.vue b/src/pages/Middle/Mold/MoldScheme/Edit.vue index a21c9d1..6af2441 100644 --- a/src/pages/Middle/Mold/MoldScheme/Edit.vue +++ b/src/pages/Middle/Mold/MoldScheme/Edit.vue @@ -53,10 +53,7 @@ :edit-config="{ trigger: 'click', mode: 'cell', icon: 'vxe-icon-edit', showStatus: false, beforeEditMethod: beforeEditMethod }">