From 41b9a9861ab8693e5ad10398dddeac298b18d7fd Mon Sep 17 00:00:00 2001 From: zhoucong <123456> Date: 星期四, 05 五月 2022 08:42:42 +0800 Subject: [PATCH] fix --- src/views/accidentHidden/fillProgress.vue | 9 src/api/sgyhpczl/hiddenDangerRegistration.js | 50 ++++++ src/views/hiddenDangerRegistration/index.vue | 78 ++++++++ src/views/hiddenDangerRegistration/hiddenDangerAdd.vue | 81 ++++++++- src/views/hiddenDangerRegistration/hiddenDangerList.vue | 228 +++++++++++----------------- 5 files changed, 282 insertions(+), 164 deletions(-) diff --git a/src/api/sgyhpczl/hiddenDangerRegistration.js b/src/api/sgyhpczl/hiddenDangerRegistration.js index e6510ee..b92ddc5 100644 --- a/src/api/sgyhpczl/hiddenDangerRegistration.js +++ b/src/api/sgyhpczl/hiddenDangerRegistration.js @@ -107,3 +107,53 @@ data }); } + +export function editDanger(data) { + return request({ + headers:{ + 'token': getTokenAndVerify().token, + 'verify':getTokenAndVerify().verify + }, + url: "/taboi/danger/edit_do", + contentType: "application/json", + method: 'POST', + 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', + data + }); +} + +export function delDanger(id) { + return request({ + headers:{ + 'token': getTokenAndVerify().token, + 'verify':getTokenAndVerify().verify + }, + url: "/taboi/danger/del_do?id="+id, + contentType: "application/json", + method: 'POST', + }); +} + +export function getDangerInfo(id) { + return request({ + headers:{ + 'token': getTokenAndVerify().token, + 'verify':getTokenAndVerify().verify + }, + url: "/taboi/danger/danger_info?id="+id, + contentType: "application/json", + method: 'POST', + }); +} diff --git a/src/views/accidentHidden/fillProgress.vue b/src/views/accidentHidden/fillProgress.vue index 63130a0..c665310 100644 --- a/src/views/accidentHidden/fillProgress.vue +++ b/src/views/accidentHidden/fillProgress.vue @@ -5,8 +5,8 @@ <div class="whole"> <el-form ref="form" :model="form" label-width="100px"> <el-form-item style="text-align: right;"> - <el-button class="btn" type="primary" size="small" icon="el-icon-plus" @click="addProgress">添加</el-button> - <el-button size="small" @click="deleteBatch">批量删除</el-button> + <el-button class="btn" type="primary" size="small" icon="el-icon-plus" @click="addProgress" v-if="type!=1">添加</el-button> + <el-button size="small" @click="deleteBatch" v-if="type!=1">批量删除</el-button> </el-form-item> </el-form> <el-table @@ -19,6 +19,7 @@ <el-table-column type="selection" align="center" + v-if="type!=1" width="55"> </el-table-column> <el-table-column @@ -51,9 +52,9 @@ align="center" width="200"> <template slot-scope="scope"> - <el-button type="text" size="small" @click="updateClick(scope.row)">编辑</el-button> + <el-button type="text" size="small" @click="updateClick(scope.row)" v-if="type!=1">编辑</el-button> <!-- <el-button @click="save(scope.row)" type="text" size="small">保存</el-button>--> - <el-button type="text" size="small" style="color: #f56c6c" @click="deleteClick(scope.row)">删除</el-button> + <el-button type="text" size="small" style="color: #f56c6c" @click="deleteClick(scope.row)" v-if="type!=1">删除</el-button> </template> </el-table-column> </el-table> diff --git a/src/views/hiddenDangerRegistration/hiddenDangerAdd.vue b/src/views/hiddenDangerRegistration/hiddenDangerAdd.vue index 05a6532..bb4ff05 100644 --- a/src/views/hiddenDangerRegistration/hiddenDangerAdd.vue +++ b/src/views/hiddenDangerRegistration/hiddenDangerAdd.vue @@ -104,7 +104,7 @@ </el-col> </el-row> - <el-row style="margin-bottom: 20px"> + <el-row style="margin-bottom: 20px" v-if="addShow"> <el-col :span="9"> <el-button type="primary" class="btns" @click="addDanger">新增隐患</el-button> </el-col> @@ -135,6 +135,7 @@ </el-button> <el-button size="mini" + v-if="addShow" @click="deleteDanger(scope.row, scope.$index)" >删除 </el-button> @@ -151,7 +152,7 @@ <el-button type="primary" class="btns" @click="submitForm('ruleForm')" >保存</el-button > - <el-button @click="close()">关闭</el-button> + <el-button @click="returnIndex">关闭</el-button> </el-form-item> </el-col> </el-row> @@ -322,7 +323,7 @@ import Titlename from "../../components/Titlename/index.vue"; import {initJCBM ,initYHLX, initBC ,initJCLB ,initYHBM ,initYHJB,initLlr,initReformStatus,initYwks,initWxy} from "@/api/sgyhpczl/initSelect"; -import {saveDanger,initDangerRebound} from '@/api/sgyhpczl/hiddenDangerRegistration' +import {saveDanger,initDangerRebound,getDangerInfo,editDanger} from '@/api/sgyhpczl/hiddenDangerRegistration' import {deepClone} from '@/utils' export default { @@ -330,6 +331,8 @@ name: "hiddenDangerList", data() { return { + addShow:true, + id:'', rowIndex:-1, dangerList:[], dangerForm:{}, @@ -381,8 +384,23 @@ 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){ @@ -552,7 +570,11 @@ }, - + returnIndex(){ + this.$router.push({ + path:"/hiddenDangerRegistration" + }) + }, submitForm(formName) { this.$refs[formName].validate((valid) => { if (valid) { @@ -560,16 +582,47 @@ this.$message({type:'error', message:"请添加隐患", duration:2000}) } this.ruleForm.items=this.tableData - 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}) - } - }) + 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}) + } + }) + } + + } else { console.log("error submit!!"); diff --git a/src/views/hiddenDangerRegistration/hiddenDangerList.vue b/src/views/hiddenDangerRegistration/hiddenDangerList.vue index a0c57b9..b7247b8 100644 --- a/src/views/hiddenDangerRegistration/hiddenDangerList.vue +++ b/src/views/hiddenDangerRegistration/hiddenDangerList.vue @@ -7,44 +7,33 @@ style="margin: 0 14% 0 16%;"> <el-row> <el-col :span="9"> - <el-form-item label="隐患编号" prop="name"> - <el-input v-model="ruleForm.name" :disabled="true"></el-input> + <el-form-item label="隐患编号" prop="number"> + <el-input v-model="ruleForm.number" :disabled="true"></el-input> </el-form-item> </el-col> <el-col :span="9" :offset="4"> - <el-form-item label="检查单位" prop="elementAName"> - <el-select - v-model="ruleForm.elementAName" - :disabled="true" - style="width: 100%" - > - </el-select> + <el-form-item label="检查单位" prop="check_main_branch"> + <el-input v-model="ruleForm.check_main_branch" :disabled="true"></el-input> </el-form-item> </el-col> </el-row> <el-row> <el-col :span="9"> - <el-form-item label="检查人" prop="region"> - <el-input v-model="ruleForm.name" :disabled="true"></el-input> - <!-- <el-select--> - <!-- v-model="ruleForm.elementAName"--> - <!-- :disabled="true"--> - <!-- style="width: 100%"--> - <!-- >--> - <!-- </el-select>--> + <el-form-item label="检查人" prop="check_man"> + <el-input v-model="ruleForm.check_man" :disabled="true"></el-input> </el-form-item> </el-col> <el-col :span="9" :offset="4"> - <el-form-item label="陪检人员" prop="name"> - <el-input v-model="ruleForm.name" :disabled="true"></el-input> + <el-form-item label="陪检人员" prop="acc_man"> + <el-input v-model="ruleForm.acc_man" :disabled="true"></el-input> </el-form-item> </el-col> </el-row> <el-row> <el-col :span="9"> - <el-form-item label="检查时间" prop="name"> + <el-form-item label="检查时间" prop="check_date"> <el-date-picker - v-model="value1" + v-model="ruleForm.check_date" type="date" :disabled="true" placeholder="选择日期" @@ -53,16 +42,8 @@ </el-form-item> </el-col> <el-col :span="9" :offset="4"> - <!-- <el-form-item label="班次:" prop="name">--> - <!-- <el-input v-model="ruleForm.name"></el-input>--> - <!-- </el-form-item>--> - <el-form-item label="班次" prop="elementAName"> - <el-select - v-model="ruleForm.elementAName" - :disabled="true" - style="width: 100%" - > - </el-select> + <el-form-item label="班次" prop="check_class"> + <el-input v-model="ruleForm.check_class" :disabled="true"></el-input> </el-form-item> </el-col> </el-row> @@ -80,77 +61,53 @@ </el-row> <el-row> <el-col :span="22"> - <el-form-item label="行走路线" prop="name"> - <el-input type="textarea" v-model="ruleForm.name" class="multiline" :disabled="true"></el-input> + <el-form-item label="行走路线" prop="route"> + <el-input type="textarea" v-model="ruleForm.route" class="multiline" :disabled="true"></el-input> </el-form-item> </el-col> </el-row> <el-row> <el-col :span="9"> - <el-form-item label="隐患单位" prop="name"> - <!--<el-input v-model="ruleForm.name"></el-input>--> - <el-select - v-model="ruleForm.elementAName" - :disabled="true" - style="width: 100%" - > - </el-select> + <el-form-item label="隐患单位" prop="ht_community"> + <el-input v-model="ruleForm.ht_community" :disabled="true"></el-input> </el-form-item> </el-col> <el-col :span="9" :offset="4"> - <el-form-item label="隐患部门" prop="name"> - <!-- <el-input v-model="ruleForm.name"></el-input>--> - <el-select - v-model="ruleForm.elementAName" - :disabled="true" - style="width: 100%" - > - </el-select> + <el-form-item label="隐患部门" prop="ht_branch"> + <el-input v-model="ruleForm.ht_branch" :disabled="true"></el-input> </el-form-item> </el-col> </el-row> <el-row> <el-col :span="22"> - <el-form-item label="隐患地点" prop="name"> - <el-input type="textarea" v-model="ruleForm.name" class="multiline" :disabled="true"></el-input> + <el-form-item label="隐患地点" prop="address"> + <el-input type="textarea" v-model="ruleForm.address" class="multiline" :disabled="true"></el-input> </el-form-item> </el-col> </el-row> <el-row> <el-col :span="22"> - <el-form-item label="隐患内容" prop="name"> - <el-input type="textarea" v-model="ruleForm.name" class="multiline" :disabled="true"></el-input> + <el-form-item label="隐患内容" prop="ht_content"> + <el-input type="textarea" v-model="ruleForm.ht_content" class="multiline" :disabled="true"></el-input> </el-form-item> </el-col> </el-row> <el-row> <el-col :span="9"> - <el-form-item label="隐患类别" prop="name"> - <!--<el-input v-model="ruleForm.name"></el-input>--> - <el-select - v-model="ruleForm.elementAName" - :disabled="true" - style="width: 100%" - > - </el-select> + <el-form-item label="隐患类别" prop="ht_typesub"> + <el-input v-model="ruleForm.ht_typesub" :disabled="true"></el-input> </el-form-item> </el-col> <el-col :span="9" :offset="4"> - <el-form-item label="隐患级别" prop="name"> - <!--<el-input v-model="ruleForm.name"></el-input>--> - <el-select - v-model="ruleForm.elementAName" - :disabled="true" - style="width: 100%" - > - </el-select> + <el-form-item label="隐患级别" prop="ht_level"> + <el-input v-model="ruleForm.ht_level" :disabled="true"></el-input> </el-form-item> </el-col> </el-row> <el-row> <el-col :span="9"> - <el-form-item label="整改措施" prop="name"> - <el-input v-model="ruleForm.name" :disabled="true"></el-input> + <el-form-item label="整改措施" prop="measure"> + <el-input v-model="ruleForm.measure" :disabled="true"></el-input> </el-form-item> </el-col> <el-col :span="9" :offset="4"> @@ -161,10 +118,9 @@ </el-row> <el-row> <el-col :span="9"> - <el-form-item label="限改时间" prop="name"> - <!--<el-input v-model="ruleForm.name"></el-input>--> + <el-form-item label="限改时间" prop="alter_time"> <el-date-picker - v-model="value1" + v-model="ruleForm.alter_time" type="date" :disabled="true" placeholder="选择日期" @@ -173,8 +129,8 @@ </el-form-item> </el-col> <el-col :span="9" :offset="4"> - <el-form-item label="责任人" prop="name"> - <el-input v-model="ruleForm.name" :disabled="true"></el-input> + <el-form-item label="责任人" prop="duty_officer"> + <el-input v-model="ruleForm.duty_officer" :disabled="true"></el-input> </el-form-item> </el-col> </el-row> @@ -192,8 +148,8 @@ </el-form-item> </el-col> <el-col :span="9" :offset="4"> - <el-form-item label="整改完成情况" prop="name"> - <el-input v-model="ruleForm.name" :disabled="true"></el-input> + <el-form-item label="整改完成情况" prop="alter_status"> + <el-input v-model="ruleForm.alter_status" :disabled="true"></el-input> </el-form-item> </el-col> </el-row> @@ -230,32 +186,20 @@ </el-row> <el-row> <el-col :span="22"> - <el-form-item label="危险源" prop="name"> - <el-input type="textarea" v-model="ruleForm.name" class="multiline" :disabled="true"></el-input> + <el-form-item label="危险源" prop="dangerousSource"> + <el-input type="textarea" v-model="ruleForm.dangerousSource" class="multiline" :disabled="true"></el-input> </el-form-item> </el-col> </el-row> <el-row> <el-col :span="9"> - <el-form-item label="风险等级" prop="name"> - <!-- <el-input v-model="ruleForm.name" :disabled="true"></el-input>--> - <el-select - v-model="ruleForm.elementAName" - :disabled="true" - style="width: 100%" - > - </el-select> + <el-form-item label="风险等级" prop="DTRisk_level"> + <el-input v-model="ruleForm.DTRisk_level" :disabled="true"></el-input> </el-form-item> </el-col> <el-col :span="9" :offset="4"> - <el-form-item label="业务科室" prop="name"> - <!-- <el-input v-model="ruleForm.name" :disabled="true"></el-input>--> - <el-select - v-model="ruleForm.elementAName" - :disabled="true" - style="width: 100%" - > - </el-select> + <el-form-item label="业务科室" prop="Review"> + <el-input v-model="ruleForm.Review" :disabled="true"></el-input> </el-form-item> </el-col> </el-row> @@ -310,6 +254,13 @@ </el-row> <el-row> <el-col :span="22"> + <el-form-item label="下一步" prop="next"> + <el-input v-model="ruleForm.next" class="multiline" :disabled="true"></el-input> + </el-form-item> + </el-col> + </el-row> + <!-- <el-row> + <el-col :span="22"> <el-form-item label="是否发送" prop="name"> <el-radio-group v-model="ruleForm.safetyInspectionItemResult"> <el-radio :label="0">通过</el-radio> @@ -317,8 +268,8 @@ </el-radio-group> </el-form-item> </el-col> - </el-row> - <div + </el-row>--> + <!--<div v-if="ruleForm.safetyInspectionItemResult == 0"> <el-row> <el-col :span="9"> @@ -389,7 +340,14 @@ </el-form-item> </el-col> </el-row> - </div> + </div>--> + <el-row> + <el-col :span="22"> + <el-form-item label="备注" prop="dealContent"> + <el-input class="textarea" type="textarea" v-model="ruleForm.dealContent"></el-input> + </el-form-item> + </el-col> + </el-row> <el-row> <el-col :span="22"> <el-form-item style="text-align: center;"> @@ -408,64 +366,56 @@ <script> import Titlename from "../../components/Titlename/index.vue"; - + import {getDangerInfo,next_step_do} from '@/api/sgyhpczl/hiddenDangerRegistration' + import {deepClone} from '@/utils' export default { components: {Titlename}, name: "hiddenDangerList", data() { return { - ruleForm: { - name: '', - region: '', - date1: '', - date2: '', - delivery: false, - type: [], - resource: '', - value1: '', - desc: '', - rechecker:'', - reviewTime:'', - reviewResults:'', - rechecker1:'', - reviewTime1:'', - reviewResults1:'', - desc1:'' - }, + id:'', + ruleForm: {}, rules: { reviewTime: { required: true, message: '请填写复查时间', trigger: 'blur' }, rechecker: { required: true, message: '请填写复查人', trigger: 'blur' }, reviewResults: { required: true, message: '请填写复查结果', trigger: 'blur' }, desc1: { required: true, message: '复查不通过时请在备注说明原因!', trigger: 'blur' }, }, - tableData: [{ - date: ' 1', - name: '超级管理员', - province: '2022-04-07 16:10:27', - city: '', - address: '已发送众泰煤焦化安全环保部', - }, { - date: ' 1', - name: '超级管理员', - province: '2022-04-07 16:10:27', - city: '', - address: '已发送众泰煤焦化安全环保部', - }, { - date: ' 1', - name: '超级管理员', - province: '2022-04-07 16:10:27', - city: '', - address: '已发送众泰煤焦化安全环保部', - }], + tableData: [], fileList: [], - // safetyInspectionItemResult:'0', }; }, + mounted(){ + this.id = this.$route.query.id; + if( this.id!=null && this.id!=''){ + this.initInfo(); + } + }, methods: { + async initInfo(){ + var res=await getDangerInfo(this.id) + if (res.data.ok==1){ + this.ruleForm=res.data.data + this.ruleForm.next='发送到'+res.data.data.ht_community+res.data.data.ht_branch + + } + }, submitForm(formName) { this.$refs[formName].validate((valid) => { if (valid) { - alert('submit!'); + var param={ + id:this.id, + step: "1", + dealContent: this.ruleForm.dealContent + } + next_step_do(param).then(res=>{ + if (res.data.ok==1){ + this.$message({type:'success', message:"fas成功", duration:3000}) + this.close() + }else { + this.$message({type:'error', message:res.data.msg, duration:3000}) + } + }) } else { console.log('error submit!!'); return false; diff --git a/src/views/hiddenDangerRegistration/index.vue b/src/views/hiddenDangerRegistration/index.vue index 3f86d62..de1a993 100644 --- a/src/views/hiddenDangerRegistration/index.vue +++ b/src/views/hiddenDangerRegistration/index.vue @@ -177,12 +177,13 @@ >添加</el-button > <el-button size="small" + @click="deleteBatch" >删除</el-button > </el-col> </el-row> - <el-table :data="tableData" style="width: 100%"> + <el-table :data="tableData" style="width: 100%" @selection-change="changeBox"> <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> @@ -225,10 +226,15 @@ <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="date" label="基本操作" align="center"> + <el-table-column prop="date" label="流程操作" align="center" fixed="right"> <template slot-scope="scope"> <el-button @click="handleClick(scope.row)" type="text" size="small">点击发送</el-button> + </template> + </el-table-column> + <el-table-column prop="date" label="基本操作" align="center" fixed="right"> + <template slot-scope="scope"> + <el-button @click="updateClick(scope.row)" type="text" size="small">编辑</el-button> + <el-button @click="deleteClick(scope.row)" type="text" size="small">删除</el-button> </template> </el-table-column> </el-table> @@ -248,11 +254,12 @@ </div> </template> <script> -import {getPageList} from "@/api/sgyhpczl/hiddenDangerRegistration"; +import {getPageList,delDanger} from "@/api/sgyhpczl/hiddenDangerRegistration"; import {initJCBM ,initYHLX, initBC ,initJCLB ,initYHBM ,initYHJB,initLlr} from "@/api/sgyhpczl/initSelect"; export default { data() { return { + selectedList:[], reList:[{label:"未关联",value:0}], llrList:[], options: [], @@ -288,6 +295,39 @@ this.initYHBM() }, methods:{ + 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(()=>{ + delDanger(ids).then(() => { + this.getPageList() + this.$notify({ + title: "成功", + message: "删除成功", + type: "success", + duration: 2000, + }); + }); + }) + .catch(error =>{ + }); + }, + changeBox(val){ + this.selectedList = [] + val.forEach((item) => { + this.selectedList.push(item) + }) + }, initLlr(){ initLlr().then(res=>{ if (res.data.ok==1){ @@ -418,18 +458,42 @@ } }) }, - + updateClick(row){ + this.$router.push({ + path:"/hiddenDangerAdd?id="+row.id + }) + }, jump(){ this.$router.push({ path:"/hiddenDangerAdd" }) }, // 发送隐患单跳转 - handleClick(){ + handleClick(row){ this.$router.push({ - path:"/hiddenDangerList", + path:"/hiddenDangerList?id="+row.id, }) }, + deleteClick(row){ + this.$confirm('确认删除吗','提示', { + confirmButtonText: '确认', + cancelButtonText: '取消', + type: 'warning' + }) + .then(()=>{ + delDanger(row.id).then(() => { + this.getPageList() + this.$notify({ + title: "成功", + message: "删除成功", + type: "success", + duration: 2000, + }); + }); + }) + .catch(error =>{ + }); + }, } }; </script> -- Gitblit v1.9.2