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/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/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 @@ + + + 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: [], 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 { - + - 物料名称 + 物料编码 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 @@ - +