Commit 53fd758e authored by 黄自鹏's avatar 黄自鹏

安全活动增加公司

parent 554bc8f9
...@@ -11,12 +11,20 @@ ...@@ -11,12 +11,20 @@
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="12"> <el-col :span="12">
<el-form-item label="组织单位" ref="bmid" prop="bmid"> <el-form-item label="公司" ref="gsid" prop="gsid">
<RelSelect style="width: 100%;" src='jcsj/common/bm/queryBz' :readonly="readonly" :match="{value:'id',label:'bmmc'}" v-model='form.bmid' ></RelSelect> <RelSelect :readonly="readonly" filterable style="width: 100%;" src='/jcsj/common/bm/queryGs' :match="{value:'id',label:'bmmc'}" v-model='form.gsid' ></RelSelect>
<!-- <el-input :readonly="readonly" v-model="form.bmid" ></el-input> --> <!-- <el-input :readonly="readonly" v-model="form.bmid" ></el-input> -->
</el-form-item> </el-form-item>
</el-col> </el-col>
</el-row> </el-row>
<el-row :gutter="20">
<el-col :span="24">
<el-form-item label="所属部门" ref="bmid" prop="bmid">
<!-- <el-input :readonly="readonly" v-model="form.name" ></el-input> -->
<RelSelect :readonly="readonly" filterable linkage :linkParams="{pid:form.gsid}" style="width: 100%;" src='jcsj/common/bm/queryBz' :match="{value:'id',label:'bmmc'}" v-model='form.bmid' ></RelSelect>
</el-form-item>
</el-col>
</el-row>
<el-row :gutter="20"> <el-row :gutter="20">
<el-col :span="24"> <el-col :span="24">
<el-form-item label="活动内容" ref="content" prop="content"> <el-form-item label="活动内容" ref="content" prop="content">
...@@ -54,6 +62,7 @@ ...@@ -54,6 +62,7 @@
/* 当前表单初始值,默认由RelDialog查询indexQuery赋值,copy时不赋值id,初始化时所有query的值都会赋值给form*/ /* 当前表单初始值,默认由RelDialog查询indexQuery赋值,copy时不赋值id,初始化时所有query的值都会赋值给form*/
form: { form: {
gsid:'',
//ID //ID
id:'', id:'',
//活动日期 //活动日期
......
...@@ -19,8 +19,14 @@ ...@@ -19,8 +19,14 @@
</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 src='jcsj/common/bm/queryBz' clearable :match="{value:'id',label:'bmmc'}" v-model='queryParams.bmid' ></RelSelect> <RelSelect style="width: 100%;" src='jcsj/common/bm/queryGs' filterable clearable :match="{value:'id',label:'bmmc'}" v-model='queryParams.gsid' ></RelSelect>
</div>
</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/queryBz' filterable clearable :match="{value:'id',label:'bmmc'}" v-model='queryParams.bmid' ></RelSelect>
</div> </div>
</el-col> </el-col>
</el-row> </el-row>
...@@ -89,8 +95,9 @@ ...@@ -89,8 +95,9 @@
}, },
/* 表格标题对应参数*/ /* 表格标题对应参数*/
tableTitle: [ tableTitle: [
{label: "公司", prop: "gsName", fieldType: "ftString",width:160},
{label: "活动日期", prop: "hdrq", fieldType: "ftDateTime"}, {label: "活动日期", prop: "hdrq", fieldType: "ftDateTime"},
{label: "组织单位", prop: "bmName", fieldType: "ftString",width:160}, {label: "部门", prop: "bmName", fieldType: "ftString",width:160},
{label: "活动内容", prop: "content", fieldType: "ftString",width:300}, {label: "活动内容", prop: "content", fieldType: "ftString",width:300},
{label: "活动结论", prop: "hdjl", fieldType: "ftString",width:300}, {label: "活动结论", prop: "hdjl", fieldType: "ftString",width:300},
{label: "备注", prop: "bz", fieldType: "ftString",width:300}, {label: "备注", prop: "bz", fieldType: "ftString",width:300},
......
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