From 0993108a9566af0e912415f6ef4d37d9e3b65a6d Mon Sep 17 00:00:00 2001 From: Kxc0822a <kxc000822> Date: 星期一, 11 四月 2022 18:11:28 +0800 Subject: [PATCH] 重大 --- src/views/hiddenDangerManagement/fillRectification.vue | 13 src/views/delayHiddenDangerRectification/rectificationDelayHiddenDanger.vue | 511 +++++++++++++++++++++++++++++++++++++++++++++++++++ src/views/hiddenDangerManagement/index.vue | 22 + src/views/hiddenDangerReview/recheckHiddenDangerList.vue | 5 src/views/hiddenDangerReview/recheckCancellationNumber.vue | 18 + src/views/delayHiddenDangerRectification/index.vue | 14 + src/views/hiddenDangerManagement/fillInspector.vue | 11 src/views/hiddenDangerRectification/index.vue | 6 8 files changed, 578 insertions(+), 22 deletions(-) diff --git a/src/views/delayHiddenDangerRectification/index.vue b/src/views/delayHiddenDangerRectification/index.vue index 9715bc7..bc88024 100644 --- a/src/views/delayHiddenDangerRectification/index.vue +++ b/src/views/delayHiddenDangerRectification/index.vue @@ -209,7 +209,11 @@ <el-table-column label="风险等级" align="center"> </el-table-column> <el-table-column label="初始警情" align="center"> </el-table-column> <el-table-column label="当前警情" align="center"> </el-table-column> - <el-table-column label="流程操作" align="center"> </el-table-column> + <el-table-column label="流程操作" align="center"> + <template slot-scope="scope"> + <el-button @click="handleClick(scope.row)" type="text" size="small">发送流程</el-button> + </template> + </el-table-column> </el-table> <div style="text-align: right"> <el-pagination @@ -270,6 +274,14 @@ currentPage: 1, }; }, + methods:{ + // 发送隐患单跳转 + handleClick(){ + this.$router.push({ + path:"/rectificationDelayHiddenDanger" + }) + }, + } }; </script> <style> diff --git a/src/views/delayHiddenDangerRectification/rectificationDelayHiddenDanger.vue b/src/views/delayHiddenDangerRectification/rectificationDelayHiddenDanger.vue index c46f146..ba98496 100644 --- a/src/views/delayHiddenDangerRectification/rectificationDelayHiddenDanger.vue +++ b/src/views/delayHiddenDangerRectification/rectificationDelayHiddenDanger.vue @@ -1,13 +1,522 @@ <template> + <div class="app-container"> + <div style=""> + <Titlename title="发送隐患单"></Titlename> + <div class="whole-form"> + <el-form :model="ruleForm" :rules="rules" ref="ruleForm" label-width="150px" class="demo-ruleForm" + style="margin: 0 14% 0 16%;"> + <el-row> + <el-col :span="9"> + <el-form-item label="隐患编号:" prop="name"> + <el-input v-model="ruleForm.name" :disabled="true"></el-input> + </el-form-item> + </el-col> + <el-col :span="9" :offset="4"> + <el-form-item label="检查单位:" prop="elementAName"> + <el-select + v-model="ruleForm.elementAName" + :disabled="true" + style="width: 100%" + > + </el-select> + </el-form-item> + </el-col> + </el-row> + <el-row> + <el-col :span="9"> + <el-form-item label="检查人:" prop="region"> + <el-input v-model="ruleForm.name" :disabled="true"></el-input> + <!-- <el-select--> + <!-- v-model="ruleForm.elementAName"--> + <!-- :disabled="true"--> + <!-- style="width: 100%"--> + <!-- >--> + <!-- </el-select>--> + </el-form-item> + </el-col> + <el-col :span="9" :offset="4"> + <el-form-item label="陪检人员:" prop="name"> + <el-input v-model="ruleForm.name" :disabled="true"></el-input> + </el-form-item> + </el-col> + </el-row> + <el-row> + <el-col :span="9"> + <el-form-item label="检查时间:" prop="name"> + <el-date-picker + v-model="value1" + type="date" + :disabled="true" + placeholder="选择日期" + style="width: 100%"> + </el-date-picker> + </el-form-item> + </el-col> + <el-col :span="9" :offset="4"> + <!-- <el-form-item label="班次:" prop="name">--> + <!-- <el-input v-model="ruleForm.name"></el-input>--> + <!-- </el-form-item>--> + <el-form-item label="班次:" prop="elementAName"> + <el-select + v-model="ruleForm.elementAName" + :disabled="true" + style="width: 100%" + > + </el-select> + </el-form-item> + </el-col> + </el-row> + <el-row> + <el-col :span="9"> + <el-form-item label="跟班、带班情况:" prop="name"> + <el-input v-model="ruleForm.name" :disabled="true"></el-input> + </el-form-item> + </el-col> + <el-col :span="9" :offset="4"> + <el-form-item label="跟班、带班人员:" prop="name"> + <el-input v-model="ruleForm.name" :disabled="true"></el-input> + </el-form-item> + </el-col> + </el-row> + <el-row> + <el-col :span="22"> + <el-form-item label="行走路线:" prop="name"> + <el-input type="textarea" v-model="ruleForm.name" class="multiline" :disabled="true"></el-input> + </el-form-item> + </el-col> + </el-row> + <el-row> + <el-col :span="9"> + <el-form-item label="隐患单位:" prop="name"> + <!--<el-input v-model="ruleForm.name"></el-input>--> + <el-select + v-model="ruleForm.elementAName" + :disabled="true" + style="width: 100%" + > + </el-select> + </el-form-item> + </el-col> + <el-col :span="9" :offset="4"> + <el-form-item label="隐患部门:" prop="name"> + <!-- <el-input v-model="ruleForm.name"></el-input>--> + <el-select + v-model="ruleForm.elementAName" + :disabled="true" + style="width: 100%" + > + </el-select> + </el-form-item> + </el-col> + </el-row> + <el-row> + <el-col :span="22"> + <el-form-item label="隐患地点:" prop="name"> + <el-input type="textarea" v-model="ruleForm.name" class="multiline" :disabled="true"></el-input> + </el-form-item> + </el-col> + </el-row> + <el-row> + <el-col :span="22"> + <el-form-item label="隐患内容:" prop="name"> + <el-input type="textarea" v-model="ruleForm.name" class="multiline" :disabled="true"></el-input> + </el-form-item> + </el-col> + </el-row> + <el-row> + <el-col :span="9"> + <el-form-item label="隐患类别:" prop="name"> + <!--<el-input v-model="ruleForm.name"></el-input>--> + <el-select + v-model="ruleForm.elementAName" + :disabled="true" + style="width: 100%" + > + </el-select> + </el-form-item> + </el-col> + <el-col :span="9" :offset="4"> + <el-form-item label="隐患级别:" prop="name"> + <!--<el-input v-model="ruleForm.name"></el-input>--> + <el-select + v-model="ruleForm.elementAName" + :disabled="true" + style="width: 100%" + > + </el-select> + </el-form-item> + </el-col> + </el-row> + <el-row> + <el-col :span="9"> + <el-form-item label="整改措施:" prop="name"> + <el-input v-model="ruleForm.name" :disabled="true"></el-input> + </el-form-item> + </el-col> + <el-col :span="9" :offset="4"> + <el-form-item label="所需资金:" prop="name"> + <el-input v-model="ruleForm.name" :disabled="true"></el-input> + </el-form-item> + </el-col> + </el-row> + <el-row> + <el-col :span="9"> + <el-form-item label="限改时间:" prop="name"> + <!--<el-input v-model="ruleForm.name"></el-input>--> + <el-date-picker + v-model="value1" + type="date" + :disabled="true" + placeholder="选择日期" + style="width: 100%"> + </el-date-picker> + </el-form-item> + </el-col> + <el-col :span="9" :offset="4"> + <el-form-item label="责任人:" prop="name"> + <el-input v-model="ruleForm.name" :disabled="true"></el-input> + </el-form-item> + </el-col> + </el-row> + <el-row> + <el-col :span="9"> + <el-form-item label="完成时间:" prop="name"> + <!--<el-input v-model="ruleForm.name"></el-input>--> + <el-date-picker + v-model="value1" + type="date" + :disabled="true" + placeholder="选择日期" + style="width: 100%"> + </el-date-picker> + </el-form-item> + </el-col> + <el-col :span="9" :offset="4"> + <el-form-item label="整改完成情况:" prop="name"> + <el-input v-model="ruleForm.name" :disabled="true"></el-input> + </el-form-item> + </el-col> + </el-row> + <el-row> + <el-col :span="9"> + <el-form-item label="复查时间:" prop="name"> + <!--<el-input v-model="ruleForm.name"></el-input>--> + <el-date-picker + v-model="value1" + type="date" + :disabled="true" + placeholder="选择日期" + style="width: 100%"> + </el-date-picker> + </el-form-item> + </el-col> + <el-col :span="9" :offset="4"> + <el-form-item label="复查人:" prop="name"> + <el-input v-model="ruleForm.name" :disabled="true"></el-input> + </el-form-item> + </el-col> + </el-row> + <el-row> + <el-col :span="9"> + <el-form-item label="复查结果:" prop="name"> + <el-input v-model="ruleForm.name" :disabled="true"></el-input> + </el-form-item> + </el-col> + <el-col :span="9" :offset="4"> + <el-form-item label="整改次数:" prop="name"> + <el-input v-model="ruleForm.name" :disabled="true"></el-input> + </el-form-item> + </el-col> + </el-row> + <el-row> + <el-col :span="22"> + <el-form-item label="危险源:" prop="name"> + <el-input type="textarea" v-model="ruleForm.name" class="multiline" :disabled="true"></el-input> + </el-form-item> + </el-col> + </el-row> + <el-row> + <el-col :span="9"> + <el-form-item label="风险等级:" prop="name"> + <!-- <el-input v-model="ruleForm.name" :disabled="true"></el-input>--> + <el-select + v-model="ruleForm.elementAName" + :disabled="true" + style="width: 100%" + > + </el-select> + </el-form-item> + </el-col> + <el-col :span="9" :offset="4"> + <el-form-item label="业务科室:" prop="name"> + <!-- <el-input v-model="ruleForm.name" :disabled="true"></el-input>--> + <el-select + v-model="ruleForm.elementAName" + :disabled="true" + style="width: 100%" + > + </el-select> + </el-form-item> + </el-col> + </el-row> + <el-row> + <el-col :span="22"> + <el-form-item label="流程信息:" prop="name"> + <!-- <el-input v-model="ruleForm.name" class="multiline" :disabled="true"></el-input>--> + <el-table + :data="tableData" + style="width: 100%"> + <el-table-column + prop="date" + label="步骤" + align="center" + width="60"> + </el-table-column> + <el-table-column + prop="name" + label="操作人:" + align="center" + width="139"> + </el-table-column> + <el-table-column + prop="province" + label="处理时间:" + align="center" + width="200"> + </el-table-column> + <el-table-column + prop="city" + label="审批意见:" + align="center" + width="260"> + </el-table-column> + <el-table-column + prop="address" + label="流程信息:" + align="center" + width="170"> + </el-table-column> + </el-table> + </el-form-item> + </el-col> + </el-row> + <el-row> + <el-col :span="22"> + <el-form-item label="发送流程:" prop="name"> + <el-input type="textarea" v-model="ruleForm.name" class="multiline" :disabled="true"></el-input> + </el-form-item> + </el-col> + </el-row> + <el-row> + <el-col :span="22"> + <el-form-item label="是否发送:" prop="name"> + <el-radio-group v-model="ruleForm.safetyInspectionItemResult"> + <el-radio :label="0">通过</el-radio> + <el-radio :label="1">不通过</el-radio> + </el-radio-group> + </el-form-item> + </el-col> + </el-row> + <div + v-if="ruleForm.safetyInspectionItemResult == 0"> + <el-row> + <el-col :span="9"> + <el-form-item label="复查时间:" prop="reviewTime"> + <el-date-picker + v-model="ruleForm.reviewTime" + type="date" + placeholder="选择日期" + style="width: 100%"> + </el-date-picker> + </el-form-item> + </el-col> + </el-row> + <el-row> + <el-col :span="9"> + <el-form-item label="复查人:" prop="rechecker"> + <el-input v-model="ruleForm.rechecker" clearable></el-input> + </el-form-item> + </el-col> + </el-row> + <el-row> + <el-col :span="22"> + <el-form-item label="复查结果" prop="reviewResults"> + <el-input class="textarea2" type="textarea" clearable v-model="ruleForm.reviewResults"></el-input> + </el-form-item> + </el-col> + </el-row> + <el-row> + <el-col :span="22"> + <el-form-item label="备注" prop="desc"> + <el-input class="textarea" type="textarea" v-model="ruleForm.desc"></el-input> + </el-form-item> + </el-col> + </el-row> + </div> + <div + v-else="ruleForm.safetyInspectionItemResult == 1"> + <el-row> + <el-col :span="9"> + <el-form-item label="复查时间:" prop="reviewTime"> + <el-date-picker + v-model="ruleForm.reviewTime" + type="date" + placeholder="选择日期" + style="width: 100%"> + </el-date-picker> + </el-form-item> + </el-col> + </el-row> + <el-row> + <el-col :span="9"> + <el-form-item label="复查人:" prop="rechecker"> + <el-input v-model="ruleForm.rechecker" clearable></el-input> + </el-form-item> + </el-col> + </el-row> + <el-row> + <el-col :span="22"> + <el-form-item label="复查结果" prop="reviewResults"> + <el-input class="textarea2" type="textarea" v-model="ruleForm.reviewResults1"></el-input> + </el-form-item> + </el-col> + </el-row> + <el-row> + <el-col :span="22"> + <el-form-item label="备注" prop="desc1"> + <el-input class="textarea" type="textarea" v-model="ruleForm.desc1"></el-input> + </el-form-item> + </el-col> + </el-row> + </div> + <el-row> + <el-col :span="22"> + <el-form-item style="text-align: center;"> + <el-button type="primary" @click="submitForm('ruleForm')">保存</el-button> + <el-button @click="close()">关闭</el-button> + </el-form-item> + </el-col> + </el-row> + </el-form> + </div> + </div> + </div> </template> <script> + import Titlename from "../../components/Titlename/index.vue"; + export default { - name: "rectificationDelayHiddenDanger" + components: {Titlename}, + name: "rectificationDelayHiddenDanger", + data() { + return { + ruleForm: { + name: '', + region: '', + date1: '', + date2: '', + delivery: false, + type: [], + resource: '', + value1: '', + desc: '', + rechecker:'', + reviewTime:'', + reviewResults:'', + rechecker1:'', + reviewTime1:'', + reviewResults1:'', + desc1:'' + }, + rules: { + reviewTime: { required: true, message: '请填写复查时间', trigger: 'blur' }, + rechecker: { required: true, message: '请填写复查人', trigger: 'blur' }, + reviewResults: { required: true, message: '请填写复查结果', trigger: 'blur' }, + desc1: { required: true, message: '复查不通过时请在备注说明原因!', trigger: 'blur' }, + }, + tableData: [{ + date: ' 1', + name: '超级管理员', + province: '2022-04-07 16:10:27', + city: '', + address: '已发送众泰煤焦化安全环保部', + }, { + date: ' 1', + name: '超级管理员', + province: '2022-04-07 16:10:27', + city: '', + address: '已发送众泰煤焦化安全环保部', + }, { + date: ' 1', + name: '超级管理员', + province: '2022-04-07 16:10:27', + city: '', + address: '已发送众泰煤焦化安全环保部', + }], + fileList: [], + // safetyInspectionItemResult:'0', + }; + }, + methods: { + submitForm(formName) { + this.$refs[formName].validate((valid) => { + if (valid) { + alert('submit!'); + } else { + console.log('error submit!!'); + return false; + } + }); + }, + handleRemove(file, fileList) { + console.log(file, fileList); + }, + handlePreview(file) { + console.log(file); + }, + beforeUpload(file) { + var FileExt = file.name.replace(/.+\./, ""); + if (['jpg','png','bmp','gif','jpeg'].indexOf(FileExt.toLowerCase()) === -1){ + this.$message({ + type: 'warning', + message: '请上传后缀名为jpg、png、bmp、gif、jpeg的图片!' + }); + return false; + } + }, + close(){ + this.$router.push({ + path:"/delayHiddenDangerRectification" + }) + } + } } </script> <style scoped> + .app-container { + padding: 20px; + height: 850px; + overflow-y: auto; + } + /deep/ .box { + padding-top: 0; + } + + /deep/ .multiline .el-input__inner { + height: 62px; + } + /deep/ .textarea .el-textarea__inner{ + height: 80px; + max-height: 80px; + overflow-y: auto + } + /deep/ .textarea2 .el-textarea__inner{ + height: 100px; + max-height: 100px; + overflow-y: auto + } </style> diff --git a/src/views/hiddenDangerManagement/fillInspector.vue b/src/views/hiddenDangerManagement/fillInspector.vue index c582a2f..7278abe 100644 --- a/src/views/hiddenDangerManagement/fillInspector.vue +++ b/src/views/hiddenDangerManagement/fillInspector.vue @@ -153,12 +153,12 @@ </el-table-column> </el-table> </el-form> - <div class="btns"> + <div class="btn"> <el-button type="primary" @click="submitConfig('config')">保存</el-button> <el-button - type="primary">关闭</el-button> + type="primary" @click="close()">关闭</el-button> </div> </div> </div> @@ -254,6 +254,11 @@ // cell.querySelector('.item__input').style.display = 'none' // cell.querySelector('.item__txt').style.display = 'block' } + }, + close(){ + this.$router.push({ + path:"/hiddenDangerManagement" + }) } } } @@ -291,7 +296,7 @@ /deep/ .is-center{ font-size: 14px; } - .btns{ + .btn{ text-align: center; margin-top: 50px; } diff --git a/src/views/hiddenDangerManagement/fillRectification.vue b/src/views/hiddenDangerManagement/fillRectification.vue index fc13899..f0e4ef0 100644 --- a/src/views/hiddenDangerManagement/fillRectification.vue +++ b/src/views/hiddenDangerManagement/fillRectification.vue @@ -129,12 +129,12 @@ </el-table-column> </el-table> </el-form> - <div class="btns"> + <div class="btn"> <el-button type="primary" @click="submitConfig('config')">保存</el-button> <el-button - type="primary">关闭</el-button> + type="primary" @click="close()">关闭</el-button> </div> </div> </div> @@ -221,7 +221,12 @@ // cell.querySelector('.item__input').style.display = 'none' // cell.querySelector('.item__txt').style.display = 'block' } - } + }, + close(){ + this.$router.push({ + path:"/hiddenDangerManagement" + }) + }, } } </script> @@ -258,7 +263,7 @@ /deep/ .is-center{ font-size: 14px; } - .btns{ + .btn{ text-align: center; margin-top: 50px; } diff --git a/src/views/hiddenDangerManagement/index.vue b/src/views/hiddenDangerManagement/index.vue index 9ad445e..b1598e4 100644 --- a/src/views/hiddenDangerManagement/index.vue +++ b/src/views/hiddenDangerManagement/index.vue @@ -214,12 +214,14 @@ class="btns" type="primary" size="small" + @click="fillRectification()" >填写整改</el-button > <el-button class="btns" type="primary" size="small" + @click="fillInspector()" >填写督查</el-button > <el-button class="btns" type="primary" icon="el-icon-plus" @click="jump" size="small" @@ -228,7 +230,7 @@ <el-button size="small" >批量删除</el-button > - + </el-col> </el-row> <el-table :data="tableData" style="width: 100%"> @@ -342,7 +344,9 @@ label: "北京烤鸭", }, ], - tableData: [], + tableData: [ + + ], pageSize: 10, recordTotal: 0, currentPage: 1, @@ -356,7 +360,17 @@ this.$router.push({ path:"/fillRectificationAdd" }) - } + }, + fillRectification(){ + this.$router.push({ + path:"/fillRectification" + }) + }, + fillInspector(){ + this.$router.push({ + path:"/fillInspector" + }) + }, } }; </script> @@ -381,7 +395,7 @@ } .title-center /deep/ .el-radio-button__inner{ border: none; - border-radius: 0px; + border-radius: 0px; } .title-center /deep/ .el-radio-button__orig-radio:checked+.el-radio-button__inner{ background-color: #034ea2;background-color: #034ea2; diff --git a/src/views/hiddenDangerRectification/index.vue b/src/views/hiddenDangerRectification/index.vue index 309fdb8..2c232f9 100644 --- a/src/views/hiddenDangerRectification/index.vue +++ b/src/views/hiddenDangerRectification/index.vue @@ -281,12 +281,6 @@ path:"/sendHiddenDangerList" }) }, - // 申请延期页面跳转 - applicationExtension(){ - this.$router.push({ - path:"/applicationForExtension" - }) - } } }; </script> diff --git a/src/views/hiddenDangerReview/recheckCancellationNumber.vue b/src/views/hiddenDangerReview/recheckCancellationNumber.vue index d30907a..f9aea68 100644 --- a/src/views/hiddenDangerReview/recheckCancellationNumber.vue +++ b/src/views/hiddenDangerReview/recheckCancellationNumber.vue @@ -210,7 +210,11 @@ <el-table-column label="风险等级" align="center"> </el-table-column> <el-table-column label="初始警情" align="center"> </el-table-column> <el-table-column label="当前警情" align="center"> </el-table-column> - <el-table-column label="流程操作" align="center"> </el-table-column> + <el-table-column label="流程操作" align="center"> + <template slot-scope="scope"> + <el-button @click="handleClick(scope.row)" type="text" size="small">发送流程</el-button> + </template> + </el-table-column> </el-table> <div style="text-align: right"> <el-pagination @@ -270,7 +274,15 @@ recordTotal: 0, currentPage: 1, }; - }, + }, + methods:{ + // 发送隐患单跳转 + handleClick(){ + this.$router.push({ + path:"/recheckHiddenDangerList" + }) + }, + } }; </script> <style> @@ -289,4 +301,4 @@ background-color: #034ea2; border: 1px solid #034ea2; } -</style> \ No newline at end of file +</style> diff --git a/src/views/hiddenDangerReview/recheckHiddenDangerList.vue b/src/views/hiddenDangerReview/recheckHiddenDangerList.vue index 0fab765..9734ed0 100644 --- a/src/views/hiddenDangerReview/recheckHiddenDangerList.vue +++ b/src/views/hiddenDangerReview/recheckHiddenDangerList.vue @@ -485,6 +485,11 @@ }); return false; } + }, + close(){ + this.$router.push({ + path:"/recheckCancellationNumber" + }) } } } -- Gitblit v1.9.2