Commit 43bef3fc authored by 张伯涛's avatar 张伯涛

修改

parent cc3e9e24
...@@ -2,13 +2,13 @@ ...@@ -2,13 +2,13 @@
<div class="app-container-quaTest"> <div class="app-container-quaTest">
<div class="testSearch" style="margin-left: 10px"> <div class="testSearch" style="margin-left: 10px">
<el-form ref="queryForm" :model="queryParams" :inline="true"> <el-form ref="queryForm" :model="queryParams" :inline="true">
<el-form-item label="开工时间" prop="revisedStartDate"> <el-form-item label="开工时间" prop="startDate">
<div slot="label" class="labelClass"> <div slot="label" class="labelClass">
<div>开工时间</div> <div>开工时间</div>
<div>Start Time</div> <div>Start Time</div>
</div> </div>
<el-date-picker <el-date-picker
v-model="queryParams.revisedStartDate" v-model="queryParams.startDate"
type="date" type="date"
placeholder="选择日期" placeholder="选择日期"
:editable="false" :editable="false"
...@@ -307,9 +307,9 @@ export default { ...@@ -307,9 +307,9 @@ export default {
}, },
pickerOptionsEnd: { pickerOptionsEnd: {
disabledDate: time => { disabledDate: time => {
if (this.queryParams.revisedStartDate) { if (this.queryParams.startDate) {
return time.getTime() >= new Date(moment(new Date().getTime()).format('YYYY-MM-DD')).getTime() || 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() time.getTime() < new Date(moment(new Date(this.queryParams.startDate).getTime()).format('YYYY-MM-DD')).getTime()
} }
} }
}, },
...@@ -317,7 +317,7 @@ export default { ...@@ -317,7 +317,7 @@ export default {
queryParams: { queryParams: {
page: 1, page: 1,
rows: 10, rows: 10,
revisedStartDate: moment(new Date().setTime(new Date().getTime() - 3600 * 1000 * 24 * 6)).format('YYYY/MM/DD'), startDate: moment(new Date().setTime(new Date().getTime() - 3600 * 1000 * 24 * 6)).format('YYYY/MM/DD'),
endDate: moment(new Date()).format('YYYY/MM/DD'), endDate: moment(new Date()).format('YYYY/MM/DD'),
materSn: undefined, materSn: undefined,
orderNo: undefined orderNo: undefined
...@@ -382,7 +382,7 @@ export default { ...@@ -382,7 +382,7 @@ export default {
* 重置方法 * 重置方法
*/ */
resetQuery() { resetQuery() {
this.queryParams.revisedStartDate = moment(new Date().setTime(new Date().getTime() - 3600 * 1000 * 24 * 6)).format('YYYY/MM/DD') this.queryParams.startDate = 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.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 diff is collapsed.
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