wilson
/
xujiecloud-vue
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

维修工单审核功能优化

java8
赵宏斌 6 months ago
parent
805a7c2e66
commit
7ca680b5fd
3 changed files with 246 additions and 98 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 171
      src/views/modules/eam/eamWorkOrderForDefect.vue
  2. 172
      src/views/modules/eam/eamWorkOrderForDefect2.vue
  3. 1
      src/views/modules/scheduling/schedulingUpload.vue

171
src/views/modules/eam/eamWorkOrderForDefect.vue
View File

@ -214,8 +214,9 @@
</el-form-item>
</el-form>
<el-footer style="height:40px;margin-top: 10px;text-align:center">
<el-button type="primary" @click="submitModel()">确定</el-button>
<el-button type="primary" @click="submitModelFlag = false">取消</el-button>
<el-button type="primary" @click="submitModel(1)">通过</el-button>
<el-button type="primary" @click="submitModel(2)">退回</el-button>
<!-- <el-button type="primary" @click="submitModelFlag = false">取消</el-button>-->
</el-footer>
</el-dialog>
@ -318,7 +319,7 @@
</el-form-item>
<el-form-item :label="' '" style="margin-left: 20px">
<el-checkbox v-model="detailData.knowledgeFlag" true-label="Y">维修记录移至知识库</el-checkbox>
<el-button v-if="detailData.status === '已完工'" type="primary" @click="checkModal()" style="margin-left: 10px">审核退回</el-button>
<el-button v-if="detailData.status === '已完工'" type="primary" @click="revokeModel()" style="margin-left: 10px">审核撤销</el-button>
<el-button v-else type="primary" @click="checkModal()" style="margin-left: 10px">审核</el-button>
</el-form-item>
<!-- <el-form-item :label="' '">-->
@ -2134,59 +2135,133 @@ export default {
this.submitData.actualOperatorName = this.detailData.actualOperatorName
this.submitData.knowledgeFlag = this.detailData.knowledgeFlag
this.submitData.updateBy = this.$store.state.user.name
if (this.detailData.status === '已完工') {
this.$confirm(`是否取消审核?`, '提示', {
confirmButtonText: '确定',
cancelButtonText: '取消',
type: 'warning'
}).then(() => {
this.submitData.status = '已到达'
submitDefect(this.submitData).then(({data}) => {
if (data && data.code === 0) {
this.getDataList()
this.detailData.status = '待审核'
this.$message({
message: '操作成功',
type: 'success',
duration: 1500,
onClose: () => {
}
})
} else {
this.$alert(data.msg, '错误', {
confirmButtonText: '确定'
})
}
})
})
} else {
this.submitData.status = '已完工'
this.submitModelFlag = true
}
// if (this.detailData.status === '已完工') {
// this.$confirm(`是否取消审核?`, '提示', {
// confirmButtonText: '确定',
// cancelButtonText: '取消',
// type: 'warning'
// }).then(() => {
// this.submitData.status = '已到达'
// submitDefect(this.submitData).then(({data}) => {
// if (data && data.code === 0) {
// this.getDataList()
// this.detailData.status = '待审核'
// this.$message({
// message: '操作成功',
// type: 'success',
// duration: 1500,
// onClose: () => {
// }
// })
// } else {
// this.$alert(data.msg, '错误', {
// confirmButtonText: '确定'
// })
// }
// })
// })
// } else {
// this.submitData.status = '已完工'
// this.submitModelFlag = true
// }
this.submitData.status = '已完工'
this.submitModelFlag = true
},
// 确认审核
submitModel () {
submitModel (param) {
if (this.submitData.difficultyLevel === '' || this.submitData.difficultyLevel == null) {
this.$message.warning('请选择难度等级！')
return
}
submitDefect(this.submitData).then(({data}) => {
if (data && data.code === 0) {
this.getDataList()
this.detailData.status = '已完工'
this.submitModelFlag = false
this.$message({
message: '操作成功',
type: 'success',
duration: 1500,
onClose: () => {}
})
} else {
this.$alert(data.msg, '错误', {
confirmButtonText: '确定'
})
if (param === 1) {
submitDefect(this.submitData).then(({data}) => {
if (data && data.code === 0) {
this.getDataList()
this.detailData.status = '已完工'
this.submitModelFlag = false
this.$message({
message: '操作成功',
type: 'success',
duration: 1500,
onClose: () => {}
})
} else {
this.$alert(data.msg, '错误', {
confirmButtonText: '确定'
})
}
})
} else {
this.submitData.status = '已到达'
submitDefect(this.submitData).then(({data}) => {
if (data && data.code === 0) {
this.getDataList()
this.detailData.status = '待审核'
this.submitModelFlag = false
this.detailModelFlag = false
this.$message({
message: '操作成功',
type: 'success',
duration: 1500,
onClose: () => {
}
})
} else {
this.$alert(data.msg, '错误', {
confirmButtonText: '确定'
})
}
})
}
},
revokeModel(){
this.$confirm(`是否撤销审核,回退到‘待审核’状态?`, '提示', {
confirmButtonText: '确定',
cancelButtonText: '取消',
type: 'warning'
}).then(() => {
if (this.authCheck) {
this.$message.warning('无审核权限！')
return
}
this.submitData.site = this.detailData.site
this.submitData.buNo = this.detailData.buNo
this.submitData.orderNo = this.detailData.orderNo
this.submitData.planID = this.detailData.planID
this.submitData.objectID = this.detailData.objectID
this.submitData.planDesc = this.detailData.feedBackDesc
this.submitData.disposalMeasures = this.detailData.disposalMeasures
this.submitData.defectID = this.detailData.defectID
this.submitData.defectDesc = this.detailData.defectDesc
this.submitData.remark = this.detailData.remark
this.submitData.difficultyLevel = ''
this.submitData.difficultyRemark = ''
this.submitData.faultReason = this.detailData.faultReason
this.submitData.handlingMethod = this.detailData.handlingMethod
this.submitData.preventiveMeasure = this.detailData.preventiveMeasure
this.submitData.feedbackBy = this.detailData.createBy
this.submitData.actualOperatorName = this.detailData.actualOperatorName
this.submitData.knowledgeFlag = this.detailData.knowledgeFlag
this.submitData.updateBy = this.$store.state.user.name
this.submitData.status = '待审核'
submitDefect(this.submitData).then(({data}) => {
if (data && data.code === 0) {
this.getDataList()
this.detailData.status = '待审核'
this.$message({
message: '操作成功',
type: 'success',
duration: 1500,
onClose: () => {
}
})
} else {
this.$alert(data.msg, '错误', {
confirmButtonText: '确定'
})
}
})
})
},

172
src/views/modules/eam/eamWorkOrderForDefect2.vue
View File

@ -214,8 +214,9 @@
</el-form-item>
</el-form>
<el-footer style="height:40px;margin-top: 10px;text-align:center">
<el-button type="primary" @click="submitModel()">确定</el-button>
<el-button type="primary" @click="submitModelFlag = false">取消</el-button>
<el-button type="primary" @click="submitModel(1)">通过</el-button>
<el-button type="primary" @click="submitModel(2)">退回</el-button>
<!-- <el-button type="primary" @click="submitModelFlag = false">取消</el-button>-->
</el-footer>
</el-dialog>
@ -319,7 +320,7 @@
</el-form-item>
<el-form-item :label="' '" style="margin-left: 20px">
<el-checkbox v-model="detailData.knowledgeFlag" true-label="Y">维修记录移至知识库</el-checkbox>
<el-button v-if="detailData.status === '已完工'" type="primary" @click="checkModal()" style="margin-left: 10px">审核退回</el-button>
<el-button v-if="detailData.status === '已完工'" type="primary" @click="revokeModel()" style="margin-left: 10px">审核撤销</el-button>
<el-button v-else type="primary" @click="checkModal()" style="margin-left: 10px">审核</el-button>
</el-form-item>
<!-- <el-form-item :label="' '">-->
@ -2136,62 +2137,135 @@ export default {
this.submitData.actualOperatorName = this.detailData.actualOperatorName
this.submitData.knowledgeFlag = this.detailData.knowledgeFlag
this.submitData.updateBy = this.$store.state.user.name
if (this.detailData.status === '已完工') {
this.$confirm(`是否取消审核?`, '提示', {
confirmButtonText: '确定',
cancelButtonText: '取消',
type: 'warning'
}).then(() => {
this.submitData.status = '已到达'
submitDefect(this.submitData).then(({data}) => {
if (data && data.code === 0) {
this.getDataList()
this.detailData.status = '待审核'
this.$message({
message: '操作成功',
type: 'success',
duration: 1500,
onClose: () => {
}
})
} else {
this.$alert(data.msg, '错误', {
confirmButtonText: '确定'
})
}
})
})
} else {
this.submitData.status = '已完工'
this.submitModelFlag = true
}
// if (this.detailData.status === '已完工') {
// this.$confirm(`是否取消审核?`, '提示', {
// confirmButtonText: '确定',
// cancelButtonText: '取消',
// type: 'warning'
// }).then(() => {
// this.submitData.status = '已到达'
// submitDefect(this.submitData).then(({data}) => {
// if (data && data.code === 0) {
// this.getDataList()
// this.detailData.status = '待审核'
// this.$message({
// message: '操作成功',
// type: 'success',
// duration: 1500,
// onClose: () => {
// }
// })
// } else {
// this.$alert(data.msg, '错误', {
// confirmButtonText: '确定'
// })
// }
// })
// })
// } else {
// this.submitData.status = '已完工'
// this.submitModelFlag = true
// }
this.submitData.status = '已完工'
this.submitModelFlag = true
},
// 确认审核
submitModel () {
submitModel (param) {
if (this.submitData.difficultyLevel === '' || this.submitData.difficultyLevel == null) {
this.$message.warning('请选择难度等级！')
return
}
submitDefect(this.submitData).then(({data}) => {
if (data && data.code === 0) {
this.getDataList()
this.detailData.status = '已完工'
this.submitModelFlag = false
this.$message({
message: '操作成功',
type: 'success',
duration: 1500,
onClose: () => {}
})
} else {
this.$alert(data.msg, '错误', {
confirmButtonText: '确定'
})
if (param === 1) {
submitDefect(this.submitData).then(({data}) => {
if (data && data.code === 0) {
this.getDataList()
this.detailData.status = '已完工'
this.submitModelFlag = false
this.$message({
message: '操作成功',
type: 'success',
duration: 1500,
onClose: () => {}
})
} else {
this.$alert(data.msg, '错误', {
confirmButtonText: '确定'
})
}
})
} else {
this.submitData.status = '已到达'
submitDefect(this.submitData).then(({data}) => {
if (data && data.code === 0) {
this.getDataList()
this.detailData.status = '待审核'
this.submitModelFlag = false
this.detailModelFlag = false
this.$message({
message: '操作成功',
type: 'success',
duration: 1500,
onClose: () => {
}
})
} else {
this.$alert(data.msg, '错误', {
confirmButtonText: '确定'
})
}
})
}
},
revokeModel(){
this.$confirm(`是否撤销审核,回退到‘待审核’状态?`, '提示', {
confirmButtonText: '确定',
cancelButtonText: '取消',
type: 'warning'
}).then(() => {
if (this.authCheck) {
this.$message.warning('无审核权限！')
return
}
this.submitData.site = this.detailData.site
this.submitData.buNo = this.detailData.buNo
this.submitData.orderNo = this.detailData.orderNo
this.submitData.planID = this.detailData.planID
this.submitData.objectID = this.detailData.objectID
this.submitData.planDesc = this.detailData.feedBackDesc
this.submitData.disposalMeasures = this.detailData.disposalMeasures
this.submitData.defectID = this.detailData.defectID
this.submitData.defectDesc = this.detailData.defectDesc
this.submitData.remark = this.detailData.remark
this.submitData.difficultyLevel = ''
this.submitData.difficultyRemark = ''
this.submitData.faultReason = this.detailData.faultReason
this.submitData.handlingMethod = this.detailData.handlingMethod
this.submitData.preventiveMeasure = this.detailData.preventiveMeasure
this.submitData.feedbackBy = this.detailData.createBy
this.submitData.actualOperatorName = this.detailData.actualOperatorName
this.submitData.knowledgeFlag = this.detailData.knowledgeFlag
this.submitData.updateBy = this.$store.state.user.name
this.submitData.status = '待审核'
submitDefect(this.submitData).then(({data}) => {
if (data && data.code === 0) {
this.getDataList()
this.detailData.status = '待审核'
this.$message({
message: '操作成功',
type: 'success',
duration: 1500,
onClose: () => {
}
})
} else {
this.$alert(data.msg, '错误', {
confirmButtonText: '确定'
})
}
})
})
},
// 详情
async reportModal(row) {
this.detailData = {

1
src/views/modules/scheduling/schedulingUpload.vue
View File

@ -147,7 +147,6 @@ export default {
if (data && data.code === 0) {
file.id = data.data.id
file.fileName = data.data.fileName
this.$message.success(file)
} else {
this.$alert(data.msg, '错误', {
confirmButtonText: '确定'

Write Preview
Loading…
Cancel
Save