From 4f77b7a712833d073f4006f3043468e0cbd9d7ca Mon Sep 17 00:00:00 2001
From: shj <1790240199@qq.com>
Date: 星期四, 19 五月 2022 18:29:10 +0800
Subject: [PATCH] Merge branch 'shf' of https://sinanoaq.cn:8888/r/ztqt into shf
---
src/api/sgyhpczl/oneFromanotherN.js | 68 ++++
src/views/oneFromanotherN/index.vue | 345 +++++++++++++++++++++++---
src/views/oneFromanother/index.vue | 55 ++-
src/api/sgyhpczl/oneFromanother.js | 18 +
src/views/oneFromanotherN/existN.vue | 265 +++----------------
src/views/oneFromanother/exist.vue | 5
6 files changed, 459 insertions(+), 297 deletions(-)
diff --git a/src/api/sgyhpczl/oneFromanother.js b/src/api/sgyhpczl/oneFromanother.js
index 615e6d3..7b6b447 100644
--- a/src/api/sgyhpczl/oneFromanother.js
+++ b/src/api/sgyhpczl/oneFromanother.js
@@ -25,8 +25,8 @@
arr.push({field:"address",value:data.form.address,type:'TXT'})
}
/*检查类别*/
- if(data.form.ht_typesub!=null && data.form.ht_typesub!=''){
- arr.push({field:"ht_typesub",value:data.form.ht_typesub,type:'OPT'})
+ if(data.form.checktype!=null && data.form.checktype!=''){
+ arr.push({field:"checktype",value:data.form.checktype,type:'OPT'})
}
/*隐患内容*/
if(data.form.ht_content!=null && data.form.ht_content!=''){
@@ -61,6 +61,20 @@
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:{}
+ });
+}
//撤销
export function revoke(id) {
return request({
diff --git a/src/api/sgyhpczl/oneFromanotherN.js b/src/api/sgyhpczl/oneFromanotherN.js
index def75e9..bd71dd3 100644
--- a/src/api/sgyhpczl/oneFromanotherN.js
+++ b/src/api/sgyhpczl/oneFromanotherN.js
@@ -6,7 +6,7 @@
var arr=[]
/*隐患单位*/
if(data.form.check_main_branch!=null && data.form.check_main_branch!=''){
- arr.push({field:"check_main_branch",value:data.form.check_main_branch,type:'OPT'})
+ arr.push({field:"check_main_branch",value:data.form.check_main_branch,type:'TXT'})
}
/*检查类别*/
if(data.form.checktype!=null && data.form.checktype!=''){
@@ -32,7 +32,7 @@
if(data.form.ht_content!=null && data.form.ht_content!=''){
arr.push({field:"ht_content",value:data.form.ht_content,type:'TXT'})
}
- /*隐患内容*/
+ /*发送单位*/
if(data.form.workGroupName!=null && data.form.workGroupName!=''){
arr.push({field:"workGroupName",value:data.form.workGroupName,type:'TXT'})
}
@@ -52,18 +52,68 @@
data
});
}
-//导出
-export function analogy_export_do(data) {
+//新增
+export function save(data) {
return request({
- headers: {
+ headers:{
'token': getTokenAndVerify().token,
- 'verify': getTokenAndVerify().verify
+ 'verify':getTokenAndVerify().verify
},
- url: '/taboi/excel/analogy_export_do',
+ url: "/taboi/analogy/save_do",
+ contentType: "application/json",
method: 'POST',
- responseType: 'arraybuffer',
+ data
+ });
+}
+//编辑
+export function edit(data) {
+ return request({
+ headers:{
+ 'token': getTokenAndVerify().token,
+ 'verify':getTokenAndVerify().verify
+ },
+ url: "/taboi/analogy/edit_do",
+ contentType: "application/json",
+ method: 'POST',
data
});
}
-
+//删除
+export function del(data) {
+ return request({
+ headers:{
+ 'token': getTokenAndVerify().token,
+ 'verify':getTokenAndVerify().verify
+ },
+ url: "/taboi/analogy/del_do?id=" + data,
+ contentType: "multipart/form-data",
+ method: 'POST'
+ });
+}
+//发送
+export function send(data) {
+ return request({
+ headers:{
+ 'token': getTokenAndVerify().token,
+ 'verify':getTokenAndVerify().verify
+ },
+ url: "/taboi/analogy/inner_send_do",
+ contentType: "application/x-www-form-urlencoded",
+ method: 'POST',
+ data
+ });
+}
+//回收
+export function revoke(data) {
+ return request({
+ headers:{
+ 'token': getTokenAndVerify().token,
+ 'verify':getTokenAndVerify().verify
+ },
+ url: "/taboi/analogy/inner_revoke_do",
+ contentType: "application/x-www-form-urlencoded",
+ method: 'POST',
+ data
+ });
+}
diff --git a/src/views/oneFromanother/exist.vue b/src/views/oneFromanother/exist.vue
index a4cb54e..b1a35e1 100644
--- a/src/views/oneFromanother/exist.vue
+++ b/src/views/oneFromanother/exist.vue
@@ -1,6 +1,6 @@
<template>
<div class="app-container" >
- <div v-if="type == '0'" style="">
+ <div v-if="type=='0'" style="">
<Titlename title="录入隐患单页面"></Titlename>
<div class="whole-form">
<el-form
@@ -112,7 +112,7 @@
<el-button
size="mini"
@click="editDanger(scope.row, scope.$index)"
- >添加
+ >编辑
</el-button>
<el-button
size="mini"
@@ -139,7 +139,6 @@
</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>
diff --git a/src/views/oneFromanother/index.vue b/src/views/oneFromanother/index.vue
index a62ce0c..fed5586 100644
--- a/src/views/oneFromanother/index.vue
+++ b/src/views/oneFromanother/index.vue
@@ -15,7 +15,7 @@
<el-input v-model="listQuery.form.ht_community" style="width:202px"></el-input>
</el-form-item>
<el-form-item label="隐患类别">
- <el-select v-model="listQuery.form.checktype" placeholder="请选择">
+ <el-select v-model="listQuery.form.ht_typesub" placeholder="请选择">
<el-option
v-for="item in YHLBList"
:key="item.value"
@@ -38,7 +38,7 @@
<el-input v-model="listQuery.form.address" style="width:202px" placeholder="请输入内容"></el-input>
</el-form-item>
<el-form-item label="检查类别">
- <el-select v-model="listQuery.form.ht_typesub" placeholder="请选择">
+ <el-select v-model="listQuery.form.checktype" placeholder="请选择">
<el-option
v-for="item in JCLBList"
:key="item.value"
@@ -124,7 +124,7 @@
>
</el-pagination>
</div>
- <el-dialog title="填写自查结果" :visible.sync="selfInspectVisible" :modal-append-to-body="false" :close-on-click-modal="false" width="600px">
+ <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>
@@ -140,16 +140,16 @@
<el-input v-model="selfInspectForm.remark" type="textarea" rows="5" class="analyseUnit_input"></el-input>
</el-form-item>
</el-form>
- <div align="right">
- <el-button @click="selfInspectVisible = false">取消</el-button>
- <el-button type="primary" @click="submitSelfInspect()">确认</el-button>
+ <div align="center">
+ <el-button type="primary" v-if="listQuery.type == '0'" @click="submitSelfInspect()">确认</el-button>
+ <el-button @click="selfInspectVisible = false">关闭</el-button>
</div>
</el-dialog>
</div>
</template>
<script>
- import { getPageList, noExistSave, revoke, analogy_export_do} from "@/api/sgyhpczl/oneFromanother"
+ import { getPageList, noExistSave,selfCheckNotInfo, revoke, analogy_export_do} from "@/api/sgyhpczl/oneFromanother"
import {initJCBM, initYHLX, initJCLB, initYHJB} from "@/api/sgyhpczl/initSelect";
export default{
@@ -179,6 +179,7 @@
markDate:'',
remark:'',
},
+ selfTitle: '',
selfInspectFormRules:{
markUserName: [{ required: true, message: '自查人不能为空', trigger: 'blur' }],
markDate: [{ required: true, message: '自查时间不能为空', trigger: 'blur' }]
@@ -219,34 +220,38 @@
})
},
handleClick(data,val){
- if(!val){
- this.$router.push({
- path:'/exist',
- query: {
- data: data,
- type: this.listQuery.type
- }
- })
- return
- }
if(val=='不存在'){
this.$nextTick(() =>{
this.$refs["selfInspectForm"].clearValidate()
})
+ this.selfInspectForm={}
this.selfInspectVisible = true
- this.selfInspectForm.id = data.id
if (this.listQuery.type == '1'){
- initYHLX().then(res=>{
+ let params = {
+ id: data.id,
+ type: 0,
+ }
+ selfCheckNotInfo(params).then(res=>{
if (res.data.ok==1){
- this.selfInspectForm.remark=res.data.data[0].value
+ this.selfInspectForm=res.data.data[0]
} else{
this.$message({type:'error', message:res.data.msg, duration:3000})
}
})
}
-
-
+ return
}
+ let puType = '0';
+ if (this.listQuery.type=='1' && data.jyfsFlag=='0'){
+ puType = '1';
+ }
+ this.$router.push({
+ path:'/exist',
+ query: {
+ data: data,
+ type: puType
+ }
+ })
},
initXFDW(){
initJCBM(1).then(res=>{
@@ -319,8 +324,14 @@
this.listQuery.form={};
this.getPageList()
},
+ //自查切换
radioChange(val){
this.listQuery.type = val;
+ if (val == '0'){
+ this.selfTitle = '填写自查结果'
+ }else {
+ this.selfTitle = '查看自查结果'
+ }
this.getPageList()
},
changeBox(val){
diff --git a/src/views/oneFromanotherN/existN.vue b/src/views/oneFromanotherN/existN.vue
index 73cfd78..61c15fc 100644
--- a/src/views/oneFromanotherN/existN.vue
+++ b/src/views/oneFromanotherN/existN.vue
@@ -1,7 +1,7 @@
<template>
<div class="app-container">
<div style="">
- <Titlename title="录入隐患单页面"></Titlename>
+ <Titlename title="录入举一反三页面"></Titlename>
<div class="whole-form">
<el-form
:model="ruleForm"
@@ -9,8 +9,7 @@
ref="ruleForm"
label-width="150px"
class="demo-ruleForm"
- style="margin: 0 14% 0 16%"
- >
+ style="margin: 0 14% 0 16%">
<el-row>
<el-col :span="9">
<el-form-item label="检查时间" prop="check_date">
@@ -19,8 +18,7 @@
type="date"
value-format="yyyy-MM-dd"
placeholder="选择日期"
- style="width: 100%"
- >
+ style="width: 100%">
</el-date-picker>
</el-form-item>
</el-col>
@@ -40,87 +38,53 @@
<el-row>
<el-col :span="9" >
<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-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>
- <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>
- <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" v-if="addShow">
+ <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" @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="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 size="mini" @click="editDanger(scope.row, scope.$index)">
+ 编辑
</el-button>
- <el-button
- size="mini"
- v-if="addShow"
- @click="deleteDanger(scope.row, scope.$index)"
- >删除
+ <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-button type="primary" class="btns" @click="submitForm('ruleForm')">
+ 保存
+ </el-button>
+ <el-button @click="closeShow">关闭</el-button>
</el-form-item>
</el-col>
</el-row>
@@ -140,15 +104,14 @@
<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-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="请选择">
@@ -177,9 +140,9 @@
<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 type="primary" class="btns" @click="submitDanger('form')">
+ 保存
+ </el-button>
<el-button @click="dialogVisible=false">关闭</el-button>
</el-form-item>
</el-col>
@@ -193,8 +156,10 @@
<script>
import Titlename from "../../components/Titlename/index.vue";
-import {initJCBM ,initYHLX, initBC ,initJCLB ,initYHBM ,initYHJB,initLlr,initReformStatus,initYwks,initWxy} from "@/api/sgyhpczl/initSelect";
+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 {
@@ -202,85 +167,36 @@
name: "hiddenDangerList",
data() {
return {
- addShow:true,
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: {
+ 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' },],
+ check_main_branch: [{ required: true, message: '不能为空', trigger: 'change' },],
checktype: [{ required: true, message: '不能为空', trigger: 'blur' },],
- },
- tableData: [],
+ },
+ tableData: [],
};
},
mounted(){
- this.initBC()
this.initJCLB()
this.initYHJB()
this.initYHLX()
- //this.initLlr()
- this.initReformStatus()
- this.initYHBM()
- this.initYWKS()
- this.initWXY()
- this.initDangerRebound()
- this.id = this.$route.query.id;
- if( this.id!=null && this.id!=''){
- this.initInfo();
- this.addShow=false
- }
},
methods: {
- 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.reboundList=res.data.data
- } else{
- this.$message({type:'error', message:res.data.msg, duration:3000})
- }
- })
- },
submitDanger(formName){
this.$refs[formName].validate((valid) => {
if (valid) {
@@ -300,8 +216,6 @@
});
},
deleteDanger(row, index) {
-
-
this.$confirm('确认删除吗', '提示', {
confirmButtonText: '确认',
cancelButtonText: '取消',
@@ -345,46 +259,6 @@
}
}
},
- 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){
@@ -421,15 +295,6 @@
}
})
},
- 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){
@@ -440,10 +305,9 @@
})
},
-
- returnIndex(){
+ closeShow(){
this.$router.push({
- path:"/hiddenDangerRegistration"
+ path:"/oneFromanotherN"
})
},
submitForm(formName) {
@@ -453,47 +317,16 @@
this.$message({type:'error', message:"请添加隐患", duration:2000})
}
this.ruleForm.items=this.tableData
- if(this.addShow){
- saveDanger(this.ruleForm).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 {
- 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})
- }
- })
- }
-
-
+ 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!!");
diff --git a/src/views/oneFromanotherN/index.vue b/src/views/oneFromanotherN/index.vue
index 64723ba..ed13ff7 100644
--- a/src/views/oneFromanotherN/index.vue
+++ b/src/views/oneFromanotherN/index.vue
@@ -2,14 +2,15 @@
<div class="app-container">
<el-form ref="form" :inline="true" class="inquire" :model="listQuery.form" label-width="80px">
<el-form-item label="隐患单位">
- <el-select v-model="listQuery.form.check_main_branch" placeholder="请选择">
- <el-option
- v-for="item in XFDWList"
- :key="item.value"
- :label="item.value"
- :value="item.value">
- </el-option>
- </el-select>
+ <el-input v-model="listQuery.form.check_main_branch" style="width:202px"></el-input>
+<!-- <el-select v-model="listQuery.form.check_main_branch" placeholder="请选择">-->
+<!-- <el-option-->
+<!-- v-for="item in XFDWList"-->
+<!-- :key="item.value"-->
+<!-- :label="item.value"-->
+<!-- :value="item.value">-->
+<!-- </el-option>-->
+<!-- </el-select>-->
</el-form-item>
<el-form-item label="检查类别">
<el-select v-model="listQuery.form.checktype" placeholder="请选择">
@@ -50,9 +51,8 @@
<el-form-item label="隐患内容">
<el-input v-model="listQuery.form.ht_content" style="width:202px" placeholder="请输入内容"></el-input>
</el-form-item>
-
- <el-form-item label="发送单位">
- <el-input v-model="listQuery.form.workGroupName" style="width:202px" placeholder="请输入内容"></el-input>
+ <el-form-item label="发送单位" v-if="listQuery.type=='1'">
+ <el-input v-model="listQuery.form.workGroupName" style="width:202px" placeholder="请输入内容"></el-input>
</el-form-item>
<el-form-item label="检查时间">
<el-col :span="11">
@@ -69,8 +69,6 @@
<el-button type="primary" class="btns" size="small" icon="el-icon-search" @click="getPageList()">查询
</el-button>
<el-button type="primary" class="btns" size="small" @click="reset()">重置</el-button>
- <el-button type="primary" class="btns" size="small" icon="el-icon-upload2" @click="exportData">导出excel
- </el-button>
</el-form-item>
</el-form>
<el-row class="title-center">
@@ -88,12 +86,12 @@
</el-col>
<div v-if="table1">
<el-col :span="14" style="text-align:right;" v-if="listQuery.type==0">
- <el-button class="btns" type="primary" size="small" icon="el-icon-upload2" >发送</el-button>
- <el-button class="btns" type="primary" size="small" icon="el-icon-plus" @click="sendBath()">添加</el-button>
- <el-button size="small" >批量删除</el-button>
+ <el-button class="btns" type="primary" size="small" icon="el-icon-upload2" @click="openSend()">发送</el-button>
+ <el-button class="btns" type="primary" size="small" icon="el-icon-plus" @click="addDanger()">添加</el-button>
+ <el-button size="small" @click="deleteBatch()" >批量删除</el-button>
</el-col>
<el-col :span="14" style="text-align:right;" v-if="listQuery.type==1">
- <el-button class="btns" type="primary" size="small" >收回</el-button>
+ <el-button class="btns" type="primary" size="small" @click="tackBack()">收回</el-button>
</el-col>
</div>
</el-row>
@@ -113,15 +111,15 @@
<el-table-column prop="check_main_branch" label="检查单位" align="center"></el-table-column>
<el-table-column prop="checktype" label="检查类别" align="center"></el-table-column>
<!-- <el-table-column prop="measure" label="被检单位" align="center"></el-table-column> -->
- <el-table-column prop="ht_level" label="隐患类别" align="center"></el-table-column>
- <el-table-column prop="ht_typesub" 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="address" label="隐患地点" align="center"></el-table-column>
<el-table-column prop="ht_content" label="隐患内容" width="200" align="center"></el-table-column>
<!-- <el-table-column prop="curWarningLevel" 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="editDanger(scope.row)" type="text" size="small">编辑</el-button>
+ <el-button @click="deleteDanger(scope.row)" type="text" size="small">删除</el-button>
</template>
</el-table-column>
</el-table>
@@ -185,11 +183,128 @@
</el-pagination>
</div>
+ <!-- 编辑弹窗 -->
+ <el-dialog
+ 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="check_date">
+ <el-date-picker
+ v-model="dangerForm.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="checktype">
+ <el-select v-model="dangerForm.checktype" placeholder="请选择">
+ <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="dangerForm.check_main_branch" class="multiline"></el-input>
+ </el-form-item>
+ </el-col>
+ </el-row>
+
+ <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 YHLBList"
+ :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>
+
+ <!-- 部门弹窗 -->
+ <el-dialog
+ title="责任单位"
+ :visible.sync="bmDialogVisible"
+ :close-on-click-modal="false"
+ width="40%">
+ <el-form>
+ <el-row>
+ <el-checkbox style="width: 80px;height: 30px" v-for="item in YHBMList" v-model="checked" :label="item.branch_id">
+ {{item.branch_name}}
+ </el-checkbox>
+ </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()">
+ 保存
+ </el-button>
+ <el-button size="small" @click="bmDialogVisible = false">关闭</el-button>
+ </el-form-item>
+ </el-col>
+ </el-row>
+ </el-form>
+ </el-dialog>
+
</div>
</template>
<script>
- import { getPageList, analogy_export_do} from "@/api/sgyhpczl/oneFromanotherN"
- import {initJCBM, initYHLX, initJCLB, initYHJB} from "@/api/sgyhpczl/initSelect";
+import { getPageList, edit, del, send, revoke} from "@/api/sgyhpczl/oneFromanotherN"
+import {initJCBM, initYHLX, initJCLB, initYHJB,initYHBM} from "@/api/sgyhpczl/initSelect";
+import {deepClone} from '@/utils'
+
export default{
data(){
@@ -209,6 +324,10 @@
currentPage: 1,
pageSize: 10,
recordTotal: 0,
+ YHBMList: [],
+ bmDialogVisible: false,
+ checked:[],
+ requestData:{},//发送提交参数
XFDWList:[],
YHLBList:[],
YHJBList:[],
@@ -227,20 +346,28 @@
markUserName: [{ required: true, message: '自查人不能为空', trigger: 'blur' }],
markDate: [{ required: true, message: '自查时间不能为空', trigger: 'blur' }]
},
+ dialogVisible:false,
+ dangerForm:{},
+ dangerRules:{
+ check_date: [{ required: true, message: '不能为空', trigger: 'blur' },],
+ check_main_branch: [{ required: true, message: '不能为空', trigger: 'blur' },],
+ checktype: [{ required: true, message: '不能为空', trigger: 'blur' },],
+ },
}
},
mounted() {
this.getPageList();
+ this.initYHBM();
this.initJCLB();
this.initXFDW();
this.initYHJB();
this.initYHLB();
},
methods:{
- sendBath(){
+ addDanger(){
this.$router.push({
- path:'/existN'
+ path:'/existN',
})
},
handleClick(data,val){
@@ -255,12 +382,22 @@
this.table1=false
this.table2=true
this.listQuery.type = 2
- console.log(this.listQuery.type)
this.getPageList()
}else{
+ this.listQuery.type = 0
+ this.getPageList()
this.table1=true
this.table2=false
}
+ },
+ 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})
+ }
+ })
},
initXFDW(){
initJCBM(1).then(res=>{
@@ -362,25 +499,6 @@
this.selectedList.push(item)
})
},
- exportData() {
- var requestData = this.listQuery;
- //删除分页参数
- this.$delete(requestData, 'page')
- this.$delete(requestData, 'limit')
- analogy_export_do(requestData).then(res => {
- var blob = new Blob([res.data])
- var downloadElement = document.createElement('a')
- var href = window.URL.createObjectURL(blob) //创建下载的链接
- downloadElement.href = href
- downloadElement.download = '内部举一反三.xlsx' //下载后文件名
- document.body.appendChild(downloadElement)
- downloadElement.click() //点击下载
- document.body.removeChild(downloadElement) //下载完成移除元素
- window.URL.revokeObjectURL(href) //释放掉blob对象
- }).catch(err => {
- console.log(err)
- })
- },
//日期格式转换
formatColumnDate(row, column) {
// 获取单元格数据
@@ -391,6 +509,143 @@
let dt = new Date(data)
return dt.getFullYear() + '-' + (dt.getMonth() + 1) + '-' + dt.getDate() + ' '
},
+ editDanger(row, index) {
+ this.dangerForm = deepClone(row);
+ this.rowIndex = index;
+ this.dialogVisible = true;
+ },
+ //编辑提交
+ submitDanger(formName){
+ this.$refs[formName].validate((valid) => {
+ if (valid) {
+ edit(this.dangerForm).then(res=>{
+ if (res.data.ok==1) {
+ this.dialogVisible=false
+ this.$message({type:'success', message:res.data.msg, duration:3000})
+ this.getPageList()
+ }else{
+ this.$message({type:'error', message:res.data.msg, duration:3000})
+ }
+ })
+ } else {
+ console.log("error submit!!");
+ return false;
+ }
+ });
+ },
+ deleteBatch() {
+ if (this.selectedList == null || this.selectedList.length == 0) {
+ this.$message({type: 'warning', message: '至少选中一条数据', duration: 3000})
+ return
+ }
+ var ids = this.selectedList.map((obj) => {
+ return obj.id
+ }).join(",")
+ this.$confirm('确认删除吗', '提示', {
+ confirmButtonText: '确认',
+ cancelButtonText: '取消',
+ type: 'warning'
+ }).then(() => {
+ del(ids).then(() => {
+ this.getPageList()
+ this.$notify({
+ title: "成功",
+ message: "删除成功",
+ type: "success",
+ duration: 2000,
+ });
+ });
+ })
+ .catch(error => {
+ });
+ },
+ deleteDanger(row) {
+ this.$confirm('确认删除吗', '提示', {
+ confirmButtonText: '确认',
+ cancelButtonText: '取消',
+ type: 'warning'
+ }).then(() => {
+ console.log(row.id)
+ del(row.id).then(() => {
+ this.getPageList()
+ this.$notify({
+ title: "成功",
+ message: "删除成功",
+ type: "success",
+ duration: 2000,
+ });
+ });
+ }).catch(error => {
+ });
+ },
+ //发送提交
+ submitForm() {
+ if (this.checked.length == 0) {
+ this.$message({
+ type: 'warning',
+ message: '请勾选需要发送的部门！'
+ });
+ return;
+ }
+ this.requestData.branchIds = this.checked.join(";");
+ send(this.requestData).then(res => {
+ if (res.data.ok) {
+ this.$message({
+ type: 'success',
+ message: res.data.msg
+ });
+ this.bmDialogVisible = false;
+ this.getPageList();
+ } else {
+ this.$message({
+ type: 'error',
+ message: res.data.msg
+ });
+ }
+ })
+ },
+ openSend() {
+ if (this.selectedList.length != 1) {
+ this.$message({
+ type: 'warning',
+ message: '请选择一条数据！'
+ });
+ return false;
+ } else {
+ this.requestData.id = this.selectedList[0].id;
+ this.bmDialogVisible = true;
+ }
+ },
+ tackBack(){
+ if (this.selectedList.length != 1) {
+ this.$message({
+ type: 'warning',
+ message: '请选择一条数据！'
+ });
+ return false;
+ }else {
+ this.$confirm('确认收回吗', '提示', {
+ confirmButtonText: '确认',
+ cancelButtonText: '取消',
+ type: 'warning'
+ }).then(() => {
+ let data = {
+ id: this.selectedList[0].id
+ }
+ revoke(data).then(() => {
+ this.getPageList()
+ this.$notify({
+ title: "成功",
+ message: "收回成功",
+ type: "success",
+ duration: 2000,
+ });
+ });
+ }).catch(error => {
+ });
+ }
+ }
+
}
}
</script>
--
Gitblit v1.9.2