Compare commits
No commits in common. "f89f0de7400da5fd40042e4a605c09309d6eb366" and "5336bfd70943a645fbf69f169e6eeb4a047a4d7a" have entirely different histories.
f89f0de740
...
5336bfd709
|
@ -111,7 +111,6 @@
|
||||||
v-model="searchData[item.prop]"
|
v-model="searchData[item.prop]"
|
||||||
:placeholder="item.placeholder"
|
:placeholder="item.placeholder"
|
||||||
type="datetime"
|
type="datetime"
|
||||||
value-format="yyyy-MM-dd HH:mm:ss"
|
|
||||||
:disabled="item.disable && item.disable(searchData[item.prop])"
|
:disabled="item.disable && item.disable(searchData[item.prop])"
|
||||||
:style="{ width: item.width }"
|
:style="{ width: item.width }"
|
||||||
/>
|
/>
|
||||||
|
@ -123,8 +122,6 @@
|
||||||
range-separator="至"
|
range-separator="至"
|
||||||
start-placeholder="开始日期"
|
start-placeholder="开始日期"
|
||||||
end-placeholder="结束日期"
|
end-placeholder="结束日期"
|
||||||
value-format="yyyy-MM-dd"
|
|
||||||
format="yyyy-MM-dd"
|
|
||||||
:style="{ width: item.width }"
|
:style="{ width: item.width }"
|
||||||
clearable
|
clearable
|
||||||
/>
|
/>
|
||||||
|
|
|
@ -11,6 +11,12 @@
|
||||||
@reset="handleReset"
|
@reset="handleReset"
|
||||||
@new="handleAddUser"
|
@new="handleAddUser"
|
||||||
/>
|
/>
|
||||||
|
<!-- <el-button-->
|
||||||
|
<!-- type="primary"-->
|
||||||
|
<!-- size="mini"-->
|
||||||
|
<!-- style="margin-left:auto;height: 28px;position: absolute;bottom: 0;right: 10px"-->
|
||||||
|
<!-- @click="handleAddUser"-->
|
||||||
|
<!-- >{{$t('common:button:new')}}</el-button>-->
|
||||||
</div>
|
</div>
|
||||||
<base-table
|
<base-table
|
||||||
v-loading="loading"
|
v-loading="loading"
|
||||||
|
@ -64,9 +70,6 @@ const searchDataDefault = () => {
|
||||||
PageSize: 20,
|
PageSize: 20,
|
||||||
Asc: false,
|
Asc: false,
|
||||||
RealName: '',
|
RealName: '',
|
||||||
BeginCreateTime: '',
|
|
||||||
EndCreateTime: '',
|
|
||||||
CreateTimeArr: [],
|
|
||||||
SortField: 'CreateTime'
|
SortField: 'CreateTime'
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -332,14 +335,7 @@ export default {
|
||||||
handleReset() {
|
handleReset() {
|
||||||
this.searchData = searchDataDefault()
|
this.searchData = searchDataDefault()
|
||||||
this.getList()
|
this.getList()
|
||||||
},
|
|
||||||
handleSearch() {
|
|
||||||
if (this.searchData.CreateTimeArr.length > 0) {
|
|
||||||
this.searchData.BeginCreateTime = this.searchData.CreateTimeArr[0]
|
|
||||||
this.searchData.EndCreateTime = this.searchData.CreateTimeArr[1]
|
|
||||||
}
|
}
|
||||||
this.getList()
|
|
||||||
},
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
</script>
|
</script>
|
||||||
|
|
Loading…
Reference in New Issue