|
|
@@ -27,6 +27,18 @@
|
|
|
<el-form-item label="假日名称" prop="companyId">
|
|
|
<el-input type="text" size="mini" v-model="queryModel.holidayName"></el-input>
|
|
|
</el-form-item>
|
|
|
+ <el-form-item label="假日区间" prop="timeRanges">
|
|
|
+ <el-date-picker
|
|
|
+ v-model="queryModel.timeRanges"
|
|
|
+ type="daterange"
|
|
|
+ range-separator="至"
|
|
|
+ start-placeholder="开始日期"
|
|
|
+ end-placeholder="结束日期"
|
|
|
+ value-format="yyyy-MM-dd"
|
|
|
+ :default-time="timeRangesDefaultTime"
|
|
|
+ size="mini"
|
|
|
+ ></el-date-picker>
|
|
|
+ </el-form-item>
|
|
|
<el-form-item>
|
|
|
<el-button
|
|
|
type="primary"
|
|
|
@@ -35,6 +47,12 @@
|
|
|
@click="changePage(1)"
|
|
|
:loading="loading"
|
|
|
>查询</el-button>
|
|
|
+ <el-button
|
|
|
+ type="info"
|
|
|
+ size="mini"
|
|
|
+ style="margin-left: 8px"
|
|
|
+ @click="handleReset('queryForm')"
|
|
|
+ >重置</el-button>
|
|
|
</el-form-item>
|
|
|
</el-form>
|
|
|
<el-divider></el-divider>
|
|
|
@@ -118,12 +136,14 @@ export default {
|
|
|
direction: "",
|
|
|
pageSizeList: [10, 20, 30],
|
|
|
multipleSelection: [],
|
|
|
+ timeRangesDefaultTime: [],
|
|
|
showModal: false,
|
|
|
modalTitle: "",
|
|
|
businessKey: "",
|
|
|
queryModel: {
|
|
|
companyId: "",
|
|
|
- holidayName: ""
|
|
|
+ holidayName: "",
|
|
|
+ timeRanges: ""
|
|
|
}
|
|
|
};
|
|
|
},
|
|
|
@@ -135,6 +155,18 @@ export default {
|
|
|
self.pageIndex = pageIndex;
|
|
|
var formData = new FormData();
|
|
|
|
|
|
+ var startDate = "";
|
|
|
+ var endDate = "";
|
|
|
+ var timeRanges = self.queryModel.timeRanges + "";
|
|
|
+
|
|
|
+ if (timeRanges != "" && timeRanges != null) {
|
|
|
+ timeRanges = timeRanges.split(",");
|
|
|
+ startDate = timeRanges[0];
|
|
|
+ endDate = timeRanges[1];
|
|
|
+ }
|
|
|
+
|
|
|
+ formData.append("startDate", startDate);
|
|
|
+ formData.append("endDate", endDate);
|
|
|
formData.append("pageIndex", self.pageIndex);
|
|
|
formData.append("pageSize", self.pageSize);
|
|
|
|
