|
|
@@ -22,8 +22,9 @@
|
|
|
</el-select>
|
|
|
</el-form-item>
|
|
|
<el-form-item label="日期:" v-if="!isShowTab">
|
|
|
- <el-date-picker v-model="dateRange" type="datetimerange" range-separator="~" start-placeholder="开始时间"
|
|
|
- end-placeholder="结束时间" clearable value-format="YYYY-MM-DD HH:mm:ss.SSS" @change="handleDateChange" />
|
|
|
+ <el-date-picker v-model="dateRange" type="daterange" range-separator="~" start-placeholder="开始时间"
|
|
|
+ end-placeholder="结束时间" clearable unlink-panels value-format="YYYY-MM-DD HH:mm:ss.SSS"
|
|
|
+ @change="handleDateChange" />
|
|
|
</el-form-item>
|
|
|
</div>
|
|
|
<div class="btn-group">
|
|
|
@@ -79,6 +80,8 @@ const workLocation = ref([]); // 级联选择器,为二维数组(提取wor
|
|
|
const dateRange = ref([]); // 时间段,拆分成startTime/endTime
|
|
|
|
|
|
const handleSearch = () => {
|
|
|
+ console.log(queryForm);
|
|
|
+
|
|
|
emits('onSearch', queryForm);
|
|
|
};
|
|
|
|
|
|
@@ -115,9 +118,15 @@ const handleCascaderChange = () => {
|
|
|
};
|
|
|
|
|
|
const handleDateChange = () => {
|
|
|
- queryForm.startTime = dateRange.value[0];
|
|
|
- queryForm.endTime = dateRange.value[1];
|
|
|
-}
|
|
|
+ if (dateRange.value != null) {
|
|
|
+ queryForm.startTime = dateRange.value[0];
|
|
|
+ queryForm.endTime = dateRange.value[1];
|
|
|
+ } else {
|
|
|
+ Reflect.deleteProperty(queryForm, "startTime");
|
|
|
+ Reflect.deleteProperty(queryForm, "endTime");
|
|
|
+ }
|
|
|
+ console.log(queryForm);
|
|
|
+};
|
|
|
</script>
|
|
|
|
|
|
<style scoped lang="scss">
|