Commit 0de5de6f authored by 李苏's avatar 李苏 💬

增加查询字段

parent e1b25201
...@@ -5,25 +5,54 @@ ...@@ -5,25 +5,54 @@
<div class="search" v-condition> <div class="search" v-condition>
<SearchButton :app='app'></SearchButton> <SearchButton :app='app'></SearchButton>
<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
</div> :match="{value:'id',label:'bmmc'}" v-model='queryParams.gsid'></RelSelect>
</div>
</el-col>
<el-col :span="4" 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="4" 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/queryBz'
filterable clearable :match="{value:'id',label:'bmmc'}" v-model='queryParams.bzid'></RelSelect>
</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 linkage :linkParams="{gsid:queryParams.gsid}" style="width: 100%;" clearable src='aqgl/fxyk/fxd/init/fxd' :match="{value:'id',label:'fxdName'}" v-model='queryParams.id' ></RelSelect> <RelSelect linkage :linkParams="{gsid:queryParams.gsid}" style="width: 100%;" clearable
src='aqgl/fxyk/fxd/init/fxd' :match="{value:'id',label:'fxdName'}" v-model='queryParams.id'></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 linkage :linkParams="{gsid:queryParams.gsid}" style="width: 100%;" src='/aqgl/jcsj/scgw/query' clearable :match="{value:'id',label:'name'}" v-model='queryParams.gwid' ></RelSelect> <RelSelect style="width: 100%;" src='/aqgl/fxyk/fxpc/init/wxdj' clearable
</div> :match="{value:'id',label:'name'}" v-model='queryParams.wxdj'></RelSelect>
</div>
</el-col> </el-col>
</el-row>
<el-row :gutter="20" class="search-row-1">
<el-col :span="6" class="search-col">
<div class="search-item">
<span class="search-span">岗位:</span>
<RelSelect linkage :linkParams="{gsid:queryParams.gsid}" style="width: 100%;" src='/aqgl/jcsj/scgw/query'
clearable :match="{value:'id',label:'name'}" v-model='queryParams.gwid'></RelSelect>
</div>
</el-col>
</el-row> </el-row>
</div> </div>
<!-- 按钮操作--> <!-- 按钮操作-->
...@@ -51,21 +80,21 @@ ...@@ -51,21 +80,21 @@
</div> </div>
<div class="min_full" style="height: 60%;padding: 10px;"> <div class="min_full" style="height: 60%;padding: 10px;">
<!-- tabs --> <!-- tabs -->
<el-tabs v-model="activeName" @tab-click="handleClick" > <el-tabs v-model="activeName" @tab-click="handleClick">
<el-tab-pane label="详细" name="first" > <el-tab-pane label="详细" name="first">
<Details v-show='tabData.length>0' ref="Details" /> <Details v-show='tabData.length>0' ref="Details" />
</el-tab-pane> </el-tab-pane>
<!-- <el-tab-pane label="检查周期" name="second"> <!-- <el-tab-pane label="检查周期" name="second">
<Cycle /> <Cycle />
</el-tab-pane> --> </el-tab-pane> -->
<el-tab-pane label="检查任务" name="third"> <el-tab-pane label="检查任务" name="third">
<Content v-show='tabData.length>0' :vMain='this' ref="Content" /> <Content v-show='tabData.length>0' :vMain='this' ref="Content" />
</el-tab-pane> </el-tab-pane>
<!-- <el-tab-pane label="责任人" name="fourth"> <!-- <el-tab-pane label="责任人" name="fourth">
<PersonLiable /> <PersonLiable />
</el-tab-pane> --> </el-tab-pane> -->
</el-tabs> </el-tabs>
</div> </div>
</div> </div>
</template> </template>
...@@ -89,7 +118,7 @@ ...@@ -89,7 +118,7 @@
import Details from './details.vue' import Details from './details.vue'
import Cycle from './cycle.vue' import Cycle from './cycle.vue'
import Content from './content.vue' import Content from './content.vue'
import PersonLiable from './personLiable.vue' import PersonLiable from './personLiable.vue'
import { import {
tableMixin tableMixin
} from 'common' } from 'common'
...@@ -99,19 +128,21 @@ ...@@ -99,19 +128,21 @@
/* 初始额外赋值*/ /* 初始额外赋值*/
async mounted() { async mounted() {
await this.$asRun( await this.$asRun(
[doQueryScgw(), [doQueryScgw(),
res => { res => {
var data = res['data']['records']; var data = res['data']['records'];
this.doQueryScgw = data this.doQueryScgw = data
} }
] ]
) )
this.$refs['TablePager'].pageQuery({setFirstCurrent:true}) this.$refs['TablePager'].pageQuery({
setFirstCurrent: true
})
}, },
data() { data() {
return { return {
doQueryScgw:[], doQueryScgw: [],
activeName: 'first', activeName: 'first',
/*需要的额外参数 */ /*需要的额外参数 */
showDialog: false, showDialog: false,
...@@ -122,59 +153,112 @@ ...@@ -122,59 +153,112 @@
baseUrl: '/aqgl/fxyk/fxbz', baseUrl: '/aqgl/fxyk/fxbz',
/* 查询参数*/ /* 查询参数*/
queryParams: { queryParams: {
gsid:'', gsid: '',
bmid:'',
bzid:'',
wxdj:'',
gwid: '', gwid: '',
id: '' id: ''
}, },
/* 表格标题对应参数*/ /* 表格标题对应参数*/
tableTitle: [ tableTitle: [{
{label: "公司", prop: "gsName", fieldType: "ftString",width:192}, label: "公司",
{label: "部门", prop: "bmName", fieldType: "ftString",width:192}, prop: "gsName",
// {label: "车间", prop: "cjName", fieldType: "ftString",width:192}, fieldType: "ftString",
{label: "岗位", prop: "gwName", fieldType: "ftString",width:192}, width: 192
{label: "风险地点", prop: "fxpcdd", fieldType: "ftString",width:300}, },
{label: "风险点", prop: "fxdName", fieldType: "ftString",width:300}, {
/* 假*/ label: "部门",
{label: "检查部位", prop: "jcyd", fieldType: "ftString",width:300}, prop: "bmName",
{label: "事故后果", prop: "sghg", fieldType: "ftString",width:300}, fieldType: "ftString",
{label: "固有风险等级", prop: "wxdj", fieldType: "ftString",width:300,transform:{ width: 192
url:'/aqgl/fxyk/fxpc/init/wxdj',label:'name',value:'id' },
}}, // {label: "车间", prop: "cjName", fieldType: "ftString",width:192},
/* 检查部位 事故后果 固有风险等级 现有风险等级*/ {
label: "岗位",
// {label: "事故类型", prop: "sglx", fieldType: "ftString",width:192}, prop: "gwName",
{label: "现有风险等级", prop: "lsdj", fieldType: "ftString",width:160,transform:{ fieldType: "ftString",
url:'/aqgl/fxyk/fxpc/init/wxdj',label:'name',value:'id' width: 192
}}, },
// {label: "分值", prop: "fz", fieldType: "float"}, {
// {label: "风险类型", prop: "fxlx", fieldType: "ftString",width:192}, label: "风险地点",
// {label: "管控落实后等级", prop: "lsdj", fieldType: "ftString",width:160}, prop: "fxpcdd",
// {label: "管理层级", prop: "glcj",width:160,transform:{ fieldType: "ftString",
// url:'/aqgl/fxyk/fxpc/init/glcj',label:'name',value:'id' width: 300
// }}, },
// {label: "拍照选项", prop: "pzxx", fieldType: "ftString",width:160,transform:{ {
// url:'/aqgl/fxyk/fxpc/init/pzxx',label:'name',value:'id' label: "风险点",
// }}, prop: "fxdName",
// {label: "序号", prop: "xh", fieldType: "int"}, fieldType: "ftString",
// {label: "图形编号", prop: "txcode", fieldType: "ftString",width:180}, width: 300
// {label: "措施类型", prop: "cslx", fieldType: "ftString",width:192}, },
// {label: "基准精度", prop: "jzjd", fieldType: "ftString",width:160}, /* 假*/
// {label: "基准维度", prop: "jzwd", fieldType: "ftString",width:160}, {
// {label: "检查要点", prop: "jcyd", fieldType: "ftString",width:300}, label: "检查部位",
// {label: "危害因素", prop: "whys", fieldType: "ftString",width:300}, prop: "jcyd",
// {label: "事故后果", prop: "sghg", fieldType: "ftString",width:300}, fieldType: "ftString",
// {label: "检查措施描述", prop: "jccsms", fieldType: "ftString",width:300}, width: 300
// {label: "备注", prop: "bz", fieldType: "ftString",width:300}, },
// {label: "责任人", prop: "zrr", fieldType: "ftString",width:300}, {
// {label: "维护人", prop: "whr", fieldType: "ftString"}, label: "事故后果",
// {label: "维护时间", prop: "whsj", fieldType: "ftDateTime"}, prop: "sghg",
// {label: "创建人", prop: "cjr", fieldType: "ftString"}, fieldType: "ftString",
// {label: "创建时间", prop: "cjsj", fieldType: "ftDateTime"}, width: 300
] },
{
label: "固有风险等级",
prop: "wxdj",
fieldType: "ftString",
width: 300,
transform: {
url: '/aqgl/fxyk/fxpc/init/wxdj',
label: 'name',
value: 'id'
}
},
/* 检查部位 事故后果 固有风险等级 现有风险等级*/
// {label: "事故类型", prop: "sglx", fieldType: "ftString",width:192},
{
label: "现有风险等级",
prop: "lsdj",
fieldType: "ftString",
width: 160,
transform: {
url: '/aqgl/fxyk/fxpc/init/wxdj',
label: 'name',
value: 'id'
}
},
// {label: "分值", prop: "fz", fieldType: "float"},
// {label: "风险类型", prop: "fxlx", fieldType: "ftString",width:192},
// {label: "管控落实后等级", prop: "lsdj", fieldType: "ftString",width:160},
// {label: "管理层级", prop: "glcj",width:160,transform:{
// url:'/aqgl/fxyk/fxpc/init/glcj',label:'name',value:'id'
// }},
// {label: "拍照选项", prop: "pzxx", fieldType: "ftString",width:160,transform:{
// url:'/aqgl/fxyk/fxpc/init/pzxx',label:'name',value:'id'
// }},
// {label: "序号", prop: "xh", fieldType: "int"},
// {label: "图形编号", prop: "txcode", fieldType: "ftString",width:180},
// {label: "措施类型", prop: "cslx", fieldType: "ftString",width:192},
// {label: "基准精度", prop: "jzjd", fieldType: "ftString",width:160},
// {label: "基准维度", prop: "jzwd", fieldType: "ftString",width:160},
// {label: "检查要点", prop: "jcyd", fieldType: "ftString",width:300},
// {label: "危害因素", prop: "whys", fieldType: "ftString",width:300},
// {label: "事故后果", prop: "sghg", fieldType: "ftString",width:300},
// {label: "检查措施描述", prop: "jccsms", fieldType: "ftString",width:300},
// {label: "备注", prop: "bz", fieldType: "ftString",width:300},
// {label: "责任人", prop: "zrr", fieldType: "ftString",width:300},
// {label: "维护人", prop: "whr", fieldType: "ftString"},
// {label: "维护时间", prop: "whsj", fieldType: "ftDateTime"},
// {label: "创建人", prop: "cjr", fieldType: "ftString"},
// {label: "创建时间", prop: "cjsj", fieldType: "ftDateTime"},
]
} }
}, },
methods: { methods: {
handleClick(val){ handleClick(val) {
}, },
/* 基础查询*/ /* 基础查询*/
...@@ -191,12 +275,12 @@ ...@@ -191,12 +275,12 @@
}, },
autoGen() { autoGen() {
if (this.app.selectOne || this.app.clickOne) { if (this.app.selectOne || this.app.clickOne) {
doAutoGen(this.singleItem).then(res=>{ doAutoGen(this.singleItem).then(res => {
if(res.success){ if (res.success) {
this.$success('生成作业成功!') this.$success('生成作业成功!')
} }
}) })
}else{ } else {
this.$warning('请选中标准进行操作!'); this.$warning('请选中标准进行操作!');
} }
}, },
...@@ -204,10 +288,10 @@ ...@@ -204,10 +288,10 @@
/* 重写点击事件*/ /* 重写点击事件*/
getRow: function(e) { getRow: function(e) {
this.rowItem = e this.rowItem = e
this.$refs.Details.details=e this.$refs.Details.details = e
this.$refs.Content.queryParams.mid=e.id this.$refs.Content.queryParams.mid = e.id
this.$nextTick(()=>{ this.$nextTick(() => {
this.$refs.Content.$refs['TablePager'].pageQuery() this.$refs.Content.$refs['TablePager'].pageQuery()
}) })
} }
......
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