Skip to content

D
dxgaqgl-vue
Commit ff411bdf authored by 李苏's avatar 李苏 💬
Browse files
Options

调整

parent 76f2fd38
Show whitespace changes
Inline Side-by-side
Showing with 240 additions and 158 deletions
src/views/riskPrecontrol/maintenanceRiskTask/index.vue
View file @ ff411bdf
...@@ -44,11 +44,18 @@ ...@@ -44,11 +44,18 @@
:match="{value:'id',label:'bmmc'}" v-model='queryParams.gsid'></RelSelect> :match="{value:'id',label:'bmmc'}" v-model='queryParams.gsid'></RelSelect>
</div> </div>
</el-col> </el-col>
<el-col :span="6" class="search-col">
<div class="search-item">
<span class="search-span">部门:</span>
<RelSelect linkage :linkParams="{pid:queryParams.gsid}" style="width: 100%;" src='jcsj/common/bm/queryBm'
filterable clearable :match="{value:'id',label:'bmmc'}" v-model='queryParams.bmid'></RelSelect>
</div>
</el-col>
<el-col :span="6" class="search-col"> <el-col :span="6" class="search-col">
<div class="search-item"> <div class="search-item">
<span class="search-span">班组:</span> <span class="search-span">班组:</span>
<RelSelect linkage :linkParams="{pid:queryParams.gsid}" style="width: 100%;" src='jcsj/common/bm/queryBz' <RelSelect linkage :linkParams="{pid:queryParams.gsid}" style="width: 100%;" src='jcsj/common/bm/queryBz'
filterable clearable :match="{value:'id',label:'bmmc'}" v-model='queryParams.bmid'></RelSelect> filterable clearable :match="{value:'id',label:'bmmc'}" v-model='queryParams.bzid'></RelSelect>
</div> </div>
</el-col> </el-col>
<el-col :span="6" class="search-col"> <el-col :span="6" class="search-col">
...@@ -167,6 +174,7 @@ ...@@ -167,6 +174,7 @@
rwlx: '', rwlx: '',
queryType: 'fxpc', queryType: 'fxpc',
gsid: '', gsid: '',
bzid:'',
bmid: '', bmid: '',
jcr: '', jcr: '',
zt: '', zt: '',
......
src/views/riskPrecontrol/queryRiskTask/index.vue
View file @ ff411bdf
<template> <template>
<!-- <div class="min_full" style="height: 140vh;"> --> <!-- <div class="min_full" style="height: 140vh;"> -->
<div class="min_full" > <div class="min_full">
<!-- <Zdzrr :app='this' v-if="showDialog&&DialogName=='指定检查人'" ></Zdzrr> --> <!-- <Zdzrr :app='this' v-if="showDialog&&DialogName=='指定检查人'" ></Zdzrr> -->
<yhContent :app='this' v-if="showDialog&&DialogName=='关联隐患'" ></yhContent> <yhContent :app='this' v-if="showDialog&&DialogName=='关联隐患'"></yhContent>
<!-- 查询条件--> <!-- 查询条件-->
<div class="search" v-condition> <div class="search" v-condition>
<SearchButton :app='app'></SearchButton> <SearchButton :app='app'></SearchButton>
...@@ -11,13 +11,14 @@ ...@@ -11,13 +11,14 @@
<el-col :span="6" class="search-col"> <el-col :span="6" class="search-col">
<div class="search-item"> <div class="search-item">
<span class="search-span">状态:</span> <span class="search-span">状态:</span>
<RelSelect style="width: 100%;" src='aqgl/fxyk/fxpc/init/zt' clearable :match="{value:'id',label:'name'}" v-model='queryParams.zt' ></RelSelect> <RelSelect style="width: 100%;" src='aqgl/fxyk/fxpc/init/zt' clearable :match="{value:'id',label:'name'}"
v-model='queryParams.zt'></RelSelect>
</div> </div>
</el-col> </el-col>
<el-col :span="6" class="search-col"> <el-col :span="6" class="search-col">
<div class="search-item"> <div class="search-item">
<span class="search-span">检查人员:</span> <span class="search-span">检查人员:</span>
<el-input v-model="queryParams.jcr" ></el-input> <el-input v-model="queryParams.jcr"></el-input>
</div> </div>
</el-col> </el-col>
...@@ -30,41 +31,45 @@ ...@@ -30,41 +31,45 @@
<el-col :span="6" class="search-col"> <el-col :span="6" class="search-col">
<div class="search-item"> <div class="search-item">
<span class="search-span">结束日期:</span> <span class="search-span">结束日期:</span>
<el-date-picker value-format="timestamp" v-model="queryParams.jsrq" ></el-date-picker> <el-date-picker value-format="timestamp" v-model="queryParams.jsrq"></el-date-picker>
</div> </div>
</el-col> </el-col>
</el-row> </el-row>
<el-row :gutter="20" class="search-row-1"> <el-row :gutter="20" class="search-row-1">
<el-col :span="6" class="search-col"> <el-col :span="4" class="search-col">
<div class="search-item"> <div class="search-item">
<span class="search-span">公司:</span> <span class="search-span">公司:</span>
<RelSelect style="width: 100%;" src='jcsj/common/bm/queryGs' filterable clearable :match="{value:'id',label:'bmmc'}" v-model='queryParams.gsid' ></RelSelect> <RelSelect style="width: 100%;" src='jcsj/common/bm/queryGs' filterable clearable
:match="{value:'id',label:'bmmc'}" v-model='queryParams.gsid'></RelSelect>
</div> </div>
</el-col> </el-col>
<!-- <el-col :span="6" class="search-col"> <el-col :span="4" class="search-col">
<div class="search-item"> <div class="search-item">
<span class="search-span">部门:</span> <span class="search-span">部门:</span>
<RelSelect linkage :linkParams="{pid:queryParams.gsid}" style="width: 100%;" src='jcsj/common/bm/queryBz' filterable clearable :match="{value:'id',label:'bmmc'}" v-model='queryParams.bmid' ></RelSelect> <RelSelect linkage :linkParams="{pid:queryParams.gsid}" style="width: 100%;" src='jcsj/common/bm/queryBm'
filterable clearable :match="{value:'id',label:'bmmc'}" v-model='queryParams.bmid'></RelSelect>
</div> </div>
</el-col> --> </el-col>
<el-col :span="4" class="search-col">
<el-col :span="6" class="search-col">
<div class="search-item"> <div class="search-item">
<span class="search-span">班组:</span> <span class="search-span">班组:</span>
<RelSelect linkage :linkParams="{pid:queryParams.gsid}" style="width: 100%;" src='jcsj/common/bm/queryBz' filterable clearable :match="{value:'id',label:'bmmc'}" v-model='queryParams.bmid' ></RelSelect> <RelSelect linkage :linkParams="{pid:queryParams.gsid}" style="width: 100%;" src='jcsj/common/bm/queryBz'
filterable clearable :match="{value:'id',label:'bmmc'}" v-model='queryParams.bzid'></RelSelect>
</div> </div>
</el-col> </el-col>
<el-col :span="6" class="search-col"> <el-col :span="6" class="search-col">
<div class="search-item"> <div class="search-item">
<span class="search-span">检查结果:</span> <span class="search-span">检查结果:</span>
<RelSelect style="width: 100%;" src='aqgl/fxyk/fxpc/init/jcjg' filterable clearable :match="{value:'id',label:'name'}" v-model='queryParams.jcjg' ></RelSelect> <RelSelect style="width: 100%;" src='aqgl/fxyk/fxpc/init/jcjg' filterable clearable
:match="{value:'id',label:'name'}" v-model='queryParams.jcjg'></RelSelect>
</div> </div>
</el-col> </el-col>
<el-col :span="6" class="search-col"> <el-col :span="6" class="search-col">
<div class="search-item"> <div class="search-item">
<span class="search-span">任务类型:</span> <span class="search-span">任务类型:</span>
<RelSelect style="width: 100%;" src='aqgl/fxyk/fxpc/init/rwlx' clearable :match="{value:'id',label:'name'}" v-model='queryParams.rwlx' ></RelSelect> <RelSelect style="width: 100%;" src='aqgl/fxyk/fxpc/init/rwlx' clearable :match="{value:'id',label:'name'}"
v-model='queryParams.rwlx'></RelSelect>
</div> </div>
</el-col> </el-col>
</el-row> </el-row>
...@@ -82,12 +87,13 @@ ...@@ -82,12 +87,13 @@
</el-row> </el-row>
<!-- 表格--> <!-- 表格-->
<div class="tablePagers"> <div class="tablePagers">
<TablePager :delButton='false' @getData='getData' :ref="'TablePager'" :app='app' :query='query' @selectItem='selectItem' <TablePager :delButton='false' @getData='getData' :ref="'TablePager'" :app='app' :query='query'
@getRow='getRow'> @selectItem='selectItem' @getRow='getRow'>
<template slot="tabCustom"> <template slot="tabCustom">
<el-table-column label="关联隐患" width="90" header-align="center" > <el-table-column label="关联隐患" width="90" header-align="center">
<template slot-scope="scope" > <template slot-scope="scope">
<span @click="watchglyh(scope.row)" style="color: cornflowerblue;cursor: pointer;line-height: 30px;text-align: center;width: 70px;display: inline-block;">查看</span> <span @click="watchglyh(scope.row)"
style="color: cornflowerblue;cursor: pointer;line-height: 30px;text-align: center;width: 70px;display: inline-block;">查看</span>
</template> </template>
</el-table-column> </el-table-column>
</template> </template>
...@@ -97,7 +103,7 @@ ...@@ -97,7 +103,7 @@
</template> </template>
<script> <script>
// import Zdzrr from './zdzrr' // import Zdzrr from './zdzrr'
/* 引入需要的接口*/ /* 引入需要的接口*/
/* 引入需要的接口*/ /* 引入需要的接口*/
import { import {
...@@ -132,15 +138,17 @@ ...@@ -132,15 +138,17 @@
} }
] ]
) )
this.$refs['TablePager'].pageQuery({setFirstCurrent:true}) this.$refs['TablePager'].pageQuery({
setFirstCurrent: true
})
console.log(this) console.log(this)
}, },
data() { data() {
return { return {
DialogTitle:'指定检查人', DialogTitle: '指定检查人',
/*需要的额外参数 */ /*需要的额外参数 */
showDialog:false, showDialog: false,
doQueryScgw:[], doQueryScgw: [],
activeName: 'first', activeName: 'first',
/*需要的额外参数 */ /*需要的额外参数 */
showDialog: false, showDialog: false,
...@@ -150,54 +158,120 @@ ...@@ -150,54 +158,120 @@
baseUrl: '/aqgl/fxyk/fxpc', baseUrl: '/aqgl/fxyk/fxpc',
/* 查询参数*/ /* 查询参数*/
queryParams: { queryParams: {
queryType:'fxpc', queryType: 'fxpc',
rwlx:'', rwlx: '',
jcjg:'', jcjg: '',
gsid:'', gsid: '',
bmid:'', bmid: '',
jcr:'', bzid:'',
zt:'', jcr: '',
zt: '',
ksrq: '', ksrq: '',
jsrq:'' jsrq: ''
}, },
/* 表格标题对应参数*/ /* 表格标题对应参数*/
tableTitle: [ tableTitle: [
// {label: "ID", prop: "id", fieldType: "ftString",width:192}, // {label: "ID", prop: "id", fieldType: "ftString",width:192},
// {label: "单据来源", prop: "djly", fieldType: "ftString",width:60}, // {label: "单据来源", prop: "djly", fieldType: "ftString",width:60},
// {label: "风险排查标准编码", prop: "fxbzid", fieldType: "ftString",width:192}, // {label: "风险排查标准编码", prop: "fxbzid", fieldType: "ftString",width:192},
{label: "状态", prop: "ztName", fieldType: "ftString",width:50}, {
{label: "任务类型", prop: "rwlxName", fieldType: "ftString",width:100}, label: "状态",
{label: "下达日期", prop: "xdrq", fieldType: "ftDate"}, prop: "ztName",
fieldType: "ftString",
width: 50
},
{
label: "任务类型",
prop: "rwlxName",
fieldType: "ftString",
width: 100
},
{
label: "下达日期",
prop: "xdrq",
fieldType: "ftDate"
},
// {label: "截止日期", prop: "jzrq", fieldType: "ftDateTime"}, // {label: "截止日期", prop: "jzrq", fieldType: "ftDateTime"},
{label: "检查时间", prop: "sjjcsj", fieldType: "ftDateTime"}, {
{label: "检查结果", prop: "jcjgName"}, label: "检查时间",
{label: "创建时间", prop: "cjsj", fieldType: "ftDateTime"}, prop: "sjjcsj",
{label: "检查岗位", prop: "gwName", fieldType: "ftString",width:192}, fieldType: "ftDateTime"
{label: "检查内容", prop: "nr", fieldType: "ftString",width:300}, },
{label: "检查部位", prop: "jcyd", fieldType: "ftString",width:300}, {
{label: "检查人", prop: "jcrName", fieldType: "ftString",width:192}, label: "检查结果",
{label: "地点", prop: "fxpcdd", fieldType: "ftString",width:192}, prop: "jcjgName"
{label: "风险点", prop: "fxd", fieldType: "ftString",width:192}, },
{label: "公司", prop: "gsName", fieldType: "ftString",width:192}, {
{label: "班组", prop: "bzName", fieldType: "ftString",width:192}, label: "创建时间",
prop: "cjsj",
fieldType: "ftDateTime"
},
{
label: "检查岗位",
prop: "gwName",
fieldType: "ftString",
width: 192
},
{
label: "检查内容",
prop: "nr",
fieldType: "ftString",
width: 300
},
{
label: "检查部位",
prop: "jcyd",
fieldType: "ftString",
width: 300
},
{
label: "检查人",
prop: "jcrName",
fieldType: "ftString",
width: 192
},
{
label: "地点",
prop: "fxpcdd",
fieldType: "ftString",
width: 192
},
{
label: "风险点",
prop: "fxd",
fieldType: "ftString",
width: 192
},
{
label: "公司",
prop: "gsName",
fieldType: "ftString",
width: 192
},
{
label: "班组",
prop: "bzName",
fieldType: "ftString",
width: 192
},
], ],
timer:false, timer: false,
} }
}, },
methods: { methods: {
watchglyh(row){ watchglyh(row) {
this.watchglyh.fxpcid=row.id this.watchglyh.fxpcid = row.id
this.showDialog = true this.showDialog = true
this.DialogTitle='关联隐患' this.DialogTitle = '关联隐患'
this.DialogName='关联隐患' this.DialogName = '关联隐患'
}, },
zdzrr(){ zdzrr() {
if (this.app.selectOne || this.app.clickOne) { if (this.app.selectOne || this.app.clickOne) {
this.showDialog = true this.showDialog = true
this.DialogTitle='指定检查人' this.DialogTitle = '指定检查人'
this.DialogName='指定检查人' this.DialogName = '指定检查人'
} else { } else {
this.$warning('请选中一行操作'); this.$warning('请选中一行操作');
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment