From 80a0a4937ad534d59cb42a2f330f533584b9aa70 Mon Sep 17 00:00:00 2001 From: zhoucong <123456> Date: 星期二, 26 四月 2022 15:34:19 +0800 Subject: [PATCH] 众泰新增 --- src/api/sgyhpczl/hiddenDangerRegistration.js | 26 + src/views/hiddenDangerManagement/index.vue | 4 src/views/hiddenDangerRegistration/index.vue | 5 src/api/sgyhpczl/hiddenDangerManagement.js | 13 src/views/accidentHidden/majorHidden.vue | 6 src/views/hiddenDangerRegistration/hiddenDangerAdd.vue | 656 +++++++++++++++++++------ src/views/hiddenDangerReview/recheckCancellationNumber.vue | 5 src/views/delayHiddenDangerRectification/index.vue | 5 src/views/hiddenDangerRectification/index.vue | 5 src/api/sgyhpczl/initSelect.js | 27 + src/views/hiddenDangerManagement/fillRectificationAdd.vue | 788 ++++++++++++++++++++++-------- 11 files changed, 1,163 insertions(+), 377 deletions(-) diff --git a/src/api/sgyhpczl/hiddenDangerManagement.js b/src/api/sgyhpczl/hiddenDangerManagement.js index 4d1b9d3..28c1169 100644 --- a/src/api/sgyhpczl/hiddenDangerManagement.js +++ b/src/api/sgyhpczl/hiddenDangerManagement.js @@ -71,3 +71,16 @@ data }); } + +export function saveSelfDanger(data) { + return request({ + headers:{ + 'token': getTokenAndVerify().token, + 'verify':getTokenAndVerify().verify + }, + url: "/taboi/danger/self_save_do", + contentType: "application/json", + method: 'POST', + data + }); +} diff --git a/src/api/sgyhpczl/hiddenDangerRegistration.js b/src/api/sgyhpczl/hiddenDangerRegistration.js index 8fba519..e6510ee 100644 --- a/src/api/sgyhpczl/hiddenDangerRegistration.js +++ b/src/api/sgyhpczl/hiddenDangerRegistration.js @@ -81,3 +81,29 @@ data }); } + +export function saveDanger(data) { + return request({ + headers:{ + 'token': getTokenAndVerify().token, + 'verify':getTokenAndVerify().verify + }, + url: "/taboi/danger/save_do", + contentType: "application/json", + method: 'POST', + data + }); +} + +export function initDangerRebound(data) { + return request({ + headers:{ + 'token': getTokenAndVerify().token, + 'verify':getTokenAndVerify().verify + }, + url: "/taboi/danger/danger_rebound", + contentType: "application/json", + method: 'POST', + data + }); +} diff --git a/src/api/sgyhpczl/initSelect.js b/src/api/sgyhpczl/initSelect.js index 2766f49..b55abaf 100644 --- a/src/api/sgyhpczl/initSelect.js +++ b/src/api/sgyhpczl/initSelect.js @@ -106,3 +106,30 @@ method: 'GET', }); } + +//业务科室 +export function initYwks() { + return request({ + headers:{ + 'token': getTokenAndVerify().token, + 'verify':getTokenAndVerify().verify + }, + contentType: "multipart/form-data", + url: "/taboi/user/review_do", + method: 'GET', + }); +} + +//关联危险源 +export function initWxy(data) { + return request({ + headers:{ + 'token': getTokenAndVerify().token, + 'verify':getTokenAndVerify().verify + }, + contentType: "multipart/form-data", + url: "/taboi/risk/risk_list_do", + method: 'POST', + data + }); +} diff --git a/src/views/accidentHidden/majorHidden.vue b/src/views/accidentHidden/majorHidden.vue index 8206c1f..665b6c2 100644 --- a/src/views/accidentHidden/majorHidden.vue +++ b/src/views/accidentHidden/majorHidden.vue @@ -200,7 +200,7 @@ options: [], form:{}, llrList:[], - JCDWList:[{label:"众泰",value:0},{label:"上级单位",value:1}], + JCDWList:[{label:"众泰煤焦化",value:0},{label:"上级单位",value:1}], JCBMList:[], YHLXList:[], BCList:[], @@ -227,7 +227,7 @@ this.initBC() this.initJCLB() this.initLlr() - //this.changeJCDW() + this.initYHBM() }, methods:{ initLlr(){ @@ -239,7 +239,7 @@ } }) }, - changeYHDW(val){ + initYHBM(val){ initYHBM().then(res=>{ if (res.data.ok==1){ this.YHBMList=res.data.data diff --git a/src/views/delayHiddenDangerRectification/index.vue b/src/views/delayHiddenDangerRectification/index.vue index cb8c36e..a1a0282 100644 --- a/src/views/delayHiddenDangerRectification/index.vue +++ b/src/views/delayHiddenDangerRectification/index.vue @@ -220,7 +220,7 @@ value1:"", reList:[{label:"未关联",value:0}], llrList:[], - JCDWList:[{label:"众泰",value:0},{label:"上级单位",value:1}], + JCDWList:[{label:"众泰煤焦化",value:0},{label:"上级单位",value:1}], JCBMList:[], YHLXList:[], BCList:[], @@ -247,6 +247,7 @@ this.initBC() this.initJCLB() this.initLlr() + this.initYHBM() }, methods:{ initLlr(){ @@ -258,7 +259,7 @@ } }) }, - changeYHDW(val){ + initYHBM(val){ initYHBM().then(res=>{ if (res.data.ok==1){ this.YHBMList=res.data.data diff --git a/src/views/hiddenDangerManagement/fillRectificationAdd.vue b/src/views/hiddenDangerManagement/fillRectificationAdd.vue index 65f8106..b82b9cf 100644 --- a/src/views/hiddenDangerManagement/fillRectificationAdd.vue +++ b/src/views/hiddenDangerManagement/fillRectificationAdd.vue @@ -1,230 +1,602 @@ <template> - <div class="app-container"> - <div> - <Titlename title="自查隐患管理新增"></Titlename> - <div class="whole-form"> - <el-form - :model="ruleForm" - :rules="rules" - ref="ruleForm" - label-width="150px" - class="demo-ruleForm" - style="margin: 0 14% 0 16%" - > - <el-row> - <el-col :span="9"> - <el-form-item label="检查时间" prop="name"> - <el-date-picker - v-model="value1" - type="date" - placeholder="选择日期" - style="width: 100%" + <div class="app-container"> + <div style=""> + <Titlename title="自查隐患管理新增"></Titlename> + <div class="whole-form"> + <el-form + :model="ruleForm" + :rules="rules" + ref="ruleForm" + label-width="150px" + class="demo-ruleForm" + style="margin: 0 14% 0 16%" > - </el-date-picker> - </el-form-item> - </el-col> - <el-col :span="9" :offset="4"> - <el-form-item label="班次" prop="name"> - <el-select v-model="ruleForm.elementAName" style="width: 100%"> - </el-select> - </el-form-item> - </el-col> - </el-row> - <el-row> - <el-col :span="9"> - <el-form-item label="检查人" prop="name"> - <el-input v-model="ruleForm.name"></el-input> - </el-form-item> - </el-col> - <el-col :span="9" :offset="4"> - <el-form-item label="隐患单位"> - <el-input v-model="ruleForm.name"></el-input> - </el-form-item> - </el-col> - </el-row> - <el-row> - <el-col :span="9"> - <el-form-item label="隐患级别"> - <!-- <el-input v-model="ruleForm.name"></el-input> --> - <el-select - v-model="ruleForm.elementAName" + <el-row> + <el-col :span="9"> + <el-form-item label="检查时间" prop="check_date"> + <el-date-picker + v-model="ruleForm.check_date" + type="date" + value-format="yyyy-MM-dd" + placeholder="选择日期" style="width: 100%" > + </el-date-picker> + </el-form-item> + </el-col> + <el-col :span="9" :offset="4"> + <el-form-item label="班次" prop="check_class"> + <el-select v-model="ruleForm.check_class" placeholder="请选择" style="width: 100%"> + <el-option + v-for="item in BCList" + :key="item.value" + :label="item.value" + :value="item.value"> + </el-option> </el-select> - </el-form-item> - </el-col> - <el-col :span="9" :offset="4"> - <el-form-item label="隐患类别" > - <el-select v-model="ruleForm.elementAName" style="width: 100%"> - </el-select> - </el-form-item> - </el-col> - </el-row> - <el-row> - <el-col :span="9"> - <el-form-item label="限改时间"> - <!--<el-input v-model="ruleForm.name"></el-input>--> - <el-date-picker - v-model="value1" - type="date" - placeholder="选择日期" - style="width: 100%" - > - </el-date-picker> - </el-form-item> - </el-col> - <el-col :span="9" :offset="4"> - <el-form-item label="责任人"> - <el-input v-model="ruleForm.name"></el-input> - </el-form-item> - </el-col> - </el-row> - <el-row> - <el-col :span="9"> - <el-form-item label="整改情况"> - <!-- <el-input v-model="ruleForm.name"></el-input> --> - <el-select v-model="ruleForm.elementAName" style="width: 100%"> - </el-select> - </el-form-item> - </el-col> - <!-- <el-col :span="9" :offset="4"> - <el-form-item label="业务科室:" prop="name"> - <el-select v-model="ruleForm.elementAName" style="width: 100%"> - </el-select> - </el-form-item> - </el-col> --> - </el-row> - <!-- <el-row> - <el-col :span="22"> - <el-form-item label="行走路线:" prop="name"> - <el-input v-model="ruleForm.name" class="multiline"></el-input> - </el-form-item> - </el-col> - </el-row> --> - <el-row> - <el-col :span="22"> - <el-form-item label="隐患地点" > - <el-input v-model="ruleForm.name" rows="3" type="textarea" class="multiline"></el-input> - </el-form-item> - </el-col> - </el-row> - <el-row> - <el-col :span="22"> - <el-form-item label="隐患内容" > - <el-input v-model="ruleForm.name" rows="3" type="textarea" class="multiline"></el-input> - </el-form-item> - </el-col> - </el-row> - <el-row> - <el-col :span="22"> - <el-form-item label="整改措施"> - <el-input v-model="ruleForm.name" rows="3" type="textarea" class="multiline"></el-input> - </el-form-item> - </el-col> - </el-row> - <el-row> - <el-col :span="22"> - <el-form-item label="关联危险源" > - <el-input v-model="ruleForm.name" rows="3" type="textarea" class="multiline"></el-input> - </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="submitForm('ruleForm')" - >保存</el-button - > - <el-button @click="close()">关闭</el-button> - </el-form-item> - </el-col> - </el-row> - </el-form> - </div> + </el-form-item> + </el-col> + </el-row> + <!--<el-row> + <el-col :span="9"> + <el-form-item label="检查类别" prop="checktype"> + <el-select v-model="ruleForm.checktype" placeholder="请选择" style="width: 100%"> + <el-option + v-for="item in JCLBList" + :key="item.value" + :label="item.value" + :value="item.value"> + </el-option> + </el-select> + </el-form-item> + </el-col> + <el-col :span="9" :offset="4"> + <el-form-item label="检查单位" prop="check_main_branch"> + <el-select v-model="ruleForm.check_main_branch" placeholder="请选择" @change="changeJCDW" style="width: 100%"> + <el-option + v-for="item in JCDWList" + :key="item.label" + :label="item.label" + :value="item.label" + > + </el-option> + </el-select> + </el-form-item> + </el-col> + </el-row> + <el-row> + <el-col :span="9"> + <el-form-item label="检查部门" prop="check_branch"> + <el-select v-model="ruleForm.check_branch" placeholder="请选择" style="width: 100%"> + <el-option + v-for="item in JCBMList" + :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-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> + <el-col :span="9"> + <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> + <el-button + size="mini" + @click="deleteDanger(scope.row, scope.$index)" + >删除 + </el-button> + </div> + </template> + </el-table-column> + </el-table> + </el-row> + + + <el-row> + <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="close()">关闭</el-button> + </el-form-item> + </el-col> + </el-row> + </el-form> + </div> + </div> + + <el-dialog + :title="title" + :visible.sync="dialogVisible" + :close-on-click-modal="false" + width="40%"> + <el-form ref="form" :rules="dangerRules" :model="dangerForm" label-width="100px"> + <el-row> + <el-col :span="9"> + <el-form-item label="隐患部门" prop="ht_branch"> + <el-select v-model="dangerForm.ht_branch" placeholder="请选择"> + <el-option + v-for="item in YHBMList" + :key="item.branch_id" + :label="item.branch_name" + :value="item.branch_name"> + </el-option> + </el-select> + </el-form-item> + </el-col> + <el-col :span="9" :offset="4"> + <el-form-item label="地点" prop="address"> + <el-input v-model="dangerForm.address" rows="3" type="textarea" class="multiline"></el-input> + </el-form-item> + </el-col> + </el-row> + + <el-row> + <el-col :span="9"> + <el-form-item label="隐患内容" prop="ht_content"> + <el-input v-model="dangerForm.ht_content" rows="3" type="textarea" class="multiline"></el-input> + </el-form-item> + </el-col> + <el-col :span="9" :offset="4"> + <el-form-item label="整改措施" prop="measure"> + <el-input v-model="dangerForm.measure" rows="3" type="textarea" class="multiline"></el-input> + </el-form-item> + </el-col> + </el-row> + <el-row> + <el-col :span="9"> + <el-form-item label="隐患类别" prop="ht_typesub"> + <el-select v-model="dangerForm.ht_typesub" placeholder="请选择"> + <el-option + v-for="item in YHLXList" + :key="item.value" + :label="item.value" + :value="item.value"> + </el-option> + </el-select> + </el-form-item> + </el-col> + <el-col :span="9" :offset="4"> + <el-form-item label="关联危险源" prop="DTRisk_bankId"> + <el-select v-model="dangerForm.DTRisk_bankId" placeholder="请选择" @change="changeWxy" filterable> + <el-option + v-for="item in dangerList" + :key="item.id" + :label="item.mriskPoint" + :value="item.id"> + </el-option> + </el-select> + </el-form-item> + </el-col> + </el-row> + + <el-row> + <el-col :span="9"> + <el-form-item label="风险等级" prop="DTRisk_level"> + <el-input v-model="dangerForm.DTRisk_level" :disabled="true"></el-input> + </el-form-item> + </el-col> + <el-col :span="9" :offset="4"> + <el-form-item label="隐患级别" prop="ht_level"> + <el-select v-model="dangerForm.ht_level" placeholder="请选择"> + <el-option + v-for="item in YHJBList" + :key="item.value" + :label="item.label" + :value="item.value"> + </el-option> + </el-select> + </el-form-item> + </el-col> + </el-row> + <el-row> + <el-col :span="9"> + <el-form-item label="限改时间" prop="alter_time"> + <el-date-picker + v-model="dangerForm.alter_time" + type="date" + value-format="yyyy-MM-dd" + placeholder="选择日期" + style="width: 100%" + > + </el-date-picker> + </el-form-item> + </el-col> + <el-col :span="9" :offset="4"> + <el-form-item label="责任人" prop="duty_officer"> + <el-input v-model="dangerForm.duty_officer"></el-input> + </el-form-item> + </el-col> + </el-row> + <el-row> + <el-col :span="9"> + <el-form-item label="整改情况" prop="alter_status"> + <el-select v-model="dangerForm.alter_status" placeholder="请选择"> + <el-option + v-for="item in statusList" + :key="item.value" + :label="item.label" + :value="item.value"> + </el-option> + </el-select> + </el-form-item> + </el-col> + <el-col :span="9" :offset="4"> + <el-form-item label="业务科室" prop="Review"> + <el-select v-model="dangerForm.Review" style="width: 100%"> + <el-option + v-for="item in YWKSList" + :key="item.value" + :label="item.label" + :value="item.value"> + </el-option> + </el-select> + </el-form-item> + </el-col> + </el-row> + <!--<el-row v-if="dangerForm.alter_status=='重复反弹隐患'"> + <el-col :span="9"> + <el-form-item label="重复反弹隐患" prop="repeatId"> + <el-select v-model="dangerForm.repeatId" placeholder="请选择"> + <el-option + v-for="item in reboundList" + :key="item.id" + :label="item.content" + :value="item.id"> + </el-option> + </el-select> + </el-form-item> + </el-col> + </el-row>--> + <el-row> + <el-col :span="22"> + <el-form-item style="text-align: center"> + <el-button type="primary" class="btns" @click="submitDanger('form')" + >保存</el-button + > + <el-button @click="dialogVisible=false">关闭</el-button> + </el-form-item> + </el-col> + </el-row> + </el-form> + </el-dialog> + </div> - </div> </template> <script> -import Titlename from "../../components/Titlename/index.vue"; + import Titlename from "../../components/Titlename/index.vue"; -export default { - components: { Titlename }, - name: "hiddenDangerList", - data() { - return { - ruleForm: { - name: "", - region: "", - date1: "", - date2: "", - delivery: false, - type: [], - resource: "", - value1: "", - desc: "", - }, - rules: { - name: [ - { required: true, message: '请输入活动名称', trigger: 'blur' }, - ], - }, - tableData: [ - { - date: " 1", - name: "超级管理员", - province: "2022-04-07 16:10:27", - city: "", - address: "已发送众泰煤焦化安全环保部", + import {initJCBM ,initYHLX, initBC ,initJCLB ,initYHBM ,initYHJB,initLlr,initReformStatus,initYwks,initWxy} from "@/api/sgyhpczl/initSelect"; + import {initDangerRebound} from '@/api/sgyhpczl/hiddenDangerRegistration' + import {saveSelfDanger} from '@/api/sgyhpczl/hiddenDangerManagement' + import {deepClone} from '@/utils' + + export default { + components: { Titlename }, + name: "hiddenDangerList", + data() { + return { + 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' },], + }, + title:'新增', + dialogVisible:false, + BCList:[], + JCLBList:[], + JCDWList:[{label:"众泰煤焦化",value:0},{label:"上级单位",value:1}], + YHBMList:[], + YHLXList:[], + YHJBList:[], + JCBMList:[], + llrList:[], + statusList:[], + YWKSList:[], + reboundList:[], + ruleForm: {}, + rules: { + check_date: [{ required: true, message: '不能为空', trigger: 'blur' },], + check_class: [{ required: true, message: '不能为空', trigger: 'blur' },], + check_main_branch: [{ required: true, message: '不能为空', trigger: 'blur' },], + check_branch: [{ required: true, message: '不能为空', trigger: 'blur' },], + check_man: [{ required: true, message: '不能为空', trigger: 'blur' },], + checktype: [{ required: true, message: '不能为空', trigger: 'blur' },], + }, + tableData: [], + }; }, - { - date: " 1", - name: "超级管理员", - province: "2022-04-07 16:10:27", - city: "", - address: "已发送众泰煤焦化安全环保部", + mounted(){ + this.initBC() + //this.initJCLB() + this.initYHJB() + this.initYHLX() + //this.initLlr() + this.initReformStatus() + this.initYHBM() + this.initYWKS() + this.initWXY() + //this.initDangerRebound() }, - { - date: " 1", - name: "超级管理员", - province: "2022-04-07 16:10:27", - city: "", - address: "已发送众泰煤焦化安全环保部", + methods: { + 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) { + if(this.title=='新增'){ + this.tableData.push(this.dangerForm) + }else { + var arr = this.tableData; + arr.splice(this.rowIndex, 1, this.dangerForm); + this.tableData = arr; + } + this.dialogVisible=false + + } else { + console.log("error submit!!"); + return false; + } + }); + }, + deleteDanger(row, index) { + + + this.$confirm('确认删除吗', '提示', { + confirmButtonText: '确认', + cancelButtonText: '取消', + type: 'warning' + }) + .then(() => { + var arr = deepClone(this.tableData); + var brr = []; + for (var i = 0; i < arr.length; i++) { + if (i == index) { + } else { + brr.push(arr[i]); + } + } + this.tableData = deepClone(brr); + //this.tableData.splice(index) + + }) + .catch(error => { + }); + + + }, + editDanger(row, index) { + this.dangerForm = deepClone(row); + this.rowIndex = index; + this.dialogVisible = true; + this.title = '编辑'; + }, + + addDanger(){ + this.dangerForm={} + this.title="新增" + this.dialogVisible=true + }, + changeWxy(e){ + for(var i=0;i<this.dangerList.length;i++){ + if(e==this.dangerList[i].id){ + this.dangerForm.DTRisk_level=this.dangerList[i].mriskLevel + this.dangerForm.dangerousSource=this.dangerList[i].mriskPoint + } + } + }, + initWXY(){ + var param={ + page: 1, + limit: 1000 + } + initWxy(param).then(res=>{ + if (res.data.ok==1){ + this.dangerList=res.data.data.items + } else{ + this.$message({type:'error', message:res.data.msg, duration:3000}) + } + }) + }, + initYWKS(){ + initYwks().then(res=>{ + if (res.data.ok==1){ + this.YWKSList=res.data.data + } else{ + this.$message({type:'error', message:res.data.msg, duration:3000}) + } + }) + }, + initYHBM(){ + initYHBM().then(res=>{ + if (res.data.ok==1){ + this.YHBMList=res.data.data + } else{ + this.$message({type:'error', message:res.data.msg, duration:3000}) + } + }) + }, + initLlr(){ + initLlr().then(res=>{ + if (res.data.ok==1){ + this.llrList=res.data.data + } else{ + this.$message({type:'error', message:res.data.msg, duration:3000}) + } + }) + }, + initReformStatus(){ + initReformStatus().then(res=>{ + if (res.data.ok==1){ + this.statusList=res.data.data + } else{ + this.$message({type:'error', message:res.data.msg, duration:3000}) + } + }) + }, + changeJCDW(val){ + initJCBM(val).then(res=>{ + if (res.data.ok==1){ + this.JCBMList=res.data.data + } else{ + this.$message({type:'error', message:res.data.msg, duration:3000}) + } + }) + }, + initYHLX(){ + initYHLX().then(res=>{ + if (res.data.ok==1){ + this.YHLXList=res.data.data + } else{ + this.$message({type:'error', message:res.data.msg, duration:3000}) + } + }) + }, + initYHJB(){ + initYHJB().then(res=>{ + if (res.data.ok==1){ + this.YHJBList=res.data.data + } else{ + this.$message({type:'error', message:res.data.msg, duration:3000}) + } + }) + }, + initBC(){ + initBC().then(res=>{ + if (res.data.ok==1){ + this.BCList=res.data.data + } else{ + this.$message({type:'error', message:res.data.msg, duration:3000}) + } + }) + }, + initJCLB(){ + initJCLB().then(res=>{ + if (res.data.ok==1){ + this.JCLBList=res.data.data + } else{ + this.$message({type:'error', message:res.data.msg, duration:3000}) + } + }) + }, + + + + submitForm(formName) { + this.$refs[formName].validate((valid) => { + if (valid) { + if(this.tableData==null || this.tableData.length==0){ + this.$message({type:'error', message:"请添加隐患", duration:2000}) + } + this.ruleForm.items=this.tableData + saveSelfDanger(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 { + console.log("error submit!!"); + return false; + } + }); + }, }, - ], }; - }, - methods: { - submitForm(formName) { - this.$refs[formName].validate((valid) => { - if (valid) { - alert("submit!"); - } else { - console.log("error submit!!"); - return false; - } - }); - }, - }, -}; </script> <style scoped> -.app-container { - padding: 20px; - height: 850px; - overflow-y: auto; -} + .app-container { + padding: 20px; + height: 850px; + overflow-y: auto; + } -.app-container /deep/ .box { - padding-top: 0; -} + .app-container /deep/ .box { + padding-top: 0; + } -/* /deep/ .multiline .el-input__inner { - height: 62px; -} */ - .btns{ + /* /deep/ .multiline .el-input__inner { + height: 62px; + } */ + .btns{ background-color: #034ea2; border: 1px solid #034ea2; } -</style> \ No newline at end of file +</style> diff --git a/src/views/hiddenDangerManagement/index.vue b/src/views/hiddenDangerManagement/index.vue index 81a15f8..ec90f6d 100644 --- a/src/views/hiddenDangerManagement/index.vue +++ b/src/views/hiddenDangerManagement/index.vue @@ -93,7 +93,7 @@ <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"></el-radio-button> + <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"> @@ -216,7 +216,7 @@ value1:"", radio1:"未整改", reList:[{label:"未关联",value:0}], - JCDWList:[{label:"众泰",value:0},{label:"上级单位",value:1}], + JCDWList:[{label:"众泰煤焦化",value:0},{label:"上级单位",value:1}], JCBMList:[], YHLXList:[], YHLYList:[{label:'自查录入',value:1},{label:'举一反三',value:2}], diff --git a/src/views/hiddenDangerRectification/index.vue b/src/views/hiddenDangerRectification/index.vue index 7f78602..c57ca8d 100644 --- a/src/views/hiddenDangerRectification/index.vue +++ b/src/views/hiddenDangerRectification/index.vue @@ -266,7 +266,7 @@ form:{}, value1:"", llrList:[], - JCDWList:[{label:"众泰",value:0},{label:"上级单位",value:1}], + JCDWList:[{label:"众泰煤焦化",value:0},{label:"上级单位",value:1}], JCBMList:[], YHLXList:[], BCList:[], @@ -308,6 +308,7 @@ this.initBC() this.initJCLB() this.initLlr() + this.initYHBM() }, methods:{ @@ -320,7 +321,7 @@ } }) }, - changeYHDW(val){ + initYHBM(val){ initYHBM().then(res=>{ if (res.data.ok==1){ this.YHBMList=res.data.data diff --git a/src/views/hiddenDangerRegistration/hiddenDangerAdd.vue b/src/views/hiddenDangerRegistration/hiddenDangerAdd.vue index 0d062cc..fe37c78 100644 --- a/src/views/hiddenDangerRegistration/hiddenDangerAdd.vue +++ b/src/views/hiddenDangerRegistration/hiddenDangerAdd.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" @@ -13,10 +13,11 @@ > <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" + value-format="yyyy-MM-dd" placeholder="选择日期" style="width: 100%" > @@ -24,139 +25,126 @@ </el-form-item> </el-col> <el-col :span="9" :offset="4"> - <el-form-item label="班次" prop="name"> - <el-select v-model="ruleForm.elementAName" style="width: 100%"> - </el-select> + <el-form-item label="班次" prop="check_class"> + <el-select v-model="ruleForm.check_class" placeholder="请选择" style="width: 100%"> + <el-option + v-for="item in BCList" + :key="item.value" + :label="item.value" + :value="item.value"> + </el-option> + </el-select> </el-form-item> </el-col> </el-row> <el-row> <el-col :span="9"> - <el-form-item label="检查类别"> - <el-input v-model="ruleForm.name"></el-input> + <el-form-item label="检查类别" prop="checktype"> + <el-select v-model="ruleForm.checktype" placeholder="请选择" style="width: 100%"> + <el-option + v-for="item in JCLBList" + :key="item.value" + :label="item.value" + :value="item.value"> + </el-option> + </el-select> </el-form-item> </el-col> <el-col :span="9" :offset="4"> - <el-form-item label="检查单位" prop="name"> - <el-select v-model="ruleForm.elementAName" style="width: 100%"> - </el-select> + <el-form-item label="检查单位" prop="check_main_branch"> + <el-select v-model="ruleForm.check_main_branch" placeholder="请选择" @change="changeJCDW" style="width: 100%"> + <el-option + v-for="item in JCDWList" + :key="item.label" + :label="item.label" + :value="item.label" + > + </el-option> + </el-select> </el-form-item> </el-col> </el-row> + <el-row> + <el-col :span="9"> + <el-form-item label="检查部门" prop="check_branch"> + <el-select v-model="ruleForm.check_branch" placeholder="请选择" style="width: 100%"> + <el-option + v-for="item in JCBMList" + :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-col> + </el-row> + <el-row> <el-col :span="9"> - <el-form-item label="检查人员" prop="region"> - <el-input v-model="ruleForm.name"></el-input> + <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="陪检人员"> - <el-input v-model="ruleForm.name"></el-input> + <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="9"> - <el-form-item label="隐患部门"> - <el-input v-model="ruleForm.name"></el-input> - <!-- <el-select - v-model="ruleForm.elementAName" - style="width: 100%" - > - </el-select> --> - </el-form-item> - </el-col> - <el-col :span="9" :offset="4"> - <el-form-item label="隐患类别"> - <el-select v-model="ruleForm.elementAName" style="width: 100%"> - </el-select> - </el-form-item> - </el-col> - </el-row> - <el-row> - <el-col :span="9"> - <el-form-item label="风险等级"> - <!-- <el-input v-model="ruleForm.name"></el-input> --> - <el-select v-model="ruleForm.elementAName" style="width: 100%"> - </el-select> - </el-form-item> - </el-col> - <el-col :span="9" :offset="4"> - <el-form-item label="隐患级别"> - <el-select v-model="ruleForm.elementAName" style="width: 100%"> - </el-select> - </el-form-item> - </el-col> - </el-row> - <el-row> - <el-col :span="9"> - <el-form-item label="限改时间"> - <!--<el-input v-model="ruleForm.name"></el-input>--> - <el-date-picker - v-model="value1" - type="date" - placeholder="选择日期" - style="width: 100%" - > - </el-date-picker> - </el-form-item> - </el-col> - <el-col :span="9" :offset="4"> - <el-form-item label="责任人"> - <el-input v-model="ruleForm.name"></el-input> - </el-form-item> - </el-col> - </el-row> - <el-row> - <el-col :span="9"> - <el-form-item label="整改情况"> - <!-- <el-input v-model="ruleForm.name"></el-input> --> - <el-select v-model="ruleForm.elementAName" style="width: 100%"> - </el-select> - </el-form-item> - </el-col> - <el-col :span="9" :offset="4"> - <el-form-item label="业务科室"> - <el-select v-model="ruleForm.elementAName" style="width: 100%"> - </el-select> - </el-form-item> - </el-col> - </el-row> - <el-row> - <el-col :span="22"> - <el-form-item label="行走路线"> - <el-input v-model="ruleForm.name" rows="3" type="textarea" class="multiline"></el-input> - </el-form-item> - </el-col> - </el-row> - <el-row> - <el-col :span="22"> - <el-form-item label="地点"> - <el-input v-model="ruleForm.name" rows="3" type="textarea" class="multiline"></el-input> - </el-form-item> - </el-col> - </el-row> - <el-row> - <el-col :span="22"> - <el-form-item label="隐患内容"> - <el-input v-model="ruleForm.name" rows="3" type="textarea" class="multiline"></el-input> - </el-form-item> - </el-col> - </el-row> - <el-row> - <el-col :span="22"> - <el-form-item label="整改措施" > - <el-input v-model="ruleForm.name" rows="3" type="textarea" class="multiline"></el-input> - </el-form-item> - </el-col> - </el-row> - <el-row> - <el-col :span="22"> - <el-form-item label="关联危险源"> - <el-input v-model="ruleForm.name" rows="3" type="textarea" class="multiline"></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> + <el-col :span="9"> + <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> + <el-button + size="mini" + @click="deleteDanger(scope.row, scope.$index)" + >删除 + </el-button> + </div> + </template> + </el-table-column> + </el-table> + </el-row> + + <el-row> <el-col :span="22"> <el-form-item style="text-align: center"> @@ -170,63 +158,419 @@ </el-form> </div> </div> + + <el-dialog + :title="title" + :visible.sync="dialogVisible" + :close-on-click-modal="false" + width="40%"> + <el-form ref="form" :rules="dangerRules" :model="dangerForm" label-width="100px"> + <el-row> + <el-col :span="9"> + <el-form-item label="隐患部门" prop="ht_branch"> + <el-select v-model="dangerForm.ht_branch" placeholder="请选择"> + <el-option + v-for="item in YHBMList" + :key="item.branch_id" + :label="item.branch_name" + :value="item.branch_name"> + </el-option> + </el-select> + </el-form-item> + </el-col> + <el-col :span="9" :offset="4"> + <el-form-item label="地点" prop="address"> + <el-input v-model="dangerForm.address" rows="3" type="textarea" class="multiline"></el-input> + </el-form-item> + </el-col> + </el-row> + + <el-row> + <el-col :span="9"> + <el-form-item label="隐患内容" prop="ht_content"> + <el-input v-model="dangerForm.ht_content" rows="3" type="textarea" class="multiline"></el-input> + </el-form-item> + </el-col> + <el-col :span="9" :offset="4"> + <el-form-item label="整改措施" prop="measure"> + <el-input v-model="dangerForm.measure" rows="3" type="textarea" class="multiline"></el-input> + </el-form-item> + </el-col> + </el-row> + <el-row> + <el-col :span="9"> + <el-form-item label="隐患类别" prop="ht_typesub"> + <el-select v-model="dangerForm.ht_typesub" placeholder="请选择"> + <el-option + v-for="item in YHLXList" + :key="item.value" + :label="item.value" + :value="item.value"> + </el-option> + </el-select> + </el-form-item> + </el-col> + <el-col :span="9" :offset="4"> + <el-form-item label="关联危险源" prop="DTRisk_bankId"> + <el-select v-model="dangerForm.DTRisk_bankId" placeholder="请选择" @change="changeWxy" filterable> + <el-option + v-for="item in dangerList" + :key="item.id" + :label="item.mriskPoint" + :value="item.id"> + </el-option> + </el-select> + </el-form-item> + </el-col> + </el-row> + + <el-row> + <el-col :span="9"> + <el-form-item label="风险等级" prop="DTRisk_level"> + <el-input v-model="dangerForm.DTRisk_level" :disabled="true"></el-input> + </el-form-item> + </el-col> + <el-col :span="9" :offset="4"> + <el-form-item label="隐患级别" prop="ht_level"> + <el-select v-model="dangerForm.ht_level" placeholder="请选择"> + <el-option + v-for="item in YHJBList" + :key="item.value" + :label="item.label" + :value="item.value"> + </el-option> + </el-select> + </el-form-item> + </el-col> + </el-row> + <el-row> + <el-col :span="9"> + <el-form-item label="限改时间" prop="alter_time"> + <el-date-picker + v-model="dangerForm.alter_time" + type="date" + value-format="yyyy-MM-dd" + placeholder="选择日期" + style="width: 100%" + > + </el-date-picker> + </el-form-item> + </el-col> + <el-col :span="9" :offset="4"> + <el-form-item label="责任人" prop="duty_officer"> + <el-input v-model="dangerForm.duty_officer"></el-input> + </el-form-item> + </el-col> + </el-row> + <el-row> + <el-col :span="9"> + <el-form-item label="整改情况" prop="alter_status"> + <el-select v-model="dangerForm.alter_status" placeholder="请选择"> + <el-option + v-for="item in statusList" + :key="item.value" + :label="item.label" + :value="item.value"> + </el-option> + </el-select> + </el-form-item> + </el-col> + <el-col :span="9" :offset="4"> + <el-form-item label="业务科室" prop="Review"> + <el-select v-model="dangerForm.Review" style="width: 100%"> + <el-option + v-for="item in YWKSList" + :key="item.value" + :label="item.label" + :value="item.value"> + </el-option> + </el-select> + </el-form-item> + </el-col> + </el-row> + <el-row v-if="dangerForm.alter_status=='重复反弹隐患'"> + <el-col :span="9"> + <el-form-item label="重复反弹隐患" prop="repeatId"> + <el-select v-model="dangerForm.repeatId" placeholder="请选择"> + <el-option + v-for="item in reboundList" + :key="item.id" + :label="item.content" + :value="item.id"> + </el-option> + </el-select> + </el-form-item> + </el-col> + </el-row> + <el-row> + <el-col :span="22"> + <el-form-item style="text-align: center"> + <el-button type="primary" class="btns" @click="submitDanger('form')" + >保存</el-button + > + <el-button @click="dialogVisible=false">关闭</el-button> + </el-form-item> + </el-col> + </el-row> + </el-form> + </el-dialog> + </div> </template> <script> 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 {deepClone} from '@/utils' + export default { components: { Titlename }, name: "hiddenDangerList", data() { return { - ruleForm: { - name: "", - region: "", - date1: "", - date2: "", - delivery: false, - type: [], - resource: "", - value1: "", - desc: "", - }, + 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: { - name: [ - { required: true, message: '请输入活动名称', trigger: 'blur' }, - ], + check_date: [{ required: true, message: '不能为空', trigger: 'blur' },], + check_class: [{ required: true, message: '不能为空', trigger: 'blur' },], + check_main_branch: [{ required: true, message: '不能为空', trigger: 'blur' },], + check_branch: [{ required: true, message: '不能为空', trigger: 'blur' },], + check_man: [{ required: true, message: '不能为空', trigger: 'blur' },], + checktype: [{ required: true, message: '不能为空', trigger: 'blur' },], }, - tableData: [ - { - 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: [], }; }, + mounted(){ + this.initBC() + this.initJCLB() + this.initYHJB() + this.initYHLX() + //this.initLlr() + this.initReformStatus() + this.initYHBM() + this.initYWKS() + this.initWXY() + this.initDangerRebound() + }, methods: { + 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) { + if(this.title=='新增'){ + this.tableData.push(this.dangerForm) + }else { + var arr = this.tableData; + arr.splice(this.rowIndex, 1, this.dangerForm); + this.tableData = arr; + } + this.dialogVisible=false + + } else { + console.log("error submit!!"); + return false; + } + }); + }, + deleteDanger(row, index) { + + + this.$confirm('确认删除吗', '提示', { + confirmButtonText: '确认', + cancelButtonText: '取消', + type: 'warning' + }) + .then(() => { + var arr = deepClone(this.tableData); + var brr = []; + for (var i = 0; i < arr.length; i++) { + if (i == index) { + } else { + brr.push(arr[i]); + } + } + this.tableData = deepClone(brr); + //this.tableData.splice(index) + + }) + .catch(error => { + }); + + + }, + editDanger(row, index) { + this.dangerForm = deepClone(row); + this.rowIndex = index; + this.dialogVisible = true; + this.title = '编辑'; + }, + + addDanger(){ + this.dangerForm={} + this.title="新增" + this.dialogVisible=true + }, + changeWxy(e){ + for(var i=0;i<this.dangerList.length;i++){ + if(e==this.dangerList[i].id){ + this.dangerForm.DTRisk_level=this.dangerList[i].mriskLevel + this.dangerForm.dangerousSource=this.dangerList[i].mriskPoint + } + } + }, + initWXY(){ + var param={ + page: 1, + limit: 1000 + } + initWxy(param).then(res=>{ + if (res.data.ok==1){ + this.dangerList=res.data.data.items + } else{ + this.$message({type:'error', message:res.data.msg, duration:3000}) + } + }) + }, + initYWKS(){ + initYwks().then(res=>{ + if (res.data.ok==1){ + this.YWKSList=res.data.data + } else{ + this.$message({type:'error', message:res.data.msg, duration:3000}) + } + }) + }, + initYHBM(){ + initYHBM().then(res=>{ + if (res.data.ok==1){ + this.YHBMList=res.data.data + } else{ + this.$message({type:'error', message:res.data.msg, duration:3000}) + } + }) + }, + initLlr(){ + initLlr().then(res=>{ + if (res.data.ok==1){ + this.llrList=res.data.data + } else{ + this.$message({type:'error', message:res.data.msg, duration:3000}) + } + }) + }, + initReformStatus(){ + initReformStatus().then(res=>{ + if (res.data.ok==1){ + this.statusList=res.data.data + } else{ + this.$message({type:'error', message:res.data.msg, duration:3000}) + } + }) + }, + changeJCDW(val){ + initJCBM(val).then(res=>{ + if (res.data.ok==1){ + this.JCBMList=res.data.data + } else{ + this.$message({type:'error', message:res.data.msg, duration:3000}) + } + }) + }, + initYHLX(){ + initYHLX().then(res=>{ + if (res.data.ok==1){ + this.YHLXList=res.data.data + } else{ + this.$message({type:'error', message:res.data.msg, duration:3000}) + } + }) + }, + initYHJB(){ + initYHJB().then(res=>{ + if (res.data.ok==1){ + this.YHJBList=res.data.data + } else{ + this.$message({type:'error', message:res.data.msg, duration:3000}) + } + }) + }, + initBC(){ + initBC().then(res=>{ + if (res.data.ok==1){ + this.BCList=res.data.data + } else{ + this.$message({type:'error', message:res.data.msg, duration:3000}) + } + }) + }, + initJCLB(){ + initJCLB().then(res=>{ + if (res.data.ok==1){ + this.JCLBList=res.data.data + } else{ + this.$message({type:'error', message:res.data.msg, duration:3000}) + } + }) + }, + + + submitForm(formName) { this.$refs[formName].validate((valid) => { if (valid) { - alert("submit!"); + if(this.tableData==null || this.tableData.length==0){ + 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}) + } + }) + } else { console.log("error submit!!"); return false; @@ -255,4 +599,4 @@ background-color: #034ea2; border: 1px solid #034ea2; } -</style> \ No newline at end of file +</style> diff --git a/src/views/hiddenDangerRegistration/index.vue b/src/views/hiddenDangerRegistration/index.vue index 3e203e4..3f86d62 100644 --- a/src/views/hiddenDangerRegistration/index.vue +++ b/src/views/hiddenDangerRegistration/index.vue @@ -258,7 +258,7 @@ options: [], form:{}, - JCDWList:[{label:"众泰",value:0},{label:"上级单位",value:1}], + JCDWList:[{label:"众泰煤焦化",value:0},{label:"上级单位",value:1}], JCBMList:[], YHLXList:[], BCList:[], @@ -285,6 +285,7 @@ this.initBC() this.initJCLB() this.initLlr() + this.initYHBM() }, methods:{ initLlr(){ @@ -296,7 +297,7 @@ } }) }, - changeYHDW(val){ + initYHBM(){ initYHBM().then(res=>{ if (res.data.ok==1){ this.YHBMList=res.data.data diff --git a/src/views/hiddenDangerReview/recheckCancellationNumber.vue b/src/views/hiddenDangerReview/recheckCancellationNumber.vue index 79908bb..a38f044 100644 --- a/src/views/hiddenDangerReview/recheckCancellationNumber.vue +++ b/src/views/hiddenDangerReview/recheckCancellationNumber.vue @@ -219,7 +219,7 @@ form:{}, value1:"", llrList:[], - JCDWList:[{label:"众泰",value:0},{label:"上级单位",value:1}], + JCDWList:[{label:"众泰煤焦化",value:0},{label:"上级单位",value:1}], JCBMList:[], YHLXList:[], BCList:[], @@ -246,6 +246,7 @@ this.initBC() this.initJCLB() this.initLlr() + this.initYHBM() }, methods:{ initLlr(){ @@ -257,7 +258,7 @@ } }) }, - changeYHDW(val){ + initYHBM(val){ initYHBM().then(res=>{ if (res.data.ok==1){ this.YHBMList=res.data.data -- Gitblit v1.9.2