From 67df85b16e6a6fde0a026672a8a2924429b610cb Mon Sep 17 00:00:00 2001
From: cqf <2252655793@qq.com>
Date: 星期四, 12 五月 2022 18:00:34 +0800
Subject: [PATCH] 优化
---
src/views/delayHiddenDangerRectification/rectificationDelayHiddenDanger.vue | 379 +++++++++---------
src/views/hiddenDangerManagement/index.vue | 95 ++++
src/views/hiddenDangerReview/recheckCancellationNumber.vue | 35 +
src/views/delayHiddenDangerRectification/index.vue | 40 +
src/views/hiddenDangerRectification/index.vue | 31 +
src/views/hiddenDangerManagement/fillRectificationAdd.vue | 598 +++++++++++++++--------------
6 files changed, 691 insertions(+), 487 deletions(-)
diff --git a/src/views/delayHiddenDangerRectification/index.vue b/src/views/delayHiddenDangerRectification/index.vue
index ad983de..3e5491b 100644
--- a/src/views/delayHiddenDangerRectification/index.vue
+++ b/src/views/delayHiddenDangerRectification/index.vue
@@ -164,7 +164,12 @@
<el-table-column prop="check_man" label="检查人" align="center" width="120"></el-table-column>
<el-table-column prop="checktype" label="检查类别" align="center"></el-table-column>
<el-table-column label="隐患项目" align="center">
- <el-table-column prop="check_date" label="检查时间" width="120" align="center"></el-table-column>
+ <el-table-column prop="check_date" label="检查时间" width="120" align="center">
+ <template slot-scope="scope">
+ <label>{{ formatDate(scope.row.check_date)}}</label><br/>
+ <label>{{ scope.row.check_class}}</label>
+ </template>
+ </el-table-column>
<el-table-column prop="address" label="地点" align="center"></el-table-column>
<el-table-column prop="ht_content" label="内容" align="center"></el-table-column>
<el-table-column prop="ht_typesub" label="类别" align="center"></el-table-column>
@@ -174,13 +179,13 @@
<el-table-column prop="measure" label="整改措施" align="center"></el-table-column>
<el-table-column prop="ht_branch" label="隐患部门" align="center"></el-table-column>
<el-table-column prop="duty_officer" label="责任人" align="center"></el-table-column>
- <el-table-column prop="alter_time" label="限改时间" width="120" align="center"></el-table-column>
+ <el-table-column prop="alter_time" label="限改时间" :formatter="formatColumnDate" width="120" align="center"></el-table-column>
</el-table-column>
<el-table-column label="整改情况" align="center">
- <el-table-column prop="ACCOMPLISHTIME" label="完成时间" width="120" align="center"></el-table-column>
+ <el-table-column prop="ACCOMPLISHTIME" label="完成时间" :formatter="formatColumnDate" width="120" align="center"></el-table-column>
<el-table-column prop="CALLBACKRESULT" label="复查结果" align="center"></el-table-column>
<el-table-column prop="CALLBACKPERSON" label="复查人" align="center"></el-table-column>
- <el-table-column prop="CALLBACKTIME" label="复查时间" width="120" align="center"></el-table-column>
+ <el-table-column prop="CALLBACKTIME" label="复查时间" :formatter="formatColumnDate" width="120" align="center"></el-table-column>
</el-table-column>
<el-table-column label="隐患处理状态" align="center">
<template slot-scope="scope">
@@ -393,9 +398,10 @@
this.multipleSelection = val;
},
// 发送隐患单跳转
- handleClick() {
+ handleClick(row) {
this.$router.push({
- path: "/rectificationDelayHiddenDanger"
+ path: "/rectificationDelayHiddenDanger",
+ query:{"id":row.id}
})
},
sendBath() {
@@ -452,7 +458,27 @@
}).catch(err => {
console.log(err)
})
- }
+ },
+ //方法区
+ formatDate(data) {
+ // 获取单元格数据
+ if(data == null) {
+ return null
+ }
+ let dt = new Date(data)
+ return dt.getFullYear() + '-' + (dt.getMonth() + 1) + '-' + dt.getDate()
+ },
+
+ //方法区
+ formatColumnDate(row, column) {
+ // 获取单元格数据
+ let data = row[column.property]
+ if(data == null) {
+ return null
+ }
+ let dt = new Date(data)
+ return dt.getFullYear() + '-' + (dt.getMonth() + 1) + '-' + dt.getDate() + ' '
+ },
}
};
</script>
diff --git a/src/views/delayHiddenDangerRectification/rectificationDelayHiddenDanger.vue b/src/views/delayHiddenDangerRectification/rectificationDelayHiddenDanger.vue
index e735c09..9bf8a75 100644
--- a/src/views/delayHiddenDangerRectification/rectificationDelayHiddenDanger.vue
+++ b/src/views/delayHiddenDangerRectification/rectificationDelayHiddenDanger.vue
@@ -8,13 +8,13 @@
<el-row>
<el-col :span="9">
<el-form-item label="隐患编号" prop="name">
- <el-input v-model="ruleForm.name" :disabled="true"></el-input>
+ <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"
+ v-model="ruleForm.check_main_branch"
:disabled="true"
style="width: 100%"
>
@@ -25,7 +25,7 @@
<el-row>
<el-col :span="9">
<el-form-item label="检查人" prop="region">
- <el-input v-model="ruleForm.name" :disabled="true"></el-input>
+ <el-input v-model="ruleForm.check_man" :disabled="true"></el-input>
<!-- <el-select-->
<!-- v-model="ruleForm.elementAName"-->
<!-- :disabled="true"-->
@@ -36,7 +36,7 @@
</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-input v-model="ruleForm.acc_man" :disabled="true"></el-input>
</el-form-item>
</el-col>
</el-row>
@@ -44,7 +44,7 @@
<el-col :span="9">
<el-form-item label="检查时间" prop="name">
<el-date-picker
- v-model="value1"
+ v-model="ruleForm.check_date"
type="date"
:disabled="true"
placeholder="选择日期"
@@ -58,7 +58,7 @@
<!-- </el-form-item>-->
<el-form-item label="班次" prop="elementAName">
<el-select
- v-model="ruleForm.elementAName"
+ v-model="ruleForm.check_class"
:disabled="true"
style="width: 100%"
>
@@ -69,19 +69,20 @@
<el-row>
<el-col :span="9">
<el-form-item label="跟班、带班情况" prop="name">
- <el-input v-model="ruleForm.name" :disabled="true"></el-input>
+ <el-input v-model="ruleForm.class_situation" :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-input v-model="ruleForm.class_man" :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-input type="textarea" v-model="ruleForm.route" class="multiline"
+ :disabled="true"></el-input>
</el-form-item>
</el-col>
</el-row>
@@ -90,7 +91,7 @@
<el-form-item label="隐患单位" prop="name">
<!--<el-input v-model="ruleForm.name"></el-input>-->
<el-select
- v-model="ruleForm.elementAName"
+ v-model="ruleForm.ht_community"
:disabled="true"
style="width: 100%"
>
@@ -101,7 +102,7 @@
<el-form-item label="隐患部门" prop="name">
<!-- <el-input v-model="ruleForm.name"></el-input>-->
<el-select
- v-model="ruleForm.elementAName"
+ v-model="ruleForm.ht_branch"
:disabled="true"
style="width: 100%"
>
@@ -112,14 +113,16 @@
<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-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-input type="textarea" v-model="ruleForm.ht_content" class="multiline"
+ :disabled="true"></el-input>
</el-form-item>
</el-col>
</el-row>
@@ -128,7 +131,7 @@
<el-form-item label="隐患类别" prop="name">
<!--<el-input v-model="ruleForm.name"></el-input>-->
<el-select
- v-model="ruleForm.elementAName"
+ v-model="ruleForm.ht_typesub"
:disabled="true"
style="width: 100%"
>
@@ -139,7 +142,7 @@
<el-form-item label="隐患级别" prop="name">
<!--<el-input v-model="ruleForm.name"></el-input>-->
<el-select
- v-model="ruleForm.elementAName"
+ v-model="ruleForm.ht_level"
:disabled="true"
style="width: 100%"
>
@@ -150,7 +153,7 @@
<el-row>
<el-col :span="9">
<el-form-item label="整改措施" prop="name">
- <el-input v-model="ruleForm.name" :disabled="true"></el-input>
+ <el-input v-model="ruleForm.measure" :disabled="true"></el-input>
</el-form-item>
</el-col>
<el-col :span="9" :offset="4">
@@ -164,7 +167,7 @@
<el-form-item label="限改时间" prop="name">
<!--<el-input v-model="ruleForm.name"></el-input>-->
<el-date-picker
- v-model="value1"
+ v-model="ruleForm.alter_time"
type="date"
:disabled="true"
placeholder="选择日期"
@@ -174,7 +177,7 @@
</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-input v-model="ruleForm.duty_officer" :disabled="true"></el-input>
</el-form-item>
</el-col>
</el-row>
@@ -183,7 +186,7 @@
<el-form-item label="完成时间" prop="name">
<!--<el-input v-model="ruleForm.name"></el-input>-->
<el-date-picker
- v-model="value1"
+ v-model="ruleForm.ACCOMPLISHTIME"
type="date"
:disabled="true"
placeholder="选择日期"
@@ -202,7 +205,7 @@
<el-form-item label="复查时间" prop="name">
<!--<el-input v-model="ruleForm.name"></el-input>-->
<el-date-picker
- v-model="value1"
+ v-model="ruleForm.CALLBACKTIME"
type="date"
:disabled="true"
placeholder="选择日期"
@@ -212,26 +215,27 @@
</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-input v-model="ruleForm.CALLBACKPERSON" :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-input v-model="ruleForm.CALLBACKRESULT" :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-input v-model="ruleForm.amendnum" :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-input type="textarea" v-model="ruleForm.dangerousSource" class="multiline"
+ :disabled="true"></el-input>
</el-form-item>
</el-col>
</el-row>
@@ -240,7 +244,7 @@
<el-form-item label="风险等级" prop="name">
<!-- <el-input v-model="ruleForm.name" :disabled="true"></el-input>-->
<el-select
- v-model="ruleForm.elementAName"
+ v-model="ruleForm.DTRisk_level"
:disabled="true"
style="width: 100%"
>
@@ -251,7 +255,7 @@
<el-form-item label="业务科室" prop="name">
<!-- <el-input v-model="ruleForm.name" :disabled="true"></el-input>-->
<el-select
- v-model="ruleForm.elementAName"
+ v-model="ruleForm.Review"
:disabled="true"
style="width: 100%"
>
@@ -274,13 +278,13 @@
width="60">
</el-table-column>
<el-table-column
- prop="name"
+ prop="realname"
label="操作人"
align="center"
width="138">
</el-table-column>
<el-table-column
- prop="province"
+ prop="create_time"
label="处理时间"
align="center"
width="200">
@@ -290,9 +294,16 @@
label="审批意见"
align="center"
width="260">
+ <template slot-scope="scope">
+ <span size="medium">{{ scope.row.content }}</span>
+ <a v-for="item in scope.row.realFileName"
+ :href="scope.row.url+'/'+item">
+ {{ item.split("fileName=")[1] }}
+ </a>
+ </template>
</el-table-column>
<el-table-column
- prop="address"
+ prop="ispass"
label="流程信息"
align="center"
width="170">
@@ -301,19 +312,29 @@
</el-form-item>
</el-col>
</el-row>
+ </el-form>
+ <el-form :model="sendData" :rules="rules" ref="sendData" label-width="150px" class="demo-ruleForm"
+ style="margin: 0 14% 0 16%;">
+ >
<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-form-item label="下一步" prop="name">
+ 发送到{{ ruleForm.check_main_branch + ruleForm.ht_branch }}
+ </el-form-item>
+ </el-col>
+ </el-row>
+ <el-row>
+ <el-col :span="22">
+ <el-form-item label="是否同意延期：" prop="name">
+ <el-radio-group v-model="sendData.ispass">
+ <el-radio :label="0">同意延期</el-radio>
+ <el-radio :label="1">不同意</el-radio>
</el-radio-group>
</el-form-item>
</el-col>
@@ -322,9 +343,9 @@
v-if="ruleForm.safetyInspectionItemResult == 0">
<el-row>
<el-col :span="9">
- <el-form-item label="复查时间" prop="reviewTime">
+ <el-form-item label="限改时间" prop="alter_time">
<el-date-picker
- v-model="ruleForm.reviewTime"
+ v-model="sendData.alter_time"
type="date"
placeholder="选择日期"
style="width: 100%">
@@ -332,24 +353,12 @@
</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-row>
+ <el-row></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-input class="textarea" type="textarea" v-model="sendData.dealContent"></el-input>
</el-form-item>
</el-col>
</el-row>
@@ -358,9 +367,9 @@
v-else="ruleForm.safetyInspectionItemResult == 1">
<el-row>
<el-col :span="9">
- <el-form-item label="复查时间" prop="reviewTime">
+ <el-form-item label="限改时间" prop="alter_time">
<el-date-picker
- v-model="ruleForm.reviewTime"
+ v-model="sendData.alter_time"
type="date"
placeholder="选择日期"
style="width: 100%">
@@ -369,23 +378,9 @@
</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-input class="textarea" type="textarea" v-model="sendData.dealContent"></el-input>
</el-form-item>
</el-col>
</el-row>
@@ -393,7 +388,8 @@
<el-row>
<el-col :span="22">
<el-form-item style="text-align: center;">
- <el-button class="btn" size="small" type="primary" @click="submitForm('ruleForm')">保存</el-button>
+ <el-button class="btn" size="small" type="primary" @click="submitForm('ruleForm')">保存
+ </el-button>
<el-button size="small" @click="close()">关闭</el-button>
</el-form-item>
</el-col>
@@ -406,127 +402,150 @@
</template>
<script>
- import Titlename from "../../components/Titlename/index.vue";
+import Titlename from "../../components/Titlename/index.vue";
+import {sendDangerNext, getDangerDetails, getWfRecordList} from "@/api/sgyhpczl/recheckCancellationNumber";
- export default {
- 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',
- };
+export default {
+ 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: {
+ alter_time: {required: true, message: '请填写复查时间', trigger: 'blur'},
+ },
+ sendData: {
+ id:"",
+ step:"1",
+ ispass:"同意延期",
+ alter_time:"",
+ dealContent:"",
+
+ },
+ tableData: [],
+ fileList: [],
+ // safetyInspectionItemResult:'0',
+ };
+ },
+ mounted() {
+ this.getDangerDetails();
+ this.getWfRecordList()
+ },
+ methods: {
+ getDangerDetails() {
+ getDangerDetails(this.$route.query.id).then(res => {
+ var data = res.data;
+ if (data.ok) {
+ this.ruleForm = data.data;
+ this.sendData.id = this.ruleForm.id;
+ this.sendData.alter_time = this.ruleForm.alter_time;
+
+ this.ruleForm.url = process.env.BASE_API;
+ this.ruleForm.callback_branch = data.data.check_main_branch
+ //this.ruleForm.ispass=0
+ this.sendDataForm.id = this.ruleForm.id
+ } else {
+ this.$message({type: 'error', message: "数据查询失败，请重试！", duration: 3000})
+ }
+ })
},
- 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的图片！'
- });
+ getWfRecordList() {
+ getWfRecordList(this.$route.query.id).then(res => {
+ var data = res.data;
+ if (data.ok) {
+ this.tableData = data.data;
+ } else {
+ this.$message({type: 'error', message: "数据查询失败，请重试！", duration: 3000})
+ }
+ })
+ },
+ submitForm(formName) {
+ this.$refs[formName].validate((valid) => {
+ if (valid) {
+ alert('submit!');
+ } else {
+ console.log('error submit!!');
return false;
}
- },
- close(){
- this.$router.push({
- path:"/delayHiddenDangerRectification"
- })
+ });
+ },
+ 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;
- }
+.app-container {
+ padding: 20px;
+ height: 850px;
+ overflow-y: auto;
+}
- /deep/ .box {
- padding-top: 0;
- }
+/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
- }
- .btn{
- background-color: #034ea2;
- border: 1px solid #034ea2;
- }
- /*.el-button:hover {*/
- /* background: #66b1ff;*/
- /* border-color: #66b1ff;*/
- /* color: #FFF;*/
- /*}*/
+/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
+}
+
+.btn {
+ background-color: #034ea2;
+ border: 1px solid #034ea2;
+}
+
+/*.el-button:hover {*/
+/* background: #66b1ff;*/
+/* border-color: #66b1ff;*/
+/* color: #FFF;*/
+/*}*/
</style>
diff --git a/src/views/hiddenDangerManagement/fillRectificationAdd.vue b/src/views/hiddenDangerManagement/fillRectificationAdd.vue
index a099da3..c4fe786 100644
--- a/src/views/hiddenDangerManagement/fillRectificationAdd.vue
+++ b/src/views/hiddenDangerManagement/fillRectificationAdd.vue
@@ -26,7 +26,7 @@
</el-col>
<el-col :span="9" :offset="4">
<el-form-item label="班次" prop="check_class">
- <el-select v-model="ruleForm.check_class" placeholder="请选择" style="width: 100%">
+ <el-select v-model="ruleForm.check_class" placeholder="请选择" style="width: 100%">
<el-option
v-for="item in BCList"
:key="item.value"
@@ -96,35 +96,35 @@
</el-row>
- <!-- <el-row>
- <el-col :span="22">
- <el-form-item label="行走路线">
- <el-input v-model="ruleForm.route" rows="3" type="textarea" class="multiline"></el-input>
- </el-form-item>
- </el-col>
- </el-row>-->
+ <!-- <el-row>
+ <el-col :span="22">
+ <el-form-item label="行走路线">
+ <el-input v-model="ruleForm.route" rows="3" type="textarea" class="multiline"></el-input>
+ </el-form-item>
+ </el-col>
+ </el-row>-->
<el-row style="margin-bottom: 20px">
<el-col :span="9">
- <el-button type="primary" class="btns" @click="addDanger">新增隐患</el-button>
+ <el-button type="primary" class="btns" v-show="!update" @click="addDanger">新增隐患</el-button>
</el-col>
</el-row>
<el-row>
<el-table :data="tableData" style="width: 100%">
<el-table-column type="index" width="55" align="center" label="序号"></el-table-column>
- <el-table-column prop="ht_branch" align="center" label="隐患部门"></el-table-column>
- <el-table-column prop="address" align="center" label="地点"></el-table-column>
- <el-table-column prop="ht_content" align="center" label="隐患内容"></el-table-column>
- <el-table-column prop="measure" align="center" label="整改措施"></el-table-column>
- <el-table-column prop="ht_typesub" align="center" label="隐患类别"></el-table-column>
- <el-table-column prop="dangerousSource" align="center" label="关联危险源"></el-table-column>
- <el-table-column prop="DTRisk_level" align="center" label="风险等级"></el-table-column>
- <el-table-column prop="ht_level" align="center" label="隐患级别"></el-table-column>
- <el-table-column prop="alter_time" align="center" label="限改时间"></el-table-column>
- <el-table-column prop="duty_officer" align="center" label="责任人"></el-table-column>
- <el-table-column prop="alter_status" align="center" label="整改情况"></el-table-column>
- <el-table-column prop="Review" align="center" label="业务科室"></el-table-column>
+ <el-table-column prop="ht_branch" align="center" label="隐患部门"></el-table-column>
+ <el-table-column prop="address" align="center" label="地点"></el-table-column>
+ <el-table-column prop="ht_content" align="center" label="隐患内容"></el-table-column>
+ <el-table-column prop="measure" align="center" label="整改措施"></el-table-column>
+ <el-table-column prop="ht_typesub" align="center" label="隐患类别"></el-table-column>
+ <el-table-column prop="dangerousSource" align="center" label="关联危险源"></el-table-column>
+ <el-table-column prop="DTRisk_level" align="center" label="风险等级"></el-table-column>
+ <el-table-column prop="ht_level" align="center" label="隐患级别"></el-table-column>
+ <el-table-column prop="alter_time" align="center" label="限改时间"></el-table-column>
+ <el-table-column prop="duty_officer" align="center" label="责任人"></el-table-column>
+ <el-table-column prop="alter_status" align="center" label="整改情况"></el-table-column>
+ <el-table-column prop="Review" align="center" label="业务科室"></el-table-column>
<el-table-column prop="time" label="操作" align="center" width="140">
<template slot-scope="scope">
<div style="display: flex;align-items: center;flex-direction: row;">
@@ -134,6 +134,7 @@
>编辑
</el-button>
<el-button
+ v-if="!update"
size="mini"
@click="deleteDanger(scope.row, scope.$index)"
>删除
@@ -149,7 +150,8 @@
<el-col :span="22">
<el-form-item style="text-align: center">
<el-button type="primary" class="btns" @click="submitForm('ruleForm')"
- >保存</el-button
+ >保存
+ </el-button
>
<el-button @click="close()">关闭</el-button>
</el-form-item>
@@ -180,7 +182,8 @@
</el-col>
<el-col :span="9" :offset="4">
<el-form-item label="地点" prop="address">
- <el-input v-model="dangerForm.address" rows="3" type="textarea" class="multiline"></el-input>
+ <el-input v-model="dangerForm.address" rows="3" type="textarea"
+ class="multiline"></el-input>
</el-form-item>
</el-col>
</el-row>
@@ -188,12 +191,14 @@
<el-row>
<el-col :span="9">
<el-form-item label="隐患内容" prop="ht_content">
- <el-input v-model="dangerForm.ht_content" rows="3" type="textarea" class="multiline"></el-input>
+ <el-input v-model="dangerForm.ht_content" rows="3" type="textarea"
+ class="multiline"></el-input>
</el-form-item>
</el-col>
<el-col :span="9" :offset="4">
<el-form-item label="整改措施" prop="measure">
- <el-input v-model="dangerForm.measure" rows="3" type="textarea" class="multiline"></el-input>
+ <el-input v-model="dangerForm.measure" rows="3" type="textarea"
+ class="multiline"></el-input>
</el-form-item>
</el-col>
</el-row>
@@ -212,7 +217,8 @@
</el-col>
<el-col :span="9" :offset="4">
<el-form-item label="关联危险源" prop="DTRisk_bankId">
- <el-select v-model="dangerForm.DTRisk_bankId" placeholder="请选择" @change="changeWxy" filterable>
+ <el-select v-model="dangerForm.DTRisk_bankId" placeholder="请选择" @change="changeWxy"
+ filterable>
<el-option
v-for="item in dangerList"
:key="item.id"
@@ -306,7 +312,8 @@
<el-col :span="22">
<el-form-item style="text-align: center">
<el-button type="primary" class="btns" @click="submitDanger('form')"
- >保存</el-button
+ >保存
+ </el-button
>
<el-button @click="dialogVisible=false">关闭</el-button>
</el-form-item>
@@ -319,256 +326,284 @@
</template>
<script>
- import Titlename from "../../components/Titlename/index.vue";
+import Titlename from "../../components/Titlename/index.vue";
- import {initJCBM ,initYHLX, initBC ,initJCLB ,initYHBM ,initYHJB,initLlr,initReformStatus,initYwks,initWxy} from "@/api/sgyhpczl/initSelect";
- import {initDangerRebound} from '@/api/sgyhpczl/hiddenDangerRegistration'
- import {saveSelfDanger} from '@/api/sgyhpczl/hiddenDangerManagement'
- import {deepClone} from '@/utils'
+import {
+ initJCBM,
+ initYHLX,
+ initBC,
+ initJCLB,
+ initYHBM,
+ initYHJB,
+ initLlr,
+ initReformStatus,
+ initYwks,
+ initWxy
+} from "@/api/sgyhpczl/initSelect";
+import {initDangerRebound} from '@/api/sgyhpczl/hiddenDangerRegistration'
+import {getDangerDetails} from "@/api/sgyhpczl/recheckCancellationNumber";
- export default {
- components: { Titlename },
- name: "hiddenDangerList",
- data() {
- return {
- rowIndex:-1,
- dangerList:[],
- dangerForm:{},
- dangerRules:{
- ht_branch: [{ required: true, message: '不能为空', trigger: 'blur' },],
- address: [{ required: true, message: '不能为空', trigger: 'blur' },],
- ht_content: [{ required: true, message: '不能为空', trigger: 'blur' },],
- ht_typesub: [{ required: true, message: '不能为空', trigger: 'blur' },],
- DTRisk_bankId: [{ required: true, message: '不能为空', trigger: 'blur' },],
- ht_level: [{ required: true, message: '不能为空', trigger: 'blur' },],
- alter_time: [{ required: true, message: '不能为空', trigger: 'blur' },],
- alter_status: [{ required: true, message: '不能为空', trigger: 'blur' },],
- Review: [{ required: true, message: '不能为空', trigger: 'blur' },],
- duty_officer:[{ required: true, message: '不能为空', trigger: 'blur' },]
- },
- title:'新增',
- dialogVisible:false,
- BCList:[],
- JCLBList:[],
- JCDWList:[{label:"众泰煤焦化",value:0},{label:"上级单位",value:1}],
- YHBMList:[],
- YHLXList:[],
- YHJBList:[],
- JCBMList:[],
- llrList:[],
- statusList:[],
- YWKSList:[],
- reboundList:[],
- ruleForm: {},
- rules: {
- check_date: [{ required: true, message: '不能为空', trigger: 'blur' },],
- check_class: [{ required: true, message: '不能为空', trigger: 'blur' },],
- check_main_branch: [{ required: true, message: '不能为空', trigger: 'blur' },],
- check_branch: [{ required: true, message: '不能为空', trigger: 'blur' },],
- check_man: [{ required: true, message: '不能为空', trigger: 'blur' },],
- checktype: [{ required: true, message: '不能为空', trigger: 'blur' },],
- },
- tableData: [],
- };
- },
- mounted(){
- this.initBC()
- //this.initJCLB()
- this.initYHJB()
- this.initYHLX()
- //this.initLlr()
- this.initReformStatus()
- this.initYHBM()
- this.initYWKS()
- this.initWXY()
- //this.initDangerRebound()
- },
- methods: {
- initDangerRebound(){
- initDangerRebound().then(res=>{
- if (res.data.ok==1){
- this.reboundList=res.data.data
- } else{
- this.$message({type:'error', message:res.data.msg, duration:3000})
- }
- })
+import {saveSelfDanger} from '@/api/sgyhpczl/hiddenDangerManagement'
+import {deepClone} from '@/utils'
+
+export default {
+ components: {Titlename},
+ name: "hiddenDangerList",
+ data() {
+ return {
+ rowIndex: -1,
+ dangerList: [],
+ dangerForm: {},
+ dangerRules: {
+ ht_branch: [{required: true, message: '不能为空', trigger: 'blur'},],
+ address: [{required: true, message: '不能为空', trigger: 'blur'},],
+ ht_content: [{required: true, message: '不能为空', trigger: 'blur'},],
+ ht_typesub: [{required: true, message: '不能为空', trigger: 'blur'},],
+ DTRisk_bankId: [{required: true, message: '不能为空', trigger: 'blur'},],
+ ht_level: [{required: true, message: '不能为空', trigger: 'blur'},],
+ alter_time: [{required: true, message: '不能为空', trigger: 'blur'},],
+ alter_status: [{required: true, message: '不能为空', trigger: 'blur'},],
+ Review: [{required: true, message: '不能为空', trigger: 'blur'},],
+ duty_officer: [{required: true, message: '不能为空', trigger: 'blur'},]
},
- submitDanger(formName){
- this.$refs[formName].validate((valid) => {
- if (valid) {
- if(this.title=='新增'){
- this.tableData.push(this.dangerForm)
- }else {
- var arr = this.tableData;
- arr.splice(this.rowIndex, 1, this.dangerForm);
- this.tableData = arr;
- }
- this.dialogVisible=false
+ title: '新增',
+ dialogVisible: false,
+ BCList: [],
+ JCLBList: [],
+ JCDWList: [{label: "众泰煤焦化", value: 0}, {label: "上级单位", value: 1}],
+ YHBMList: [],
+ YHLXList: [],
+ YHJBList: [],
+ JCBMList: [],
+ llrList: [],
+ statusList: [],
+ YWKSList: [],
+ update: false,
+ reboundList: [],
+ ruleForm: {},
+ rules: {
+ check_date: [{required: true, message: '不能为空', trigger: 'blur'},],
+ check_class: [{required: true, message: '不能为空', trigger: 'blur'},],
+ check_main_branch: [{required: true, message: '不能为空', trigger: 'blur'},],
+ check_branch: [{required: true, message: '不能为空', trigger: 'blur'},],
+ check_man: [{required: true, message: '不能为空', trigger: 'blur'},],
+ checktype: [{required: true, message: '不能为空', trigger: 'blur'},],
+ },
+ tableData: [],
+ };
+ },
+ mounted() {
+ if (this.$route.query != null) {
+ console.log(11111)
+ getDangerDetails(this.$route.query.id).then(res => {
+ console.log(res)
+ if (res.data.ok) {
+ this.tableData.push(res.data.data);
+ this.ruleForm.check_date = res.data.data.check_date
+ this.ruleForm.check_class = res.data.data.check_class
+ this.ruleForm.check_man = res.data.data.check_man
+ this.update = true;
+ }
+ })
+ }
+ this.initBC()
+ //this.initJCLB()
+ this.initYHJB()
+ this.initYHLX()
+ //this.initLlr()
+ this.initReformStatus()
+ this.initYHBM()
+ this.initYWKS()
+ this.initWXY()
+ //this.initDangerRebound()
+ },
+ methods: {
+ initDangerRebound() {
+ initDangerRebound().then(res => {
+ if (res.data.ok == 1) {
+ this.reboundList = res.data.data
+ } else {
+ this.$message({type: 'error', message: res.data.msg, duration: 3000})
+ }
+ })
+ },
+ submitDanger(formName) {
+ this.$refs[formName].validate((valid) => {
+ if (valid) {
+ if (this.title == '新增') {
+ this.tableData.push(this.dangerForm)
} else {
- console.log("error submit!!");
- return false;
+ var arr = this.tableData;
+ arr.splice(this.rowIndex, 1, this.dangerForm);
+ this.tableData = arr;
}
- });
- },
- deleteDanger(row, index) {
+ this.dialogVisible = false
+
+ } else {
+ console.log("error submit!!");
+ return false;
+ }
+ });
+ },
+ deleteDanger(row, index) {
- this.$confirm('确认删除吗', '提示', {
- confirmButtonText: '确认',
- cancelButtonText: '取消',
- type: 'warning'
- })
- .then(() => {
- var arr = deepClone(this.tableData);
- var brr = [];
- for (var i = 0; i < arr.length; i++) {
- if (i == index) {
- } else {
- brr.push(arr[i]);
- }
+ this.$confirm('确认删除吗', '提示', {
+ confirmButtonText: '确认',
+ cancelButtonText: '取消',
+ type: 'warning'
+ })
+ .then(() => {
+ var arr = deepClone(this.tableData);
+ var brr = [];
+ for (var i = 0; i < arr.length; i++) {
+ if (i == index) {
+ } else {
+ brr.push(arr[i]);
}
- this.tableData = deepClone(brr);
- //this.tableData.splice(index)
-
- })
- .catch(error => {
- });
-
-
- },
- editDanger(row, index) {
- this.dangerForm = deepClone(row);
- this.rowIndex = index;
- this.dialogVisible = true;
- this.title = '编辑';
- },
-
- addDanger(){
- this.dangerForm={}
- this.title="新增"
- this.dialogVisible=true
- },
- changeWxy(e){
- for(var i=0;i<this.dangerList.length;i++){
- if(e==this.dangerList[i].id){
- this.dangerForm.DTRisk_level=this.dangerList[i].mriskLevel
- this.dangerForm.dangerousSource=this.dangerList[i].mriskPoint
}
+ this.tableData = deepClone(brr);
+ //this.tableData.splice(index)
+
+ })
+ .catch(error => {
+ });
+
+
+ },
+ editDanger(row, index) {
+ this.dangerForm = deepClone(row);
+ this.rowIndex = index;
+ this.dialogVisible = true;
+ this.title = '编辑';
+ },
+
+ addDanger() {
+ this.dangerForm = {}
+ this.title = "新增"
+ this.dialogVisible = true
+ },
+ changeWxy(e) {
+ for (var i = 0; i < this.dangerList.length; i++) {
+ if (e == this.dangerList[i].id) {
+ this.dangerForm.DTRisk_level = this.dangerList[i].mriskLevel
+ this.dangerForm.dangerousSource = this.dangerList[i].mriskPoint
}
- },
- initWXY(){
- var param={
- page: 1,
- limit: 1000
+ }
+ },
+ initWXY() {
+ var param = {
+ page: 1,
+ limit: 1000
+ }
+ initWxy(param).then(res => {
+ if (res.data.ok == 1) {
+ this.dangerList = res.data.data.items
+ } else {
+ this.$message({type: 'error', message: res.data.msg, duration: 3000})
}
- initWxy(param).then(res=>{
- if (res.data.ok==1){
- this.dangerList=res.data.data.items
- } else{
- this.$message({type:'error', message:res.data.msg, duration:3000})
- }
- })
- },
- initYWKS(){
- initYwks().then(res=>{
- if (res.data.ok==1){
- this.YWKSList=res.data.data
- } else{
- this.$message({type:'error', message:res.data.msg, duration:3000})
- }
- })
- },
- initYHBM(){
- initYHBM().then(res=>{
- if (res.data.ok==1){
- this.YHBMList=res.data.data
- } else{
- this.$message({type:'error', message:res.data.msg, duration:3000})
- }
- })
- },
- initLlr(){
- initLlr().then(res=>{
- if (res.data.ok==1){
- this.llrList=res.data.data
- } else{
- this.$message({type:'error', message:res.data.msg, duration:3000})
- }
- })
- },
- initReformStatus(){
- initReformStatus().then(res=>{
- if (res.data.ok==1){
- this.statusList=res.data.data
- } else{
- this.$message({type:'error', message:res.data.msg, duration:3000})
- }
- })
- },
- changeJCDW(val){
- initJCBM(val).then(res=>{
- if (res.data.ok==1){
- this.JCBMList=res.data.data
- } else{
- this.$message({type:'error', message:res.data.msg, duration:3000})
- }
- })
- },
- initYHLX(){
- initYHLX().then(res=>{
- if (res.data.ok==1){
- this.YHLXList=res.data.data
- } else{
- this.$message({type:'error', message:res.data.msg, duration:3000})
- }
- })
- },
- initYHJB(){
- initYHJB().then(res=>{
- if (res.data.ok==1){
- this.YHJBList=res.data.data
- } else{
- this.$message({type:'error', message:res.data.msg, duration:3000})
- }
- })
- },
- initBC(){
- initBC().then(res=>{
- if (res.data.ok==1){
- this.BCList=res.data.data
- } else{
- this.$message({type:'error', message:res.data.msg, duration:3000})
- }
- })
- },
- initJCLB(){
- initJCLB().then(res=>{
- if (res.data.ok==1){
- this.JCLBList=res.data.data
- } else{
- this.$message({type:'error', message:res.data.msg, duration:3000})
- }
- })
- },
+ })
+ },
+ initYWKS() {
+ initYwks().then(res => {
+ if (res.data.ok == 1) {
+ this.YWKSList = res.data.data
+ } else {
+ this.$message({type: 'error', message: res.data.msg, duration: 3000})
+ }
+ })
+ },
+ initYHBM() {
+ initYHBM().then(res => {
+ if (res.data.ok == 1) {
+ this.YHBMList = res.data.data
+ } else {
+ this.$message({type: 'error', message: res.data.msg, duration: 3000})
+ }
+ })
+ },
+ initLlr() {
+ initLlr().then(res => {
+ if (res.data.ok == 1) {
+ this.llrList = res.data.data
+ } else {
+ this.$message({type: 'error', message: res.data.msg, duration: 3000})
+ }
+ })
+ },
+ initReformStatus() {
+ initReformStatus().then(res => {
+ if (res.data.ok == 1) {
+ this.statusList = res.data.data
+ } else {
+ this.$message({type: 'error', message: res.data.msg, duration: 3000})
+ }
+ })
+ },
+ changeJCDW(val) {
+ initJCBM(val).then(res => {
+ if (res.data.ok == 1) {
+ this.JCBMList = res.data.data
+ } else {
+ this.$message({type: 'error', message: res.data.msg, duration: 3000})
+ }
+ })
+ },
+ initYHLX() {
+ initYHLX().then(res => {
+ if (res.data.ok == 1) {
+ this.YHLXList = res.data.data
+ } else {
+ this.$message({type: 'error', message: res.data.msg, duration: 3000})
+ }
+ })
+ },
+ initYHJB() {
+ initYHJB().then(res => {
+ if (res.data.ok == 1) {
+ this.YHJBList = res.data.data
+ } else {
+ this.$message({type: 'error', message: res.data.msg, duration: 3000})
+ }
+ })
+ },
+ initBC() {
+ initBC().then(res => {
+ if (res.data.ok == 1) {
+ this.BCList = res.data.data
+ } else {
+ this.$message({type: 'error', message: res.data.msg, duration: 3000})
+ }
+ })
+ },
+ initJCLB() {
+ initJCLB().then(res => {
+ if (res.data.ok == 1) {
+ this.JCLBList = res.data.data
+ } else {
+ this.$message({type: 'error', message: res.data.msg, duration: 3000})
+ }
+ })
+ },
-
- submitForm(formName) {
+ submitForm(formName) {
+ if (!this.update) {
this.$refs[formName].validate((valid) => {
if (valid) {
- if(this.tableData==null || this.tableData.length==0){
- this.$message({type:'error', message:"请添加隐患", duration:2000})
+ if (this.tableData == null || this.tableData.length == 0) {
+ this.$message({type: 'error', message: "请添加隐患", duration: 2000})
}
- this.ruleForm.items=this.tableData
- saveSelfDanger(this.ruleForm).then(res=>{
- if (res.data.ok==1){
- this.$message({type:'success', message:"新增成功", duration:3000})
+ this.ruleForm.items = this.tableData
+ saveSelfDanger(this.ruleForm).then(res => {
+ if (res.data.ok == 1) {
+ this.$message({type: 'success', message: "新增成功", duration: 3000})
this.$router.push({
- path:"/hiddenDangerManagement"
+ path: "/hiddenDangerManagement"
})
- }else {
- this.$message({type:'error', message:res.data.msg, duration:3000})
+ } else {
+ this.$message({type: 'error', message: res.data.msg, duration: 3000})
}
})
@@ -577,32 +612,35 @@
return false;
}
});
- },
- close(){
- this.$router.push({
- path:"/hiddenDangerManagement"
- })
- },
+ } else {
+ console.log(this.tableData)
+ }
},
- };
+ close() {
+ this.$router.push({
+ path: "/hiddenDangerManagement"
+ })
+ },
+ },
+};
</script>
<style scoped>
- .app-container {
- padding: 20px;
- height: 850px;
- overflow-y: auto;
- }
+.app-container {
+ padding: 20px;
+ height: 850px;
+ overflow-y: auto;
+}
- .app-container /deep/ .box {
- padding-top: 0;
- }
+.app-container /deep/ .box {
+ padding-top: 0;
+}
- /* /deep/ .multiline .el-input__inner {
- height: 62px;
- } */
- .btns{
- background-color: #034ea2;
- border: 1px solid #034ea2;
- }
+/* /deep/ .multiline .el-input__inner {
+ height: 62px;
+} */
+.btns {
+ background-color: #034ea2;
+ border: 1px solid #034ea2;
+}
</style>
diff --git a/src/views/hiddenDangerManagement/index.vue b/src/views/hiddenDangerManagement/index.vue
index 7f2d1ca..3146c82 100644
--- a/src/views/hiddenDangerManagement/index.vue
+++ b/src/views/hiddenDangerManagement/index.vue
@@ -187,30 +187,59 @@
<el-table-column prop="ht_branch" label="隐患单位" align="center" width="120"></el-table-column>
<el-table-column prop="check_man" label="检查人" align="center" width="120"></el-table-column>
<el-table-column label="隐患项目" align="center">
- <el-table-column prop="check_date" label="检查时间" width="120" align="center"></el-table-column>
+ <el-table-column prop="check_date" label="检查时间" width="120" align="center">
+ <template slot-scope="scope">
+ <label>{{ formatDate(scope.row.check_date) }}</label><br/>
+ <label>{{ scope.row.check_class }}</label>
+ </template>
+ </el-table-column>
<el-table-column prop="address" label="地点" align="center"></el-table-column>
- <el-table-column prop="ht_content" label="内容" align="center"></el-table-column>
- <el-table-column prop="ht_typesub" label="类别" align="center"></el-table-column>
- <el-table-column prop="ht_level" label="级别" align="center"></el-table-column>
+ <el-table-column prop="ht_content" label="内容" width="150" align="center">
+ <template slot-scope="scope">
+ <el-popover trigger="hover" placement="top">
+ <p>{{ scope.row.ht_content }}</p>
+ <div slot="reference" class="name-wrapper">{{
+ scope.row.ht_content != null && scope.row.ht_content.length > 10 ? scope.row.ht_content.substring(0, 8) + "...." : scope.row.ht_content
+ }}
+ </div>
+ </el-popover>
+ </template>
+ </el-table-column>
+ <el-table-column prop="ht_typesub" label="类别" align="center"></el-table-column>
+ <el-table-column prop="ht_level" label="级别" width="100" align="center"></el-table-column>
</el-table-column>
<el-table-column label="整改计划" align="center">
- <el-table-column prop="measure" label="整改措施" align="center"></el-table-column>
+ <el-table-column prop="measure" label="整改措施" width="150" align="center"></el-table-column>
<!-- <el-table-column label="隐患部门" align="center"> </el-table-column> -->
<el-table-column prop="duty_officer" label="责任人" align="center"></el-table-column>
- <el-table-column prop="alter_time" label="限改时间" width="120" align="center"></el-table-column>
+ <el-table-column prop="alter_time" label="限改时间" :formatter="formatColumnDate" width="120"
+ align="center">
+ <template slot-scope="scope">
+ <div v-if="new Date(scope.row.alter_time).getTime()>new Date().getTime()" slot="reference" class="name-wrapper">{{
+ formatDate(scope.row.alter_time)
+ }}
+ </div>
+ <div style="background-color: orange;height: 50px;line-height: 50px" v-if="new Date(scope.row.alter_time).getTime()<new Date().getTime()" slot="reference" class="name-wrapper">{{
+ formatDate(scope.row.alter_time)
+ }}
+ </div>
+ </template>
+ </el-table-column>
<!-- <el-table-column label="级别" align="center"> </el-table-column> -->
</el-table-column>
<el-table-column label="整改情况" align="center">
- <el-table-column prop="ACCOMPLISHTIME" label="完成时间" width="120" align="center"></el-table-column>
+ <el-table-column prop="ACCOMPLISHTIME" label="完成时间" :formatter="formatColumnDate" width="120"
+ align="center"></el-table-column>
<!-- <el-table-column label="复查结果" align="center"> </el-table-column> -->
<el-table-column prop="CALLBACKPERSON" label="复查人" align="center"></el-table-column>
- <el-table-column prop="CALLBACKTIME" label="复查时间" width="120" align="center"></el-table-column>
+ <el-table-column prop="CALLBACKTIME" label="复查时间" :formatter="formatColumnDate" width="120"
+ align="center"></el-table-column>
</el-table-column>
<!-- <el-table-column label="隐患处理状态" align="center"> </el-table-column> -->
- <el-table-column prop="DTRisk_bankId" label="是否关联" align="center">
+ <el-table-column prop="DTRisk_bankId" label="是否关联" align="center" >
<template slot-scope="scope">
<span
- v-if="scope.row.DTRisk_bankId==0 || scope.row.DTRisk_bankId=='' || scope.row.DTRisk_bankId==null">未关联</span>
+ v-if="scope.row.DTRisk_bankId==0 || scope.row.DTRisk_bankId=='' || scope.row.DTRisk_bankId==null" style="color: red">未关联</span>
<span v-else>已关联</span>
</template>
</el-table-column>
@@ -221,7 +250,7 @@
<el-table-column label="基本操作" align="center">
<template slot-scope="scope">
<el-button @click="handleClick(scope.row)" type="text" size="small">编辑</el-button>
- <el-button type="text" size="small">删除</el-button>
+ <el-button type="text" @click="handleDelete(scope.row)" size="small">删除</el-button>
</template>
</el-table-column>
</el-table>
@@ -247,7 +276,7 @@
self_import_do,
self_del_do,
self_revoke,
- self_template
+ self_template,
} from "@/api/sgyhpczl/hiddenDangerManagement";
import {initJCBM, initYHLX, initBC, initJCLB, initYHBM, initYHJB, initReformStatus} from "@/api/sgyhpczl/initSelect";
@@ -436,6 +465,12 @@
path: "/fillRectificationAdd"
})
},
+ handleClick(row){
+ this.$router.push({
+ path: "/fillRectificationAdd",
+ query:row
+ })
+ },
fillRectification() {
var checkData = this.$refs.dataTable.selection;
if (checkData.length < 1) {
@@ -583,6 +618,42 @@
}
})
})
+ },
+ //方法区
+ formatDate(data) {
+ // 获取单元格数据
+ if (data == null) {
+ return null
+ }
+ let dt = new Date(data)
+ return dt.getFullYear() + '-' + (dt.getMonth() + 1) + '-' + dt.getDate()
+ },
+
+ //方法区
+ formatColumnDate(row, column) {
+ // 获取单元格数据
+ let data = row[column.property]
+ if (data == null) {
+ return null
+ }
+ let dt = new Date(data)
+ return dt.getFullYear() + '-' + (dt.getMonth() + 1) + '-' + dt.getDate() + ' '
+ },
+ handleDelete(row){
+ this.$confirm('确认要删除吗', '提示', {
+ confirmButtonText: '确认',
+ cancelButtonText: '取消',
+ type: 'warning'
+ }).then((res) => {
+ self_del_do(row.id).then(res => {
+ if (res.data.ok) {
+ this.$message({type: 'success', message: res.data.msg, duration: 3000})
+ this.getPageList()//调用表格方法，刷新页面
+ } else {
+ this.$message({type: 'error', message: res.data.msg, duration: 3000})
+ }
+ })
+ })
}
}
};
diff --git a/src/views/hiddenDangerRectification/index.vue b/src/views/hiddenDangerRectification/index.vue
index 9a2bed8..d0c9a08 100644
--- a/src/views/hiddenDangerRectification/index.vue
+++ b/src/views/hiddenDangerRectification/index.vue
@@ -156,7 +156,12 @@
<el-table-column prop="check_man" label="检查人" align="center" width="120"></el-table-column>
<el-table-column prop="checktype" label="检查类别" align="center"></el-table-column>
<el-table-column label="隐患项目" align="center">
- <el-table-column prop="check_date" label="检查时间" width="120" align="center"></el-table-column>
+ <el-table-column prop="check_date" label="检查时间" width="120" align="center">
+ <template slot-scope="scope">
+ <label>{{ formatDate(scope.row.check_date)}}</label><br/>
+ <label>{{ scope.row.check_class}}</label>
+ </template>
+ </el-table-column>
<el-table-column prop="address" label="地点" align="center"></el-table-column>
<el-table-column prop="ht_content" label="内容" align="center"></el-table-column>
<el-table-column prop="ht_typesub" label="类别" align="center"></el-table-column>
@@ -166,10 +171,10 @@
<el-table-column prop="measure" label="整改措施" align="center"></el-table-column>
<el-table-column prop="ht_branch" label="隐患部门" align="center"></el-table-column>
<el-table-column prop="duty_officer" label="责任人" align="center"></el-table-column>
- <el-table-column prop="alter_time" label="限改时间" width="120" align="center"></el-table-column>
+ <el-table-column prop="alter_time" label="限改时间" width="120" :formatter="formatColumnDate" align="center"></el-table-column>
</el-table-column>
<el-table-column label="整改情况" align="center">
- <el-table-column prop="ACCOMPLISHTIME" label="完成时间" width="120" align="center"></el-table-column>
+ <el-table-column prop="ACCOMPLISHTIME" label="完成时间" :formatter="formatColumnDate" width="120" align="center"></el-table-column>
<el-table-column prop="CALLBACKRESULT" label="复查结果" align="center"></el-table-column>
<el-table-column prop="CALLBACKPERSON" label="复查人" align="center"></el-table-column>
<el-table-column prop="CALLBACKTIME" label="复查时间" width="120" align="center"></el-table-column>
@@ -553,6 +558,26 @@
});
})
},
+ //方法区
+ formatDate(data) {
+ // 获取单元格数据
+ if(data == null) {
+ return null
+ }
+ let dt = new Date(data)
+ return dt.getFullYear() + '-' + (dt.getMonth() + 1) + '-' + dt.getDate()
+ },
+
+ //方法区
+ formatColumnDate(row, column) {
+ // 获取单元格数据
+ let data = row[column.property]
+ if(data == null) {
+ return null
+ }
+ let dt = new Date(data)
+ return dt.getFullYear() + '-' + (dt.getMonth() + 1) + '-' + dt.getDate() + ' '
+ },
exportData(){
var requestData = this.listQuery;
requestData.export_type = 2;
diff --git a/src/views/hiddenDangerReview/recheckCancellationNumber.vue b/src/views/hiddenDangerReview/recheckCancellationNumber.vue
index e9749f9..0aa4aa5 100644
--- a/src/views/hiddenDangerReview/recheckCancellationNumber.vue
+++ b/src/views/hiddenDangerReview/recheckCancellationNumber.vue
@@ -158,7 +158,12 @@
<el-table-column prop="check_man" label="检查人" align="center" width="120"></el-table-column>
<el-table-column prop="checktype" label="检查类别" align="center"></el-table-column>
<el-table-column label="隐患项目" align="center">
- <el-table-column prop="check_date" label="检查时间" width="120" align="center"></el-table-column>
+ <el-table-column prop="check_date" label="检查时间" width="120" align="center">
+ <template slot-scope="scope">
+ <label>{{ formatDate(scope.row.check_date)}}</label><br/>
+ <label>{{ scope.row.check_class}}</label>
+ </template>
+ </el-table-column>
<el-table-column prop="address" label="地点" align="center"></el-table-column>
<el-table-column prop="ht_content" label="内容" align="center"></el-table-column>
<el-table-column prop="ht_typesub" label="类别" align="center"></el-table-column>
@@ -168,13 +173,13 @@
<el-table-column prop="measure" label="整改措施" align="center"></el-table-column>
<el-table-column prop="ht_branch" label="隐患部门" align="center"></el-table-column>
<el-table-column prop="duty_officer" label="责任人" align="center"></el-table-column>
- <el-table-column prop="alter_time" label="限改时间" width="120" align="center"></el-table-column>
+ <el-table-column prop="alter_time" label="限改时间" :formatter="formatColumnDate" width="120" align="center"></el-table-column>
</el-table-column>
<el-table-column label="整改情况" align="center">
- <el-table-column prop="ACCOMPLISHTIME" label="完成时间" align="center"></el-table-column>
+ <el-table-column prop="ACCOMPLISHTIME" label="完成时间" :formatter="formatColumnDate" width="120" align="center"></el-table-column>
<el-table-column prop="CALLBACKRESULT" label="复查结果" align="center"></el-table-column>
<el-table-column prop="CALLBACKPERSON" label="复查人" align="center"></el-table-column>
- <el-table-column prop="CALLBACKTIME" label="复查时间" width="120" align="center"></el-table-column>
+ <el-table-column prop="CALLBACKTIME" label="复查时间" :formatter="formatColumnDate" width="120" align="center"></el-table-column>
</el-table-column>
<el-table-column label="隐患处理状态" align="center">
<template slot-scope="scope">
@@ -567,7 +572,27 @@
},
close() {
this.dialogVisible = false;
- }
+ },
+ //方法区
+ formatDate(data) {
+ // 获取单元格数据
+ if(data == null) {
+ return null
+ }
+ let dt = new Date(data)
+ return dt.getFullYear() + '-' + (dt.getMonth() + 1) + '-' + dt.getDate()
+ },
+
+ //方法区
+ formatColumnDate(row, column) {
+ // 获取单元格数据
+ let data = row[column.property]
+ if(data == null) {
+ return null
+ }
+ let dt = new Date(data)
+ return dt.getFullYear() + '-' + (dt.getMonth() + 1) + '-' + dt.getDate() + ' '
+ },
}
};
</script>
--
Gitblit v1.9.2