From 56884922ab73583c931e045f6b40c23433dfac5f Mon Sep 17 00:00:00 2001
From: cqf <2252655793@qq.com>
Date: 星期五, 13 五月 2022 16:16:29 +0800
Subject: [PATCH] 众泰接口对接
---
src/views/delayHiddenDangerRectification/rectificationDelayHiddenDanger.vue | 58 +++--
src/views/hiddenDangerManagement/index.vue | 17 +
src/views/dangerDetails/dnagerDetails.vue | 448 ++++++++++++++++++++++++++++++++++++++++
src/views/hiddenDangerReview/recheckCancellationNumber.vue | 55 ++++
src/views/delayHiddenDangerRectification/index.vue | 41 +++
src/api/sgyhpczl/delayHiddenDangerRectification.js | 1
src/router/index.js | 10
7 files changed, 593 insertions(+), 37 deletions(-)
diff --git a/src/api/sgyhpczl/delayHiddenDangerRectification.js b/src/api/sgyhpczl/delayHiddenDangerRectification.js
index 293b92d..1790060 100644
--- a/src/api/sgyhpczl/delayHiddenDangerRectification.js
+++ b/src/api/sgyhpczl/delayHiddenDangerRectification.js
@@ -94,5 +94,6 @@
url: "/taboi/danger/next_step_do",
contentType: "application/json",
method: 'POST',
+ data
});
}
diff --git a/src/router/index.js b/src/router/index.js
index f56f76d..cc13a9f 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -54,7 +54,8 @@
{
path: '/',
component: Layout,
- redirect: '/workPlan/workPlan/reserve',
+ // redirect: '/workPlan/workPlan/reserve',
+ redirect: '/accidentHidden/majorHidden',
children: [
{
path: 'dashboard',
@@ -324,6 +325,13 @@
// meta: { title: '自查隐患管理-填写督察', icon: '' }
hidden: true
},
+ {
+ path: '/dangerDetails',
+ // name: '隐患详情',
+ component: () => import('@/views/dangerDetails/dnagerDetails'),
+ // meta: { title: '自查隐患管理-填写督察', icon: '' }
+ hidden: true
+ },
]
}
]
diff --git a/src/views/dangerDetails/dnagerDetails.vue b/src/views/dangerDetails/dnagerDetails.vue
new file mode 100644
index 0000000..d645908
--- /dev/null
+++ b/src/views/dangerDetails/dnagerDetails.vue
@@ -0,0 +1,448 @@
+<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.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.check_main_branch"
+ :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.check_man" :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.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-date-picker
+ v-model="ruleForm.check_date"
+ 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.check_class"
+ :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.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.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.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.ht_community"
+ :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.ht_branch"
+ :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.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.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.ht_typesub"
+ :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.ht_level"
+ :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.measure" :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="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="name">
+ <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="ACCOMPLISHTIME">
+ <!--<el-input v-model="ruleForm.name"></el-input>-->
+ <el-date-picker
+ v-model="ruleForm.ACCOMPLISHTIME"
+ 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="ruleForm.CALLBACKTIME"
+ 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.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.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.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.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.DTRisk_level"
+ :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.Review"
+ :disabled="true"
+ style="width: 100%"
+ >
+ </el-select>
+ </el-form-item>
+ </el-col>
+ </el-row>
+
+
+ <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 size="small" @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";
+ import {sendDangerNext, getDangerDetails, getWfRecordList} from "@/api/sgyhpczl/recheckCancellationNumber";
+
+ export default {
+ components: {Titlename},
+ name: "sendHiddenDangerList",
+ data() {
+ return {
+ sendDataForm: {
+ id: "",
+ step: "2",
+ ispass: "",
+ callback_branch:"",
+ ACCOMPLISHTIME: "",
+ penalty_dy: "",
+ realFileName: "",
+ dealContent: "",
+ },
+ ispass:0,
+ ruleForm: {
+ name: '',
+ region: '',
+ date1: '',
+ date2: '',
+ delivery: false,
+ type: [],
+ resource: '',
+ value1: '',
+ desc: '',
+ rechecker:'',
+ reviewTime:'',
+ reviewResults:'',
+ rechecker1:'',
+ reviewTime1:'',
+ reviewResults1:'',
+ desc1:''
+ },
+ rules: {
+ },
+ tableData: [],
+ fileList: [],
+ // safetyInspectionItemResult:'0',
+ };
+ },
+ mounted() {
+ console.log(this.$route.query.id)
+ 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.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})
+ }
+ })
+ },
+ 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) {
+ if(this.ispass==0){
+ if(this.sendDataForm.duty_officer==null || this.sendDataForm.duty_officer==""){
+ this.$message({type: 'error', message: "请输入落实责任人", duration: 3000})
+ return
+ }
+ if(this.sendDataForm.ACCOMPLISHTIME==null || this.sendDataForm.ACCOMPLISHTIME==""){
+ this.$message({type: 'error', message: "请选择完成时间", duration: 3000})
+ return
+ }
+ this.sendDataForm.ispass="申请复查"
+ }
+ if(this.ispass==1){
+ this.sendDataForm.ispass="不接受,返回"+this.ruleForm.check_main_branch
+ }
+ this.sendDataForm.callback_branch=this.ruleForm.check_main_branch
+ sendDangerNext(this.sendDataForm).then(res => {
+ var msg = res.data.msg;
+ if (res.data.ok) {
+ this.$router.push({
+ path:"/hiddenDangerRectification",
+ })
+ this.$message({type: 'success', message: msg, duration: 3000})
+ } else {
+ this.$message({type: 'error', message: msg, duration: 3000})
+ }
+ })
+ /*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:"/hiddenDangerRectification"
+ })
+ }
+ }
+ }
+</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
+ }
+ .btn{
+ background-color: #034ea2;
+ border: 1px solid #034ea2;
+ }
+ /*.el-button:hover {*/
+ /* background: #66b1ff;*/
+ /* border-color: #66b1ff;*/
+ /* color: #FFF;*/
+ /*}*/
+</style>
diff --git a/src/views/delayHiddenDangerRectification/index.vue b/src/views/delayHiddenDangerRectification/index.vue
index 3e5491b..686eeb8 100644
--- a/src/views/delayHiddenDangerRectification/index.vue
+++ b/src/views/delayHiddenDangerRectification/index.vue
@@ -159,7 +159,11 @@
</el-row>
<el-table ref="dataTable" :data="tableData" style="width: 100%" @selection-change="handleSelectionChange">
<el-table-column type="selection" width="55" align="center"></el-table-column>
- <el-table-column prop="number" label="编号" align="center" width="120"></el-table-column>
+ <el-table-column prop="number" label="编号" align="center" width="120">
+ <template slot-scope="scope">
+ <div class="blue-font-color" @click="showDetails(scope.row)">{{ scope.row.number }}</div>
+ </template>
+ </el-table-column>
<el-table-column prop="check_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 prop="checktype" label="检查类别" align="center"></el-table-column>
@@ -171,12 +175,32 @@
</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_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="级别" 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">
+ <template slot-scope="scope">
+ <el-popover trigger="hover" placement="top">
+ <p>{{ scope.row.measure }}</p>
+ <div slot="reference" class="name-wrapper">{{
+ scope.row.measure != null && scope.row.measure.length > 10 ? scope.row.measure.substring(0, 8) + "...." : scope.row.measure
+ }}
+ </div>
+ </el-popover>
+ </template>
+ </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="限改时间" :formatter="formatColumnDate" width="120" align="center"></el-table-column>
@@ -468,7 +492,12 @@
let dt = new Date(data)
return dt.getFullYear() + '-' + (dt.getMonth() + 1) + '-' + dt.getDate()
},
-
+ showDetails(row){
+ this.$router.push({
+ path: "/dangerDetails",
+ query:{"id":row.id}
+ })
+ },
//方法区
formatColumnDate(row, column) {
// 获取单元格数据
@@ -501,4 +530,8 @@
background-color: #034ea2;
border: 1px solid #034ea2;
}
+.blue-font-color:hover{
+ cursor: pointer;
+ color: blue;
+}
</style>
diff --git a/src/views/delayHiddenDangerRectification/rectificationDelayHiddenDanger.vue b/src/views/delayHiddenDangerRectification/rectificationDelayHiddenDanger.vue
index 9bf8a75..70416c6 100644
--- a/src/views/delayHiddenDangerRectification/rectificationDelayHiddenDanger.vue
+++ b/src/views/delayHiddenDangerRectification/rectificationDelayHiddenDanger.vue
@@ -315,7 +315,7 @@
</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">
@@ -331,7 +331,7 @@
</el-row>
<el-row>
<el-col :span="22">
- <el-form-item label="是否同意延期：" prop="name">
+ <el-form-item label="是否同意延期：" prop="ispass">
<el-radio-group v-model="sendData.ispass">
<el-radio :label="0">同意延期</el-radio>
<el-radio :label="1">不同意</el-radio>
@@ -339,8 +339,7 @@
</el-form-item>
</el-col>
</el-row>
- <div
- v-if="ruleForm.safetyInspectionItemResult == 0">
+ <div v-if="ruleForm.safetyInspectionItemResult == 0">
<el-row>
<el-col :span="9">
<el-form-item label="限改时间" prop="alter_time">
@@ -353,15 +352,6 @@
</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="sendData.dealContent"></el-input>
- </el-form-item>
- </el-col>
- </el-row>
</div>
<div
v-else="ruleForm.safetyInspectionItemResult == 1">
@@ -369,6 +359,7 @@
<el-col :span="9">
<el-form-item label="限改时间" prop="alter_time">
<el-date-picker
+ disabled
v-model="sendData.alter_time"
type="date"
placeholder="选择日期"
@@ -380,7 +371,8 @@
<el-row>
<el-col :span="22">
<el-form-item label="备注" prop="desc1">
- <el-input class="textarea" type="textarea" v-model="sendData.dealContent"></el-input>
+ <el-input class="textarea" type="textarea"
+ v-model="sendData.dealContent"></el-input>
</el-form-item>
</el-col>
</el-row>
@@ -388,7 +380,7 @@
<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 class="btn" size="small" type="primary" @click="submitForm('sendData')">保存
</el-button>
<el-button size="small" @click="close()">关闭</el-button>
</el-form-item>
@@ -432,11 +424,11 @@
alter_time: {required: true, message: '请填写复查时间', trigger: 'blur'},
},
sendData: {
- id:"",
- step:"1",
- ispass:"同意延期",
- alter_time:"",
- dealContent:"",
+ id: "",
+ step: "1",
+ ispass: 0,
+ alter_time: "",
+ dealContent: "",
},
tableData: [],
@@ -448,6 +440,16 @@
this.getDangerDetails();
this.getWfRecordList()
},
+ watch: {
+ "sendData.ispass": function (newVal, oldVal) {
+ console.log(newVal)
+ if (newVal == 0) {
+ this.sendData.alter_time = this.ruleForm.extension;
+ } else {
+ this.sendData.alter_time = this.ruleForm.alter_time;
+ }
+ }
+ },
methods: {
getDangerDetails() {
getDangerDetails(this.$route.query.id).then(res => {
@@ -455,12 +457,10 @@
if (data.ok) {
this.ruleForm = data.data;
this.sendData.id = this.ruleForm.id;
- this.sendData.alter_time = this.ruleForm.alter_time;
-
+ this.sendData.alter_time = this.ruleForm.extension;
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})
}
@@ -479,7 +479,17 @@
submitForm(formName) {
this.$refs[formName].validate((valid) => {
if (valid) {
- alert('submit!');
+ sendDangerNext(this.sendData).then(res => {
+ var msg = res.data.msg;
+ if (res.data.ok) {
+ this.$router.push({
+ path: "/delayHiddenDangerRectification",
+ })
+ this.$message({type: 'success', message: msg, duration: 3000})
+ } else {
+ this.$message({type: 'error', message: msg, duration: 3000})
+ }
+ })
} else {
console.log('error submit!!');
return false;
diff --git a/src/views/hiddenDangerManagement/index.vue b/src/views/hiddenDangerManagement/index.vue
index 3146c82..30fa22e 100644
--- a/src/views/hiddenDangerManagement/index.vue
+++ b/src/views/hiddenDangerManagement/index.vue
@@ -183,7 +183,11 @@
</el-row>
<el-table :data="tableData" ref="dataTable" style="width: 100%">
<el-table-column type="selection" width="55" align="center"></el-table-column>
- <el-table-column prop="number" label="编号" align="center" width="120"></el-table-column>
+ <el-table-column prop="number" label="编号" align="center" width="120">
+ <template slot-scope="scope">
+ <div class="blue-font-color" @click="showDetails(scope.row)">{{ scope.row.number }}</div>
+ </template>
+ </el-table-column>
<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">
@@ -654,6 +658,12 @@
}
})
})
+ },
+ showDetails(row){
+ this.$router.push({
+ path: "/dangerDetails",
+ query:{"id":row.id}
+ })
}
}
};
@@ -686,7 +696,10 @@
border: none;
border-radius: 0px;
}
-
+.blue-font-color:hover{
+ cursor: pointer;
+ color: blue;
+}
.title-center /deep/ .el-radio-button__orig-radio:checked + .el-radio-button__inner {
background-color: #034ea2;
background-color: #034ea2;
diff --git a/src/views/hiddenDangerReview/recheckCancellationNumber.vue b/src/views/hiddenDangerReview/recheckCancellationNumber.vue
index 0aa4aa5..5126227 100644
--- a/src/views/hiddenDangerReview/recheckCancellationNumber.vue
+++ b/src/views/hiddenDangerReview/recheckCancellationNumber.vue
@@ -153,7 +153,11 @@
</el-row>
<el-table :data="tableData" ref="dangerRectificationTable" style="width: 100%">
<el-table-column type="selection" width="55" align="center"></el-table-column>
- <el-table-column prop="number" label="编号" align="center" width="120"></el-table-column>
+ <el-table-column prop="number" label="编号" align="center" width="120">
+ <template slot-scope="scope">
+ <div class="blue-font-color" @click="showDetails(scope.row)">{{ scope.row.number }}</div>
+ </template>
+ </el-table-column>
<el-table-column prop="check_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 prop="checktype" label="检查类别" align="center"></el-table-column>
@@ -164,13 +168,43 @@
<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="address" label="地点" align="center">
+ <template slot-scope="scope">
+ <el-popover trigger="hover" placement="top">
+ <p>{{ scope.row.address }}</p>
+ <div slot="reference" class="name-wrapper">{{
+ scope.row.address
+ }}
+ </div>
+ </el-popover>
+ </template>
+ </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="级别" 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="整改措施" align="center">
+ <template slot-scope="scope">
+ <el-popover trigger="hover" placement="top">
+ <p>{{ scope.row.measure }}</p>
+ <div slot="reference" class="name-wrapper">{{
+ scope.row.measure != null && scope.row.measure.length > 10 ? scope.row.measure.substring(0, 8) + "...." : scope.row.measure
+ }}
+ </div>
+ </el-popover>
+ </template>
+ </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="限改时间" :formatter="formatColumnDate" width="120" align="center"></el-table-column>
@@ -191,7 +225,7 @@
</el-table-column>
<el-table-column prop="DTRisk_bankId" label="是否关联" align="center">
<template slot-scope="scope">
- <span
+ <span style="color: red"
v-if="scope.row.DTRisk_bankId==0 || scope.row.DTRisk_bankId=='' || scope.row.DTRisk_bankId==null">未关联</span>
<span v-else>已关联</span>
</template>
@@ -582,7 +616,12 @@
let dt = new Date(data)
return dt.getFullYear() + '-' + (dt.getMonth() + 1) + '-' + dt.getDate()
},
-
+ showDetails(row){
+ this.$router.push({
+ path: "/dangerDetails",
+ query:{"id":row.id}
+ })
+ },
//方法区
formatColumnDate(row, column) {
// 获取单元格数据
@@ -615,4 +654,8 @@
background-color: #034ea2;
border: 1px solid #034ea2;
}
+.blue-font-color:hover{
+ cursor: pointer;
+ color: blue;
+}
</style>
--
Gitblit v1.9.2