Skip to content

S
sgaqgl-vue
Commit 18dc1f16 authored by zhoumaotao's avatar zhoumaotao
Browse files
Options

页面调整6

parent ddaf6a05
Hide whitespace changes
Inline Side-by-side
Showing with 62 additions and 71 deletions
src/views/daily/holdCertificate/edit.vue
View file @ 18dc1f16
...@@ -3,99 +3,97 @@ ...@@ -3,99 +3,97 @@
<!-- 填写表单内容，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="8"> <el-col :span="12">
<el-form-item label="用户" ref="userid" prop="userid"> <el-form-item label="职工姓名" ref="userid" prop="userid">
<!-- <el-input :readonly="readonly" v-model="form.userid" ></el-input> --> <!-- <el-input :readonly="readonly" v-model="form.userid" ></el-input> -->
<personSelector :label="form.userName||form.userid||'暂无'" @selected='userSelected' ></personSelector> <personSelector :label="form.username||form.userid||'暂无'" @selected='userSelected' ></personSelector>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="8"> <el-col :span="12">
<el-form-item label="证书编号" ref="code" prop="code"> <el-form-item label="证书编号" ref="code" prop="code">
<el-input :readonly="readonly" v-model="form.code" ></el-input> <el-input :readonly="readonly" v-model="form.code" ></el-input>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="8">
</el-row>
<el-row :gutter="20">
<el-col :span="12">
<el-form-item label="证书名称" ref="name" prop="name"> <el-form-item label="证书名称" ref="name" prop="name">
<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-row> <el-col :span="12">
<el-row :gutter="20">
<el-col :span="8">
<el-form-item label="发证日期" ref="fzsq" prop="fzsq"> <el-form-item label="发证日期" ref="fzsq" prop="fzsq">
<el-date-picker style="width: 100%;" :readonly="readonly" type="date" <el-date-picker style="width: 100%;" :readonly="readonly" type="date"
v-model="form.fzsq" placeholder="选择日期"> v-model="form.fzsq" placeholder="选择日期">
</el-date-picker> </el-date-picker>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="8"> </el-row>
<el-row :gutter="20">
<el-col :span="12">
<el-form-item label="有效期(年)" ref="yxq" prop="yxq"> <el-form-item label="有效期(年)" ref="yxq" prop="yxq">
<el-input type="number" :readonly="readonly" v-model="form.yxq" ></el-input> <el-input type="number" :readonly="readonly" v-model="form.yxq" ></el-input>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="8"> <el-col :span="12">
<el-form-item label="截止日期" ref="jzrq" prop="jzrq"> <el-form-item label="截止日期" ref="jzrq" prop="jzrq">
<el-date-picker style="width: 100%;" :readonly="readonly" type="date" <el-date-picker style="width: 100%;" :readonly="readonly" type="date"
v-model="form.jzrq" placeholder="选择日期"> v-model="form.jzrq" placeholder="选择日期">
</el-date-picker> </el-date-picker>
</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="8"> <el-col :span="12">
<el-form-item label="复审日期1" ref="fsrq1" prop="fsrq1"> <el-form-item label="复审日期1" ref="fsrq1" prop="fsrq1">
<el-date-picker style="width: 100%;" :readonly="readonly" type="date" <el-date-picker style="width: 100%;" :readonly="readonly" type="date"
v-model="form.fsrq1" placeholder="选择日期"> v-model="form.fsrq1" placeholder="选择日期">
</el-date-picker> </el-date-picker>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="8"> <el-col :span="12">
<el-form-item label="复审日期2" ref="fsrq2" prop="fsrq2"> <el-form-item label="复审日期2" ref="fsrq2" prop="fsrq2">
<el-date-picker style="width: 100%;" :readonly="readonly" type="date" <el-date-picker style="width: 100%;" :readonly="readonly" type="date"
v-model="form.fsrq2" placeholder="选择日期"> v-model="form.fsrq2" placeholder="选择日期">
</el-date-picker> </el-date-picker>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="8"> </el-row>
<el-row :gutter="20">
<el-col :span="12">
<el-form-item label="实际复审日期1" ref="sjfsrq1" prop="sjfsrq1"> <el-form-item label="实际复审日期1" ref="sjfsrq1" prop="sjfsrq1">
<el-date-picker style="width: 100%;" :readonly="readonly" type="date" <el-date-picker style="width: 100%;" :readonly="readonly" type="date"
v-model="form.sjfsrq1" placeholder="选择日期"> v-model="form.sjfsrq1" placeholder="选择日期">
</el-date-picker> </el-date-picker>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="12">
<el-form-item label="实际复审日期2" ref="sjfsrq2" prop="sjfsrq2">
<el-date-picker style="width: 100%;" :readonly="readonly" type="date"
v-model="form.sjfsrq2" placeholder="选择日期">
</el-date-picker>
</el-form-item>
</el-col>
</el-row> </el-row>
<el-row :gutter="20"> <el-row :gutter="20">
<el-col :span="8"> <el-col :span="12">
<el-form-item label="实际复审日期2" ref="sjfsrq2" prop="sjfsrq2"> <el-form-item label="适用范围" ref="syfw" prop="syfw">
<el-date-picker style="width: 100%;" :readonly="readonly" type="date" <RelSelect :readonly="readonly" src='aqgl/rcgl/ygczxx/init/syfw' clearable :match="{value:'id',label:'name'}" v-model='form.syfw' ></RelSelect>
v-model="form.sjfsrq2" placeholder="选择日期"> </el-form-item>
</el-date-picker> </el-col>
</el-form-item> <el-col :span="12">
</el-col> <el-form-item label="发证单位" ref="fzdw" prop="fzdw">
<!-- <el-col :span="8"> <el-input :readonly="readonly" v-model="form.fzdw" ></el-input>
<el-form-item label="备注" ref="bz" prop="bz"> </el-form-item>
<el-input :readonly="readonly" v-model="form.bz" ></el-input> </el-col>
</el-form-item>
</el-col> -->
<!-- <el-col :span="8">
<el-form-item label="系统版本" ref="sysversion" prop="sysversion">
<el-input :readonly="readonly" v-model="form.sysversion" ></el-input>
</el-form-item>
</el-col> -->
<el-col :span="8">
<el-form-item label="适用范围" ref="syfw" prop="syfw">
<RelSelect :readonly="readonly" src='aqgl/rcgl/ygczxx/init/syfw' clearable :match="{value:'id',label:'name'}" v-model='form.syfw' ></RelSelect>
</el-form-item>
</el-col>
</el-row> </el-row>
<el-row :gutter="20"> <el-row :gutter="20">
<el-col :span="24"> <!-- <el-col :span="8">
<el-form-item label="发证单位" ref="fzdw" prop="fzdw"> <el-form-item label="备注" ref="bz" prop="bz">
<el-input :readonly="readonly" v-model="form.fzdw" ></el-input> <el-input :readonly="readonly" v-model="form.bz" ></el-input>
</el-form-item>
</el-form-item> </el-col> -->
</el-col>
</el-row> </el-row>
</el-form> </el-form>
</RelDialog> </RelDialog>
......
src/views/daily/holdCertificate/index.vue
View file @ 18dc1f16
...@@ -4,34 +4,26 @@ ...@@ -4,34 +4,26 @@
<!-- 查询条件--> <!-- 查询条件-->
<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="24" class="search-row-1">
<el-col :span="8" 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-input v-model="queryParams.zsbh"></el-input> <el-input v-model="queryParams.code"></el-input>
</div> </div>
</el-col> </el-col>
<el-col :span="8" 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-input v-model="queryParams.zggh"></el-input> <el-input v-model="queryParams.user"></el-input>
</div> </div>
</el-col> </el-col>
<el-col :span="8" class="search-col"> <el-col :span="6" class="search-col">
<div class="search-item">
<span class="search-span">姓名:</span>
<el-input v-model="queryParams.xm" ></el-input>
</div>
</el-col>
</el-row>
<el-row :gutter="20" class="search-row-1">
<el-col :span="8" class="search-col">
<div class="search-item"> <div class="search-item">
<span class="search-span">证书状态:</span> <span class="search-span">证书状态:</span>
<RelSelect src='aqgl/rcgl/ygczxx/init/zszt' clearable :match="{value:'id',label:'name'}" v-model='queryParams.zszt' ></RelSelect> <RelSelect src='aqgl/rcgl/ygczxx/init/zt' clearable :match="{value:'id',label:'name'}" v-model='queryParams.zszt' ></RelSelect>
</div> </div>
</el-col> </el-col>
<el-col :span="8" 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='aqgl/rcgl/ygczxx/init/syfw' clearable :match="{value:'id',label:'name'}" v-model='queryParams.syfw' ></RelSelect> <RelSelect src='aqgl/rcgl/ygczxx/init/syfw' clearable :match="{value:'id',label:'name'}" v-model='queryParams.syfw' ></RelSelect>
...@@ -108,26 +100,27 @@ import { ...@@ -108,26 +100,27 @@ import {
}, },
/* 表格标题对应参数*/ /* 表格标题对应参数*/
tableTitle: [ tableTitle: [
// {label: "用户编码", prop: "userid", fieldType: "ftString",width:192}, {label: "职工工号", prop: "usercode", fieldType: "ftString",width:140},
{label: "证书编号", prop: "code", fieldType: "ftString",width:240}, {label: "职工姓名", prop: "username", fieldType: "ftString",width:160},
{label: "证书名称", prop: "name", fieldType: "ftString",width:300}, {label: "证书编号", prop: "code", fieldType: "ftString",width:160},
{label: "证书名称", prop: "name", fieldType: "ftString",width:180},
{label: "发证日期", prop: "fzsq", fieldType: "ftDateTime"}, {label: "发证日期", prop: "fzsq", fieldType: "ftDateTime"},
{label: "有效期", prop: "yxq", fieldType: "float"}, {label: "有效期", prop: "yxq", fieldType: "float"},
{label: "截止日期", prop: "jzrq", fieldType: "ftDateTime"}, {label: "截止日期", prop: "jzrq", fieldType: "ftDateTime"},
{label: "状态", prop: "zt", fieldType: "ftString",width:60}, {label: "状态", prop: "ztName", fieldType: "ftString",width:60},
{label: "复审日期1", prop: "fsrq1", fieldType: "ftDateTime"}, {label: "复审日期1", prop: "fsrq1", fieldType: "ftDateTime"},
{label: "复审日期2", prop: "fsrq2", fieldType: "ftDateTime"}, {label: "复审日期2", prop: "fsrq2", fieldType: "ftDateTime"},
{label: "实际复审日期1", prop: "sjfsrq1", fieldType: "ftDateTime"}, {label: "实际复审日期1", prop: "sjfsrq1", fieldType: "ftDateTime"},
{label: "实际复审日期2", prop: "sjfsrq2", fieldType: "ftDateTime"}, {label: "实际复审日期2", prop: "sjfsrq2", fieldType: "ftDateTime"},
{label: "发证单位", prop: "fzdw", fieldType: "ftString",width:300},
// {label: "适用范围", prop: "syfw", fieldType: "ftString",width:60},
{label: "适用范围", prop: "syfwName", fieldType: "ftString",width:160},
{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"},
{label: "创建人", prop: "cjr", fieldType: "ftString"}, {label: "创建人", prop: "cjr", fieldType: "ftString"},
{label: "创建时间", prop: "cjsj", fieldType: "ftDateTime"}, {label: "创建时间", prop: "cjsj", fieldType: "ftDateTime"}
{label: "发证单位", prop: "fzdw", fieldType: "ftString",width:300},
// {label: "适用范围", prop: "syfw", fieldType: "ftString",width:60},
{label: "适用范围", prop: "syfwName", fieldType: "ftString",width:160,
},
] ]
} }
}, },
......
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