From 366a180e9bdc23f087d3bd15d00f7d50193683d0 Mon Sep 17 00:00:00 2001
From: cqf
Date: 星期三, 25 五月 2022 17:36:34 +0800
Subject: [PATCH] 内部举一反三-进入自查
---
src/views/careabout/index.vue | 18
src/api/sgyhpczl/oneFromanotherN.js | 14
src/views/oneFromanotherN/index.vue | 110 +++
src/views/oneFromanotherN/addDanger.vue | 359 +++++++++++++
src/views/oneFromanotherN/existN.vue | 1012 ++++++++++++++++++++++++++------------
src/api/sgyhpczl/initSelect.js | 14
6 files changed, 1,196 insertions(+), 331 deletions(-)
diff --git a/src/api/sgyhpczl/initSelect.js b/src/api/sgyhpczl/initSelect.js
index 0e7b2bb..5b57c50 100644
--- a/src/api/sgyhpczl/initSelect.js
+++ b/src/api/sgyhpczl/initSelect.js
@@ -134,4 +134,18 @@
});
}
+//深入现场情况（带班值班）
+export function initSrxcqk() {
+ return request({
+ headers:{
+ 'token': getTokenAndVerify().token,
+ 'verify':getTokenAndVerify().verify
+ },
+ contentType: "multipart/form-data",
+ url: "/taboi/user/situation_do",
+ method: 'GET',
+ });
+}
+
+
diff --git a/src/api/sgyhpczl/oneFromanotherN.js b/src/api/sgyhpczl/oneFromanotherN.js
index bd71dd3..dffc8e6 100644
--- a/src/api/sgyhpczl/oneFromanotherN.js
+++ b/src/api/sgyhpczl/oneFromanotherN.js
@@ -117,3 +117,17 @@
data
});
}
+//不存在结果详情
+export function selfCheckNotInfo(params) {
+ return request({
+ headers: {
+ 'token': getTokenAndVerify().token,
+ 'verify': getTokenAndVerify().verify
+ },
+ url: '/taboi/danger/self_check_not_info',
+ // '?id=24871&type=0',
+ contentType: "multipart/form-data",
+ method: 'GET',
+ params:params?params:{}
+ });
+}
diff --git a/src/views/careabout/index.vue b/src/views/careabout/index.vue
index 55b1262..07ba8a8 100644
--- a/src/views/careabout/index.vue
+++ b/src/views/careabout/index.vue
@@ -100,7 +100,7 @@
<el-option
v-for="item in reList"
:key="item.value"
- :label="item.label"
+ :label="item.value"
:value="item.value">
</el-option>
</el-select>
@@ -155,7 +155,7 @@
<div v-if="table1">
<el-col :span="14" style="text-align:right;">
<el-button class="btns" type="primary" size="small" @click="specialFocus()">{{focusDesc}}</el-button>
- <el-button class="btns" type="primary" size="small" @click="sendBath()">管理关注</el-button>
+<!-- <el-button class="btns" type="primary" size="small" @click="sendBath()">管理关注</el-button>-->
</el-col>
</div>
</el-row>
@@ -236,7 +236,7 @@
</template>
<script>
import { getPageList, danger_focus_tag, analogy_export_do, focus_do} from "@/api/sgyhpczl/careabout"
-import {initJCBM ,initYHLX, initBC ,initJCLB ,initYHBM ,initYHJB,initLlr} from "@/api/sgyhpczl/initSelect";
+import {initJCBM ,initYHLX, initBC ,initJCLB ,initYHBM ,initYHJB,initLlr,initSrxcqk} from "@/api/sgyhpczl/initSelect";
export default{
data(){
@@ -261,7 +261,7 @@
JCBMList:[],
YHLXList:[],
BCList:[],
- reList:[{label:"值班",value:"值班"},{label:"带班",value:"带班"}],
+ reList:[],
JCLBList:[],
YHBMList:[],
YHJBList:[],
@@ -290,6 +290,7 @@
this.initJCLB();
this.initLlr();
this.initYHBM();
+ this.initSrxcqk();
this.initTags();
this.getPageList();
},
@@ -351,6 +352,15 @@
}
})
},
+ initSrxcqk(){
+ initSrxcqk().then(res=>{
+ if (res.data.ok==1){
+ this.reList=res.data.data
+ } else{
+ this.$message({type:'error', message:res.data.msg, duration:3000})
+ }
+ })
+ },
initTags(){
danger_focus_tag().then(res=>{
if (res.data.ok==1){
diff --git a/src/views/oneFromanotherN/addDanger.vue b/src/views/oneFromanotherN/addDanger.vue
new file mode 100644
index 0000000..61c15fc
--- /dev/null
+++ b/src/views/oneFromanotherN/addDanger.vue
@@ -0,0 +1,359 @@
+<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="check_date">
+ <el-date-picker
+ v-model="ruleForm.check_date"
+ type="date"
+ value-format="yyyy-MM-dd"
+ placeholder="选择日期"
+ style="width: 100%">
+ </el-date-picker>
+ </el-form-item>
+ </el-col>
+ <el-col :span="9">
+ <el-form-item label="检查类别" prop="checktype">
+ <el-select v-model="ruleForm.checktype" placeholder="请选择" style="width: 100%">
+ <el-option
+ v-for="item in JCLBList"
+ :key="item.value"
+ :label="item.value"
+ :value="item.value">
+ </el-option>
+ </el-select>
+ </el-form-item>
+ </el-col>
+ </el-row>
+ <el-row>
+ <el-col :span="9" >
+ <el-form-item label="检查单位" prop="check_main_branch">
+ <el-input v-model="ruleForm.check_main_branch" style="width:100%"></el-input>
+<!-- <el-select v-model="ruleForm.check_main_branch" placeholder="请选择" @change="changeJCDW" style="width: 100%">-->
+<!-- <el-option-->
+<!-- v-for="item in JCDWList"-->
+<!-- :key="item.label"-->
+<!-- :label="item.label"-->
+<!-- :value="item.label"-->
+<!-- >-->
+<!-- </el-option>-->
+<!-- </el-select>-->
+ </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-col>
+ </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="address" align="center" label="隐患地点"></el-table-column>
+ <el-table-column prop="ht_content" align="center" label="隐患内容"></el-table-column>
+ <el-table-column prop="ht_typesub" align="center" label="隐患类别"></el-table-column>
+ <el-table-column prop="ht_level" 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;">
+ <el-button size="mini" @click="editDanger(scope.row, scope.$index)">
+ 编辑
+ </el-button>
+ <el-button size="mini" @click="deleteDanger(scope.row, scope.$index)">
+ 删除
+ </el-button>
+ </div>
+ </template>
+ </el-table-column>
+ </el-table>
+ <el-row style="margin-top: 20px">
+ <el-col :span="22">
+ <el-form-item style="text-align: center">
+ <el-button type="primary" class="btns" @click="submitForm('ruleForm')">
+ 保存
+ </el-button>
+ <el-button @click="closeShow">关闭</el-button>
+ </el-form-item>
+ </el-col>
+ </el-row>
+ </el-form>
+ </div>
+ </div>
+
+ <el-dialog
+ :title="title"
+ :visible.sync="dialogVisible"
+ :close-on-click-modal="false"
+ width="40%">
+ <el-form ref="form" :rules="dangerRules" :model="dangerForm" label-width="100px">
+ <el-row>
+ <el-col :span="9">
+ <el-form-item label="隐患地点" prop="address">
+ <el-input v-model="dangerForm.address" rows="3" type="textarea" class="multiline"></el-input>
+ </el-form-item>
+ </el-col>
+ <el-col :span="9" :offset="4">
+ <el-form-item label="隐患内容" prop="ht_content">
+ <el-input v-model="dangerForm.ht_content" rows="3" type="textarea" class="multiline"></el-input>
+ </el-form-item>
+ </el-col>
+ </el-row>
+ <el-row>
+
+ <el-col :span="9">
+ <el-form-item label="隐患类别" prop="ht_typesub">
+ <el-select v-model="dangerForm.ht_typesub" placeholder="请选择">
+ <el-option
+ v-for="item in YHLXList"
+ :key="item.value"
+ :label="item.value"
+ :value="item.value">
+ </el-option>
+ </el-select>
+ </el-form-item>
+ </el-col>
+ <el-col :span="9" :offset="4">
+ <el-form-item label="隐患级别" prop="ht_level">
+ <el-select v-model="dangerForm.ht_level" placeholder="请选择">
+ <el-option
+ v-for="item in YHJBList"
+ :key="item.value"
+ :label="item.label"
+ :value="item.value">
+ </el-option>
+ </el-select>
+ </el-form-item>
+ </el-col>
+ </el-row>
+ <el-row>
+ <el-col :span="22">
+ <el-form-item style="text-align: center">
+ <el-button type="primary" class="btns" @click="submitDanger('form')">
+ 保存
+ </el-button>
+ <el-button @click="dialogVisible=false">关闭</el-button>
+ </el-form-item>
+ </el-col>
+ </el-row>
+ </el-form>
+ </el-dialog>
+
+ </div>
+</template>
+
+<script>
+import Titlename from "../../components/Titlename/index.vue";
+
+import {initJCBM ,initYHLX,initJCLB,initYHJB,initReformStatus} from "@/api/sgyhpczl/initSelect";
+import {saveDanger,initDangerRebound,getDangerInfo,editDanger} from '@/api/sgyhpczl/hiddenDangerRegistration'
+import { save } from '@/api/sgyhpczl/oneFromanotherN'
+
+import {deepClone} from '@/utils'
+
+export default {
+ components: { Titlename },
+ name: "hiddenDangerList",
+ data() {
+ return {
+ id:'',
+ rowIndex:-1,
+ dangerList:[],
+ dangerForm:{},
+ dangerRules:{
+ address: [{ required: true, message: '不能为空', trigger: 'blur' },],
+ ht_content: [{ required: true, message: '不能为空', trigger: 'blur' },],
+ ht_typesub: [{ required: true, message: '不能为空', trigger: 'blur' },],
+ ht_level: [{ required: true, message: '不能为空', trigger: 'blur' },],
+ },
+ title:'新增',
+ dialogVisible:false,
+ JCLBList:[],
+ YHLXList:[],
+ YHJBList:[],
+ ruleForm: {},
+ rules: {
+ check_date: [{ required: true, message: '不能为空', trigger: 'blur' },],
+ check_main_branch: [{ required: true, message: '不能为空', trigger: 'change' },],
+ checktype: [{ required: true, message: '不能为空', trigger: 'blur' },],
+ },
+ tableData: [],
+ };
+ },
+ mounted(){
+ this.initJCLB()
+ this.initYHJB()
+ this.initYHLX()
+ },
+ methods: {
+ 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
+
+ } 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.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
+ }
+ }
+ },
+ 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})
+ }
+ })
+ },
+ 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})
+ }
+ })
+ },
+
+ closeShow(){
+ this.$router.push({
+ path:"/oneFromanotherN"
+ })
+ },
+ submitForm(formName) {
+ this.$refs[formName].validate((valid) => {
+ if (valid) {
+ if(this.tableData==null || this.tableData.length==0){
+ this.$message({type:'error', message:"请添加隐患", duration:2000})
+ }
+ this.ruleForm.items=this.tableData
+ save(this.ruleForm).then(res=>{
+ if (res.data.ok==1){
+ this.$message({type:'success', message:"新增成功", duration:3000})
+ this.$router.push({
+ path:"/oneFromanotherN"
+ })
+ }else {
+ this.$message({type:'error', message:res.data.msg, duration:3000})
+ }
+ })
+
+ } else {
+ console.log("error submit!!");
+ return false;
+ }
+ });
+ },
+ },
+};
+</script>
+
+<style scoped>
+.app-container {
+ padding: 20px;
+ height: 850px;
+ overflow-y: auto;
+}
+
+.app-container /deep/ .box {
+ padding-top: 0;
+}
+
+/* /deep/ .multiline .el-input__inner {
+ height: 62px;
+} */
+ .btns{
+ background-color: #034ea2;
+ border: 1px solid #034ea2;
+ }
+</style>
diff --git a/src/views/oneFromanotherN/existN.vue b/src/views/oneFromanotherN/existN.vue
index 61c15fc..6fd5b59 100644
--- a/src/views/oneFromanotherN/existN.vue
+++ b/src/views/oneFromanotherN/existN.vue
@@ -1,359 +1,735 @@
<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="check_date">
- <el-date-picker
- v-model="ruleForm.check_date"
- type="date"
- value-format="yyyy-MM-dd"
- placeholder="选择日期"
- style="width: 100%">
- </el-date-picker>
- </el-form-item>
- </el-col>
- <el-col :span="9">
- <el-form-item label="检查类别" prop="checktype">
- <el-select v-model="ruleForm.checktype" placeholder="请选择" style="width: 100%">
- <el-option
- v-for="item in JCLBList"
- :key="item.value"
- :label="item.value"
- :value="item.value">
- </el-option>
- </el-select>
- </el-form-item>
- </el-col>
- </el-row>
- <el-row>
- <el-col :span="9" >
- <el-form-item label="检查单位" prop="check_main_branch">
- <el-input v-model="ruleForm.check_main_branch" style="width:100%"></el-input>
-<!-- <el-select v-model="ruleForm.check_main_branch" placeholder="请选择" @change="changeJCDW" style="width: 100%">-->
-<!-- <el-option-->
-<!-- v-for="item in JCDWList"-->
-<!-- :key="item.label"-->
-<!-- :label="item.label"-->
-<!-- :value="item.label"-->
-<!-- >-->
-<!-- </el-option>-->
-<!-- </el-select>-->
- </el-form-item>
- </el-col>
- </el-row>
+ <div class="app-container" >
+ <div v-if="type=='0'" 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="check_date">
+ <el-date-picker
+ v-model="ruleForm.check_date"
+ type="date"
+ value-format="yyyy-MM-dd"
+ placeholder="选择日期"
+ style="width: 100%"
+ >
+ </el-date-picker>
+ </el-form-item>
+ </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-option
+ v-for="item in BCList"
+ :key="item.value"
+ :label="item.value"
+ :value="item.value">
+ </el-option>
+ </el-select>
+ </el-form-item>
+ </el-col>
+ </el-row>
+ <el-row>
+ <el-col :span="9">
+ <el-form-item label="检查类别" prop="checktype">
+ <el-select v-model="ruleForm.checktype" placeholder="请选择" style="width: 100%">
+ <el-option
+ v-for="item in JCLBList"
+ :key="item.value"
+ :label="item.value"
+ :value="item.value">
+ </el-option>
+ </el-select>
+ </el-form-item>
+ </el-col>
+ <el-col :span="9" :offset="4">
+ <el-form-item label="检查单位" prop="check_main_branch">
+ <el-select v-model="ruleForm.check_main_branch" placeholder="请选择" @change="changeJCDW" style="width: 100%">
+ <el-option
+ v-for="item in JCDWList"
+ :key="item.label"
+ :label="item.label"
+ :value="item.label"
+ >
+ </el-option>
+ </el-select>
+ </el-form-item>
+ </el-col>
+ </el-row>
+ <el-row>
+ <el-col :span="9">
+ <el-form-item label="检查人员" prop="check_man">
+ <el-input v-model="ruleForm.check_man"></el-input>
+ </el-form-item>
+ </el-col>
+ <el-col :span="9" :offset="4">
+ <el-form-item label="陪检人员" prop="acc_man">
+ <el-input v-model="ruleForm.acc_man"></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-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-table :data="tableData" style="width: 100%">
- <el-table-column type="index" width="55" 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="ht_typesub" align="center" label="隐患类别"></el-table-column>
- <el-table-column prop="ht_level" 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;">
- <el-button size="mini" @click="editDanger(scope.row, scope.$index)">
- 编辑
- </el-button>
- <el-button size="mini" @click="deleteDanger(scope.row, scope.$index)">
- 删除
- </el-button>
- </div>
- </template>
- </el-table-column>
- </el-table>
- <el-row style="margin-top: 20px">
- <el-col :span="22">
- <el-form-item style="text-align: center">
- <el-button type="primary" class="btns" @click="submitForm('ruleForm')">
- 保存
- </el-button>
- <el-button @click="closeShow">关闭</el-button>
- </el-form-item>
- </el-col>
- </el-row>
- </el-form>
- </div>
+ <!-- <el-row style="margin-bottom: 20px" v-if="addShow">
+ <el-col :span="9">
+ <el-button type="primary" class="btns" @click="addDanger">新增隐患</el-button>
+ </el-col>
+ </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" show-overflow-tooltip 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;">
+ <el-button
+ size="mini"
+ @click="editDanger(scope.row, scope.$index)"
+ >编辑
+ </el-button>
+ <el-button
+ size="mini"
+ @click="deleteDanger(scope.row, scope.$index)"
+ >删除
+ </el-button>
+ </div>
+ </template>
+ </el-table-column>
+ </el-table>
+
+
+ <el-row style="margin-top: 20px">
+ <el-col :span="22">
+ <el-form-item style="text-align: center">
+ <el-button type="primary" class="btns" @click="submitForm('ruleForm')"
+ >保存</el-button
+ >
+ <el-button @click="returnIndex">关闭</el-button>
+ </el-form-item>
+ </el-col>
+ </el-row>
+ </el-form>
+ </div>
+ </div>
+ <div v-else>
+ <el-table :data="detailTableData" 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="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>
+ <el-table-column label="隐患项目" align="center">
+ <el-table-column prop="check_date" label="检查时间" width="120" align="center"></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>
+ <el-table-column label="整改计划" align="center">
+ <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="ht_level" label="级别" align="center"> </el-table-column>
+ </el-table-column>
+ <el-table-column label="整改情况" align="center">
+ <el-table-column prop="ACCOMPLISHTIME" label="完成时间" width="110px" 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>
+ <el-table-column label="隐患处理状态" align="center">
+ <template slot-scope="scope">
+ <span v-if="scope.row.step =='1'">初始状态</span>
+ <span v-if="scope.row.step =='2'">整改中</span>
+ <span v-if="scope.row.step =='3'">复查中</span>
+ <span v-if="scope.row.step =='end'">处理结束</span>
+ </template>
+ </el-table-column>
+ <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>
+ <span v-else>已关联</span>
+ </template>
+ </el-table-column>
+ <el-table-column prop="DTRisk_level" label="风险等级" align="center"> </el-table-column>
+ <el-table-column prop="warningLevel" label="初始警情" align="center"> </el-table-column>
+ <el-table-column prop="curWarningLevel" label="当前警情" align="center"> </el-table-column>
+ </el-table>
+
+ <el-button style="margin-top: 20px" @click="returnIndex">关闭</el-button>
+ </div>
+ <el-dialog
+ :title="title"
+ :visible.sync="dialogVisible"
+ :close-on-click-modal="false"
+ width="40%">
+ <el-form ref="form" :rules="dangerRules" :model="dangerForm" label-width="100px">
+ <el-row>
+ <el-col :span="9">
+ <el-form-item label="隐患部门" prop="ht_branch">
+ <el-select v-model="dangerForm.ht_branch" placeholder="请选择">
+ <el-option
+ v-for="item in YHBMList"
+ :key="item.branch_id"
+ :label="item.branch_name"
+ :value="item.branch_name">
+ </el-option>
+ </el-select>
+ </el-form-item>
+ </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-form-item>
+ </el-col>
+ </el-row>
+
+ <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-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-form-item>
+ </el-col>
+ </el-row>
+ <el-row>
+ <el-col :span="9">
+ <el-form-item label="隐患类别" prop="ht_typesub">
+ <el-select v-model="dangerForm.ht_typesub" placeholder="请选择">
+ <el-option
+ v-for="item in YHLXList"
+ :key="item.value"
+ :label="item.value"
+ :value="item.value">
+ </el-option>
+ </el-select>
+ </el-form-item>
+ </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-option
+ v-for="item in dangerList"
+ :key="item.id"
+ :label="item.mriskPoint"
+ :value="item.id">
+ </el-option>
+ </el-select>
+ </el-form-item>
+ </el-col>
+ </el-row>
+
+ <el-row>
+ <el-col :span="9">
+ <el-form-item label="风险等级" prop="DTRisk_level">
+ <el-input v-model="dangerForm.DTRisk_level" :disabled="true"></el-input>
+ </el-form-item>
+ </el-col>
+ <el-col :span="9" :offset="4">
+ <el-form-item label="隐患级别" prop="ht_level">
+ <el-select v-model="dangerForm.ht_level" placeholder="请选择">
+ <el-option
+ v-for="item in YHJBList"
+ :key="item.value"
+ :label="item.label"
+ :value="item.value">
+ </el-option>
+ </el-select>
+ </el-form-item>
+ </el-col>
+ </el-row>
+ <el-row>
+ <el-col :span="9">
+ <el-form-item label="限改时间" prop="alter_time">
+ <el-date-picker
+ v-model="dangerForm.alter_time"
+ type="date"
+ value-format="yyyy-MM-dd"
+ 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="dangerForm.duty_officer"></el-input>
+ </el-form-item>
+ </el-col>
+ </el-row>
+ <el-row>
+ <el-col :span="9">
+ <el-form-item label="整改情况" prop="alter_status">
+ <el-select v-model="dangerForm.alter_status" placeholder="请选择">
+ <el-option
+ v-for="item in statusList"
+ :key="item.value"
+ :label="item.label"
+ :value="item.value">
+ </el-option>
+ </el-select>
+ </el-form-item>
+ </el-col>
+ <el-col :span="9" :offset="4">
+ <el-form-item label="业务科室" prop="Review">
+ <el-select v-model="dangerForm.Review" style="width: 100%">
+ <el-option
+ v-for="item in YWKSList"
+ :key="item.value"
+ :label="item.label"
+ :value="item.value">
+ </el-option>
+ </el-select>
+ </el-form-item>
+ </el-col>
+ </el-row>
+ <el-row v-if="dangerForm.alter_status=='重复反弹隐患'">
+ <el-col :span="9">
+ <el-form-item label="重复反弹隐患" prop="repeatId">
+ <el-select v-model="dangerForm.repeatId" placeholder="请选择">
+ <el-option
+ v-for="item in reboundList"
+ :key="item.id"
+ :label="item.content"
+ :value="item.id">
+ </el-option>
+ </el-select>
+ </el-form-item>
+ </el-col>
+ </el-row>
+ <el-row>
+ <el-col :span="22">
+ <el-form-item style="text-align: center">
+ <el-button type="primary" class="btns" @click="submitDanger('form')"
+ >保存</el-button
+ >
+ <el-button @click="dialogVisible=false">关闭</el-button>
+ </el-form-item>
+ </el-col>
+ </el-row>
+ </el-form>
+ </el-dialog>
</div>
- <el-dialog
- :title="title"
- :visible.sync="dialogVisible"
- :close-on-click-modal="false"
- width="40%">
- <el-form ref="form" :rules="dangerRules" :model="dangerForm" label-width="100px">
- <el-row>
- <el-col :span="9">
- <el-form-item label="隐患地点" prop="address">
- <el-input v-model="dangerForm.address" rows="3" type="textarea" class="multiline"></el-input>
- </el-form-item>
- </el-col>
- <el-col :span="9" :offset="4">
- <el-form-item label="隐患内容" prop="ht_content">
- <el-input v-model="dangerForm.ht_content" rows="3" type="textarea" class="multiline"></el-input>
- </el-form-item>
- </el-col>
- </el-row>
- <el-row>
- <el-col :span="9">
- <el-form-item label="隐患类别" prop="ht_typesub">
- <el-select v-model="dangerForm.ht_typesub" placeholder="请选择">
- <el-option
- v-for="item in YHLXList"
- :key="item.value"
- :label="item.value"
- :value="item.value">
- </el-option>
- </el-select>
- </el-form-item>
- </el-col>
- <el-col :span="9" :offset="4">
- <el-form-item label="隐患级别" prop="ht_level">
- <el-select v-model="dangerForm.ht_level" placeholder="请选择">
- <el-option
- v-for="item in YHJBList"
- :key="item.value"
- :label="item.label"
- :value="item.value">
- </el-option>
- </el-select>
- </el-form-item>
- </el-col>
- </el-row>
- <el-row>
- <el-col :span="22">
- <el-form-item style="text-align: center">
- <el-button type="primary" class="btns" @click="submitDanger('form')">
- 保存
- </el-button>
- <el-button @click="dialogVisible=false">关闭</el-button>
- </el-form-item>
- </el-col>
- </el-row>
- </el-form>
- </el-dialog>
-
- </div>
</template>
<script>
import Titlename from "../../components/Titlename/index.vue";
-import {initJCBM ,initYHLX,initJCLB,initYHJB,initReformStatus} from "@/api/sgyhpczl/initSelect";
-import {saveDanger,initDangerRebound,getDangerInfo,editDanger} from '@/api/sgyhpczl/hiddenDangerRegistration'
-import { save } from '@/api/sgyhpczl/oneFromanotherN'
-
+import {
+ initBC,
+ initJCBM,
+ initJCLB,
+ initLlr,
+ initReformStatus,
+ initWxy,
+ initYHBM,
+ initYHJB,
+ initYHLX,
+ initYwks
+} from "@/api/sgyhpczl/initSelect";
+import {getPageList,initDangerRebound} from '@/api/sgyhpczl/hiddenDangerRegistration'
import {deepClone} from '@/utils'
export default {
- components: { Titlename },
- name: "hiddenDangerList",
- data() {
- return {
- id:'',
- rowIndex:-1,
- dangerList:[],
- dangerForm:{},
- dangerRules:{
- address: [{ required: true, message: '不能为空', trigger: 'blur' },],
- ht_content: [{ required: true, message: '不能为空', trigger: 'blur' },],
- ht_typesub: [{ required: true, message: '不能为空', trigger: 'blur' },],
- ht_level: [{ required: true, message: '不能为空', trigger: 'blur' },],
- },
- title:'新增',
- dialogVisible:false,
- JCLBList:[],
- YHLXList:[],
- YHJBList:[],
- ruleForm: {},
- rules: {
- check_date: [{ required: true, message: '不能为空', trigger: 'blur' },],
- check_main_branch: [{ required: true, message: '不能为空', trigger: 'change' },],
- checktype: [{ required: true, message: '不能为空', trigger: 'blur' },],
- },
- tableData: [],
- };
- },
+ components: { Titlename },
+ name: "hiddenDangerList",
+ data() {
+ return {
+ type: '0',
+ id:'',
+ 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: [],
+ paramsData: {},//上个页面参数
+ listQuery:{
+ page:1,
+ limit:10,
+ form:{},
+ },
+ currentPage: 1,
+ pageSize: 10,
+ recordTotal: 0,
+ detailTableData:[],//隐患详情列表
+ };
+ },
+
mounted(){
+ this.initBC()
this.initJCLB()
this.initYHJB()
this.initYHLX()
+ //this.initLlr()
+ this.initReformStatus()
+ this.initYHBM()
+ this.initYWKS()
+ this.initWXY()
+ this.initDangerRebound()
+ this.type = this.$route.query.type;
+ if (this.type === '0'){
+ this.initInfo(this.$route.query.data);
+ }else {
+ this.listQuery.form.jyfsId = this.$route.query.data.id
+ this.getPageList();
+ }
},
- methods: {
- 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
+ methods: {
+ initInfo(data){
+ this.paramsData = this.$route.query.data;
+ this.ruleForm.jyfsId = data.id;
+ this.tableData[0] = {
+ address: data.address,
+ ht_content: data.ht_content,
+ ht_level: data.ht_level,
+ };
+ },
- } 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.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
- }
- }
- },
- 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})
- }
- })
- },
- 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})
- }
- })
- },
-
- closeShow(){
- this.$router.push({
- path:"/oneFromanotherN"
- })
- },
- submitForm(formName) {
- this.$refs[formName].validate((valid) => {
- if (valid) {
- if(this.tableData==null || this.tableData.length==0){
- this.$message({type:'error', message:"请添加隐患", duration:2000})
- }
- this.ruleForm.items=this.tableData
- save(this.ruleForm).then(res=>{
+ // async initInfo(){
+ // var res=await getDangerInfo(this.id)
+ // if (res.data.ok==1){
+ // this.ruleForm=res.data.data
+ // this.changeJCDW(res.data.data.check_main_branch)
+ // var obj=deepClone(res.data.data)
+ // this.tableData.push(obj)
+ // }
+ // },
+ initDangerRebound(){
+ initDangerRebound().then(res=>{
if (res.data.ok==1){
- this.$message({type:'success', message:"新增成功", duration:3000})
- this.$router.push({
- path:"/oneFromanotherN"
- })
- }else {
+ 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 {
+ var arr = this.tableData;
+ arr.splice(this.rowIndex, 1, this.dangerForm);
+ this.tableData = arr;
+ }
+ this.dialogVisible=false
- } else {
- console.log("error submit!!");
- return false;
- }
- });
+ } else {
+ console.log("error submit!!");
+ return false;
+ }
+ });
+ },
+ getPageList(){
+ this.listQuery.page=1
+ getPageList(this.listQuery).then(res=>{
+ if (res.data.ok==1) {
+ this.detailTableData = res.data.data.items
+ this.recordTotal=res.data.data.total
+ }else{
+ this.$message({type:'error', message:res.data.msg, duration:3000})
+ }
+ })
+ },
+ 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.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(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})
+ }
+ })
+ },
+
+
+ returnIndex(){
+ this.$router.push({
+ path:"/oneFromanotherN"
+ })
+ },
+ judge(obj){
+ console.log(obj)
+ if (obj != null || ('ht_branch' in obj) || ('address' in obj) || ('ht_typesub' in obj) || ('dangerousSource' in obj)
+ || ('alter_time' in obj) || ('duty_officer' in obj) || ('alter_status' in obj) || ('Review' in obj) || ('DTRisk_bankId' in obj)){
+ return true;
+ }else {
+ return false;
+ }
+ },
+ submitForm(formName) {
+ this.$refs[formName].validate((valid) => {
+
+ if (valid) {
+ this.ruleForm.items=this.tableData
+ if(this.judge(this.tableData[0])){
+ this.$message({type:'error', message:"请完整录入隐患", duration:2000})
+ }
+ // if(this.addShow){
+ console.log(this.ruleForm)
+ saveDanger(this.ruleForm).then(res=>{
+ if (res.data.ok==1){
+ this.$message({type:'success', message:"保存成功", duration:3000})
+ this.$router.push({
+ path:"/oneFromanother"
+ })
+ }else {
+ this.$message({type:'error', message:res.data.msg, duration:3000})
+ }
+ })
+ // }else {
+ // var param=deepClone(this.ruleForm)
+ // var obj=deepClone(this.tableData[0])
+ // param.ht_branch=obj.ht_branch
+ // param.address=obj.address
+ // param.ht_content=obj.ht_content
+ // param.measure=obj.measure
+ // param.ht_typesub=obj.ht_typesub
+ // param.DTRisk_bankId=obj.DTRisk_bankId
+ // param.DTRisk_level=obj.mriskLevel
+ // param.dangerousSource=obj.mriskPoint
+ // param.ht_level=obj.ht_level
+ // param.alter_time=obj.alter_time
+ // param.duty_officer=obj.duty_officer
+ // param.alter_status=obj.alter_status
+ // param.Review=obj.Review
+ // param.repeatId=obj.repeatId
+ // editDanger(param).then(res=>{
+ // if (res.data.ok==1){
+ // this.$message({type:'success', message:"编辑成功", duration:3000})
+ // this.$router.push({
+ // path:"/hiddenDangerRegistration"
+ // })
+ // }else {
+ // this.$message({type:'error', message:res.data.msg, duration:3000})
+ // }
+ // })
+ // }
+
+
+
+ } else {
+ console.log("error submit!!");
+ return false;
+ }
+ });
+ },
},
- },
};
</script>
<style scoped>
.app-container {
- padding: 20px;
- height: 850px;
- overflow-y: auto;
+ padding: 20px;
+ height: 850px;
+ overflow-y: auto;
}
.app-container /deep/ .box {
- padding-top: 0;
+ padding-top: 0;
}
/* /deep/ .multiline .el-input__inner {
height: 62px;
} */
- .btns{
- background-color: #034ea2;
- border: 1px solid #034ea2;
- }
+.btns{
+ background-color: #034ea2;
+ border: 1px solid #034ea2;
+}
</style>
diff --git a/src/views/oneFromanotherN/index.vue b/src/views/oneFromanotherN/index.vue
index 856f228..dc2348d 100644
--- a/src/views/oneFromanotherN/index.vue
+++ b/src/views/oneFromanotherN/index.vue
@@ -77,11 +77,11 @@
<el-radio-button label="0">待发送</el-radio-button>
<el-radio-button label="1">已发送</el-radio-button>
</el-radio-group>
- <el-radio-group v-if="table2" >
+ <el-radio-group v-if="table2" v-model="listQuery.sendType" @change="sendTypeChange">
<el-radio-button label="0">待自查</el-radio-button>
<el-radio-button label="1">已自查</el-radio-button>
</el-radio-group>
- <el-button class="btns" type="primary" size="small" v-if="table1" @click="handoff(1)">进入自查（3）</el-button>
+ <el-button class="btns" type="primary" size="small" v-if="table1" @click="handoff(1)">进入自查（{{selfTotal}}）</el-button>
<el-button class="btns" type="primary" size="small" v-if="table2" @click="handoff(2)">返回填写</el-button>
</el-col>
<div v-if="table1">
@@ -165,8 +165,9 @@
<el-table-column prop="workGroupName" label="发送单位" align="center"></el-table-column>
<el-table-column prop="date" label="自查结果" align="center">
<template slot-scope="scope">
- <el-button @click="handleClick(scope.row)" type="text" size="small">不存在</el-button>
- <el-button @click="handleClick(scope.row)" type="text" size="small">存在</el-button>
+ <el-button @click="handleClick(scope.row,'不存在')" type="text" size="small">不存在</el-button>
+ <el-button @click="handleClick(scope.row)" type="text" v-if="listQuery.sendType=='0'" size="small">存在</el-button>
+ <el-button @click="handleClick(scope.row)" type="text" v-if="listQuery.sendType=='1'" size="small">追查结果</el-button>
</template>
</el-table-column>
</el-table>
@@ -303,10 +304,33 @@
</el-form>
</el-dialog>
+ <!-- 不存在弹窗-->
+ <el-dialog :title="selfTitle" :visible.sync="selfInspectVisible" :modal-append-to-body="false" :close-on-click-modal="false" width="600px">
+ <el-form ref="selfInspectForm" :rules="selfInspectFormRules" :model="selfInspectForm" label-position="right" label-width="80px">
+ <el-form-item label="自查人" prop="markUserName">
+ <el-input v-model="selfInspectForm.markUserName" class="analyseUnit_input"></el-input>
+ </el-form-item>
+ <el-form-item label="自查时间" prop="markDate">
+ <el-col :span="11">
+ <el-date-picker type="date" placeholder="选择日期" v-model="selfInspectForm.markDate"
+ style="width: 100%;" value-format="yyyy-MM-dd">
+ </el-date-picker>
+ </el-col>
+ </el-form-item>
+ <el-form-item label="备注" prop="remark">
+ <el-input v-model="selfInspectForm.remark" type="textarea" rows="5" class="analyseUnit_input"></el-input>
+ </el-form-item>
+ </el-form>
+ <div align="center">
+ <el-button type="primary" v-if="listQuery.sendType == '0'" @click="submitSelfInspect()">确认</el-button>
+ <el-button @click="selfInspectVisible = false">关闭</el-button>
+ </div>
+ </el-dialog>
+
</div>
</template>
<script>
-import { getPageList, edit, del, send, revoke} from "@/api/sgyhpczl/oneFromanotherN"
+import { getPageList, edit, del, send, revoke,selfCheckNotInfo} from "@/api/sgyhpczl/oneFromanotherN"
import {initJCBM, initYHLX, initJCLB, initYHJB,initYHBM} from "@/api/sgyhpczl/initSelect";
import {deepClone} from '@/utils'
@@ -318,8 +342,10 @@
page:1,
limit:10,
type: 0,
+ sendType: 0,
form:{},
},
+ selfTotal: 0,
radio1:'待发送',
table1:true,
table2:false,
@@ -345,6 +371,7 @@
markDate:'',
remark:'',
},
+ selfTitle: '',
selfInspectFormRules:{
markUserName: [{ required: true, message: '自查人不能为空', trigger: 'blur' }],
markDate: [{ required: true, message: '自查时间不能为空', trigger: 'blur' }]
@@ -357,10 +384,12 @@
checktype: [{ required: true, message: '不能为空', trigger: 'blur' },],
},
+
}
},
mounted() {
this.getPageList();
+ this.getSelfTotal();
this.initYHBM();
this.initJCLB();
this.initXFDW();
@@ -370,25 +399,66 @@
methods:{
addDanger(){
this.$router.push({
- path:'/existN',
+ path:'/addDanger',
})
},
handleClick(data,val){
- if(val=='存在'){
- this.$router.push({
- path:'/exist'
+ if(val=='不存在'){
+ this.$nextTick(() =>{
+ this.$refs["selfInspectForm"].clearValidate()
})
+ this.selfInspectForm={}
+ this.selfInspectVisible = true
+ if (this.listQuery.sendType == '1'){
+ let params = {
+ id: data.id,
+ type: 0,
+ }
+ selfCheckNotInfo(params).then(res=>{
+ if (res.data.ok==1){
+ this.selfInspectForm=res.data.data[0]
+ } else{
+ this.$message({type:'error', message:res.data.msg, duration:3000})
+ }
+ })
+ }
+ return
}
+ let puType = '0';
+ this.$router.push({
+ path:'/existN',
+ query: {
+ data: data,
+ type: puType
+ }
+ })
+ },
+ //不存在提交
+ submitSelfInspect(){
+ this.$refs["selfInspectForm"].validate((valid) =>{
+ if (valid){
+ noExistSave(this.selfInspectForm).then((res)=>{
+ if (res.data.ok==1) {
+ this.$message({type:'success', message:"保存成功", duration:3000});
+ this.selfInspectVisible = false
+ }else{
+ this.$message({type:'error', message:res.data.msg, duration:3000})
+ }
+ })
+ }
+ })
},
handoff(index){
if(index==1){
this.table1=false
this.table2=true
this.listQuery.type = 2
+ this.listQuery.sendType = 0
this.getPageList()
}else{
this.listQuery.type = 0
this.getPageList()
+ this.getSelfTotal();
this.table1=true
this.table2=false
}
@@ -463,6 +533,24 @@
}
})
},
+ //获取待自查数量
+ getSelfTotal(){
+ if (this.listQuery.type != '2'){
+ let query = {
+ page: 1,
+ sendType: 0,
+ type: 2,
+ form:{},
+ };
+ getPageList(query).then(res=>{
+ if (res.data.ok==1) {
+ this.selfTotal=res.data.data.total
+ }else{
+ this.$message({type:'error', message:res.data.msg, duration:3000})
+ }
+ })
+ }
+ },
//重置
reset(){
this.listQuery.form={};
@@ -491,6 +579,10 @@
this.listQuery.type = val;
this.getPageList()
},
+ sendTypeChange(val){
+ this.listQuery.sendType = val;
+ this.getPageList()
+ },
handleSelectionChange(val){
this.selectedList = []
val.forEach((item) => {
--
Gitblit v1.9.2