From d4dcc35263ef8ea99bd7427add8ca8e2731425b7 Mon Sep 17 00:00:00 2001 From: cqf <2252655793@qq.com> Date: 星期五, 20 五月 2022 10:25:01 +0800 Subject: [PATCH] 接口对接 --- src/views/Issuedbysuperiors/index.vue | 365 ++++++++------- src/views/safetyHazardAccount/index.vue | 4 src/views/hiddenDangerTroubleshootingList/index.vue | 143 +++++- src/api/sgyhpczl/hiddenDangerTroubleshootingList.js | 37 + src/views/hiddenDangerTroubleshootingList/preview.vue | 178 +++---- src/router/index.js | 14 src/views/Issuedbysuperiors/superiorsSend.vue | 531 ++++++++++++++++++++++++ src/api/sgyhpczl/Issuedbysuperiors.js | 15 8 files changed, 976 insertions(+), 311 deletions(-) diff --git a/src/api/sgyhpczl/Issuedbysuperiors.js b/src/api/sgyhpczl/Issuedbysuperiors.js index 71c140b..b71217a 100644 --- a/src/api/sgyhpczl/Issuedbysuperiors.js +++ b/src/api/sgyhpczl/Issuedbysuperiors.js @@ -86,3 +86,18 @@ }); } + +//保存延期申请 +export function company_next_step_do(data) { + return request({ + headers:{ + 'token': getTokenAndVerify().token, + 'verify':getTokenAndVerify().verify + }, + url: "/taboi/danger/company_next_step_do", + contentType: "application/json", + method: 'POST', + data, + }); +} + diff --git a/src/api/sgyhpczl/hiddenDangerTroubleshootingList.js b/src/api/sgyhpczl/hiddenDangerTroubleshootingList.js new file mode 100644 index 0000000..96d3f96 --- /dev/null +++ b/src/api/sgyhpczl/hiddenDangerTroubleshootingList.js @@ -0,0 +1,37 @@ +import request from '@/utils/request'; +import {getTokenAndVerify} from "@/api/sgyhpczl/auth"; + +export function standard_template() { + return request({ + headers: { + 'token': getTokenAndVerify().token, + 'verify': getTokenAndVerify().verify + }, + url: '/taboi/download/standard_template', + method: 'get', + responseType: 'arraybuffer', + }); +} + +export function standard_import_do(data) { + return request({ + headers: { + 'token': getTokenAndVerify().token, + 'verify': getTokenAndVerify().verify + }, + url: '/taboi/excel/standard_import_do', + method: 'post', + data + }) +} + +export function stand_list(data) { + return request({ + headers: { + 'token': getTokenAndVerify().token, + 'verify': getTokenAndVerify().verify + }, + url: '/taboi/danger/stand_list?standardType=' + data, + method: 'GET', + }) +} diff --git a/src/router/index.js b/src/router/index.js index eb457d4..654c9fe 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -54,7 +54,8 @@ { path: '/', component: Layout, - redirect: '/workPlan/workPlan/reserve', + redirect: "/accidentHidden", + // redirect: '/workPlan/workPlan/reserve', children: [ { path: 'dashboard', @@ -379,6 +380,17 @@ component: () => import('@/views/Issuedbysuperiors'), meta: { title: '上级下达隐患', icon: '' } }, + { + id: 9, + parentId: 0, + path: '/superiorsSend', + name: '发送隐患', + component: () => import('@/views/Issuedbysuperiors/superiorsSend'), + meta: { title: '发送隐患', icon: '' }, + hidden: true + + }, + { id: 10, parentId: 0, diff --git a/src/views/Issuedbysuperiors/index.vue b/src/views/Issuedbysuperiors/index.vue index 0622140..69a7154 100644 --- a/src/views/Issuedbysuperiors/index.vue +++ b/src/views/Issuedbysuperiors/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,39 +117,45 @@ </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" @click="exportData">导出excel</el-button> + <el-button type="primary" class="btns" size="small" icon="el-icon-upload2" @click="exportData">导出excel + </el-button> </el-form-item> </el-form> - <el-row class="title-center"> + <el-row class="title-center"> <el-col :span="10"> - <el-radio-group v-model="YHType"> - <el-radio-button label="1">待发送</el-radio-button> - <el-radio-button label="2">整改中</el-radio-button> - <el-radio-button label="3">待复查</el-radio-button> - <el-radio-button label="end">整改完成</el-radio-button> - </el-radio-group> + <el-radio-group v-model="YHType"> + <el-radio-button label="1">待发送</el-radio-button> + <el-radio-button label="2">整改中</el-radio-button> + <el-radio-button label="3">待复查</el-radio-button> + <el-radio-button label="end">整改完成</el-radio-button> + </el-radio-group> </el-col> </el-row> - <el-table :data="tableData" style="width: 100%" @selection-change="changeBox"> + <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> @@ -157,25 +163,25 @@ <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="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="measure" label="整改措施" align="center"></el-table-column> + <el-table-column prop="ht_branch" label="隐患部门" align="center"></el-table-column> + <el-table-column prop="duty_officer" label="责任人" align="center"></el-table-column> <el-table-column prop="alter_time" label="限改时间" width="120" align="center"></el-table-column> - <el-table-column prop="ht_level" label="级别" align="center"> </el-table-column> + <el-table-column prop="ht_level" label="级别" align="center"></el-table-column> </el-table-column> <el-table-column label="整改情况" align="center"> - <el-table-column prop="ACCOMPLISHTIME" label="完成时间" width="110px" align="center"> </el-table-column> - <el-table-column prop="CALLBACKRESULT" label="复查结果" align="center"> </el-table-column> - <el-table-column prop="CALLBACKPERSON" label="复查人" align="center"> </el-table-column> - <el-table-column prop="CALLBACKTIME" label="复查时间" width="120" align="center"></el-table-column> + <el-table-column prop="ACCOMPLISHTIME" label="完成时间" width="110px" align="center"></el-table-column> + <el-table-column prop="CALLBACKRESULT" label="复查结果" align="center"></el-table-column> + <el-table-column prop="CALLBACKPERSON" label="复查人" align="center"></el-table-column> + <el-table-column prop="CALLBACKTIME" label="复查时间" width="120" align="center"></el-table-column> </el-table-column> - <el-table-column label="隐患处理状态" align="center"> + <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> @@ -185,14 +191,15 @@ </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-if="scope.row.DTRisk_bankId==0 || scope.row.DTRisk_bankId=='' || scope.row.DTRisk_bankId==null">未关联</span> <span v-else>已关联</span> </template> </el-table-column> - <el-table-column prop="DTRisk_level" label="风险等级" align="center"> </el-table-column> - <el-table-column prop="warningLevel" label="初始警情" align="center"> </el-table-column> - <el-table-column prop="curWarningLevel" label="当前警情" align="center"> </el-table-column> - <el-table-column prop="date" label="流程操作" v-if="YHType=='1'" align="center" fixed="right"> + <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="流程操作" v-if="YHType==1" align="center" fixed="right"> <template slot-scope="scope"> <el-button @click="handleClick(scope.row)" type="text" size="small">点击发送</el-button> </template> @@ -222,31 +229,41 @@ <script> import {getPageList} from "@/api/sgyhpczl/Issuedbysuperiors"; import {danger_export_do} from "@/api/sgyhpczl/hiddenDangerRectification"; -import {initJCBM ,initYHLX, initBC ,initJCLB ,initYHBM ,initYHJB,initLlr,initReformStatus} from "@/api/sgyhpczl/initSelect"; +import { + initJCBM, + initYHLX, + initBC, + initJCLB, + initYHBM, + initYHJB, + initLlr, + initReformStatus +} from "@/api/sgyhpczl/initSelect"; + export default { data() { return { - YHType:'1', - selectedList:[], - reList:[{label:"未关联",value:0}], - llrList:[], + YHType: '1', + selectedList: [], + reList: [{label: "未关联", value: 0}], + llrList: [], options: [], - form:{}, + form: {}, - JCDWList:[{label:"众泰煤焦化",value:0},{label:"上级单位",value:1}], - JCBMList:[], - YHLXList:[], - BCList:[], - JCLBList:[], - YHBMList:[], - YHJBList:[], - YHZTList:[], + JCDWList: [{label: "众泰煤焦化", value: 0}, {label: "上级单位", value: 1}], + JCBMList: [], + YHLXList: [], + BCList: [], + JCLBList: [], + YHBMList: [], + YHJBList: [], + YHZTList: [], tableData: [], - listQuery:{ - page:1, - limit:10, - form:{ - ht_community:"众泰煤焦化" + listQuery: { + page: 1, + limit: 10, + form: { + ht_community: "众泰煤焦化" }, }, currentPage: 1, @@ -254,7 +271,7 @@ recordTotal: 0, }; }, - mounted(){ + mounted() { this.getPageList() this.initYHLX() this.initYHJB() @@ -264,26 +281,26 @@ this.initYHBM() this.initYHZT() }, - watch:{ - "YHType":function (newVal,oldVal){ + watch: { + "YHType": function (newVal, oldVal) { this.getPageList() } }, - methods:{ - deleteBatch(){ - if(this.selectedList==null ||this.selectedList.length==0 ){ - this.$message({type:'warning', message:'至少选中一条数据', duration:3000}) + methods: { + deleteBatch() { + if (this.selectedList == null || this.selectedList.length == 0) { + this.$message({type: 'warning', message: '至少选中一条数据', duration: 3000}) return } - var ids=this.selectedList.map((obj) => { + var ids = this.selectedList.map((obj) => { return obj.id }).join(",") - this.$confirm('确认删除吗','提示', { + this.$confirm('确认删除吗', '提示', { confirmButtonText: '确认', cancelButtonText: '取消', type: 'warning' }) - .then(()=>{ + .then(() => { delDanger(ids).then(() => { this.getPageList() this.$notify({ @@ -294,179 +311,179 @@ }); }); }) - .catch(error =>{ + .catch(error => { }); }, - changeBox(val){ + changeBox(val) { this.selectedList = [] val.forEach((item) => { this.selectedList.push(item) }) }, - 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}) + 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(){ - initYHBM().then(res=>{ - if (res.data.ok==1){ - this.YHBMList=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}) } }) }, - 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.listQuery.form.step = this.YHType; 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={ht_community:"众泰煤焦化"} + reset() { + this.listQuery.form = {ht_community: "众泰煤焦化"} 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}) } }) }, - initYHZT(){ - initReformStatus().then(res=>{ - if (res.data.ok==1){ - this.YHZTList=res.data.data + initYHZT() { + initReformStatus().then(res => { + if (res.data.ok == 1) { + this.YHZTList = res.data.data console.log(this.YHZTList) - } else{ - this.$message({type:'error', message:res.data.msg, duration:3000}) + } 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}) } }) }, - updateClick(row){ + updateClick(row) { this.$router.push({ - path:"/hiddenDangerAdd?id="+row.id + path: "/hiddenDangerAdd?id=" + row.id }) }, - jump(){ + jump() { this.$router.push({ - path:"/hiddenDangerAdd" + path: "/hiddenDangerAdd" }) }, // 发送隐患单跳转 - handleClick(row){ + handleClick(row) { this.$router.push({ - path:"/hiddenDangerList?id="+row.id, + path: "/superiorsSend?id=" + row.id, }) }, - deleteClick(row){ - this.$confirm('确认删除吗','提示', { + deleteClick(row) { + this.$confirm('确认删除吗', '提示', { confirmButtonText: '确认', cancelButtonText: '取消', type: 'warning' }) - .then(()=>{ + .then(() => { delDanger(row.id).then(() => { this.getPageList() this.$notify({ @@ -477,7 +494,7 @@ }); }); }) - .catch(error =>{ + .catch(error => { }); }, exportData() { @@ -504,22 +521,26 @@ }; </script> <style scoped> - .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; - } - .title-center /deep/ .el-radio-button:first-child .el-radio-button__inner { +.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; +} + +.title-center /deep/ .el-radio-button:first-child .el-radio-button__inner { border: none; } diff --git a/src/views/Issuedbysuperiors/superiorsSend.vue b/src/views/Issuedbysuperiors/superiorsSend.vue index 3da5aed..964cfc5 100644 --- a/src/views/Issuedbysuperiors/superiorsSend.vue +++ b/src/views/Issuedbysuperiors/superiorsSend.vue @@ -1,13 +1,542 @@ <template> + <div class="app-container"> + <div style=""> + <Titlename title="发送隐患单"></Titlename> + <div class="whole-form"> + <el-form :model="ruleForm" 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-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.check_main_branch" + :disabled="true" + style="width: 100%" + > + </el-select> + </el-form-item> + </el-col> + </el-row> + <el-row> + <el-col :span="9"> + <el-form-item label="检查人" prop="region"> + <el-input v-model="ruleForm.check_man" :disabled="true"></el-input> + <!-- <el-select--> + <!-- v-model="ruleForm.elementAName"--> + <!-- :disabled="true"--> + <!-- style="width: 100%"--> + <!-- >--> + <!-- </el-select>--> + </el-form-item> + </el-col> + <el-col :span="9" :offset="4"> + <el-form-item label="陪检人员" prop="name"> + <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-date-picker + v-model="ruleForm.check_date" + type="date" + :disabled="true" + placeholder="选择日期" + style="width: 100%"> + </el-date-picker> + </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.check_class" + :disabled="true" + 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.class_situation" :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.class_man" :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.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.ht_community" + :disabled="true" + style="width: 100%" + > + </el-select> + </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.ht_branch" + :disabled="true" + 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 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.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.ht_typesub" + :disabled="true" + style="width: 100%" + > + </el-select> + </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.ht_level" + :disabled="true" + 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.measure" :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> + </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-date-picker + v-model="ruleForm.alter_time" + type="date" + :disabled="true" + placeholder="选择日期" + style="width: 100%"> + </el-date-picker> + </el-form-item> + </el-col> + <el-col :span="9" :offset="4"> + <el-form-item label="责任人" prop="name"> + <el-input v-model="ruleForm.duty_officer" :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-date-picker + v-model="ruleForm.ACCOMPLISHTIME" + type="date" + :disabled="true" + placeholder="选择日期" + style="width: 100%"> + </el-date-picker> + </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> + </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-date-picker + v-model="ruleForm.CALLBACKTIME" + type="date" + :disabled="true" + placeholder="选择日期" + style="width: 100%"> + </el-date-picker> + </el-form-item> + </el-col> + <el-col :span="9" :offset="4"> + <el-form-item label="复查人" prop="name"> + <el-input v-model="ruleForm.CALLBACKPERSON" :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.CALLBACKRESULT" :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.amendnum" :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.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.DTRisk_level" + :disabled="true" + style="width: 100%" + > + </el-select> + </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.Review" + :disabled="true" + 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" :disabled="true"></el-input>--> + <el-table + :data="tableData" + border + style="width: 100%"> + <el-table-column + type="index" + label="步骤" + align="center" + width="60"> + </el-table-column> + <el-table-column + prop="realname" + label="操作人" + align="center" + width="138"> + </el-table-column> + <el-table-column + prop="create_time" + label="处理时间" + align="center" + width="200"> + </el-table-column> + <el-table-column + prop="content" + label="审批意见" + align="center" + width="260"> + <template slot-scope="scope"> + <span size="medium">{{ scope.row.content }}</span> + <a v-for="item in scope.row.realFileName" + :href="scope.row.url+'/'+item"> + {{ item.split("fileName=")[1] }} + </a> + </template> + </el-table-column> + <el-table-column + prop="ispass" + label="流程信息" + align="center" + width="170"> + </el-table-column> + </el-table> + </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> + </el-col> + </el-row> + <el-row> + <el-col :span="22"> + <el-form-item label="下一步:" prop="name"> + <span>隐患下达责任部门</span> + <!-- <el-input type="textarea" v-model="ruleForm.name" class="multiline"--> + <!-- :disabled="true"></el-input>--> + </el-form-item> + </el-col> + </el-row> + </el-form> + <el-form :model="sendDataForm" :rules="rules" ref="sendDataForm" label-width="150px" + class="demo-ruleForm" + style="margin: 0 14% 0 16%;"> + <div> + <el-row> + <el-col :span="9"> + <el-form-item label="隐患部门" prop="ht_branch"> + <el-input v-model="sendDataForm.ht_branch" clearable></el-input> + </el-form-item> + </el-col> + </el-row> + <el-row> + <el-col :span="9"> + <el-form-item label="责任人" prop="duty_officer"> + <el-input v-model="sendDataForm.duty_officer" clearable></el-input> + </el-form-item> + </el-col> + </el-row> + <el-row> + <el-col :span="9"> + <el-form-item label="业务科室" prop="Review"> + <el-input v-model="sendDataForm.Review" clearable></el-input> + </el-form-item> + </el-col> + </el-row> + <el-row> + <el-col :span="22"> + <el-form-item label="备注" prop="dealContent"> + <el-input class="textarea" type="textarea" + v-model="sendDataForm.dealContent"></el-input> + </el-form-item> + </el-col> + </el-row> + </div> + <el-row> + <el-col :span="22"> + <el-form-item style="text-align: center;"> + <el-button class="btn" size="small" type="primary" @click="submitForm('sendDataForm')"> + 保存 + </el-button> + <el-button size="small" @click="close()">关闭</el-button> + </el-form-item> + </el-col> + </el-row> + </el-form> + </div> + </div> + + </div> </template> <script> +import Titlename from "../../components/Titlename/index.vue"; +import {getDangerDetails, getWfRecordList} from "@/api/sgyhpczl/recheckCancellationNumber"; +import {company_next_step_do} from "@/api/sgyhpczl/Issuedbysuperiors"; +import {getUserInfo} from "@/api/sgyhpczl/hiddenDangerManagement"; + + export default { - name: "superiorsSend" + components: {Titlename}, + name: "recheckHiddenDangerList", + data() { + return { + ruleForm: { + id: "", + step: "3", + ispass: "", + CALLBACKTIME: "", + CALLBACKPERSON: "", + CALLBACKRESULT: "", + dealContent: "", + }, + sendDataForm: { + id: "", + duty_officer: "", + ht_branch: "", + Review: "", + dealContent: "", + }, + rules: { + // duty_officer: {required: true, message: '请填写复查时间', trigger: 'blur'}, + ht_branch: {required: true, message: '隐患部门不能为空', trigger: 'blur'}, + Review: {required: true, message: '业务科室不能为空', trigger: 'blur'}, + }, + tableData: [], + fileList: [], + // safetyInspectionItemResult:'0', + }; + }, + mounted() { + this.getDangerDetails(); + this.getWfRecordList(); + }, + methods: { + getUserInfo() { + getUserInfo().then(res => { + if (res.data.code == 200) { + this.sendDataForm.Review = res.data.result.department; + } else { + this.$message({type: 'error', message: "用户信息获取失败!请重试", duration: 3000}) + } + }) + }, + getDangerDetails() { + getDangerDetails(this.$route.query.id).then(res => { + var data = res.data; + if (data.ok) { + this.ruleForm = data.data; + this.ruleForm.url = process.env.BASE_API; + this.sendDataForm.id = this.ruleForm.id + } else { + this.$message({type: 'error', message: "数据查询失败,请重试!", duration: 3000}) + } + }) + }, + getWfRecordList() { + getWfRecordList(this.$route.query.id).then(res => { + var data = res.data; + if (data.ok) { + this.tableData = data.data; + } else { + this.$message({type: 'error', message: "数据查询失败,请重试!", duration: 3000}) + } + }) + }, + submitForm(formName) { + this.$refs[formName].validate((valid) => { + if (valid) { + company_next_step_do(this.sendDataForm).then(res => { + var msg = res.data.msg; + if (res.data.ok) { + this.$router.push({ + path: "/recheckCancellationNumber", + }) + this.$message({type: 'success', message: msg, duration: 3000}) + } else { + this.$message({type: 'error', message: msg, duration: 3000}) + } + }) + // alert('submit!'); + } else { + console.log('error submit!!'); + return false; + } + }); + }, + handleRemove(file, fileList) { + console.log(file, fileList); + }, + handlePreview(file) { + console.log(file); + }, + beforeUpload(file) { + var FileExt = file.name.replace(/.+\./, ""); + if (['jpg', 'png', 'bmp', 'gif', 'jpeg'].indexOf(FileExt.toLowerCase()) === -1) { + this.$message({ + type: 'warning', + message: '请上传后缀名为jpg、png、bmp、gif、jpeg的图片!' + }); + return false; + } + }, + close() { + this.$router.push({ + path: "/recheckCancellationNumber" + }) + } + } } </script> <style scoped> +.app-container { + padding: 20px; + height: 850px; + overflow-y: auto; +} +/deep/ .box { + padding-top: 0; +} + +/deep/ .multiline .el-input__inner { + height: 62px; +} + +/deep/ .textarea .el-textarea__inner { + height: 80px; + max-height: 80px; + overflow-y: auto +} + +/deep/ .textarea2 .el-textarea__inner { + height: 100px; + max-height: 100px; + overflow-y: auto +} + +.btn { + background-color: #034ea2; + border: 1px solid #034ea2; +} + +/*.el-button:hover {*/ +/* background: #66b1ff;*/ +/* border-color: #66b1ff;*/ +/* color: #FFF;*/ +/*}*/ </style> diff --git a/src/views/hiddenDangerTroubleshootingList/index.vue b/src/views/hiddenDangerTroubleshootingList/index.vue index 0ebb761..3208d2d 100644 --- a/src/views/hiddenDangerTroubleshootingList/index.vue +++ b/src/views/hiddenDangerTroubleshootingList/index.vue @@ -1,10 +1,11 @@ <template xmlns="http://www.w3.org/1999/html"> - <div class="whole"> + <div class="whole" v-loading="fullscreenLoading"> <div class="left-tree"> <el-tree :data="data" node-key="id" default-expand-all + @node-click="clickType" @node-drag-start="handleDragStart" @node-drag-enter="handleDragEnter" @node-drag-leave="handleDragLeave" @@ -24,31 +25,34 @@ }" style="color: #409eff;" /> - <i v-else class="el-icon-folder-add" style="color: #EC933A;" /> + <i v-else class="el-icon-folder-add" style="color: #EC933A;"/> <span>{{ node.label }}</span> </template> </span> </el-tree> </div> - <div class="right-table"> + <div class="right-table" v-show="templateName!=null && templateName !=''"> <table border="1" style="background: #FFFFFF;width: 100%;"> <tr> <td class="table_td" style="text-align: right;">模板名称:</td> <td> - <input class="input" style="line-height: 24px;height: 24px;"> + <input class="input" style="line-height: 24px;height: 24px;" + v-model="templateName"> </td> </tr> <tr> <td class="table_td" style="text-align: right;">模板导入:</td> <td style="line-height: 24px;height: 24px;"> - <input class="input" type="file" style="color: red;"> - <button class="btn" style="margin-left: 120px;">导入</button> - <button class="btn">下载模板</button> + <input class="input" type="file" @change="changeFile" accept=".xlsx,.xls" style="color: red;"> + <button class="btn" style="margin-left: 120px;" @click="importData" + >导入 + </button> + <button class="btn" @click="downTemplate">下载模板</button> </td> </tr> <tr class="table_tr"> <td colspan="4" align="center"> - <button class="btn">预览</button> + <button class="btn" @click="preview">预览</button> </td> </tr> </table> @@ -57,32 +61,43 @@ </template> <script> + + +import {standard_template, standard_import_do,stand_list} from "@/api/sgyhpczl/hiddenDangerTroubleshootingList"; + + export default { - name: "index" , + name: "index", data() { return { data: [{ id: 1, label: '隐患排查清单', - icon:'el-icon-folder', + icon: 'el-icon-folder', + click: true, children: [{ id: 4, label: '现场管理清单', - icon:'el-icon-folder', + icon: 'el-icon-folder', + click: true }, - { - id: 5, - label: '基础管理清单', - icon:'el-icon-success', - }] + { + id: 5, + label: '基础管理清单', + icon: 'el-icon-success', + click: true + }] }], defaultProps: { children: 'children', label: 'label' }, + templateName: "", + file: null, + fullscreenLoading:false }; }, - mounted(){ + mounted() { this.getAllColumns() }, methods: { @@ -120,59 +135,127 @@ }, handleChange(file, fileList) { this.fileList = fileList.slice(-3); + }, + clickType(item) { + if (item.click) { + this.templateName = item.label; + } + }, + downTemplate() { + //删除分页参数 + standard_template().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) + }) + }, + importData() { + if (this.file == null) { + this.$message({type: 'warning', message: "请添加Excel附件", duration: 3000}) + return; + } + console.log(this.file) + this.fullscreenLoading = true; + this.uploadByJsqd(this.file); + }, + changeFile(file) { + this.file = event.target.files[0] + }, + //文件发生改变就会触发的事件 导入 + uploadByJsqd(file) { + //判断是否符合beforeAvatarUpload方法中的条件 + var formdata = new FormData() + formdata.append('file', file) + formdata.append('standardType', this.templateName); + + //importDevice:请求接口 formdata:传递参数 + standard_import_do(formdata).then((res) => { + this.fullscreenLoading = false; + 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}) + } + }) + }, + preview(){ + this.$router.push({ + path: "/preview", + query:{"templateName":this.templateName} + }) } } } </script> <style scoped> -.whole{ +.whole { display: flex; } -.left-tree{ + +.left-tree { width: 15%; } -.left-tree .el-tree{ + +.left-tree .el-tree { background: #f0f6e4; height: 400px; overflow-y: scroll; border: 1px solid #000; } -/deep/ .is-leaf{ + +/deep/ .is-leaf { background: transparent !important; width: 5px; height: 5px; background-size: 100%; margin-right: 5px; } -/deep/ .el-icon-caret-right:before{ + +/deep/ .el-icon-caret-right:before { content: ''; } -.right-table{ + +.right-table { width: 85%; } -table,table tr th, table tr td { - border:1px solid #ccc; + +table, table tr th, table tr td { + border: 1px solid #ccc; } -.table_td{ + +.table_td { background: #e4edf4; } -.table_tr{ + +.table_tr { background: #e4edf4; line-height: 40px; height: 40px; } -table{ + +table { width: 100%; border-collapse: collapse; font-size: 14px; } -.input{ + +.input { background: #f9f9f9; border-width: 1px; margin: 5px 0; } -.btn{ + +.btn { background: url(../../assets/btn.gif) no-repeat; width: 76px; height: 26px; diff --git a/src/views/hiddenDangerTroubleshootingList/preview.vue b/src/views/hiddenDangerTroubleshootingList/preview.vue index f41ca01..629a168 100644 --- a/src/views/hiddenDangerTroubleshootingList/preview.vue +++ b/src/views/hiddenDangerTroubleshootingList/preview.vue @@ -1,122 +1,90 @@ <template> -<div class="whole"> - <h3 style="text-align: center">隐患排查标准清单(基础管理清单)</h3> - <el-table - :data="tableData" - style="width: 100%"> - <el-table-column label="排查内容" align="center"> - <el-table-column - prop="province" - label="Ⅰ级要素" - width="120"> + <div class="whole"> + <h3 style="text-align: center">隐患排查标准清单(基础管理清单)</h3> + <el-table + :data="tableData" + style="width: 100%"> + <el-table-column label="排查内容" align="center"> + <el-table-column + prop="factor_1" + label="Ⅰ级要素" + width="120"> + </el-table-column> + <el-table-column + prop="factor_2" + label="Ⅱ级要素" + width="120"> + </el-table-column> + <el-table-column + prop="factor_3" + label="Ⅲ级要素" + width="120"> + </el-table-column> + <el-table-column + prop="factor_4" + label="Ⅳ级要素" + width="120"> + </el-table-column> + </el-table-column> + <el-table-column label="排查标准" align="center"> + <el-table-column + prop="Standard" + label="标准项具体描述" + width="300"> + </el-table-column> + <el-table-column + prop="reference" + width="200" + label="参考依据"> + </el-table-column> </el-table-column> <el-table-column - prop="city" - label="Ⅱ级要素" - width="120"> + prop="method" + label="排查方法" + width="150"> </el-table-column> <el-table-column - prop="address" - label="Ⅲ级要素" - width="120"> + prop="period" + label="排查周期" + width="150"> </el-table-column> - <el-table-column - prop="zip" - label="Ⅳ级要素" - width="120"> + <el-table-column label="排查责任" align="center"> + <el-table-column + prop="level" + label="排查级别"> + </el-table-column> + <el-table-column + prop="branch" + label="责任单位"> + </el-table-column> </el-table-column> - </el-table-column> - <el-table-column label="排查标准" align="center"> - <el-table-column - prop="province" - label="标准项具体描述" - width="300"> - </el-table-column> - <el-table-column - prop="city" - width="200" - label="参考依据"> - </el-table-column> - </el-table-column> - <el-table-column - prop="date" - label="排查方法" - width="150"> - </el-table-column> - <el-table-column - prop="date" - label="排查周期" - width="150"> - </el-table-column> - <el-table-column label="排查责任" align="center"> - <el-table-column - prop="province" - label="排查级别"> - </el-table-column> - <el-table-column - prop="city" - label="责任单位"> - </el-table-column> - </el-table-column> - </el-table> -</div> + </el-table> + </div> </template> <script> +import {stand_list} from "@/api/sgyhpczl/hiddenDangerTroubleshootingList"; + export default { name: "preview", data() { return { - tableData: [{ - date: '2016-05-03', - name: '王小虎', - province: '上海', - city: '普陀区', - address: '上海市普陀区金沙江路 1518 弄', - zip: 200333 - }, { - date: '2016-05-02', - name: '王小虎', - province: '上海', - city: '普陀区', - address: '上海市普陀区金沙江路 1518 弄', - zip: 200333 - }, { - date: '2016-05-04', - name: '王小虎', - province: '上海', - city: '普陀区', - address: '上海市普陀区金沙江路 1518 弄', - zip: 200333 - }, { - date: '2016-05-01', - name: '王小虎', - province: '上海', - city: '普陀区', - address: '上海市普陀区金沙江路 1518 弄', - zip: 200333 - }, { - date: '2016-05-08', - name: '王小虎', - province: '上海', - city: '普陀区', - address: '上海市普陀区金沙江路 1518 弄', - zip: 200333 - }, { - date: '2016-05-06', - name: '王小虎', - province: '上海', - city: '普陀区', - address: '上海市普陀区金沙江路 1518 弄', - zip: 200333 - }, { - date: '2016-05-07', - name: '王小虎', - province: '上海', - city: '普陀区', - address: '上海市普陀区金沙江路 1518 弄', - zip: 200333 - }] + tableData: [] + } + }, + mounted() { + this.getTableData() + }, + methods: { + getTableData() { + stand_list(this.$route.query.templateName).then((res) => { + if (res.data.ok) { + console.log(res); + this.tableData = res.data.data; + } else { + this.$message({type: 'error', message: res.data.msg, duration: 3000}) + } + }) } } } diff --git a/src/views/safetyHazardAccount/index.vue b/src/views/safetyHazardAccount/index.vue index e15ac5a..a01159f 100644 --- a/src/views/safetyHazardAccount/index.vue +++ b/src/views/safetyHazardAccount/index.vue @@ -189,7 +189,7 @@ <el-col :span="12" style="text-align:right;" v-if="YHType=='0'"> <el-button type="primary" class="btns" size="small" @click="supervision('1')">督查督办</el-button> <el-button type="primary" class="btns" size="small" @click="supervision('2')">举一反三</el-button> - <el-button type="primary" class="btns" size="small" @click="base()">双基考核</el-button> +<!-- <el-button type="primary" class="btns" size="small" @click="base()">双基考核</el-button>--> <el-button type="primary" class="btns" size="small" @click='deleteBatch'>删除</el-button> </el-col> </el-row> @@ -272,7 +272,7 @@ > <el-form> <el-row> - <el-checkbox style="width: 80px;height: 30px" v-for="item in YHBMList" v-model="checked" + <el-checkbox style="width: 80px;height: 30px" :key="item.branch_id" v-for="item in YHBMList" v-model="checked" :label="item.branch_id">{{ item.branch_name }} -- Gitblit v1.9.2