Commit e5cb6b96 authored by 李苏's avatar 李苏 💬

Merge branch 'master' of gitlab.gavelinfo.com:lisu/sgaqgl-vue

parents 4a498ffc c808bda4
...@@ -2,34 +2,36 @@ ...@@ -2,34 +2,36 @@
<RelDialog :type='type' :editApp='editApp' :app='app' :buttonApp='buttonApp'> <RelDialog :type='type' :editApp='editApp' :app='app' :buttonApp='buttonApp'>
<!-- 填写表单内容,slot=form必写--> <!-- 填写表单内容,slot=form必写-->
<el-form slot="form" ref="form" :model="form" label-width="100px" :rules="rules"> <el-form slot="form" ref="form" :model="form" label-width="100px" :rules="rules">
<el-row :gutter="20"> <el-row :gutter="20">
<el-col :span="24"> <el-col :span="12">
<el-form-item label="三违内容" ref="content" prop="content"> <el-form-item label="序号" ref="xh" prop="xh" >
<el-input type='textarea' :readonly="readonly" v-model="form.content" ></el-input> <el-input :readonly="readonly" v-model="form.xh" ></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="wglx" prop="wglx"> <el-form-item label="三违等级" ref="swdj" prop="swdj">
<RelSelect style="width: 100%;" src='/aqgl/swgl/swcfbz/init/wglx' clearable :match="{value:'id',label:'name'}" v-model='form.wglx' ></RelSelect> <RelSelect style="width: 100%;" src='/aqgl/swgl/swcfbz/init/swdj' clearable :match="{value:'id',label:'name'}" v-model='form.swdj' ></RelSelect>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="12"> <el-col :span="12">
<el-form-item label="考核分数" ref="khfs" prop="khfs"> <el-form-item label="三违类型" ref="wglx" prop="wglx">
<el-input type='number' :readonly="readonly" v-model="form.khfs" ></el-input> <RelSelect style="width: 100%;" src='/aqgl/swgl/swcfbz/init/wglx' clearable :match="{value:'id',label:'name'}" v-model='form.wglx' ></RelSelect>
</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="fkjexx" prop="fkjexx"> <el-form-item label="罚款金额(元)" ref="fkje" prop="fkje">
<el-input type='number' :readonly="readonly" v-model="form.fkjexx" ></el-input> <el-input type='number' :readonly="readonly" v-model="form.fkje" ></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="fkjesx" prop="fkjesx"> <el-form-item label="考核分数" ref="khfs" prop="khfs">
<el-input type='number' :readonly="readonly" v-model="form.fkjesx" ></el-input> <el-input type='number' :readonly="readonly" v-model="form.khfs" ></el-input>
</el-form-item> </el-form-item>
</el-col> </el-col>
</el-row> </el-row>
...@@ -75,6 +77,8 @@ ...@@ -75,6 +77,8 @@
wglx:'', wglx:'',
//考核分数 //考核分数
khfs:'', khfs:'',
//罚款金额
fkje:'',
//罚款金额下限 //罚款金额下限
fkjexx:'', fkjexx:'',
//罚款金额上限 //罚款金额上限
...@@ -98,8 +102,19 @@ ...@@ -98,8 +102,19 @@
}, },
/* form提交时的规则,具体规则参考官网*/ /* form提交时的规则,具体规则参考官网*/
rules: { rules: {
xh: [{
} required: true,
trigger: 'blur'
}, ],
swdj: [{
required: true,
trigger: 'blur'
}, ],
wglx: [{
required: true,
trigger: 'blur'
}, ]
}
} }
}, },
methods: { methods: {
......
...@@ -4,21 +4,13 @@ ...@@ -4,21 +4,13 @@
<!-- 查询条件--> <!-- 查询条件-->
<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-col :span="6" class="search-col">
<div class="search-item">
<span class="search-span">三维内容:</span>
<el-input v-model="queryParams.wgnr" ></el-input>
</div>
</el-col>
</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>
<AddButton ref="reload" :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>
...@@ -78,16 +70,17 @@ ...@@ -78,16 +70,17 @@
/* 表格标题对应参数*/ /* 表格标题对应参数*/
tableTitle: [ tableTitle: [
// {label: "序号", prop: "xh", fieldType: "int"}, // {label: "序号", prop: "xh", fieldType: "int"},
{label: "三违内容", prop: "content", fieldType: "ftString",width:300}, {label: "三违等级", prop: "swdjName", fieldType: "ftString",width:100},
{label: "类型", prop: "wglxName", fieldType: "ftString",width:100}, {label: "三违类型", prop: "wglxName", fieldType: "ftString",width:100},
{label: "罚款金额", prop: "fkje", fieldType: "money"},
{label: "考核分数", prop: "khfs", fieldType: "int"}, {label: "考核分数", prop: "khfs", fieldType: "int"},
{label: "罚款金额下限", prop: "fkjexx", fieldType: "float"}, //{label: "罚款金额下限", prop: "fkjexx", fieldType: "float"},
{label: "罚款金额上限", prop: "fkjesx", fieldType: "float"}, //{label: "罚款金额上限", prop: "fkjesx", fieldType: "float"},
{label: "备注", prop: "bz", fieldType: "ftString",width:300}, {label: "备注", prop: "bz", fieldType: "ftString",width:260},
// {label: "维护人", prop: "whr", fieldType: "ftString"}, {label: "维护人", prop: "whr", fieldType: "ftString"},
// {label: "维护时间", prop: "whsj", fieldType: "ftDateTime"}, {label: "维护时间", prop: "whsj", fieldType: "ftDateTime"},
// {label: "创建人", prop: "cjr", fieldType: "ftString"}, {label: "创建人", prop: "cjr", fieldType: "ftString"},
// {label: "创建时间", prop: "cjsj", fieldType: "ftDateTime"}, {label: "创建时间", prop: "cjsj", fieldType: "ftDateTime"}
] ]
} }
}, },
......
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