From c819024e241b9f7c54cc3786373ad0d2998f2190 Mon Sep 17 00:00:00 2001
From: 马宇豪 <978517621@qq.com>
Date: 星期五, 05 五月 2023 08:55:46 +0800
Subject: [PATCH] 修改
---
src/views/hiddenDangerRegistration/hiddenDangerList.vue | 314 ++++++++++++++++++++++------------------------------
1 files changed, 133 insertions(+), 181 deletions(-)
diff --git a/src/views/hiddenDangerRegistration/hiddenDangerList.vue b/src/views/hiddenDangerRegistration/hiddenDangerList.vue
index 0a704be..b7247b8 100644
--- a/src/views/hiddenDangerRegistration/hiddenDangerList.vue
+++ b/src/views/hiddenDangerRegistration/hiddenDangerList.vue
@@ -1,50 +1,39 @@
<template>
<div class="app-container">
- <div style="">
+ <div>
<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 label="隐患编号" prop="number">
+ <el-input v-model="ruleForm.number" :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 label="检查单位" prop="check_main_branch">
+ <el-input v-model="ruleForm.check_main_branch" :disabled="true"></el-input>
</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 label="检查人" prop="check_man">
+ <el-input v-model="ruleForm.check_man" :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 label="陪检人员" prop="acc_man">
+ <el-input v-model="ruleForm.acc_man" :disabled="true"></el-input>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="9">
- <el-form-item label="检查时间：" prop="name">
+ <el-form-item label="检查时间" prop="check_date">
<el-date-picker
- v-model="value1"
+ v-model="ruleForm.check_date"
type="date"
:disabled="true"
placeholder="选择日期"
@@ -53,115 +42,101 @@
</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 label="班次" prop="check_class">
+ <el-input v-model="ruleForm.check_class" :disabled="true"></el-input>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="9">
- <el-form-item label="跟班、带班情况：" prop="name">
+ <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-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 label="行走路线" prop="route">
+ <el-input type="textarea" v-model="ruleForm.route" 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 label="隐患单位" prop="ht_community">
+ <el-input v-model="ruleForm.ht_community" :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"></el-input>-->
- <el-select
- v-model="ruleForm.elementAName"
- :disabled="true"
- style="width: 100%"
- >
- </el-select>
+ <el-form-item label="隐患部门" prop="ht_branch">
+ <el-input v-model="ruleForm.ht_branch" :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 label="隐患地点" prop="address">
+ <el-input type="textarea" v-model="ruleForm.address" 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 label="隐患内容" prop="ht_content">
+ <el-input type="textarea" v-model="ruleForm.ht_content" 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 label="隐患类别" prop="ht_typesub">
+ <el-input v-model="ruleForm.ht_typesub" :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"></el-input>-->
- <el-select
- v-model="ruleForm.elementAName"
- :disabled="true"
- style="width: 100%"
- >
- </el-select>
+ <el-form-item label="隐患级别" prop="ht_level">
+ <el-input v-model="ruleForm.ht_level" :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 label="整改措施" prop="measure">
+ <el-input v-model="ruleForm.measure" :disabled="true"></el-input>
</el-form-item>
</el-col>
<el-col :span="9" :offset="4">
- <el-form-item label="所需资金：" prop="name">
+ <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-form-item label="限改时间" prop="alter_time">
+ <el-date-picker
+ v-model="ruleForm.alter_time"
+ 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="duty_officer">
+ <el-input v-model="ruleForm.duty_officer" :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"
@@ -173,14 +148,14 @@
</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 label="整改完成情况" prop="alter_status">
+ <el-input v-model="ruleForm.alter_status" :disabled="true"></el-input>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="9">
- <el-form-item label="完成时间：" prop="name">
+ <el-form-item label="复查时间" prop="name">
<!--<el-input v-model="ruleForm.name"></el-input>-->
<el-date-picker
v-model="value1"
@@ -192,79 +167,49 @@
</el-form-item>
</el-col>
<el-col :span="9" :offset="4">
- <el-form-item label="整改完成情况：" prop="name">
+ <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-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-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 label="危险源" prop="dangerousSource">
+ <el-input type="textarea" v-model="ruleForm.dangerousSource" 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 label="风险等级" prop="DTRisk_level">
+ <el-input v-model="ruleForm.DTRisk_level" :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-select
- v-model="ruleForm.elementAName"
- :disabled="true"
- style="width: 100%"
- >
- </el-select>
+ <el-form-item label="业务科室" prop="Review">
+ <el-input v-model="ruleForm.Review" :disabled="true"></el-input>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="22">
- <el-form-item label="流程信息：" prop="name">
+ <el-form-item label="流程信息" prop="name">
<!-- <el-input v-model="ruleForm.name" class="multiline" :disabled="true"></el-input>-->
<el-table
:data="tableData"
+ border
style="width: 100%">
<el-table-column
prop="date"
@@ -274,25 +219,25 @@
</el-table-column>
<el-table-column
prop="name"
- label="操作人："
+ label="操作人"
align="center"
- width="139">
+ width="138">
</el-table-column>
<el-table-column
prop="province"
- label="处理时间："
+ label="处理时间"
align="center"
width="200">
</el-table-column>
<el-table-column
prop="city"
- label="审批意见："
+ label="审批意见"
align="center"
width="260">
</el-table-column>
<el-table-column
prop="address"
- label="流程信息："
+ label="流程信息"
align="center"
width="170">
</el-table-column>
@@ -302,26 +247,33 @@
</el-row>
<el-row>
<el-col :span="22">
- <el-form-item label="发送流程：" prop="name">
+ <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-form-item label="下一步" prop="next">
+ <el-input v-model="ruleForm.next" 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
+ </el-row>-->
+ <!--<div
v-if="ruleForm.safetyInspectionItemResult == 0">
<el-row>
<el-col :span="9">
- <el-form-item label="复查时间：" prop="reviewTime">
+ <el-form-item label="复查时间" prop="reviewTime">
<el-date-picker
v-model="ruleForm.reviewTime"
type="date"
@@ -333,7 +285,7 @@
</el-row>
<el-row>
<el-col :span="9">
- <el-form-item label="复查人：" prop="rechecker">
+ <el-form-item label="复查人" prop="rechecker">
<el-input v-model="ruleForm.rechecker" clearable></el-input>
</el-form-item>
</el-col>
@@ -357,7 +309,7 @@
v-else="ruleForm.safetyInspectionItemResult == 1">
<el-row>
<el-col :span="9">
- <el-form-item label="复查时间：" prop="reviewTime">
+ <el-form-item label="复查时间" prop="reviewTime">
<el-date-picker
v-model="ruleForm.reviewTime"
type="date"
@@ -369,7 +321,7 @@
</el-row>
<el-row>
<el-col :span="9">
- <el-form-item label="复查人：" prop="rechecker">
+ <el-form-item label="复查人" prop="rechecker">
<el-input v-model="ruleForm.rechecker" clearable></el-input>
</el-form-item>
</el-col>
@@ -388,12 +340,20 @@
</el-form-item>
</el-col>
</el-row>
- </div>
+ </div>-->
+ <el-row>
+ <el-col :span="22">
+ <el-form-item label="备注" prop="dealContent">
+ <el-input class="textarea" type="textarea" v-model="ruleForm.dealContent"></el-input>
+ </el-form-item>
+ </el-col>
+ </el-row>
<el-row>
<el-col :span="22">
<el-form-item style="text-align: center;">
- <el-button class="btn" @click="submitForm('ruleForm')" type="primary">保存</el-button>
- <el-button class="btn" @click="close()" type="primary">关闭</el-button>
+ <el-button class="btn" size="small" @click="submitForm('ruleForm')" type="primary">保存</el-button>
+ <el-button size="small" @click="close()"
+ >删除</el-button>
</el-form-item>
</el-col>
</el-row>
@@ -406,64 +366,56 @@
<script>
import Titlename from "../../components/Titlename/index.vue";
-
+ import {getDangerInfo,next_step_do} from '@/api/sgyhpczl/hiddenDangerRegistration'
+ import {deepClone} from '@/utils'
export default {
components: {Titlename},
name: "hiddenDangerList",
data() {
return {
- ruleForm: {
- name: '',
- region: '',
- date1: '',
- date2: '',
- delivery: false,
- type: [],
- resource: '',
- value1: '',
- desc: '',
- rechecker:'',
- reviewTime:'',
- reviewResults:'',
- rechecker1:'',
- reviewTime1:'',
- reviewResults1:'',
- desc1:''
- },
+ id:'',
+ ruleForm: {},
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: '已发送众泰煤焦化安全环保部',
- }],
+ tableData: [],
fileList: [],
- // safetyInspectionItemResult:'0',
};
},
+ mounted(){
+ this.id = this.$route.query.id;
+ if( this.id!=null && this.id!=''){
+ this.initInfo();
+ }
+ },
methods: {
+ async initInfo(){
+ var res=await getDangerInfo(this.id)
+ if (res.data.ok==1){
+ this.ruleForm=res.data.data
+ this.ruleForm.next='发送到'+res.data.data.ht_community+res.data.data.ht_branch
+
+ }
+ },
submitForm(formName) {
this.$refs[formName].validate((valid) => {
if (valid) {
- alert('submit!');
+ var param={
+ id:this.id,
+ step: "1",
+ dealContent: this.ruleForm.dealContent
+ }
+ next_step_do(param).then(res=>{
+ if (res.data.ok==1){
+ this.$message({type:'success', message:"fas成功", duration:3000})
+ this.close()
+ }else {
+ this.$message({type:'error', message:res.data.msg, duration:3000})
+ }
+ })
} else {
console.log('error submit!!');
return false;
@@ -523,9 +475,9 @@
background-color: #034ea2;
border: 1px solid #034ea2;
}
- .el-button:hover {
- background: #66b1ff;
- border-color: #66b1ff;
- color: #FFF;
- }
+ /*.el-button:hover {*/
+ /* background: #66b1ff;*/
+ /* border-color: #66b1ff;*/
+ /* color: #FFF;*/
+ /*}*/
</style>
--
Gitblit v1.9.2