From bf3dee8b344909bc1c78d36c87aa85df4b167176 Mon Sep 17 00:00:00 2001 From: cqf <2252655793@qq.com> Date: 星期二, 10 五月 2022 18:01:44 +0800 Subject: [PATCH] 众泰接口对接 --- src/views/hiddenDangerManagement/fillRectification.vue | 124 ++-- src/views/hiddenDangerManagement/index.vue | 799 ++++++++++++++++------------ src/api/sgyhpczl/hiddenDangerManagement.js | 117 +++- src/views/delayHiddenDangerRectification/index.vue | 483 +++++++++------- src/api/sgyhpczl/delayHiddenDangerRectification.js | 12 src/views/hiddenDangerManagement/fillInspector.vue | 107 +-- 6 files changed, 912 insertions(+), 730 deletions(-) diff --git a/src/api/sgyhpczl/delayHiddenDangerRectification.js b/src/api/sgyhpczl/delayHiddenDangerRectification.js index d458b62..293b92d 100644 --- a/src/api/sgyhpczl/delayHiddenDangerRectification.js +++ b/src/api/sgyhpczl/delayHiddenDangerRectification.js @@ -84,3 +84,15 @@ data }); } + +export function next_step_do(data) { + return request({ + headers:{ + 'token': getTokenAndVerify().token, + 'verify':getTokenAndVerify().verify + }, + url: "/taboi/danger/next_step_do", + contentType: "application/json", + method: 'POST', + }); +} diff --git a/src/api/sgyhpczl/hiddenDangerManagement.js b/src/api/sgyhpczl/hiddenDangerManagement.js index 28c1169..a0670c0 100644 --- a/src/api/sgyhpczl/hiddenDangerManagement.js +++ b/src/api/sgyhpczl/hiddenDangerManagement.js @@ -1,69 +1,69 @@ import request from '@/utils/request'; import {getTokenAndVerify} from "@/api/sgyhpczl/auth"; - +import {getToken} from '@/utils/auth' export function getPageList(data) { - var arr=[] + var arr = [] /*编号*/ - if(data.form.number!=null && data.form.number!=''){ - arr.push({field:"number",value:data.form.number,type:'TXT'}) + if (data.form.number != null && data.form.number != '') { + arr.push({field: "number", value: data.form.number, type: 'TXT'}) } /*检查人*/ - if(data.form.check_man!=null && data.form.check_man!=''){ - arr.push({field:"check_man",value:data.form.check_man,type:'TXT'}) + if (data.form.check_man != null && data.form.check_man != '') { + arr.push({field: "check_man", value: data.form.check_man, type: 'TXT'}) } /*隐患单位*/ - if(data.form.ht_branch!=null && data.form.ht_branch!=''){ - arr.push({field:"ht_branch",value:data.form.ht_branch,type:'TXT'}) + if (data.form.ht_branch != null && data.form.ht_branch != '') { + arr.push({field: "ht_branch", value: data.form.ht_branch, 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.ht_typesub != null && data.form.ht_typesub != '') { + arr.push({field: "ht_typesub", value: data.form.ht_typesub, type: 'OPT'}) } /*隐患级别*/ - if(data.form.ht_level!=null && data.form.ht_level!=''){ - arr.push({field:"ht_level",value:data.form.ht_level,type:'OPT'}) + if (data.form.ht_level != null && data.form.ht_level != '') { + arr.push({field: "ht_level", value: data.form.ht_level, type: 'OPT'}) } /*隐患来源*/ - if(data.form.qdJyfsId!=null && data.form.qdJyfsId!=''){ - arr.push({field:"qdJyfsId",value:data.form.qdJyfsId,type:'NOT'}) + if (data.form.qdJyfsId != null && data.form.qdJyfsId != '') { + arr.push({field: "qdJyfsId", value: data.form.qdJyfsId, type: 'NOT'}) } /*隐患地点*/ - if(data.form.address!=null && data.form.address!=''){ - arr.push({field:"address",value:data.form.address,type:'TXT'}) + if (data.form.address != null && data.form.address != '') { + arr.push({field: "address", value: data.form.address, type: 'TXT'}) } /*隐患内容*/ - 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.ht_content != null && data.form.ht_content != '') { + arr.push({field: "ht_content", value: data.form.ht_content, type: 'TXT'}) } /*班次*/ - if(data.form.check_class!=null && data.form.check_class!=''){ - arr.push({field:"check_class",value:data.form.check_class,type:'OPT'}) + if (data.form.check_class != null && data.form.check_class != '') { + arr.push({field: "check_class", value: data.form.check_class, type: 'OPT'}) } /*整改状态*/ - if(data.form.alter_status!=null && data.form.alter_status!=''){ - arr.push({field:"alter_status",value:data.form.alter_status,type:'OPT'}) + if (data.form.alter_status != null && data.form.alter_status != '') { + arr.push({field: "alter_status", value: data.form.alter_status, type: 'OPT'}) } /*是否关联*/ - if(data.form.DTRisk_bankId!=null && data.form.DTRisk_bankId!=''){ - arr.push({field:"DTRisk_bankId",value:data.form.DTRisk_bankId,type:'OPT'}) + if (data.form.DTRisk_bankId != null && data.form.DTRisk_bankId != '') { + arr.push({field: "DTRisk_bankId", value: data.form.DTRisk_bankId, type: 'OPT'}) } /*检查时间*/ - if(data.form.check_dateStart!=null && data.form.check_dateStart!='' && data.form.check_dateEnd!=null && data.form.check_dateEnd!=''){ - arr.push({field:"check_date",value:data.form.check_dateStart+"至"+data.form.check_dateEnd,type:'DAT'}) + if (data.form.check_dateStart != null && data.form.check_dateStart != '' && data.form.check_dateEnd != null && data.form.check_dateEnd != '') { + arr.push({field: "check_date", value: data.form.check_dateStart + "至" + data.form.check_dateEnd, type: 'DAT'}) } /*限改时间*/ - if(data.form.alter_timeStart!=null && data.form.alter_timeStart!='' && data.form.alter_timeEnd!=null && data.form.alter_timeEnd!=''){ - arr.push({field:"alter_time",value:data.form.alter_timeStart+"至"+data.form.alter_timeEnd,type:'DAT'}) + if (data.form.alter_timeStart != null && data.form.alter_timeStart != '' && data.form.alter_timeEnd != null && data.form.alter_timeEnd != '') { + arr.push({field: "alter_time", value: data.form.alter_timeStart + "至" + data.form.alter_timeEnd, type: 'DAT'}) } - data.query_condition=arr + data.query_condition = arr return request({ - headers:{ + headers: { 'token': getTokenAndVerify().token, - 'verify':getTokenAndVerify().verify + 'verify': getTokenAndVerify().verify }, url: "/taboi/danger/self_list", contentType: "application/json", @@ -74,9 +74,9 @@ export function saveSelfDanger(data) { return request({ - headers:{ + headers: { 'token': getTokenAndVerify().token, - 'verify':getTokenAndVerify().verify + 'verify': getTokenAndVerify().verify }, url: "/taboi/danger/self_save_do", contentType: "application/json", @@ -84,3 +84,54 @@ data }); } + +export function self_export_do(data) { + return request({ + headers: { + 'token': getTokenAndVerify().token, + 'verify': getTokenAndVerify().verify + }, + url: '/taboi/excel/self_export_do', + method: 'post', + responseType: 'arraybuffer', + data + }); +} + + +export function self_import_do(data) { + return request({ + headers: { + 'token': getTokenAndVerify().token, + 'verify': getTokenAndVerify().verify + }, + url: '/taboi/excel/self_import_do', + method: 'post', + data + }) +} + + +export function self_del_do(data) { + return request({ + headers: { + 'token': getTokenAndVerify().token, + 'verify': getTokenAndVerify().verify + }, + url: '/taboi/danger/self_del_do?id=' + data, + method: 'post', + data + }) +} + +export function self_edit_do(data) { + return request({ + headers: { + 'token': getTokenAndVerify().token, + 'verify': getTokenAndVerify().verify + }, + url: '/taboi/danger/self_edit_do', + method: 'post', + data + }) +} diff --git a/src/views/delayHiddenDangerRectification/index.vue b/src/views/delayHiddenDangerRectification/index.vue index a1a0282..cc97cac 100644 --- a/src/views/delayHiddenDangerRectification/index.vue +++ b/src/views/delayHiddenDangerRectification/index.vue @@ -5,7 +5,7 @@ <el-input v-model="listQuery.form.number" style="width:202px" placeholder="请输入内容"></el-input> </el-form-item> <el-form-item label="检查单位"> - <el-select v-model="listQuery.form.check_main_branch" placeholder="请选择" @change="changeJCDW"> + <el-select v-model="listQuery.form.check_main_branch" placeholder="请选择" @change="changeJCDW"> <el-option v-for="item in JCDWList" :key="item.value" @@ -117,24 +117,29 @@ </el-form-item> <el-form-item label="检查时间"> <el-col :span="11"> - <el-date-picker type="date" placeholder="选择日期" v-model="listQuery.form.check_dateStart" style="width: 100%;" value-format="yyyy-MM-dd"></el-date-picker> + <el-date-picker type="date" placeholder="选择日期" v-model="listQuery.form.check_dateStart" + style="width: 100%;" value-format="yyyy-MM-dd"></el-date-picker> </el-col> <el-col style="text-align:center" :span="2">-</el-col> <el-col :span="11"> - <el-date-picker type="date" placeholder="选择日期" v-model="listQuery.form.check_dateEnd" style="width: 100%;" value-format="yyyy-MM-dd"></el-date-picker> + <el-date-picker type="date" placeholder="选择日期" v-model="listQuery.form.check_dateEnd" + style="width: 100%;" value-format="yyyy-MM-dd"></el-date-picker> </el-col> </el-form-item> <el-form-item label="限改时间"> <el-col :span="11"> - <el-date-picker type="date" placeholder="选择日期" v-model="listQuery.form.alter_timeStart" value-format="yyyy-MM-dd" style="width: 100%;"></el-date-picker> + <el-date-picker type="date" placeholder="选择日期" v-model="listQuery.form.alter_timeStart" + value-format="yyyy-MM-dd" style="width: 100%;"></el-date-picker> </el-col> <el-col style="text-align:center" :span="2">-</el-col> <el-col :span="11"> - <el-date-picker type="date" placeholder="选择日期" v-model="listQuery.form.alter_timeEnd" value-format="yyyy-MM-dd" style="width: 100%;"></el-date-picker> + <el-date-picker type="date" placeholder="选择日期" v-model="listQuery.form.alter_timeEnd" + value-format="yyyy-MM-dd" style="width: 100%;"></el-date-picker> </el-col> </el-form-item> <el-form-item style="text-align:center;padding:0 50px"> - <el-button type="primary" class="btns" size="small" icon="el-icon-search" @click="getPageList()">查询</el-button> + <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">导出excel</el-button> </el-form-item> @@ -147,36 +152,36 @@ <el-radio-button label="广州"></el-radio-button> </el-radio-group> </el-col> --> - <el-col :span="24" style="text-align:right;"> - <el-button class="btns" type="primary" size="small">批量发送</el-button> + <el-col :span="24" style="text-align:right;"> + <el-button class="btns" type="primary" size="small" @click="sendBath()">批量发送</el-button> </el-col> </el-row> - <el-table :data="tableData" style="width: 100%" @selection-change="handleSelectionChange"> + <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="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="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 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="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> <el-table-column label="整改情况" align="center"> - <el-table-column prop="ACCOMPLISHTIME" label="完成时间" width="120" align="center"> </el-table-column> - <el-table-column prop="CALLBACKRESULT" label="复查结果" align="center"> </el-table-column> - <el-table-column prop="CALLBACKPERSON" label="复查人" align="center"> </el-table-column> - <el-table-column prop="CALLBACKTIME" label="复查时间" width="120" align="center"></el-table-column> + <el-table-column prop="ACCOMPLISHTIME" label="完成时间" width="120" align="center"></el-table-column> + <el-table-column prop="CALLBACKRESULT" label="复查结果" align="center"></el-table-column> + <el-table-column prop="CALLBACKPERSON" label="复查人" align="center"></el-table-column> + <el-table-column prop="CALLBACKTIME" label="复查时间" width="120" align="center"></el-table-column> </el-table-column> - <el-table-column label="隐患处理状态" align="center"> + <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> @@ -184,10 +189,10 @@ <span v-if="scope.row.step =='end'">处理结束</span> </template> </el-table-column> - <el-table-column prop="date" label="是否关联" align="center"> </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-column prop="date" label="是否关联" align="center"></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-column prop="date" label="流程操作" align="center"> <template slot-scope="scope"> <el-button @click="handleClick(scope.row)" type="text" size="small">点击发送</el-button> @@ -210,203 +215,243 @@ </div> </template> <script> - import {getPageList} from "@/api/sgyhpczl/delayHiddenDangerRectification"; - import {initJCBM ,initYHLX, initBC ,initJCLB ,initYHBM ,initYHJB,initLlr} from "@/api/sgyhpczl/initSelect"; - export default { - data() { - return { - options: [], - form:{}, - value1:"", - reList:[{label:"未关联",value:0}], - llrList:[], - JCDWList:[{label:"众泰煤焦化",value:0},{label:"上级单位",value:1}], - JCBMList:[], - YHLXList:[], - BCList:[], - JCLBList:[], - YHBMList:[], - YHJBList:[], - tableData: [], - listQuery:{ - page:1, - limit:10, - form:{ - ht_community:"众泰煤焦化" - }, +import {getPageList, next_step_do} from "@/api/sgyhpczl/delayHiddenDangerRectification"; +import {initJCBM, initYHLX, initBC, initJCLB, initYHBM, initYHJB, initLlr} from "@/api/sgyhpczl/initSelect"; + +export default { + data() { + return { + options: [], + form: {}, + value1: "", + reList: [{label: "未关联", value: 0}], + llrList: [], + JCDWList: [{label: "众泰煤焦化", value: 0}, {label: "上级单位", value: 1}], + JCBMList: [], + YHLXList: [], + BCList: [], + JCLBList: [], + YHBMList: [], + YHJBList: [], + tableData: [], + listQuery: { + page: 1, + limit: 10, + form: { + ht_community: "众泰煤焦化" }, - currentPage: 1, - pageSize: 10, - recordTotal: 0, - }; + }, + currentPage: 1, + pageSize: 10, + recordTotal: 0, + }; + }, + mounted() { + this.getPageList() + this.initYHLX() + this.initYHJB() + this.initBC() + this.initJCLB() + this.initLlr() + this.initYHBM() + }, + methods: { + 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}) + } + }) }, - mounted(){ + initYHBM(val) { + initYHBM().then(res => { + if (res.data.ok == 1) { + this.YHBMList = 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}) + } + }) + }, + checkTime() { + if (this.listQuery.form.check_dateStart != null && this.listQuery.form.check_dateStart != '') { + if (this.listQuery.form.check_dateEnd != null && this.listQuery.form.check_dateEnd != '') { + } else { + this.$message({type: 'error', message: "请选择检查结束时间", duration: 3000}) + return + } + + } + if (this.listQuery.form.check_dateEnd != null && this.listQuery.form.check_dateEnd != '') { + if (this.listQuery.form.check_dateStart != null && this.listQuery.form.check_dateStart != '') { + } else { + this.$message({type: 'error', message: "请选择检查开始时间", duration: 3000}) + return + } + } + if (this.listQuery.form.alter_timeStart != null && this.listQuery.form.alter_timeStart != '') { + if (this.listQuery.form.alter_timeEnd != null && this.listQuery.form.alter_timeEnd != '') { + } else { + this.$message({type: 'error', message: "请选择限改结束时间", duration: 3000}) + return + } + + } + if (this.listQuery.form.alter_timeEnd != null && this.listQuery.form.alter_timeEnd != '') { + if (this.listQuery.form.alter_timeStart != null && this.listQuery.form.alter_timeStart != '') { + } else { + this.$message({type: 'error', message: "请选择改开始时间", duration: 3000}) + return + } + } + }, + getPageList() { + this.listQuery.page = 1 + this.checkTime() + getPageList(this.listQuery).then(res => { + if (res.data.ok == 1) { + this.tableData = res.data.data.items + this.recordTotal = res.data.data.total + } else { + this.$message({type: 'error', message: res.data.msg, duration: 3000}) + } + }) + }, + reset() { + this.listQuery.form = {ht_community: "众泰煤焦化"} this.getPageList() - this.initYHLX() - this.initYHJB() - this.initBC() - this.initJCLB() - this.initLlr() - this.initYHBM() }, - methods:{ - 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}) - } - }) - }, - initYHBM(val){ - initYHBM().then(res=>{ - if (res.data.ok==1){ - this.YHBMList=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}) - } - }) - }, - checkTime(){ - if(this.listQuery.form.check_dateStart!=null && this.listQuery.form.check_dateStart!=''){ - if(this.listQuery.form.check_dateEnd!=null && this.listQuery.form.check_dateEnd!=''){ - }else { - this.$message({type:'error', message:"请选择检查结束时间", duration:3000}) - return - } + handleSizeChange(val) { + this.listQuery.limit = val + this.getPageListForPagination(); + }, + handleCurrentChange(val) { + this.listQuery.page = val + this.getPageListForPagination(); + }, + getPageListForPagination() { + this.checkTime() + getPageList(this.listQuery).then(res => { + if (res.data.ok == 1) { + this.tableData = res.data.data.items + this.recordTotal = res.data.data.total + } 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}) + } + }) + }, + // table点击多选框返回数据 + handleSelectionChange(val) { + this.multipleSelection = val; + }, + // 发送隐患单跳转 + handleClick() { + this.$router.push({ + path: "/rectificationDelayHiddenDanger" + }) + }, + sendBath() { - } - if(this.listQuery.form.check_dateEnd!=null && this.listQuery.form.check_dateEnd!=''){ - if(this.listQuery.form.check_dateStart!=null && this.listQuery.form.check_dateStart!=''){ - }else { - this.$message({type:'error', message:"请选择检查开始时间", duration:3000}) - return + var selectData = this.$refs.dataTable.selection; + if (selectData.length < 1) { + this.$message({type: 'warn', message: "请选择需要发送的数据!", duration: 3000}) + return; + } + var selectIds = ""; + selectData.forEach(n => { + selectIds += n.id + ","; + }) + selectIds = selectIds.substring(0, selectIds.length - 1); + var now = new Date(); + var requestData = { + "id": selectIds, //隐患ID + "step": "1", //步骤 + "alter_time": now.toLocaleDateString().replaceAll("/", "-"), + "dealContent": "同意延期申请" //备注 + } + this.$confirm('确认要发送吗?', '提示', { + confirmButtonText: '确定', + cancelButtonText: '取消', + type: 'warning', + }).then(() => { + next_step_do(requestData).then(res => { + var data = res.data; + if (data.ok) { + this.$message({type: 'success', message: data.msg, duration: 3000}); + this.getPageList(); + } else { + this.$message({type: 'warn', message: data.msg, duration: 3000}); } - } - if(this.listQuery.form.alter_timeStart!=null && this.listQuery.form.alter_timeStart!=''){ - if(this.listQuery.form.alter_timeEnd!=null && this.listQuery.form.alter_timeEnd!=''){ - }else { - this.$message({type:'error', message:"请选择限改结束时间", duration:3000}) - return - } + }) + }) - } - if(this.listQuery.form.alter_timeEnd!=null && this.listQuery.form.alter_timeEnd!=''){ - if(this.listQuery.form.alter_timeStart!=null && this.listQuery.form.alter_timeStart!=''){ - }else { - this.$message({type:'error', message:"请选择改开始时间", duration:3000}) - return - } - } - }, - getPageList(){ - this.listQuery.page=1 - this.checkTime() - getPageList(this.listQuery).then(res=>{ - if (res.data.ok==1) { - this.tableData = res.data.data.items - this.recordTotal=res.data.data.total - }else{ - this.$message({type:'error', message:res.data.msg, duration:3000}) - } - }) - }, - reset(){ - this.listQuery.form={ht_community:"众泰煤焦化"} - this.getPageList() - }, - handleSizeChange(val){ - this.listQuery.limit = val - this.getPageListForPagination(); - }, - handleCurrentChange(val){ - this.listQuery.page = val - this.getPageListForPagination(); - }, - getPageListForPagination(){ - this.checkTime() - getPageList(this.listQuery).then(res=>{ - if (res.data.ok==1) { - this.tableData = res.data.data.items - this.recordTotal=res.data.data.total - }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}) - } - }) - }, - // table点击多选框返回数据 - handleSelectionChange(val) { - this.multipleSelection = val; - }, - // 发送隐患单跳转 - handleClick(){ - this.$router.push({ - path:"/rectificationDelayHiddenDanger" - }) - }, } - }; + } +}; </script> <style> - .inquire{ - display: flex; - justify-content:left; - flex-wrap: wrap; - } - .inquire .el-form-item{ - padding: 0 46px; - } - .title-center{ - padding: 20px 0; - } - .btns { - background-color: #034ea2; - border: 1px solid #034ea2; - } +.inquire { + display: flex; + justify-content: left; + flex-wrap: wrap; +} + +.inquire .el-form-item { + padding: 0 46px; +} + +.title-center { + padding: 20px 0; +} + +.btns { + background-color: #034ea2; + border: 1px solid #034ea2; +} </style> diff --git a/src/views/hiddenDangerManagement/fillInspector.vue b/src/views/hiddenDangerManagement/fillInspector.vue index 6052daa..8383cbc 100644 --- a/src/views/hiddenDangerManagement/fillInspector.vue +++ b/src/views/hiddenDangerManagement/fillInspector.vue @@ -30,125 +30,125 @@ width="100"> </el-table-column> <el-table-column - prop="Inspector" + prop="check_man" label="检查人" align="center" width="100"> </el-table-column> <el-table-column - prop="inspection" + prop="check_class" label="检查班次" align="center" width="80"> </el-table-column> <el-table-column - prop="date" + prop="check_date" label="检查时间" align="center" width="100"> </el-table-column> <el-table-column - prop="place" + prop="address" label="地点" align="center" width="100"> </el-table-column> <el-table-column - prop="content" + prop="ht_content" label="内容" align="center" width="180"> </el-table-column> <el-table-column - prop="category" + prop="ht_typesub" label="类别" align="center" width="80"> </el-table-column> <el-table-column - prop="level" + prop="ht_level" label="级别" align="center" width="120"> </el-table-column> <el-table-column - prop="rectification" + prop="measure" label="整改措施" align="center" width="120"> </el-table-column> <el-table-column - prop="liable" + prop="duty_officer" label="责任人" align="center" width="100"> </el-table-column> <el-table-column - prop="time" + prop="alter_time" label="限改时间" align="center" width="120"> </el-table-column> <el-table-column - prop="completionTime" + prop="ACCOMPLISHTIME" align="center" label="完成时间" width="100"> </el-table-column> <el-table-column - prop="rechecker" + prop="CALLBACKPERSON" label="复查人" align="center" width="100"> </el-table-column> <el-table-column - prop="reviewTime" + prop="CALLBACKTIME" align="center" width="100" label="复查时间"> </el-table-column> <el-table-column - prop="supervision" + prop="inspectionClass" label="督察单位" align="center" width="160"> <div class="item" slot-scope="scope"> - <el-input class="item__input" v-model="scope.row.rechecker" placeholder="请输入内容" clearable></el-input> - <div class="item__txt">{{scope.row.rechecker}}</div> + <el-input class="item__input" v-model="scope.row.inspectionClass" placeholder="请输入内容" clearable></el-input> + <div class="item__txt">{{scope.row.inspectionClass}}</div> </div> </el-table-column> <el-table-column - prop="inspectorTime" + prop="inspectionTime" align="center" label="督察时间" width="160"> <div class="item" slot-scope="scope"> <el-date-picker - v-model="scope.row.completionTime" + v-model="scope.row.inspectionTime" type="date" placeholder="选择日期" clearable> </el-date-picker> - <div class="item__txt">{{scope.row.completionTime}}</div> + <div class="item__txt">{{scope.row.inspectionTime}}</div> </div> </el-table-column> <el-table-column - prop="results" + prop="inspectionResult" label="督察结果" align="center" width="160"> <div class="item" slot-scope="scope"> - <el-input class="item__input" v-model="scope.row.rechecker" placeholder="请输入内容" clearable></el-input> - <div class="item__txt">{{scope.row.rechecker}}</div> + <el-input class="item__input" v-model="scope.row.inspectionResult" placeholder="请输入内容" clearable></el-input> + <div class="item__txt">{{scope.row.inspectionResult}}</div> </div> </el-table-column> <el-table-column - prop="inspector" + prop="inspectionMan" label="督察人" align="center" width="160"> <div class="item" slot-scope="scope"> - <el-input class="item__input" v-model="scope.row.rechecker" placeholder="请输入内容" clearable></el-input> - <div class="item__txt">{{scope.row.rechecker}}</div> + <el-input class="item__input" v-model="scope.row.inspectionMan" placeholder="请输入内容" clearable></el-input> + <div class="item__txt">{{scope.row.inspectionMan}}</div> </div> </el-table-column> </el-table> @@ -177,62 +177,15 @@ data() { return { // 表格数据 - tableData: [{ - serial:'1', - number:'dycj-20220409-0083', - hiddenDanger:'电仪车间', - Inspector:'吴甲甲 ', - inspection:'早班', - date: '2016-05-02', - place:'生化站 ', - content:'生化站3号污泥回流泵电机接地线脱落', - category:'电气', - level:'一般隐患C', - rectification:'已紧固处理', - liable:'常春', - time:'2016-05-02', - completionTime:'', - rechecker:'', - reviewTime:'', - }, { - serial:'2', - number:'dycj-20220409-0083', - hiddenDanger:'电仪车间', - Inspector:'吴甲甲 ', - inspection:'早班', - date: '2016-05-02', - place:'生化站 ', - content:'生化站3号污泥回流泵电机接地线脱落', - category:'电气', - level:'一般隐患C', - rectification:'已紧固处理', - liable:'常春', - time:'2016-05-02', - completionTime:'', - rechecker:'', - reviewTime:'', - }, { - serial:'3', - number:'dycj-20220409-0083', - hiddenDanger:'电仪车间', - Inspector:'吴甲甲 ', - inspection:'早班', - date: '2016-05-02', - place:'生化站 ', - content:'生化站3号污泥回流泵电机接地线脱落', - category:'电气', - level:'一般隐患C', - rectification:'已紧固处理', - liable:'常春', - time:'2016-05-02', - completionTime:'', - rechecker:'', - reviewTime:'', - }], + tableData: [], // 需要编辑的属性 editProp: ['inspectorTime', 'results', 'inspector'] }; }, + mounted(){ + console.log(this.$store) + this.tableData = this.$route.query.checkData; + }, computed: { foodLabel () { return (val) => { diff --git a/src/views/hiddenDangerManagement/fillRectification.vue b/src/views/hiddenDangerManagement/fillRectification.vue index 7e4ecb0..57f70f1 100644 --- a/src/views/hiddenDangerManagement/fillRectification.vue +++ b/src/views/hiddenDangerManagement/fillRectification.vue @@ -30,101 +30,103 @@ width="100"> </el-table-column> <el-table-column - prop="Inspector" + prop="check_man" label="检查人" align="center" width="100"> </el-table-column> <el-table-column - prop="inspection" + prop="check_class" label="检查班次" align="center" width="80"> </el-table-column> <el-table-column - prop="date" + prop="check_date" label="检查时间" align="center" width="100"> </el-table-column> <el-table-column - prop="place" + prop="address" label="地点" align="center" width="100"> </el-table-column> <el-table-column - prop="content" + prop="ht_content" label="内容" align="center" width="180"> </el-table-column> <el-table-column - prop="category" + prop="ht_typesub" label="类别" align="center" width="80"> </el-table-column> <el-table-column - prop="level" + prop="ht_level" label="级别" align="center" width="120"> </el-table-column> <el-table-column - prop="rectification" + prop="measure" label="整改措施" align="center" width="120"> </el-table-column> <el-table-column - prop="liable" + prop="duty_officer" label="责任人" align="center" width="100"> </el-table-column> <el-table-column - prop="time" + prop="alter_time" label="限改时间" align="center" width="120"> </el-table-column> <el-table-column - prop="completionTime" + prop="ACCOMPLISHTIME" align="center" label="完成时间" width="160"> <div class="item" slot-scope="scope"> <el-date-picker - v-model="scope.row.completionTime" + v-model="scope.row.ACCOMPLISHTIME" type="date" + value-format="yyyy-MM-dd" placeholder="选择日期" clearable> </el-date-picker> - <div class="item__txt">{{scope.row.completionTime}}</div> + <div class="item__txt">{{scope.row.ACCOMPLISHTIME}}</div> </div> </el-table-column> <el-table-column - prop="rechecker" + prop="CALLBACKPERSON" label="复查人" align="center" width="160"> <div class="item" slot-scope="scope"> - <el-input class="item__input" v-model="scope.row.rechecker" placeholder="请输入内容" clearable></el-input> - <div class="item__txt">{{scope.row.rechecker}}</div> + <el-input class="item__input" v-model="scope.row.CALLBACKPERSON" placeholder="请输入内容" clearable></el-input> + <div class="item__txt">{{scope.row.CALLBACKPERSON}}</div> </div> </el-table-column> <el-table-column - prop="reviewTime" + prop="CALLBACKTIME" align="center" width="160" label="复查时间"> <div class="item" slot-scope="scope"> <el-date-picker - v-model="scope.row.reviewTime" + v-model="scope.row.CALLBACKTIME" + value-format="yyyy-MM-dd" type="date" placeholder="选择日期" clearable> </el-date-picker> - <div class="item__txt">{{scope.row.reviewTime}}</div> + <div class="item__txt">{{scope.row.CALLBACKTIME}}</div> </div> </el-table-column> </el-table> @@ -145,7 +147,9 @@ </template> <script> + import {self_edit_do} from "@/api/sgyhpczl/hiddenDangerManagement"; import Titlename from "../../components/Titlename/index.vue"; + import tab from "../../components/Tab"; export default { components: {Titlename}, @@ -153,49 +157,7 @@ data() { return { // 表格数据 - tableData: [{ - serial:'1', - number:'dycj-20220409-0083', - hiddenDanger:'电仪车间', - Inspector:'吴甲甲 ', - inspection:'早班', - date: '2016-05-02', - place:'生化站 ', - content:'生化站3号污泥回流泵电机接地线脱落', - category:'电气', - level:'一般隐患C', - rectification:'已紧固处理', - liable:'常春', - time:'2016-05-02', - }, { - serial:'2', - number:'dycj-20220409-0083', - hiddenDanger:'电仪车间', - Inspector:'吴甲甲 ', - inspection:'早班', - date: '2016-05-02', - place:'生化站 ', - content:'生化站3号污泥回流泵电机接地线脱落', - category:'电气', - level:'一般隐患C', - rectification:'已紧固处理', - liable:'常春', - time:'2016-05-02', - }, { - serial:'3', - number:'dycj-20220409-0083', - hiddenDanger:'电仪车间', - Inspector:'吴甲甲 ', - inspection:'早班', - date: '2016-05-02', - place:'生化站 ', - content:'生化站3号污泥回流泵电机接地线脱落', - category:'电气', - level:'一般隐患C', - rectification:'已紧固处理', - liable:'常春', - time:'2016-05-02', - }], + tableData: [], // 需要编辑的属性 editProp: ['completionTime', 'rechecker', 'reviewTimes'] }; @@ -206,6 +168,9 @@ return this.options.find(o => o.value === val).label } } + }, + mounted(){ + this.tableData = this.$route.query.checkData; }, methods: { /** 鼠标移入cell */ @@ -224,6 +189,41 @@ // cell.querySelector('.item__txt').style.display = 'block' } }, + submitConfig(){ + var reqeustData = []; + for (const n of this.tableData) { + if (n.CALLBACKTIME == null || n.CALLBACKTIME == "" + || n.CALLBACKPERSON == null || n.CALLBACKPERSON == "" + || n.ACCOMPLISHTIME == null ) { + this.$message({type: 'Warn', message: "请填写完整信息", duration: 3000}) + return; + } + var sigleData = {}; + sigleData.id = n.id; + sigleData.type = "1"; + sigleData.CALLBACKTIME = n.CALLBACKTIME; + sigleData.CALLBACKPERSON = n.CALLBACKPERSON; + sigleData.ACCOMPLISHTIME = n.ACCOMPLISHTIME; + reqeustData.push(sigleData); + } + var successFlag = 0; + for (let i = 0; i < reqeustData.length; i++) { + self_edit_do(reqeustData[i]).then(res=>{ + if(res.data.ok){ + successFlag ++; + if(successFlag== reqeustData.length){ + this.$message({type: 'success', message: "操作成功!", duration: 3000}) + this.$router.push({ + path:"/hiddenDangerManagement" + }) + } + } + }) + } + + + + }, close(){ this.$router.push({ path:"/hiddenDangerManagement" diff --git a/src/views/hiddenDangerManagement/index.vue b/src/views/hiddenDangerManagement/index.vue index ec90f6d..bff6334 100644 --- a/src/views/hiddenDangerManagement/index.vue +++ b/src/views/hiddenDangerManagement/index.vue @@ -1,242 +1,265 @@ <template> - <div class="app-container"> - <el-form ref="form" :inline="true" class="inquire" :model="form" label-width="80px"> - <el-form-item label="编号"> - <el-input v-model="listQuery.form.number" style="width:202px" placeholder="请输入内容"></el-input> - </el-form-item> - <el-form-item label="检查人"> - <el-input v-model="listQuery.form.check_man" style="width:202px" placeholder="请输入内容"></el-input> - </el-form-item> - <el-form-item label="隐患单位"> - <el-input v-model="listQuery.form.ht_branch" style="width:202px" ></el-input> - </el-form-item> - <el-form-item label="隐患类别"> - <el-select v-model="listQuery.form.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-form-item label="隐患级别"> - <el-select v-model="listQuery.form.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-form-item label="隐患来源"> - <el-select v-model="listQuery.form.qdJyfsId" placeholder="请选择"> - <el-option - v-for="item in YHLYList" - :key="item.value" - :label="item.label" - :value="item.value"> - </el-option> - </el-select> - </el-form-item> - <el-form-item label="隐患地点"> - <el-input v-model="listQuery.form.address" style="width:202px" placeholder="请输入内容"></el-input> - </el-form-item> - <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-select v-model="listQuery.form.check_class" placeholder="请选择"> - <el-option - v-for="item in BCList" - :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.DTRisk_bankId" placeholder="请选择"> - <el-option - v-for="item in reList" - :key="item.value" - :label="item.label" - :value="item.value"> - </el-option> - </el-select> - </el-form-item> - <el-form-item label="检查时间"> - <el-col :span="11"> - <el-date-picker type="date" placeholder="选择日期" v-model="listQuery.form.check_dateStart" style="width: 100%;" value-format="yyyy-MM-dd"></el-date-picker> - </el-col> - <el-col style="text-align:center" :span="2">-</el-col> - <el-col :span="11"> - <el-date-picker type="date" placeholder="选择日期" v-model="listQuery.form.check_dateEnd" style="width: 100%;" value-format="yyyy-MM-dd"></el-date-picker> - </el-col> - </el-form-item> - <el-form-item label="限改时间"> - <el-col :span="11"> - <el-date-picker type="date" placeholder="选择日期" v-model="listQuery.form.alter_timeStart" value-format="yyyy-MM-dd" style="width: 100%;"></el-date-picker> - </el-col> - <el-col style="text-align:center" :span="2">-</el-col> - <el-col :span="11"> - <el-date-picker type="date" placeholder="选择日期" v-model="listQuery.form.alter_timeEnd" value-format="yyyy-MM-dd" style="width: 100%;"></el-date-picker> - </el-col> - </el-form-item> - <el-form-item style="text-align:center;padding:0 50px"> - <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">导出excel</el-button> - </el-form-item> - </el-form> - <el-row class="title-center"> - <el-col :span="7"> - <el-radio-group v-model="listQuery.form.alter_status"> - <el-radio-button v-for="item in statusList" :label="item.value" :key="item.value"></el-radio-button> - </el-radio-group> - </el-col> - <el-col :span="10"> - <el-form ref="form" :inline="true" :model="form" label-width="100px"> - <el-form-item label="EXCEL导入"> - <el-input v-model="form.name" placeholder="未选择文件"></el-input> - </el-form-item> - <el-form-item> - <el-button type="primary" size="small" class="btns" - >选择文件</el-button - > - <el-button - type="primary" - class="btns" - size="small" - icon="el-icon-bottom" - >导入</el-button - > - <el-button - type="primary" - class="btns" - size="small" - icon="el-icon-download" - >下载模板</el-button - > - </el-form-item> + <div class="app-container"> + <el-form ref="form" :inline="true" class="inquire" :model="form" label-width="80px"> + <el-form-item label="编号"> + <el-input v-model="listQuery.form.number" style="width:202px" placeholder="请输入内容"></el-input> + </el-form-item> + <el-form-item label="检查人"> + <el-input v-model="listQuery.form.check_man" style="width:202px" placeholder="请输入内容"></el-input> + </el-form-item> + <el-form-item label="隐患单位"> + <el-input v-model="listQuery.form.ht_branch" style="width:202px"></el-input> + </el-form-item> + <el-form-item label="隐患类别"> + <el-select v-model="listQuery.form.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-form-item label="隐患级别"> + <el-select v-model="listQuery.form.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-form-item label="隐患来源"> + <el-select v-model="listQuery.form.qdJyfsId" placeholder="请选择"> + <el-option + v-for="item in YHLYList" + :key="item.value" + :label="item.label" + :value="item.value"> + </el-option> + </el-select> + </el-form-item> + <el-form-item label="隐患地点"> + <el-input v-model="listQuery.form.address" style="width:202px" placeholder="请输入内容"></el-input> + </el-form-item> + <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-select v-model="listQuery.form.check_class" placeholder="请选择"> + <el-option + v-for="item in BCList" + :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.DTRisk_bankId" placeholder="请选择"> + <el-option + v-for="item in reList" + :key="item.value" + :label="item.label" + :value="item.value"> + </el-option> + </el-select> + </el-form-item> + <el-form-item label="检查时间"> + <el-col :span="11"> + <el-date-picker type="date" placeholder="选择日期" v-model="listQuery.form.check_dateStart" + style="width: 100%;" value-format="yyyy-MM-dd"></el-date-picker> + </el-col> + <el-col style="text-align:center" :span="2">-</el-col> + <el-col :span="11"> + <el-date-picker type="date" placeholder="选择日期" v-model="listQuery.form.check_dateEnd" + style="width: 100%;" value-format="yyyy-MM-dd"></el-date-picker> + </el-col> + </el-form-item> + <el-form-item label="限改时间"> + <el-col :span="11"> + <el-date-picker type="date" placeholder="选择日期" v-model="listQuery.form.alter_timeStart" + value-format="yyyy-MM-dd" style="width: 100%;"></el-date-picker> + </el-col> + <el-col style="text-align:center" :span="2">-</el-col> + <el-col :span="11"> + <el-date-picker type="date" placeholder="选择日期" v-model="listQuery.form.alter_timeEnd" + value-format="yyyy-MM-dd" style="width: 100%;"></el-date-picker> + </el-col> + </el-form-item> + <el-form-item style="text-align:center;padding:0 50px"> + <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-col> - <el-col :span="7" style="text-align: right"> - <el-button - class="btns" - type="primary" - size="small" - @click="fillRectification()" - >填写整改</el-button - > - <el-button - class="btns" - type="primary" - size="small" - @click="fillInspector()" - >填写督查</el-button - > - <el-button class="btns" type="primary" icon="el-icon-plus" @click="jump" size="small" - >添加</el-button - > - <el-button size="small" - >批量删除</el-button - > + <el-row class="title-center"> + <el-col :span="7"> + <el-radio-group v-model="listQuery.form.alter_status"> + <el-radio-button v-for="item in statusList" :label="item.value" :key="item.value"></el-radio-button> + </el-radio-group> + </el-col> + <el-col :span="10"> + <el-form ref="form" :inline="true" :model="form" label-width="100px"> + <!-- <el-form-item label="EXCEL导入">--> + <!-- <el-input v-model="form.name" placeholder="未选择文件"></el-input>--> + <!-- </el-form-item>--> + <el-form-item> + <!-- <el-button type="primary" size="small" class="btns"--> + <!-- >选择文件--> + <!-- </el-button--> + <!-- >--> - </el-col> - </el-row> - <el-table :data="tableData" 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="ht_branch" label="隐患单位" align="center" width="120"></el-table-column> - <el-table-column prop="check_man" label="检查人" align="center" width="120"></el-table-column> - <el-table-column label="隐患项目" align="center"> - <el-table-column prop="check_date" label="检查时间" width="120" align="center"></el-table-column> - <el-table-column prop="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 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 label="级别" align="center"> </el-table-column> --> - </el-table-column> - <el-table-column label="整改情况" align="center"> - <el-table-column prop="ACCOMPLISHTIME" label="完成时间" width="120" align="center"> </el-table-column> - <!-- <el-table-column 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"> </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 label="风险等级" align="center"> </el-table-column> --> - <el-table-column label="初始警情" align="center" prop="warningLevel"> </el-table-column> - <el-table-column label="当前警情" align="center" prop="curWarningLevel"> </el-table-column> - <!-- <el-table-column label="流程操作" align="center"> </el-table-column> --> - <el-table-column label="基本操作" align="center"> - <template slot-scope="scope"> - <el-button @click="handleClick(scope.row)" type="text" size="small">编辑</el-button> - <el-button type="text" size="small">删除</el-button> - </template> - </el-table-column> - </el-table> - <div style="text-align: right"> - <el-pagination - v-show="recordTotal > 0" - @size-change="handleSizeChange" - @current-change="handleCurrentChange" - :current-page="currentPage" - :page-sizes="[10, 20, 30, 50]" - :page-size="pageSize" - layout="total, sizes, prev, pager, next, jumper" - :total="recordTotal" - > - </el-pagination> + + <el-upload action="" :auto-upload="false" :multiple="false" :show-file-list="false" + :on-change="uploadByJsqd" style="display: inline;" :file-list="fileList" + > + <el-button + type="primary" + class="btns" + size="small" + icon="el-icon-bottom" + >导入 + </el-button + > + </el-upload> + + <el-button + type="primary" + class="btns" + size="small" + icon="el-icon-download" + >下载模板 + </el-button + > + </el-form-item> + </el-form> + </el-col> + <el-col :span="7" style="text-align: right"> + <el-button + class="btns" + type="primary" + size="small" + @click="fillRectification()" + >填写整改 + </el-button + > + <el-button + class="btns" + type="primary" + size="small" + @click="fillInspector()" + >填写督查 + </el-button + > + <el-button class="btns" type="primary" icon="el-icon-plus" @click="jump" size="small" + >添加 + </el-button + > + <el-button size="small" @click="deleteBath" + >批量删除 + </el-button + > + + </el-col> + </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="ht_branch" label="隐患单位" align="center" width="120"></el-table-column> + <el-table-column prop="check_man" label="检查人" align="center" width="120"></el-table-column> + <el-table-column label="隐患项目" align="center"> + <el-table-column prop="check_date" label="检查时间" width="120" align="center"></el-table-column> + <el-table-column prop="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 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 label="级别" align="center"> </el-table-column> --> + </el-table-column> + <el-table-column label="整改情况" align="center"> + <el-table-column prop="ACCOMPLISHTIME" label="完成时间" width="120" align="center"></el-table-column> + <!-- <el-table-column 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"> </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 label="风险等级" align="center"> </el-table-column> --> + <el-table-column label="初始警情" align="center" prop="warningLevel"></el-table-column> + <el-table-column label="当前警情" align="center" prop="curWarningLevel"></el-table-column> + <!-- <el-table-column label="流程操作" align="center"> </el-table-column> --> + <el-table-column label="基本操作" align="center"> + <template slot-scope="scope"> + <el-button @click="handleClick(scope.row)" type="text" size="small">编辑</el-button> + <el-button type="text" size="small">删除</el-button> + </template> + </el-table-column> + </el-table> + <div style="text-align: right"> + <el-pagination + v-show="recordTotal > 0" + @size-change="handleSizeChange" + @current-change="handleCurrentChange" + :current-page="currentPage" + :page-sizes="[10, 20, 30, 50]" + :page-size="pageSize" + layout="total, sizes, prev, pager, next, jumper" + :total="recordTotal" + > + </el-pagination> + </div> </div> - </div> </template> <script> - import {getPageList} from "@/api/sgyhpczl/hiddenDangerManagement"; - import {initJCBM ,initYHLX, initBC ,initJCLB ,initYHBM ,initYHJB,initReformStatus} from "@/api/sgyhpczl/initSelect"; +import {getPageList, self_export_do, self_import_do, self_del_do} from "@/api/sgyhpczl/hiddenDangerManagement"; +import {initJCBM, initYHLX, initBC, initJCLB, initYHBM, initYHJB, initReformStatus} from "@/api/sgyhpczl/initSelect"; + export default { - data() { - return { - statusList:[], - options: [], - form:{}, - value1:"", - radio1:"未整改", - reList:[{label:"未关联",value:0}], - JCDWList:[{label:"众泰煤焦化",value:0},{label:"上级单位",value:1}], - JCBMList:[], - YHLXList:[], - YHLYList:[{label:'自查录入',value:1},{label:'举一反三',value:2}], - BCList:[], - JCLBList:[], - YHBMList:[], - YHJBList:[], - tableData: [], - listQuery:{ - page:1, - limit:10, - form:{ - alter_status:'未整改' + data() { + return { + fileList: [], + statusList: [], + options: [], + form: {}, + value1: "", + radio1: "未整改", + reList: [{label: "未关联", value: 0}], + JCDWList: [{label: "众泰煤焦化", value: 0}, {label: "上级单位", value: 1}], + JCBMList: [], + YHLXList: [], + YHLYList: [{label: '自查录入', value: 1}, {label: '举一反三', value: 2}], + BCList: [], + JCLBList: [], + YHBMList: [], + YHJBList: [], + tableData: [], + listQuery: { + page: 1, + limit: 10, + form: { + alter_status: '未整改' + }, }, - }, - currentPage: 1, - pageSize: 10, - recordTotal: 0, - }; - }, mounted(){ + currentPage: 1, + pageSize: 10, + recordTotal: 0, + }; + }, mounted() { this.getPageList() this.initYHLX() this.initYHJB() @@ -244,181 +267,279 @@ this.initJCLB() this.initReformStatus() }, - methods:{ - 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}) + methods: { + 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}) } }) }, - changeYHDW(val){ - initYHBM().then(res=>{ - if (res.data.ok==1){ - this.YHBMList=res.data.data - } else{ - this.$message({type:'error', message:res.data.msg, duration:3000}) + changeYHDW(val) { + initYHBM().then(res => { + if (res.data.ok == 1) { + this.YHBMList = 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}) + 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}) } }) }, - checkTime(){ - if(this.listQuery.form.check_dateStart!=null && this.listQuery.form.check_dateStart!=''){ - if(this.listQuery.form.check_dateEnd!=null && this.listQuery.form.check_dateEnd!=''){ - }else { - this.$message({type:'error', message:"请选择检查结束时间", duration:3000}) + checkTime() { + if (this.listQuery.form.check_dateStart != null && this.listQuery.form.check_dateStart != '') { + if (this.listQuery.form.check_dateEnd != null && this.listQuery.form.check_dateEnd != '') { + } else { + this.$message({type: 'error', message: "请选择检查结束时间", duration: 3000}) return } } - if(this.listQuery.form.check_dateEnd!=null && this.listQuery.form.check_dateEnd!=''){ - if(this.listQuery.form.check_dateStart!=null && this.listQuery.form.check_dateStart!=''){ - }else { - this.$message({type:'error', message:"请选择检查开始时间", duration:3000}) + if (this.listQuery.form.check_dateEnd != null && this.listQuery.form.check_dateEnd != '') { + if (this.listQuery.form.check_dateStart != null && this.listQuery.form.check_dateStart != '') { + } else { + this.$message({type: 'error', message: "请选择检查开始时间", duration: 3000}) return } } - if(this.listQuery.form.alter_timeStart!=null && this.listQuery.form.alter_timeStart!=''){ - if(this.listQuery.form.alter_timeEnd!=null && this.listQuery.form.alter_timeEnd!=''){ - }else { - this.$message({type:'error', message:"请选择限改结束时间", duration:3000}) + if (this.listQuery.form.alter_timeStart != null && this.listQuery.form.alter_timeStart != '') { + if (this.listQuery.form.alter_timeEnd != null && this.listQuery.form.alter_timeEnd != '') { + } else { + this.$message({type: 'error', message: "请选择限改结束时间", duration: 3000}) return } } - if(this.listQuery.form.alter_timeEnd!=null && this.listQuery.form.alter_timeEnd!=''){ - if(this.listQuery.form.alter_timeStart!=null && this.listQuery.form.alter_timeStart!=''){ - }else { - this.$message({type:'error', message:"请选择改开始时间", duration:3000}) + if (this.listQuery.form.alter_timeEnd != null && this.listQuery.form.alter_timeEnd != '') { + if (this.listQuery.form.alter_timeStart != null && this.listQuery.form.alter_timeStart != '') { + } else { + this.$message({type: 'error', message: "请选择改开始时间", duration: 3000}) return } } }, - getPageList(){ - this.listQuery.page=1 + getPageList() { + this.listQuery.page = 1 this.checkTime() - getPageList(this.listQuery).then(res=>{ - if (res.data.ok==1) { + getPageList(this.listQuery).then(res => { + if (res.data.ok == 1) { this.tableData = res.data.data.items - this.recordTotal=res.data.data.total - }else{ - this.$message({type:'error', message:res.data.msg, duration:3000}) + this.recordTotal = res.data.data.total + } else { + this.$message({type: 'error', message: res.data.msg, duration: 3000}) } }) }, - reset(){ - this.listQuery.form={} + reset() { + this.listQuery.form = {} this.getPageList() }, - handleSizeChange(val){ + handleSizeChange(val) { this.listQuery.limit = val this.getPageListForPagination(); }, - handleCurrentChange(val){ + handleCurrentChange(val) { this.listQuery.page = val this.getPageListForPagination(); }, - getPageListForPagination(){ + getPageListForPagination() { this.checkTime() - getPageList(this.listQuery).then(res=>{ - if (res.data.ok==1) { + getPageList(this.listQuery).then(res => { + if (res.data.ok == 1) { this.tableData = res.data.data.items - this.recordTotal=res.data.data.total - }else{ - this.$message({type:'error', message:res.data.msg, duration:3000}) + this.recordTotal = res.data.data.total + } 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}) + 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}) + 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}) + 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}) + 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}) } }) }, - jump(){ - this.$router.push({ - path:"/fillRectificationAdd" - }) - }, - fillRectification(){ - this.$router.push({ - path:"/fillRectification" - }) - }, - fillInspector(){ - this.$router.push({ - path:"/fillInspector" - }) - window.open(href, '_blank'); - }, - } + jump() { + this.$router.push({ + path: "/fillRectificationAdd" + }) + }, + fillRectification() { + var checkData = this.$refs.dataTable.selection; + if(checkData.length < 1){ + this.$message({type: 'warn', message: "请选择勾选需要填写的数据!", duration: 3000}) + return; + } + this.$router.push({ + path: "/fillRectification", + query:{"checkData":checkData} + }) + }, + fillInspector() { + var checkData = this.$refs.dataTable.selection; + if(checkData.length < 1){ + this.$message({type: 'warn', message: "请选择勾选需要填写的数据!", duration: 3000}) + return; + } + this.$router.push({ + path: "/fillInspector", + query:{"checkData":checkData} + }) + window.open(href, '_blank'); + }, + exportData() { + var requestData = this.listQuery; + //删除分页参数 + this.$delete(requestData, 'page') + this.$delete(requestData, 'limit') + self_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) + }) + }, + //文件发生改变就会触发的事件 导入 + uploadByJsqd(file) { + //判断是否符合beforeAvatarUpload方法中的条件 + if (this.beforeAvatarUpload(file)) { + this.fileList.name = file.name + this.fileList.url = '' + var formdata = new FormData() + formdata.append('file', file.raw) + //importDevice:请求接口 formdata:传递参数 + self_import_do(formdata).then((res) => { + if (res.data.ok) { + this.$message({type: 'success', message: res.data.msg, duration: 3000}) + this.getPageList()//调用表格方法,刷新页面 + } else { + this.$message({type: 'error', message: res.data.msg, duration: 3000}) + } + }) + } + }, + //文件校验方法 + beforeAvatarUpload(file) { + // 通过split方法和fileArr方法获取到文件的后缀名 + let fileArr = file.name.split('.') + let suffix = fileArr[fileArr.length - 1] + //只能导入.xls和.xlsx文件 + if (!/(xls|xlsx)/i.test(suffix)) { + this.$message({type: 'error', message: "文件格式不正确", duration: 3000}) + + return false + } + return true + }, + deleteBath() { + var checkData = this.$refs.dataTable.selection; + if (checkData.length < 1) { + this.$message({type: 'warn', message: "请选择勾选需要删除的数据!", duration: 3000}) + return; + } + var deleteIds = ""; + checkData.forEach(n => { + deleteIds += n.id + ","; + }) + deleteIds = deleteIds.substring(0, deleteIds.length - 1); + console.log(deleteIds) + this.$confirm('确认删除吗', '提示', { + confirmButtonText: '确认', + cancelButtonText: '取消', + type: 'warning' + }).then((res) => { + console.log(res); + self_del_do(deleteIds).then(res=>{ + if (res.data.ok) { + this.$message({type: 'success', message: res.data.msg, duration: 3000}) + this.getPageList()//调用表格方法,刷新页面 + } else { + this.$message({type: 'error', message: res.data.msg, duration: 3000}) + } + }) + }) + } + } }; </script> <style scoped> .inquire { - display: flex; - justify-content: left; - flex-wrap: wrap; + display: flex; + justify-content: left; + flex-wrap: wrap; } + .inquire .el-form-item { - padding: 0 46px; + padding: 0 46px; } + .title-center { - padding: 20px 0; + padding: 20px 0; } + .btns { - background-color: #034ea2; - border: 1px solid #034ea2; + background-color: #034ea2; + border: 1px solid #034ea2; } -.title-center /deep/ .el-radio-button:first-child .el-radio-button__inner{ - border: none; + +.title-center /deep/ .el-radio-button:first-child .el-radio-button__inner { + border: none; } -.title-center /deep/ .el-radio-button__inner{ - border: none; - border-radius: 0px; + +.title-center /deep/ .el-radio-button__inner { + border: none; + border-radius: 0px; } -.title-center /deep/ .el-radio-button__orig-radio:checked+.el-radio-button__inner{ - background-color: #034ea2;background-color: #034ea2; + +.title-center /deep/ .el-radio-button__orig-radio:checked + .el-radio-button__inner { + background-color: #034ea2; + background-color: #034ea2; } </style> -- Gitblit v1.9.2