diff --git a/src/components/ehsSelect/userselect.vue b/src/components/ehsSelect/userselect.vue index b4db3a80..73e26379 100644 --- a/src/components/ehsSelect/userselect.vue +++ b/src/components/ehsSelect/userselect.vue @@ -79,13 +79,7 @@ - - - + - + 取 消 确 定 - - 上一步 - 退出 + +
+ 上一步 + {{item.name}} + + 退出 + +
@@ -441,7 +435,7 @@ import { genTree } from "@/utils/verificate"; const defaultformworker = { id: "", worker: null, - duty: null, + duty: "作业人员", certificates: [], opl: "", }; @@ -473,7 +467,7 @@ export default { cate: "", risks_checked: [], }, - + initForm: {}, operationId: "", oplcateId: "", oplId: "", @@ -507,6 +501,32 @@ export default { true: "正常", false: "不正常", }, + rules: { + start_time: [ + {required: true, message: '请选择'} + ], + end_time: [ + {required: true, message: '请选择'} + ], + level: [ + {required: true, message: '请选择'} + ], + dept_do: [ + {required: true, message: '请选择'} + ], + charger: [ + {required: true, message: '请选择'} + ], + monitor: [ + {required: true, message: '请选择'} + ], + risks_checked: [ + {required: true, message: '请选择'} + ], + measures_checked: [ + {required: true, message: '请选择'} + ], + } }; }, mounted() { @@ -514,9 +534,8 @@ export default { this.oplcateId = this.$route.query.oplcateId; //作业许可证种类ID this.oplId = this.$route.query.oplId; //许可证ID this.getoplData(); - + this.getInit(); this.getDept(); - this.getUser(); }, methods: { @@ -546,7 +565,7 @@ export default { this.$API.opm.operation.read.req(this.operationId).then((res) => { this.form.start_time = res.start_time; //作业开始时间 this.form.end_time = res.end_time; //作业结束时间 - + this.form.name = res.name; console.log(res); }); }, @@ -685,7 +704,27 @@ export default { }); }, - + //渲染工单提交按钮 + getInit() { + this.$API.wf.workflow.initkey.req('opl_usecl').then((res) => { + this.initForm = res; + }); + }, + + //提交,创建工单 + submitTicketCreate(id) { + let ticket = {}; + ticket.workflow = this.initForm.workflow; + ticket.ticket_data = {opl: this.oplId}; + ticket.transition = id; + ticket.title = this.form.name + '-申请'; + this.tLoading = true + this.$API.wf.ticket.create.req(ticket).then((res) => { + this.tLoading = false + this.$message.success("提交成功"); + this.submitOut() + }).catch(e=>{this.tLoading=false}); + }, //退出界面 submitOut(){ this.$router.push({ diff --git a/src/views/ops/log_request.vue b/src/views/ops/log_request.vue index abfbfe68..17c50b7b 100644 --- a/src/views/ops/log_request.vue +++ b/src/views/ops/log_request.vue @@ -16,8 +16,15 @@