Commit 5cbc5309 authored by 李苏's avatar 李苏 💬

调整

parent 720b31e5
......@@ -94,7 +94,7 @@
getTreeMethod(that,list) {
let treeData =list
treeData = that.dgData(treeData, 'root')
console.log(treeData,'treeData')
that.tableData = [{
/* 具体mc需要确定后传过来 */
code: 'root',
......
......@@ -6,12 +6,12 @@
<el-col :span="12">
<el-form-item label="职工" ref="userid" prop="userid">
<!-- <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-col>
<el-col :span="12">
<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-col>
<!-- <el-col :span="8">
......@@ -23,26 +23,28 @@
<el-row :gutter="20">
<el-col :span="24">
<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-col>
</el-row>
<el-row :gutter="20">
<el-col :span="24">
<el-form-item label="发证单位" ref="fzdw" prop="fzdw">
<el-input :readonly="readonly" v-model="form.fzdw" ></el-input>
<el-input :readonly="readonly" v-model="form.fzdw"></el-input>
</el-form-item>
</el-col>
</el-row>
<el-row :gutter="20">
<el-col :span="12">
<el-form-item label="作业类别" ref="flid" prop="flid">
<RelSelect style="width: 100%;" :readonly="readonly" src='aqgl/rcgl/uaqglry/init/zsfl' clearable :match="{value:'id',label:'name'}" v-model='form.flid' ></RelSelect>
<RelSelect style="width: 100%;" :readonly="readonly" src='aqgl/rcgl/uaqglry/init/zsfl' clearable
:match="{value:'id',label:'name'}" v-model='form.flid'></RelSelect>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="适用范围" ref="syfw" prop="syfw">
<RelSelect style="width: 100%;" :readonly="readonly" src='aqgl/rcgl/uaqglry/init/syfw' clearable :match="{value:'id',label:'name'}" v-model='form.syfw' ></RelSelect>
<RelSelect style="width: 100%;" :readonly="readonly" src='aqgl/rcgl/uaqglry/init/syfw' clearable
:match="{value:'id',label:'name'}" v-model='form.syfw'></RelSelect>
</el-form-item>
</el-col>
</el-row>
......@@ -56,7 +58,7 @@
</el-col>
<el-col :span="6">
<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-col>
<el-col :span="9">
......@@ -68,6 +70,18 @@
</el-col>
</el-row>
<el-row :gutter="20">
<el-col :span="12">
<el-form-item label="提醒周期(天)" ref="txzq" prop="txzq">
<el-input :readonly="readonly" v-model="form.txzq"></el-input>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="提醒日期" ref="txrq" prop="txrq">
<el-date-picker style="width: 100%;" :readonly="true" type="date" value-format="timestamp"
v-model="form.txrq" placeholder="选择日期">
</el-date-picker>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="复审日期1" ref="fsrq1" prop="fsrq1">
<el-date-picker style="width: 100%;" :readonly="readonly" type="date" value-format="timestamp"
......@@ -104,15 +118,40 @@
</RelDialog>
</template>
<script>
import {editMixin} from 'common'
import {
editMixin
} from 'common'
export default {
mixins: [editMixin],
/* 存放index页面传递的额外参数*/
mounted() {
},
computed: {
txzq() {
return (
this.form.txzq
)
},
fsrq1() {
return (
this.form.fsrq1
)
}
},
/* 组件名称*/
name: "aqgl/rcglYgczxxEdit",
watch:{
txzq(val){
if(this.form.fsrq1){
this.form.txrq=this.form.fsrq1-val*24*60*60*1000
}
},
fsrq1(val){
if(this.form.txzq){
this.form.txrq=this.form.fsrq1-this.form.txzq*24*60*60*1000
}
}
},
/* 传递props模式一样必填,用于index,button,REdialog之间的组件通信*/
data() {
......@@ -125,71 +164,100 @@
/* 当前表单初始值,默认由RelDialog查询indexQuery赋值,copy时不赋值id,初始化时所有query的值都会赋值给form*/
form: {
gsid:'',
userName:'',
txzq: '',
txrq: '',
gsid: '',
userName: '',
//ID
id:'',
id: '',
//用户编码
userid:'',
userid: '',
//证书编号
code:'',
code: '',
//证书名称
name:'',
flid:'',
name: '',
flid: '',
//发证日期
fzrq:'',
fzrq: '',
//有效期
yxq:'',
yxq: '',
//截止日期
jzrq:'',
jzrq: '',
//状态
zt:'',
zt: '',
//复审日期1
fsrq1:'',
fsrq1: '',
//复审日期2
fsrq2:'',
fsrq2: '',
//实际复审日期1
sjfsrq1:'',
sjfsrq1: '',
//实际复审日期2
sjfsrq2:'',
sjfsrq2: '',
//备注
bz:'',
bz: '',
//维护人编码
whrid:'',
whrid: '',
//维护人
whr:'',
whr: '',
//维护时间
whsj:new Date().getTime(),
whsj: new Date().getTime(),
//创建人编码
cjrid:'',
cjrid: '',
//创建人
cjr:'',
cjr: '',
//创建时间
cjsj:new Date().getTime(),
cjsj: new Date().getTime(),
//系统版本
sysversion:'',
sysversion: '',
//发证单位
fzdw:'',
fzdw: '',
//适用范围
syfw:'',
syfw: '',
},
/* form提交时的规则,具体规则参考官网*/
rules: {
gsid: [{required: true,trigger: 'blur'}, ],
userid: [{required: true,trigger: 'blur'}, ],
fzdw: [{required: true,trigger: 'blur'},],
fzrq: [{required: true,trigger: 'blur'}, ],
code: [{required: true,trigger: 'blur'}, ],
name: [{required: true,trigger: 'blur'}, ],
flid: [{required: true,trigger: 'blur'}, ],
syfw: [{required: true,trigger: 'blur'}, ],
fsrq1: [{required: true,trigger: 'blur'}, ],
gsid: [{
required: true,
trigger: 'blur'
}, ],
userid: [{
required: true,
trigger: 'blur'
}, ],
fzdw: [{
required: true,
trigger: 'blur'
}, ],
fzrq: [{
required: true,
trigger: 'blur'
}, ],
code: [{
required: true,
trigger: 'blur'
}, ],
name: [{
required: true,
trigger: 'blur'
}, ],
flid: [{
required: true,
trigger: 'blur'
}, ],
syfw: [{
required: true,
trigger: 'blur'
}, ],
fsrq1: [{
required: true,
trigger: 'blur'
}, ],
}
}
},
methods: {
userSelected(row){
this.form.userid=row.id
userSelected(row) {
this.form.userid = row.id
}
}
}
......
......@@ -26,13 +26,15 @@
<el-col :span="6" class="search-col">
<div class="search-item">
<span class="search-span">证书状态:</span>
<RelSelect src='aqgl/rcgl/uaqglry/init/zt' clearable :match="{value:'id',label:'name'}" v-model='queryParams.zt' ></RelSelect>
<RelSelect src='aqgl/rcgl/uaqglry/init/zt' clearable :match="{value:'id',label:'name'}"
v-model='queryParams.zt'></RelSelect>
</div>
</el-col>
<el-col :span="6" class="search-col">
<div class="search-item">
<span class="search-span">适用范围:</span>
<RelSelect src='aqgl/rcgl/uaqglry/init/syfw' clearable :match="{value:'id',label:'name'}" v-model='queryParams.syfw' ></RelSelect>
<RelSelect src='aqgl/rcgl/uaqglry/init/syfw' clearable :match="{value:'id',label:'name'}"
v-model='queryParams.syfw'></RelSelect>
</div>
</el-col>
</el-row>
......@@ -44,7 +46,7 @@
<AddButton ref="add" :app='app'></AddButton>
<CopyButton ref="copy" :app='app'></CopyButton>
<EditButton ref="edit" :app='app'></EditButton>
<AttachFileButton :app='app' ></AttachFileButton>
<AttachFileButton :app='app'></AttachFileButton>
<FieldButton :app='app'></FieldButton>
<ExcelButton :app='app'></ExcelButton>
<!-- 额外按钮-->
......@@ -65,7 +67,7 @@
<script>
/* 引入需要的接口*/
import {
import {
doQuery,
doAdd,
doUpdate,
......@@ -96,37 +98,137 @@ import {
baseUrl: '/aqgl/uwxdwryzz',
/* 查询参数*/
queryParams: {
gsid:'',
code:'',
user:'',
syfw:'',
zt:''
gsid: '',
code: '',
user: '',
syfw: '',
zt: ''
},
/* 表格标题对应参数*/
tableTitle: [
// {label: "公司", prop: "gsName", fieldType: "ftString",width:100},
{label: "状态", prop: "ztName", fieldType: "ftString",width:60},
{label: "职工工号", prop: "usercode", fieldType: "ftString",width:140},
{label: "职工姓名", prop: "username", fieldType: "ftString",width:160},
{label: "证书编号", prop: "code", fieldType: "ftString",width:160},
{label: "证书名称", prop: "name", fieldType: "ftString",width:180},
{label: "作业类别", prop: "zsflName", fieldType: "ftString", width: 100},
{label: "发证日期", prop: "fzrq", fieldType: "ftDateTime"},
{label: "有效期", prop: "yxq", fieldType: "float"},
{label: "截止日期", prop: "jzrq", fieldType: "ftDateTime"},
{label: "复审日期1", prop: "fsrq1", fieldType: "ftDateTime"},
{label: "复审日期2", prop: "fsrq2", fieldType: "ftDateTime"},
{label: "实际复审日期1", prop: "sjfsrq1", fieldType: "ftDateTime"},
{label: "实际复审日期2", prop: "sjfsrq2", fieldType: "ftDateTime"},
{label: "发证单位", prop: "fzdw", fieldType: "ftString",width:300},
{
label: "状态",
prop: "ztName",
fieldType: "ftString",
width: 60
},
{
label: "职工工号",
prop: "usercode",
fieldType: "ftString",
width: 140
},
{
label: "职工姓名",
prop: "username",
fieldType: "ftString",
width: 160
},
{
label: "证书编号",
prop: "code",
fieldType: "ftString",
width: 160
},
{
label: "证书名称",
prop: "name",
fieldType: "ftString",
width: 180
},
{
label: "作业类别",
prop: "zsflName",
fieldType: "ftString",
width: 100
},
{
label: "发证日期",
prop: "fzrq",
fieldType: "ftDateTime"
},
{
label: "有效期",
prop: "yxq",
fieldType: "float"
},
{
label: "提醒周期(天)",
prop: "txzq"
},
{
label: "提醒日期",
prop: "txrq",
fieldType: "ftDateTime"
},
{
label: "截止日期",
prop: "jzrq",
fieldType: "ftDateTime"
},
{
label: "复审日期1",
prop: "fsrq1",
fieldType: "ftDateTime"
},
{
label: "复审日期2",
prop: "fsrq2",
fieldType: "ftDateTime"
},
{
label: "实际复审日期1",
prop: "sjfsrq1",
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: "whr", fieldType: "ftString"},
{label: "维护时间", prop: "whsj", fieldType: "ftDateTime"},
{label: "创建人", prop: "cjr", fieldType: "ftString", show: false},
{label: "创建时间", prop: "cjsj", fieldType: "ftDateTime", show: false}
{
label: "适用范围",
prop: "syfwName",
fieldType: "ftString",
width: 160
},
{
label: "备注",
prop: "bz",
fieldType: "ftString",
width: 300
},
{
label: "维护人",
prop: "whr",
fieldType: "ftString"
},
{
label: "维护时间",
prop: "whsj",
fieldType: "ftDateTime"
},
{
label: "创建人",
prop: "cjr",
fieldType: "ftString",
show: false
},
{
label: "创建时间",
prop: "cjsj",
fieldType: "ftDateTime",
show: false
}
]
}
......@@ -145,9 +247,6 @@ import {
},
/* 启用停用*/
},
components: {
Edit,
......
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