Commit cc3e9e24 authored by 张伯涛's avatar 张伯涛

修改

parent 5be6430e
...@@ -15,6 +15,18 @@ ...@@ -15,6 +15,18 @@
:clearable="false" :clearable="false"
format="yyyy/MM/dd" format="yyyy/MM/dd"
value-format="yyyy/MM/dd" value-format="yyyy/MM/dd"
:picker-options="pickerOptions"
/>
<span>-</span>
<el-date-picker
v-model="queryParams.endDate"
type="date"
placeholder="选择日期"
:editable="false"
:clearable="false"
format="yyyy/MM/dd"
value-format="yyyy/MM/dd"
:picker-options="pickerOptionsEnd"
/> />
</el-form-item> </el-form-item>
<el-form-item label="主板SN编号" prop="materSn"> <el-form-item label="主板SN编号" prop="materSn">
...@@ -286,11 +298,27 @@ export default { ...@@ -286,11 +298,27 @@ export default {
name: 'QualityTest', name: 'QualityTest',
data() { data() {
return { return {
pickerOptions: {
disabledDate: time => {
if (this.queryParams.endDate) {
return time.getTime() > new Date(this.queryParams.endDate).getTime()
}
}
},
pickerOptionsEnd: {
disabledDate: time => {
if (this.queryParams.revisedStartDate) {
return time.getTime() >= new Date(moment(new Date().getTime()).format('YYYY-MM-DD')).getTime() ||
time.getTime() < new Date(moment(new Date(this.queryParams.revisedStartDate).getTime()).format('YYYY-MM-DD')).getTime()
}
}
},
// 搜索栏表单 // 搜索栏表单
queryParams: { queryParams: {
page: 1, page: 1,
rows: 10, rows: 10,
revisedStartDate: moment(new Date()).format('YYYY/MM/DD'), revisedStartDate: moment(new Date().setTime(new Date().getTime() - 3600 * 1000 * 24 * 6)).format('YYYY/MM/DD'),
endDate: moment(new Date()).format('YYYY/MM/DD'),
materSn: undefined, materSn: undefined,
orderNo: undefined orderNo: undefined
}, },
...@@ -354,7 +382,8 @@ export default { ...@@ -354,7 +382,8 @@ export default {
* 重置方法 * 重置方法
*/ */
resetQuery() { resetQuery() {
this.queryParams.revisedStartDate = moment(new Date()).format('YYYY/MM/DD') this.queryParams.revisedStartDate = moment(new Date().setTime(new Date().getTime() - 3600 * 1000 * 24 * 6)).format('YYYY/MM/DD')
this.queryParams.endDate = moment(new Date()).format('YYYY/MM/DD')
this.queryParams.materSn = undefined this.queryParams.materSn = undefined
this.queryParams.orderNo = undefined this.queryParams.orderNo = undefined
this.getTestData() this.getTestData()
......
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