From 77f7a2fdd4e52fee5ee7448404283d1d7290e466 Mon Sep 17 00:00:00 2001 From: ruanqi Date: Fri, 24 Jan 2025 13:17:56 +0800 Subject: [PATCH 1/4] =?UTF-8?q?=E5=A4=87=E5=93=81=E5=A4=87=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/modules/partspare/repairtransdetail.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/views/modules/partspare/repairtransdetail.vue b/src/views/modules/partspare/repairtransdetail.vue index cff87c6..f807f0e 100644 --- a/src/views/modules/partspare/repairtransdetail.vue +++ b/src/views/modules/partspare/repairtransdetail.vue @@ -166,7 +166,7 @@ export default { supplierName: '', startTransDate: this.dayjs().format('YYYY-MM-DD'), endTransDate: this.dayjs().format('YYYY-MM-DD 23:59:59'), - userName: this.$store.state.user.name, + username: this.$store.state.user.name, }, dataList: [], wareHouseList: [], From d13b7e6b3be44457be036d4b850d9010373542b1 Mon Sep 17 00:00:00 2001 From: fengyuan_yang <1976974459@qq.com> Date: Sat, 8 Feb 2025 14:02:15 +0800 Subject: [PATCH 2/4] =?UTF-8?q?2025-02-08=20=E7=BB=B4=E4=BF=AE=E7=A1=AE?= =?UTF-8?q?=E8=AE=A4=E6=96=B0=E5=A2=9E=E4=B8=A4=E4=B8=AA=E5=AD=97=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/main-sidebar.vue | 5 ++-- .../modules/eam/eamWorkOrderForDefect.vue | 29 ++++++++++++++++--- .../reportWorkOrder/reportDefectOrder.vue | 2 +- 3 files changed, 29 insertions(+), 7 deletions(-) diff --git a/src/views/main-sidebar.vue b/src/views/main-sidebar.vue index 8c49048..a5396c2 100644 --- a/src/views/main-sidebar.vue +++ b/src/views/main-sidebar.vue @@ -8,8 +8,9 @@ :collapseTransition="false" class="site-sidebar__menu"> - + + + diff --git a/src/views/modules/eam/eamWorkOrderForDefect.vue b/src/views/modules/eam/eamWorkOrderForDefect.vue index 5b879a1..a43e1a0 100644 --- a/src/views/modules/eam/eamWorkOrderForDefect.vue +++ b/src/views/modules/eam/eamWorkOrderForDefect.vue @@ -399,14 +399,27 @@ - - + + + + + + + + + + - + + + + + + 保存 关闭 @@ -1178,6 +1191,8 @@ orderNo: '', functionType: '', confirmResult: '', + confirmAssessment: '', + confirmRemark: '', confirmBy: '' }, confirmDefectModal: false @@ -1593,6 +1608,8 @@ planID: row.planID, functionType: row.functionType, confirmResult: 'Y', + confirmAssessment: '优秀', + confirmRemark: '', confirmBy: this.$store.state.user.name } this.confirmDefectModal = true @@ -1601,7 +1618,11 @@ // 确认结果 confirmDefectOrder () { if (this.confirmData.confirmResult === '' || this.confirmData.confirmResult == null) { - this.$message.warning('请选择维修结果!') + this.$message.warning('请选择确认结果!') + return + } + if (this.confirmData.confirmAssessment === '' || this.confirmData.confirmAssessment == null) { + this.$message.warning('请选择维修评估!') return } confirmDefectOrder(this.confirmData).then(({data}) => { diff --git a/src/views/modules/reportWorkOrder/reportDefectOrder.vue b/src/views/modules/reportWorkOrder/reportDefectOrder.vue index 8ac1c05..72e511e 100644 --- a/src/views/modules/reportWorkOrder/reportDefectOrder.vue +++ b/src/views/modules/reportWorkOrder/reportDefectOrder.vue @@ -45,7 +45,7 @@ - + From 150e7cbcd2d7721965836f35490379d38257f881 Mon Sep 17 00:00:00 2001 From: qiezi <15576055375@163.com> Date: Sat, 8 Feb 2025 17:14:08 +0800 Subject: [PATCH 3/4] 20240106 --- src/views/modules/quote/detail/quoteDetail.vue | 4 ++-- src/views/modules/quote/detail/quoteGroupDetail.vue | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/views/modules/quote/detail/quoteDetail.vue b/src/views/modules/quote/detail/quoteDetail.vue index 56b664a..e6a4709 100644 --- a/src/views/modules/quote/detail/quoteDetail.vue +++ b/src/views/modules/quote/detail/quoteDetail.vue @@ -711,9 +711,9 @@ export default { - + - 物料名称 + 物料编码 diff --git a/src/views/modules/quote/detail/quoteGroupDetail.vue b/src/views/modules/quote/detail/quoteGroupDetail.vue index e00edd4..ed42c4b 100644 --- a/src/views/modules/quote/detail/quoteGroupDetail.vue +++ b/src/views/modules/quote/detail/quoteGroupDetail.vue @@ -641,9 +641,9 @@ export default { - + - 物料名称 + 物料编码 From 6e64a80f1e5b6eaae071cd7117825772c9cb14ea Mon Sep 17 00:00:00 2001 From: ruanqi Date: Sat, 8 Feb 2025 17:50:17 +0800 Subject: [PATCH 4/4] =?UTF-8?q?=E5=A4=87=E5=93=81=E5=A4=87=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/ecss/ecss.js | 5 + src/views/modules/ecss/codelnotify.vue | 751 ++++++++++++++++++++ src/views/modules/ecss/codelnotify_old.vue | 751 ++++++++++++++++++++ src/views/modules/ecss/del_upload_excel.vue | 174 +++++ 4 files changed, 1681 insertions(+) create mode 100644 src/api/ecss/ecss.js create mode 100644 src/views/modules/ecss/codelnotify.vue create mode 100644 src/views/modules/ecss/codelnotify_old.vue create mode 100644 src/views/modules/ecss/del_upload_excel.vue diff --git a/src/api/ecss/ecss.js b/src/api/ecss/ecss.js new file mode 100644 index 0000000..8b302f4 --- /dev/null +++ b/src/api/ecss/ecss.js @@ -0,0 +1,5 @@ + +import { createAPI } from "@/utils/httpRequest.js"; + + +export const saveEcssCoDelNotifyByExcel = data => createAPI(`/ecss/coDel/saveEcssCoDelNotifyByExcel`,'post',data) diff --git a/src/views/modules/ecss/codelnotify.vue b/src/views/modules/ecss/codelnotify.vue new file mode 100644 index 0000000..42d6003 --- /dev/null +++ b/src/views/modules/ecss/codelnotify.vue @@ -0,0 +1,751 @@ + + + + + diff --git a/src/views/modules/ecss/codelnotify_old.vue b/src/views/modules/ecss/codelnotify_old.vue new file mode 100644 index 0000000..cd82e0e --- /dev/null +++ b/src/views/modules/ecss/codelnotify_old.vue @@ -0,0 +1,751 @@ + + + + + diff --git a/src/views/modules/ecss/del_upload_excel.vue b/src/views/modules/ecss/del_upload_excel.vue new file mode 100644 index 0000000..9d72ffd --- /dev/null +++ b/src/views/modules/ecss/del_upload_excel.vue @@ -0,0 +1,174 @@ + + +