diff --git a/src/api/eam/eam.js b/src/api/eam/eam.js index aa79a0e..bd1034f 100644 --- a/src/api/eam/eam.js +++ b/src/api/eam/eam.js @@ -104,8 +104,15 @@ export const createEamWorkOrder = data => createAPI(`/pms/eam/createEamWorkOrder export const objectIDBlur = data => createAPI(`/pms/eam/objectIDBlur`,'post',data) export const modalCodeBlur = data => createAPI(`/pms/eam/modalCodeBlur`,'post',data) + +export const planOrder = data => createAPI(`/pms/eam/planOrder`,'post',data) +export const cancelPlan = data => createAPI(`/pms/eam/cancelPlan`,'post',data) //---------------点检工单------------------- export const eamWorkOrderSearch = data => createAPI(`/pms/eam/eamWorkOrderSearch`,'post',data) +export const cancelOrder= data => createAPI(`/pms/eam/cancelOrder`,'post',data) +export const eamWorkOrderReportSearch= data => createAPI(`/pms/eam/eamWorkOrderReportSearch`,'post',data) + +export const eamWorkOrderSearchForDefect= data => createAPI(`/pms/eam/eamWorkOrderSearchForDefect`,'post',data) //---------------故障------------------- export const eamDefectSearch = data => createAPI(`/pms/eam/eamDefectSearch`,'post',data) @@ -129,3 +136,8 @@ export const getObjectList = data => createAPI(`/pms/eam/getObjectList`,'post',d //---------------点检执行------------------- export const eamWorkOrderItemSearch = data => createAPI(`/pms/eam/eamWorkOrderItemSearch`,'post',data) +export const saveCheckOrderReport = data => createAPI(`/pms/eam/saveCheckOrderReport`,'post',data) + +export const changeOrderOperator = data => createAPI(`/pms/eam/changeOrderOperator`,'post',data) + +export const saveOrderReportForDefect= data => createAPI(`/pms/eam/saveOrderReportForDefect`,'post',data) diff --git a/src/assets/scss/index.scss b/src/assets/scss/index.scss index ccf9679..d745333 100644 --- a/src/assets/scss/index.scss +++ b/src/assets/scss/index.scss @@ -2,3 +2,5 @@ @import "variables"; // 站点变量 @import "base"; @import "global"; + +@import "rq"; diff --git a/src/assets/scss/rq.scss b/src/assets/scss/rq.scss index e9af077..8f0470c 100644 --- a/src/assets/scss/rq.scss +++ b/src/assets/scss/rq.scss @@ -37,9 +37,9 @@ font-size: 18px; } -.el-table .cell, .el-table th div, .el-table--border td:first-child .cell, .el-table--border th:first-child .cell { - padding-left: 0px; -} +//.el-table .cell, .el-table th div, .el-table--border td:first-child .cell, .el-table--border th:first-child .cell { +// padding-left: 0px; +//} .rq .el-table .cell { line-height: 20px; font-size: 12px; diff --git a/src/views/common/login.vue b/src/views/common/login.vue index fc8e1bf..8ab5fb9 100644 --- a/src/views/common/login.vue +++ b/src/views/common/login.vue @@ -76,7 +76,7 @@ this.$refs['dataForm'].validate((valid) => { if (valid) { this.$http({ - url: this.$http.adornUrl('/api/sys/login'), + url: this.$http.adornUrl('/sys/login'), method: 'post', data: this.$http.adornData({ 'username': this.dataForm.userName, diff --git a/src/views/modules/eam/eamWorkOrderForCheck.vue b/src/views/modules/eam/eamWorkOrderForCheck.vue index 070663d..5019c04 100644 --- a/src/views/modules/eam/eamWorkOrderForCheck.vue +++ b/src/views/modules/eam/eamWorkOrderForCheck.vue @@ -43,7 +43,8 @@ - 查询 + 查询 + 更改机修人员 @@ -52,14 +53,15 @@ :data="dataList" border v-loading="dataListLoading" - + @selection-change="selectionChangeHandle" style="width: 100%;"> - - - - - - + + - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + +
+ + + + + + + + +
+ + 关闭 + + + + + + + 计划执行人员 + + + + + + + + 保存 + 关闭 + + + + @@ -104,9 +186,15 @@ diff --git a/src/views/modules/eam/eamWorkOrderForDefect.vue b/src/views/modules/eam/eamWorkOrderForDefect.vue new file mode 100644 index 0000000..9500c35 --- /dev/null +++ b/src/views/modules/eam/eamWorkOrderForDefect.vue @@ -0,0 +1,571 @@ + + + diff --git a/src/views/modules/eam/eamWorkOrderForMaintenance.vue b/src/views/modules/eam/eamWorkOrderForMaintenance.vue index c01a433..3628072 100644 --- a/src/views/modules/eam/eamWorkOrderForMaintenance.vue +++ b/src/views/modules/eam/eamWorkOrderForMaintenance.vue @@ -44,6 +44,7 @@ 查询 + 更改机修人员 @@ -52,14 +53,15 @@ :data="dataList" border v-loading="dataListLoading" - + @selection-change="selectionChangeHandle" style="width: 100%;"> - - - - - - + + - - - - - - - - - - - + + + + + + + 计划执行人员 + + + + + + + + 保存 + 关闭 + + + + + diff --git a/src/views/modules/eam/eamWorkPlanForCheck.vue b/src/views/modules/eam/eamWorkPlanForCheck.vue index 4c96887..532e7c4 100644 --- a/src/views/modules/eam/eamWorkPlanForCheck.vue +++ b/src/views/modules/eam/eamWorkPlanForCheck.vue @@ -37,6 +37,7 @@ + @@ -82,9 +83,11 @@ label="操作"> @@ -389,6 +392,8 @@ objectIDBlur, modalCodeBlur, getObjectList, + planOrder, + cancelPlan, } from "@/api/eam/eam.js" import Chooselist from '@/views/modules/common/Chooselist_eam' export default { @@ -1426,7 +1431,61 @@ getObjectList(this.objectData).then(({data}) => { this.objectList = data.rows }) - } + }, + planOrder(row){ + row.userId=this.$store.state.user.name; + this.$confirm(`是否把进行中的计划变为已计划并取消未完成的工单?`, '提示', { + confirmButtonText: '确定', + cancelButtonText: '取消', + type: 'warning' + + }).then(() => { + planOrder(row).then(({data}) => { + if (data && data.code === 0) { + this.getDataList() + this.$message({ + message: '操作成功', + type: 'success', + duration: 1500, + onClose: () => { + } + }) + } else { + this.$alert(data.msg, '错误', { + confirmButtonText: '确定' + }) + } + }) + }).catch(() => { + }) + }, + cancelPlan(row){ + row.userId=this.$store.state.user.name; + this.$confirm(`是否取消计划?`, '提示', { + confirmButtonText: '确定', + cancelButtonText: '取消', + type: 'warning' + + }).then(() => { + cancelPlan(row).then(({data}) => { + if (data && data.code === 0) { + this.getDataList() + this.$message({ + message: '操作成功', + type: 'success', + duration: 1500, + onClose: () => { + } + }) + } else { + this.$alert(data.msg, '错误', { + confirmButtonText: '确定' + }) + } + }) + }).catch(() => { + }) + }, } } diff --git a/src/views/modules/eam/eamWorkPlanForMaintenance.vue b/src/views/modules/eam/eamWorkPlanForMaintenance.vue index a661437..93a85e9 100644 --- a/src/views/modules/eam/eamWorkPlanForMaintenance.vue +++ b/src/views/modules/eam/eamWorkPlanForMaintenance.vue @@ -37,6 +37,7 @@ + @@ -52,12 +53,12 @@ v-loading="dataListLoading" style="width: 100%;"> - - - - - - + + + + + + @@ -389,6 +392,8 @@ objectIDBlur, modalCodeBlur, getObjectList, + planOrder, + cancelPlan, } from "@/api/eam/eam.js" import Chooselist from '@/views/modules/common/Chooselist_eam' export default { @@ -1426,7 +1431,61 @@ getObjectList(this.objectData).then(({data}) => { this.objectList = data.rows }) - } + }, + planOrder(row){ + row.userId=this.$store.state.user.name; + this.$confirm(`是否把进行中的计划变为已计划并取消未完成的工单?`, '提示', { + confirmButtonText: '确定', + cancelButtonText: '取消', + type: 'warning' + + }).then(() => { + planOrder(row).then(({data}) => { + if (data && data.code === 0) { + this.getDataList() + this.$message({ + message: '操作成功', + type: 'success', + duration: 1500, + onClose: () => { + } + }) + } else { + this.$alert(data.msg, '错误', { + confirmButtonText: '确定' + }) + } + }) + }).catch(() => { + }) + }, + cancelPlan(row){ + row.userId=this.$store.state.user.name; + this.$confirm(`是否取消计划?`, '提示', { + confirmButtonText: '确定', + cancelButtonText: '取消', + type: 'warning' + + }).then(() => { + cancelPlan(row).then(({data}) => { + if (data && data.code === 0) { + this.getDataList() + this.$message({ + message: '操作成功', + type: 'success', + duration: 1500, + onClose: () => { + } + }) + } else { + this.$alert(data.msg, '错误', { + confirmButtonText: '确定' + }) + } + }) + }).catch(() => { + }) + }, } } diff --git a/src/views/modules/reportWorkOrder/reportCheckOrder.vue b/src/views/modules/reportWorkOrder/reportCheckOrder.vue index 6c78a76..2b46918 100644 --- a/src/views/modules/reportWorkOrder/reportCheckOrder.vue +++ b/src/views/modules/reportWorkOrder/reportCheckOrder.vue @@ -44,7 +44,7 @@ fixed="right" label="操作"> @@ -61,16 +61,25 @@ - - + + - - + + - - + + + + + + + + + + +
+ 保存 关闭 @@ -134,6 +144,7 @@ import { eamWorkOrderSearch, eamWorkOrderItemSearch, + saveCheckOrderReport, } from "@/api/eam/eam.js" export default { watch: { @@ -406,8 +417,15 @@ ], detailModelFlag:false, detailList:[], - modelData:{ - + saveData:{ + site:'', + orderNo:'', + planOperatorName:'', + workTime:'', + remark:'', + mesUser:'', + planID:'', + itemList:[], }, columnDetailList: [ { @@ -582,15 +600,86 @@ site:row.site, itemNo:row.itemNo, planID:row.planID, + orderNo:row.orderNo, itemType:row.functionType, } eamWorkOrderItemSearch(indata).then(({data}) => { this.detailList=data.rows }) + + this.saveData={ + site:row.site, + orderNo:row.orderNo, + planID:row.planID, + planOperatorName:row.planOperatorName, + workTime:'', + remark:'', + mesUser:this.$store.state.user.name, + itemList:[], + }, this.detailModelFlag=true; }, + saveCheckReport(){ + if(this.saveData.workTime==''||this.saveData.workTime==null){ + this.$alert('请输入工作时间！', '错误', { + confirmButtonText: '确定' + }) + return false + } + for (let i = 0; i < this.detailList.length; i++) { + if(this.detailList[i].valueTypeDb=='N'&&(this.detailList[i].numberValue==''||this.detailList[i].numberValue==null)){ + this.$alert(this.detailList[i].itemDesc+'实测值未填写！', '错误', { + confirmButtonText: '确定' + }) + return false + } + if(this.detailList[i].valueTypeDb=='T'&&(this.detailList[i].textValue==''||this.detailList[i].textValue==null)){ + this.$alert(this.detailList[i].itemDesc+'实测值未填写！', '错误', { + confirmButtonText: '确定' + }) + return false + } + if(this.detailList[i].valueTypeDb=='N'&&this.detailList[i].numberValue!=''&&this.detailList[i].numberValue!=null){ + if(this.detailList[i].minValue!=""&&this.detailList[i].minValue!=null&&this.detailList[i].minValue>this.detailList[i].numberValue){ + this.$alert(this.detailList[i].itemDesc+'实测值小于最小值！', '错误', { + confirmButtonText: '确定' + }) + return false + } + if(this.detailList[i].minValue!=""&&this.detailList[i].minValue!=null&&this.detailList[i].maxValue { + if (data && data.code == '0') { + this.getDataList() + this.detailModelFlag=false + this.$message({ + message: '操作成功', + type: 'success', + duration: 1500, + onClose: () => { + } + }) + } else { + this.$alert(data.msg, '错误', { + confirmButtonText: '确定' + }) + } + }) + + } } } + + diff --git a/src/views/modules/reportWorkOrder/reportDefectOrder.vue b/src/views/modules/reportWorkOrder/reportDefectOrder.vue new file mode 100644 index 0000000..adc4e92 --- /dev/null +++ b/src/views/modules/reportWorkOrder/reportDefectOrder.vue @@ -0,0 +1,479 @@ + + + + + diff --git a/src/views/modules/reportWorkOrder/reportMaintenanceOrder.vue b/src/views/modules/reportWorkOrder/reportMaintenanceOrder.vue new file mode 100644 index 0000000..5a64984 --- /dev/null +++ b/src/views/modules/reportWorkOrder/reportMaintenanceOrder.vue @@ -0,0 +1,685 @@ + + + + +