测试问然修改2
This commit is contained in:
parent
ab4f919f09
commit
bfd978abd5
|
|
@ -63,14 +63,14 @@
|
||||||
<el-table-column label="证件有效期至" align="center" prop="issueLifespan" :show-overflow-tooltip="true"/>
|
<el-table-column label="证件有效期至" align="center" prop="issueLifespan" :show-overflow-tooltip="true"/>
|
||||||
<el-table-column label="过期类型" align="center" prop="" :show-overflow-tooltip="true">
|
<el-table-column label="过期类型" align="center" prop="" :show-overflow-tooltip="true">
|
||||||
<template slot-scope="scope">
|
<template slot-scope="scope">
|
||||||
<span v-if="scope.row.type==1" style="color: orange;font-size: 25px;">临期</span>
|
<span v-if="scope.row.type==1" style="color: orange;font-size: 18px;">临期</span>
|
||||||
<span v-else="scope.row.type==2" style="color: red;font-size: 25px;">过期</span>
|
<span v-else="scope.row.type==2" style="color: red;font-size: 18px;">过期</span>
|
||||||
</template>
|
</template>
|
||||||
</el-table-column>
|
</el-table-column>
|
||||||
<el-table-column label="天数" align="center" prop="" :show-overflow-tooltip="true">
|
<el-table-column label="天数" align="center" prop="" :show-overflow-tooltip="true">
|
||||||
<template slot-scope="scope">
|
<template slot-scope="scope">
|
||||||
<span v-if="scope.row.type==1" style="color: orange;font-size: 25px;">{{scope.row.processGapDate}}</span>
|
<span v-if="scope.row.type==1" style="color: orange;font-size: 18px;">{{scope.row.processGapDate}}</span>
|
||||||
<span v-else="scope.row.type==2" style="color: red;font-size: 25px;">{{scope.row.processGapDate}}</span>
|
<span v-else="scope.row.type==2" style="color: red;font-size: 18px;">{{scope.row.processGapDate}}</span>
|
||||||
</template>
|
</template>
|
||||||
</el-table-column>
|
</el-table-column>
|
||||||
<!-- <el-table-column label="过期类型" align="center" prop="" :show-overflow-tooltip="true">
|
<!-- <el-table-column label="过期类型" align="center" prop="" :show-overflow-tooltip="true">
|
||||||
|
|
|
||||||
|
|
@ -230,7 +230,7 @@
|
||||||
<el-form-item label="计划出国日期" prop="exitTime">
|
<el-form-item label="计划出国日期" prop="exitTime">
|
||||||
<el-date-picker
|
<el-date-picker
|
||||||
v-model="baseForm.exitTime"
|
v-model="baseForm.exitTime"
|
||||||
type="date"
|
type="date" :picker-options="searchPickerOptionsStart" @change="searchChangeEnd"
|
||||||
placeholder="选择日期"
|
placeholder="选择日期"
|
||||||
format="yyyy-MM-dd" style="width: 100%;"
|
format="yyyy-MM-dd" style="width: 100%;"
|
||||||
value-format="yyyy-MM-dd"></el-date-picker>
|
value-format="yyyy-MM-dd"></el-date-picker>
|
||||||
|
|
@ -240,7 +240,7 @@
|
||||||
<el-form-item label="计划回国日期" prop="entryTime">
|
<el-form-item label="计划回国日期" prop="entryTime">
|
||||||
<el-date-picker
|
<el-date-picker
|
||||||
v-model="baseForm.entryTime"
|
v-model="baseForm.entryTime"
|
||||||
type="date"
|
type="date" :picker-options="searchPickerOptionsEnd" @change="searchChangeStart"
|
||||||
placeholder="选择日期"
|
placeholder="选择日期"
|
||||||
format="yyyy-MM-dd" style="width: 100%;"
|
format="yyyy-MM-dd" style="width: 100%;"
|
||||||
value-format="yyyy-MM-dd"></el-date-picker>
|
value-format="yyyy-MM-dd"></el-date-picker>
|
||||||
|
|
@ -477,6 +477,8 @@
|
||||||
thridIdNumber:"",
|
thridIdNumber:"",
|
||||||
remark:"",
|
remark:"",
|
||||||
},
|
},
|
||||||
|
searchPickerOptionsStart:{},
|
||||||
|
searchPickerOptionsEnd:{},
|
||||||
selectItme:{},
|
selectItme:{},
|
||||||
allUserList:[],
|
allUserList:[],
|
||||||
certificateList:[],
|
certificateList:[],
|
||||||
|
|
@ -876,6 +878,33 @@
|
||||||
const day = String(date.getDate()).padStart(2, '0');
|
const day = String(date.getDate()).padStart(2, '0');
|
||||||
return `${year}-${month}-${day}`;
|
return `${year}-${month}-${day}`;
|
||||||
},
|
},
|
||||||
|
searchChangeStart(value) {
|
||||||
|
if(!value){//为了解决点击输入框内的×之后时间限制没有变化,不能自由选择,这里利用设置了2999年之后都可选
|
||||||
|
// 可通过箭头函数的方式访问到this
|
||||||
|
this.searchPickerOptionsStart = Object.assign({}, this.searchPickerOptionsStart, {
|
||||||
|
// 可通过箭头函数的方式访问到this
|
||||||
|
disabledDate: (time) => {
|
||||||
|
return time.getTime()>=new Date('2999-12-30 23:59:59').getTime() ;
|
||||||
|
}
|
||||||
|
})
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
this.searchPickerOptionsStart = Object.assign({}, this.searchPickerOptionsStart, {
|
||||||
|
// 可通过箭头函数的方式访问到this
|
||||||
|
disabledDate: (time) => {
|
||||||
|
return time.getTime()>new Date(value).getTime() ;
|
||||||
|
}
|
||||||
|
})
|
||||||
|
},
|
||||||
|
//开始时间 控制结束时间
|
||||||
|
searchChangeEnd() {
|
||||||
|
// console.log(new Date(this.addFormList[0].startTime).getTime());
|
||||||
|
this.searchPickerOptionsEnd = Object.assign({}, this.searchPickerOptionsEnd, {
|
||||||
|
disabledDate: (time) => {
|
||||||
|
return time.getTime()<new Date(this.baseForm.exitTime).getTime();
|
||||||
|
}
|
||||||
|
})
|
||||||
|
},
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
</script>
|
</script>
|
||||||
|
|
|
||||||
|
|
@ -132,7 +132,7 @@
|
||||||
<el-form-item label="开始时间" prop="startTime">
|
<el-form-item label="开始时间" prop="startTime">
|
||||||
<el-date-picker
|
<el-date-picker
|
||||||
v-model="baseForm.startTime"
|
v-model="baseForm.startTime"
|
||||||
type="date"
|
type="date" :picker-options="searchPickerOptionsStart" @change="searchChangeEnd"
|
||||||
placeholder="选择日期"
|
placeholder="选择日期"
|
||||||
format="yyyy-MM-dd" style="width: 100%;"
|
format="yyyy-MM-dd" style="width: 100%;"
|
||||||
value-format="yyyy-MM-dd"></el-date-picker>
|
value-format="yyyy-MM-dd"></el-date-picker>
|
||||||
|
|
@ -142,7 +142,7 @@
|
||||||
<el-form-item label="结束时间" prop="endTime">
|
<el-form-item label="结束时间" prop="endTime">
|
||||||
<el-date-picker
|
<el-date-picker
|
||||||
v-model="baseForm.endTime"
|
v-model="baseForm.endTime"
|
||||||
type="date"
|
type="date" :picker-options="searchPickerOptionsEnd" @change="searchChangeStart"
|
||||||
placeholder="选择日期"
|
placeholder="选择日期"
|
||||||
format="yyyy-MM-dd" style="width: 100%;"
|
format="yyyy-MM-dd" style="width: 100%;"
|
||||||
value-format="yyyy-MM-dd"></el-date-picker>
|
value-format="yyyy-MM-dd"></el-date-picker>
|
||||||
|
|
@ -154,7 +154,7 @@
|
||||||
v-model="baseForm.verifyUsers"
|
v-model="baseForm.verifyUsers"
|
||||||
:options="deptOptions"
|
:options="deptOptions"
|
||||||
:normalizer="normalizer" :multiple="true" :flat="false" value-consists-of="LEAF_PRIORITY"
|
:normalizer="normalizer" :multiple="true" :flat="false" value-consists-of="LEAF_PRIORITY"
|
||||||
placeholder="选择核验人员"
|
placeholder="选择核验人员" noResultsText="未查询到想要的结果"
|
||||||
/>
|
/>
|
||||||
</el-form-item>
|
</el-form-item>
|
||||||
</el-col>
|
</el-col>
|
||||||
|
|
@ -308,6 +308,8 @@
|
||||||
//表格数据
|
//表格数据
|
||||||
tableListData: [],
|
tableListData: [],
|
||||||
dateRange:[],
|
dateRange:[],
|
||||||
|
searchPickerOptionsStart:{},
|
||||||
|
searchPickerOptionsEnd:{},
|
||||||
// 弹出层标题
|
// 弹出层标题
|
||||||
title: "",
|
title: "",
|
||||||
// 是否显示弹出层
|
// 是否显示弹出层
|
||||||
|
|
@ -512,6 +514,33 @@
|
||||||
const day = String(date.getDate()).padStart(2, '0');
|
const day = String(date.getDate()).padStart(2, '0');
|
||||||
return `${year}-${month}-${day}`;
|
return `${year}-${month}-${day}`;
|
||||||
},
|
},
|
||||||
|
searchChangeStart(value) {
|
||||||
|
if(!value){//为了解决点击输入框内的×之后时间限制没有变化,不能自由选择,这里利用设置了2999年之后都可选
|
||||||
|
// 可通过箭头函数的方式访问到this
|
||||||
|
this.searchPickerOptionsStart = Object.assign({}, this.searchPickerOptionsStart, {
|
||||||
|
// 可通过箭头函数的方式访问到this
|
||||||
|
disabledDate: (time) => {
|
||||||
|
return time.getTime()>=new Date('2999-12-30 23:59:59').getTime() ;
|
||||||
|
}
|
||||||
|
})
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
this.searchPickerOptionsStart = Object.assign({}, this.searchPickerOptionsStart, {
|
||||||
|
// 可通过箭头函数的方式访问到this
|
||||||
|
disabledDate: (time) => {
|
||||||
|
return time.getTime()>new Date(value).getTime() ;
|
||||||
|
}
|
||||||
|
})
|
||||||
|
},
|
||||||
|
//开始时间 控制结束时间
|
||||||
|
searchChangeEnd() {
|
||||||
|
// console.log(new Date(this.addFormList[0].startTime).getTime());
|
||||||
|
this.searchPickerOptionsEnd = Object.assign({}, this.searchPickerOptionsEnd, {
|
||||||
|
disabledDate: (time) => {
|
||||||
|
return time.getTime()<new Date(this.baseForm.startTime).getTime();
|
||||||
|
}
|
||||||
|
})
|
||||||
|
},
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
</script>
|
</script>
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue