Skip to content

S
sgaqgl-vue
Commit 040b9b0d authored by 黄自鹏's avatar 黄自鹏
Browse files
Options

调整

parent 90e3cb8b
Hide whitespace changes
Inline Side-by-side
Showing with 47 additions and 12 deletions
src/views/contingency/contingencyplan/index.vue
View file @ 040b9b0d
...@@ -20,7 +20,7 @@ ...@@ -20,7 +20,7 @@
<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>-->
<AttachFileShow :delButton='false' :addButton='false' :app='app'></AttachFileShow> <AttachFileShow :delButton='true' :addButton='true' :app='app'></AttachFileShow>
<FieldButton :app='app'></FieldButton> <FieldButton :app='app'></FieldButton>
<ExcelButton :app='app'></ExcelButton> <ExcelButton :app='app'></ExcelButton>
<!-- 额外按钮--> <!-- 额外按钮-->
...@@ -77,7 +77,11 @@ ...@@ -77,7 +77,11 @@
tableTitle: [ tableTitle: [
{label: "年度", prop: "year", fieldType: "int"}, {label: "年度", prop: "year", fieldType: "int"},
//{label: "季度", prop: "quarter", fieldType: "ftString",width:80}, //{label: "季度", prop: "quarter", fieldType: "ftString",width:80},
{label: "季度", prop: "quarterName", fieldType: "ftString",width:80}, {label: "季度", prop: "quarter",formatter:function(row, column, value, index) {
let jdobj=['','第一季度','第二季度','第三季度','第四季度']
return jdobj[value]
},width:80},
{label: "演练名称", prop: "name", fieldType: "ftString",width:180}, {label: "演练名称", prop: "name", fieldType: "ftString",width:180},
{label: "演练组织单位", prop: "zzdw", fieldType: "ftString",width:180}, {label: "演练组织单位", prop: "zzdw", fieldType: "ftString",width:180},
{label: "培训人数", prop: "pxrs", fieldType: "int"}, {label: "培训人数", prop: "pxrs", fieldType: "int"},
......
src/views/contingency/contingencystudy/edit.vue
View file @ 040b9b0d
...@@ -9,16 +9,31 @@ ...@@ -9,16 +9,31 @@
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="12"> <el-col :span="12">
<el-form-item label="公司" ref="gsid" prop="gsid">
<RelSelect style="width: 100%;" :readonly="readonly" src='jcsj/common/bm/queryGs' :match="{value:'id',label:'bmmc'}" v-model='form.gsid' ></RelSelect>
</el-form-item>
</el-col>
<!--<el-col :span="12">
<el-form-item label="演练单位" ref="zzdw" prop="zzdw"> <el-form-item label="演练单位" ref="zzdw" prop="zzdw">
<el-input :readonly="readonly" v-model="form.zzdw" ></el-input> <el-input :readonly="readonly" v-model="form.zzdw" ></el-input>
</el-form-item> </el-form-item>
</el-col> </el-col>-->
</el-row> </el-row>
<el-row :gutter="24"> <el-row :gutter="24">
<el-col :span="12"> <!--<el-col :span="12">
<el-form-item label="培训人数" ref="pxrs" prop="pxrs"> <el-form-item label="培训人数" ref="pxrs" prop="pxrs">
<el-input :readonly="readonly" v-model="form.pxrs" ></el-input> <el-input :readonly="readonly" v-model="form.pxrs" ></el-input>
</el-form-item> </el-form-item>
</el-col>-->
<!--<el-col :span="12">
<el-form-item label="演练单位" ref="zzdw" prop="zzdw">
<el-input :readonly="readonly" v-model="form.zzdw" ></el-input>
</el-form-item>
</el-col>-->
<el-col :span="12">
<el-form-item label="演练单位" ref="yldwid" prop="yldwid">
<RelSelect linkage :linkParams="{pid:form.gsid}" :readonly="readonly" style="width: 100%;" src='jcsj/common/bm/queryBz' filterable clearable :match="{value:'id',label:'bmmc'}" v-model='form.yldwid' ></RelSelect>
</el-form-item>
</el-col> </el-col>
<el-col :span="12"> <el-col :span="12">
<el-form-item label="主(协)办单位" ref="zbdw" prop="zbdw"> <el-form-item label="主(协)办单位" ref="zbdw" prop="zbdw">
...@@ -58,7 +73,7 @@ ...@@ -58,7 +73,7 @@
</el-col> </el-col>
</el-row> </el-row>
<!-- <el-row :gutter="24"> <!-- <el-row :gutter="24">
</el-row> --> </el-row> -->
<el-row :gutter="24"> <el-row :gutter="24">
<el-col :span="24"> <el-col :span="24">
...@@ -112,6 +127,8 @@ ...@@ -112,6 +127,8 @@
/* 当前表单初始值，默认由RelDialog查询indexQuery赋值，copy时不赋值id，初始化时所有query的值都会赋值给form*/ /* 当前表单初始值，默认由RelDialog查询indexQuery赋值，copy时不赋值id，初始化时所有query的值都会赋值给form*/
form: { form: {
gsid:'',
yldwid:'',
//ID //ID
id:'', id:'',
//演练名称 //演练名称
......
src/views/contingency/contingencystudy/index.vue
View file @ 040b9b0d
...@@ -32,7 +32,7 @@ ...@@ -32,7 +32,7 @@
<AttachFileShow :delButton='false' :addButton='false' :app='app'></AttachFileShow> <AttachFileShow :delButton='false' :addButton='false' :app='app'></AttachFileShow>
<FieldButton :app='app'></FieldButton> <FieldButton :app='app'></FieldButton>
<ExcelButton :app='app'></ExcelButton> <ExcelButton :app='app'></ExcelButton>
<WorkFlowButton :app='this'></WorkFlowButton> <!-- <WorkFlowButton :app='this'></WorkFlowButton>-->
<!-- 额外按钮--> <!-- 额外按钮-->
<!-- 表头设置 --> <!-- 表头设置 -->
...@@ -101,7 +101,11 @@ ...@@ -101,7 +101,11 @@
tableTitle: [ tableTitle: [
{label: "年度", prop: "year", fieldType: "int"}, {label: "年度", prop: "year", fieldType: "int"},
//{label: "季度", prop: "quarter", fieldType: "ftString",width:80}, //{label: "季度", prop: "quarter", fieldType: "ftString",width:80},
{label: "季度", prop: "quarterName", fieldType: "ftString",width:80}, {label: "季度", prop: "quarter", formatter:function(row, column, value, index) {
let jdobj=['','第一季度','第二季度','第三季度','第四季度']
return jdobj[value]
},fieldType: "ftString",width:80},
{label: "演练名称", prop: "name", fieldType: "ftString",width:180}, {label: "演练名称", prop: "name", fieldType: "ftString",width:180},
{label: "演练组织单位", prop: "zzdw", fieldType: "ftString",width:180}, {label: "演练组织单位", prop: "zzdw", fieldType: "ftString",width:180},
{label: "培训人数", prop: "pxrs", fieldType: "int"}, {label: "培训人数", prop: "pxrs", fieldType: "int"},
......
src/views/contingency/contingencystudy/reportEdit.vue
View file @ 040b9b0d
...@@ -8,17 +8,22 @@ ...@@ -8,17 +8,22 @@
<el-input :readonly="readonly" v-model="form.name" ></el-input> <el-input :readonly="readonly" v-model="form.name" ></el-input>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="12">
<el-form-item label="公司" ref="gsid" prop="gsid">
<RelSelect style="width: 100%;" :readonly="readonly" src='jcsj/common/bm/queryGs' :match="{value:'id',label:'bmmc'}" v-model='form.gsid' ></RelSelect>
</el-form-item>
</el-col>
<!-- <el-col :span="6"> <!-- <el-col :span="6">
<el-form-item label="分公司ID" ref="gsid" prop="gsid"> <el-form-item label="分公司ID" ref="gsid" prop="gsid">
<el-input :readonly="readonly" v-model="form.gsid" ></el-input> <el-input :readonly="readonly" v-model="form.gsid" ></el-input>
</el-form-item> </el-form-item>
</el-col> --> </el-col> -->
<el-col :span="12"> <!-- <el-col :span="12">
<el-form-item label="演练组织单位" ref="yldwid" prop="yldwid"> <el-form-item label="演练组织单位" ref="yldwid" prop="yldwid">
<!-- <el-input :readonly="readonly" v-model="form.yldwid" ></el-input> --> &lt;!&ndash; <el-input :readonly="readonly" v-model="form.yldwid" ></el-input> &ndash;&gt;
<RelSelect style="width: 100%;" src='jcsj/common/bm/queryGs' filterable clearable :match="{value:'id',label:'bmmc'}" v-model='form.yldwid' ></RelSelect> <RelSelect style="width: 100%;" src='jcsj/common/bm/queryGs' filterable clearable :match="{value:'id',label:'bmmc'}" v-model='form.yldwid' ></RelSelect>
</el-form-item> </el-form-item>
</el-col> </el-col>-->
<!--<el-col :span="6">--> <!--<el-col :span="6">-->
...@@ -28,10 +33,15 @@ ...@@ -28,10 +33,15 @@
<!--</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="pxrs" prop="pxrs"> <el-form-item label="培训人数" ref="pxrs" prop="pxrs">
<el-input type="number" :readonly="readonly" v-model="form.pxrs" ></el-input> <el-input type="number" :readonly="readonly" v-model="form.pxrs" ></el-input>
</el-form-item> </el-form-item>
</el-col>-->
<el-col :span="12">
<el-form-item label="演练组织部门" ref="yldwid" prop="yldwid">
<RelSelect linkage :linkParams="{pid:form.gsid}" :readonly="readonly" style="width: 100%;" src='jcsj/common/bm/queryBz' filterable clearable :match="{value:'id',label:'bmmc'}" v-model='form.yldwid' ></RelSelect>
</el-form-item>
</el-col> </el-col>
<el-col :span="12"> <el-col :span="12">
<el-form-item label="演练目标" ref="ylmb" prop="ylmb"> <el-form-item label="演练目标" ref="ylmb" prop="ylmb">
...@@ -128,7 +138,7 @@ ...@@ -128,7 +138,7 @@
//演练名称 //演练名称
name:'', name:'',
//分公司ID //分公司ID
// gsid:'', gsid:'',
//演练组织单位ID //演练组织单位ID
yldwid:'', yldwid:'',
//演练计划ID //演练计划ID
......
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