Skip to content

S
sgaqgl-vue
Commit d83f64da authored by 李苏's avatar 李苏 💬
Browse files
Options

事件库更新

parent 90d29caa
Hide whitespace changes
Inline Side-by-side
Showing with 59 additions and 46 deletions
src/views/riskPrecontrol/maintenanceRisk/edit.vue
View file @ d83f64da
...@@ -46,15 +46,14 @@ ...@@ -46,15 +46,14 @@
</el-col> </el-col>
<el-col :span="8"> <el-col :span="8">
<el-form-item label="部门" ref="bmid" prop="bmid"> <el-form-item label="公司" ref="gsid" prop="gsid">
<RelSelect style="width: 100%;" :readonly="true" src='/kzzx/bm/query' filterable clearable :match="{value:'id',label:'bmmc'}" v-model='form.bmid' ></RelSelect> <RelSelect style="width: 100%;" :readonly="readonly" src='/jcsj/common/bm/queryGs' filterable clearable :match="{value:'id',label:'bmmc'}" v-model='form.gsid' ></RelSelect>
<!-- <el-input :readonly="readonly" v-model="form.bmid" ></el-input> -->
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="8"> <el-col :span="8">
<el-form-item label="车间" ref="cjid" prop="cjid"> <el-form-item label="班组" ref="bmid" prop="bmid">
<CjSelect :readonly="readonly" :dyApp='this' v-model='form.cjid' style="width: 100%;" ></CjSelect> <RelSelect linkage :linkParams="{pid:form.gsid}" src='/jcsj/common/bm/queryBz' :readonly="readonly" :match="{value:'id',label:'bmmc'}" v-model='form.bmid' style="width: 100%;" ></RelSelect>
<!-- <el-input :readonly="readonly" v-model="form.cjid" ></el-input> -->
</el-form-item> </el-form-item>
</el-col> </el-col>
</el-row> </el-row>
...@@ -65,8 +64,8 @@ ...@@ -65,8 +64,8 @@
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="12"> <el-col :span="12">
<el-form-item label="事故日期" ref="sgrq" prop="sgrq"> <el-form-item label="事故时间" ref="sgrq" prop="sgrq">
<el-date-picker value-format="timestamp" style="width: 100%;" :readonly="readonly" v-model="form.sgrq" ></el-date-picker> <el-date-picker type="datetime" value-format="timestamp" style="width: 100%;" :readonly="readonly" v-model="form.sgrq" ></el-date-picker>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="24"> <el-col :span="24">
...@@ -101,6 +100,7 @@ ...@@ -101,6 +100,7 @@
/* 当前表单初始值，默认由RelDialog查询indexQuery赋值，copy时不赋值id，初始化时所有query的值都会赋值给form*/ /* 当前表单初始值，默认由RelDialog查询indexQuery赋值，copy时不赋值id，初始化时所有query的值都会赋值给form*/
form: { form: {
gsid:'',
//ID //ID
id:'', id:'',
//风险类型 //风险类型
......
src/views/riskPrecontrol/maintenanceRisk/index.vue
View file @ d83f64da
...@@ -79,10 +79,13 @@ ...@@ -79,10 +79,13 @@
/* 查询参数*/ /* 查询参数*/
queryParams: { queryParams: {
ksrq: new Date().getTime() - 1000*60*60*24*30, ksrq: new Date().getTime() - 1000*60*60*24*30,
jsrq: new Date().getTime() jsrq: new Date().getTime()
}, },
/* 表格标题对应参数*/ /* 表格标题对应参数*/
tableTitle: [ tableTitle: [
/* 事故时间*/
{label: "事故时间", prop: "sgrq", fieldType: "ftDateTime"},
{label: "风险类型", prop: "fxlx", fieldType: "ftString",width:192,transform:{ {label: "风险类型", prop: "fxlx", fieldType: "ftString",width:192,transform:{
url:'/aqgl/fxyk/shlx/query',label:'name',value:'id' url:'/aqgl/fxyk/shlx/query',label:'name',value:'id'
}}, }},
...@@ -94,10 +97,14 @@ ...@@ -94,10 +97,14 @@
{label: "轻伤人数", prop: "qsrs", fieldType: "int"}, {label: "轻伤人数", prop: "qsrs", fieldType: "int"},
{label: "直接经济损失", prop: "zjjjss", fieldType: "float"}, {label: "直接经济损失", prop: "zjjjss", fieldType: "float"},
{label: "损失工作日", prop: "gzrss", fieldType: "float"}, {label: "损失工作日", prop: "gzrss", fieldType: "float"},
{label: "部门", prop: "bmid", fieldType: "ftString",width:192,transform:{ /* 公司*/
url:'/kzzx/bm/query',label:'bmmc',value:'id' {label: "公司", prop: "gsid", fieldType: "ftString",width:192,transform:{
url:'/jcsj/common/bm/queryGs',label:'bmmc',value:'id'
}},
/* 班组*/
{label: "班组", prop: "bmid", fieldType: "ftString",width:192,transform:{
url:'/jcsj/common/bm/queryBz',label:'bmmc',value:'id'
}}, }},
{label: "车间编码", prop: "cjid", fieldType: "ftString",width:192},
{label: "登记人", prop: "djrid", fieldType: "ftString",width:192,transform:{ {label: "登记人", prop: "djrid", fieldType: "ftString",width:192,transform:{
url:'/kzzx/user/query',label:'username',value:'userid' url:'/kzzx/user/query',label:'username',value:'userid'
}}, }},
......
src/views/riskPrecontrol/queryRisk/edit.vue
View file @ d83f64da
...@@ -44,29 +44,28 @@ ...@@ -44,29 +44,28 @@
<el-input type="number" :readonly="readonly" v-model="form.gzrss" ></el-input> <el-input type="number" :readonly="readonly" v-model="form.gzrss" ></el-input>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="8"> <el-col :span="8">
<el-form-item label="部门" ref="bmid" prop="bmid"> <el-form-item label="公司" ref="gsid" prop="gsid">
<RelSelect style="width: 100%;" :readonly="true" src='/kzzx/bm/query' filterable clearable :match="{value:'id',label:'bmmc'}" v-model='form.bmid' ></RelSelect> <RelSelect style="width: 100%;" :readonly="readonly" src='/jcsj/common/bm/queryGs' filterable clearable :match="{value:'id',label:'bmmc'}" v-model='form.gsid' ></RelSelect>
<!-- <el-input :readonly="readonly" v-model="form.bmid" ></el-input> --> </el-form-item>
</el-form-item> </el-col>
</el-col> <el-col :span="8">
<el-col :span="8"> <el-form-item label="班组" ref="bmid" prop="bmid">
<el-form-item label="车间" ref="cjid" prop="cjid"> <RelSelect linkage :linkParams="{pid:form.gsid}" src='/jcsj/common/bm/queryBz' :readonly="readonly" :match="{value:'id',label:'bmmc'}" v-model='form.bmid' style="width: 100%;" ></RelSelect>
<CjSelect :readonly="readonly" :dyApp='this' v-model='form.cjid' style="width: 100%;" ></CjSelect>
<!-- <el-input :readonly="readonly" v-model="form.cjid" ></el-input> --> </el-form-item>
</el-form-item> </el-col>
</el-col>
</el-row> </el-row>
<el-row :gutter="20"> <el-row :gutter="20">
<el-col :span="12"> <el-col :span="12">
<el-form-item label="登记人" ref="djrid" prop="djrid"> <el-form-item label="登记人" ref="djrid" prop="djrid">
<RelSelect src='/kzzx/user/query' clearable :match="{value:'userid',label:'username'}" v-model='form.djrid' ></RelSelect> <RelSelect src='/kzzx/user/query' filterable clearable :match="{value:'userid',label:'username'}" v-model='form.djrid' ></RelSelect>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="12"> <el-col :span="12">
<el-form-item label="事故日期" ref="sgrq" prop="sgrq"> <el-form-item label="事故时间" ref="sgrq" prop="sgrq">
<el-date-picker value-format="timestamp" style="width: 100%;" :readonly="readonly" v-model="form.sgrq" ></el-date-picker> <el-date-picker type="datetime" value-format="timestamp" style="width: 100%;" :readonly="readonly" v-model="form.sgrq" ></el-date-picker>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="24"> <el-col :span="24">
...@@ -101,6 +100,7 @@ ...@@ -101,6 +100,7 @@
/* 当前表单初始值，默认由RelDialog查询indexQuery赋值，copy时不赋值id，初始化时所有query的值都会赋值给form*/ /* 当前表单初始值，默认由RelDialog查询indexQuery赋值，copy时不赋值id，初始化时所有query的值都会赋值给form*/
form: { form: {
gsid:'',
//ID //ID
id:'', id:'',
//风险类型 //风险类型
......
src/views/riskPrecontrol/queryRisk/index.vue
View file @ d83f64da
...@@ -9,26 +9,27 @@ ...@@ -9,26 +9,27 @@
<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.ksrq"></el-date-picker> <el-date-picker value-format="timestamp" v-model="queryParams.ksrq"></el-date-picker>
</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-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>
</div> </div>
<!-- 按钮操作--> <!-- 按钮操作-->
<el-row class="tool-bar"> <el-row class="tool-bar">
<!-- <PrintButton :app='app'></PrintButton> --> <PrintButton :app='app'></PrintButton>
<ViewButton ref="view" :app='app'></ViewButton> <ViewButton ref="view" :app='app'></ViewButton>
<!-- <AddButton ref="add" :app='app'></AddButton> <!-- <AddButton ref="add" :app='app'></AddButton>
<CopyButton ref="copy" :app='app'></CopyButton> <CopyButton ref="copy" :app='app'></CopyButton>
<EditButton ref="edit" :app='app'></EditButton> --> <EditButton ref="edit" :app='app'></EditButton> -->
<AttachFileButton :app='app'></AttachFileButton> <AttachFileButton :app='app'></AttachFileButton>
<!-- <FieldButton :app='app'></FieldButton> <!-- <FieldButton :app='app'></FieldButton>
<ExcelButton :app='app'></ExcelButton> --> <ExcelButton :app='app'></ExcelButton> -->
<!-- 额外按钮--> <!-- 额外按钮-->
</el-row> </el-row>
...@@ -77,29 +78,36 @@ ...@@ -77,29 +78,36 @@
baseUrl: '/aqgl/fxsj', baseUrl: '/aqgl/fxsj',
/* 查询参数*/ /* 查询参数*/
queryParams: { queryParams: {
ksrq: new Date().getTime()-1000*60*60*24*30, ksrq: new Date().getTime() - 1000*60*60*24*30,
jsrq: new Date().getTime() jsrq: new Date().getTime()
}, },
/* 表格标题对应参数*/ /* 表格标题对应参数*/
tableTitle: [ tableTitle: [
/* 事故时间*/
{label: "事故时间", prop: "sgrq", fieldType: "ftDateTime"},
{label: "风险类型", prop: "fxlx", fieldType: "ftString",width:192,transform:{ {label: "风险类型", prop: "fxlx", fieldType: "ftString",width:192,transform:{
url:'/aqgl/fxyk/shlx/query',label:'name',value:'id' url:'/aqgl/fxyk/shlx/query',label:'name',value:'id'
}}, }},
{label: "风险性质", prop: "fxxz", fieldType: "ftString",width:240,transform:{ {label: "风险性质", prop: "fxxz", fieldType: "ftString",width:240,transform:{
url:'/aqgl/fxyk/fxsj/init/shxz',label:'name',value:'id' url:'/aqgl/fxyk/fxsj/init/shxz',label:'name',value:'id'
}}, }},
{label: "死亡人数", prop: "swrs", fieldType: "int"}, {label: "死亡人数", prop: "swrs", fieldType: "int"},
{label: "重伤人数", prop: "zsrs", fieldType: "int"}, {label: "重伤人数", prop: "zsrs", fieldType: "int"},
{label: "轻伤人数", prop: "qsrs", fieldType: "int"}, {label: "轻伤人数", prop: "qsrs", fieldType: "int"},
{label: "直接经济损失", prop: "zjjjss", fieldType: "float"}, {label: "直接经济损失", prop: "zjjjss", fieldType: "float"},
{label: "损失工作日", prop: "gzrss", fieldType: "float"}, {label: "损失工作日", prop: "gzrss", fieldType: "float"},
{label: "部门", prop: "bmid", fieldType: "ftString",width:192,transform:{ /* 公司*/
url:'/kzzx/bm/query',label:'bmmc',value:'id' {label: "公司", prop: "gsid", fieldType: "ftString",width:192,transform:{
}}, url:'/jcsj/common/bm/queryGs',label:'bmmc',value:'id'
{label: "车间编码", prop: "cjid", fieldType: "ftString",width:192}, }},
/* 班组*/
{label: "班组", prop: "bmid", fieldType: "ftString",width:192,transform:{
url:'/jcsj/common/bm/queryBz',label:'bmmc',value:'id'
}},
{label: "登记人", prop: "djrid", fieldType: "ftString",width:192,transform:{ {label: "登记人", prop: "djrid", fieldType: "ftString",width:192,transform:{
url:'/kzzx/user/query',label:'username',value:'userid' url:'/kzzx/user/query',label:'username',value:'userid'
}}, }},
{label: "备注", prop: "bz", fieldType: "ftString",width:300}, {label: "备注", prop: "bz", fieldType: "ftString",width:300},
{label: "维护人", prop: "whr", fieldType: "ftString"}, {label: "维护人", prop: "whr", fieldType: "ftString"},
{label: "维护时间", prop: "whsj", fieldType: "ftDateTime"}, {label: "维护时间", prop: "whsj", fieldType: "ftDateTime"},
...@@ -109,9 +117,7 @@ ...@@ -109,9 +117,7 @@
} }
}, },
methods: { methods: {
query: doQuery,
query: doQuery,
/* 基础增*/ /* 基础增*/
apiAdd: doAdd, apiAdd: doAdd,
/* 基础更新*/ /* 基础更新*/
......
src/views/riskPrecontrol/screeningCriteria/contentEdit.vue
View file @ d83f64da
...@@ -25,7 +25,7 @@ ...@@ -25,7 +25,7 @@
</el-col> </el-col>
<el-col :span="24"> <el-col :span="24">
<el-form-item label="检查人" ref="jcr" prop="jcr"> <el-form-item label="检查人" ref="jcr" prop="jcr">
<RelSelect filterable style="width: 100%;" :params="{bmid:app.vMain.rowItem.gsid}" clearable :readonly="readonly" src='kzzx/user/query' :match="{value:'id',label:'username'}" v-model='form.jcr' ></RelSelect> <RelSelect linkage :linkParams="{gwid:form.gwid}" filterable style="width: 100%;" :params="{bmid:app.vMain.rowItem.gsid}" clearable :readonly="readonly" src='kzzx/user/query' :match="{value:'id',label:'username'}" v-model='form.jcr' ></RelSelect>
</el-form-item> </el-form-item>
</el-col> </el-col>
</el-row> </el-row>
......
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