|
@@ -48,12 +48,26 @@
|
|
@keyup.enter.native="handleQuery"
|
|
@keyup.enter.native="handleQuery"
|
|
/>
|
|
/>
|
|
</el-form-item>
|
|
</el-form-item>
|
|
|
|
+<!-- <el-form-item label="进线时间" prop="entryTime" v-if="queryParams.filterMode == 1">-->
|
|
|
|
+<!-- <el-date-picker clearable size="small"-->
|
|
|
|
+<!-- v-model="queryParams.entryTime"-->
|
|
|
|
+<!-- type="date"-->
|
|
|
|
+<!-- value-format="yyyy-MM-dd"-->
|
|
|
|
+<!-- placeholder="选择营期时间">-->
|
|
|
|
+<!-- </el-date-picker>-->
|
|
|
|
+<!-- </el-form-item>-->
|
|
|
|
+
|
|
<el-form-item label="进线时间" prop="entryTime" v-if="queryParams.filterMode == 1">
|
|
<el-form-item label="进线时间" prop="entryTime" v-if="queryParams.filterMode == 1">
|
|
- <el-date-picker clearable size="small"
|
|
|
|
- v-model="queryParams.entryTime"
|
|
|
|
- type="date"
|
|
|
|
- value-format="yyyy-MM-dd"
|
|
|
|
- placeholder="选择营期时间">
|
|
|
|
|
|
+ <el-date-picker
|
|
|
|
+ v-model="scheduleEntryTime"
|
|
|
|
+ type="datetimerange"
|
|
|
|
+ size="small"
|
|
|
|
+ style="width: 350px"
|
|
|
|
+ value-format="yyyy-MM-dd HH:mm:ss"
|
|
|
|
+ range-separator="-"
|
|
|
|
+ start-placeholder="开始日期"
|
|
|
|
+ end-placeholder="结束日期"
|
|
|
|
+ @change="handleScheduleTimeChange">
|
|
</el-date-picker>
|
|
</el-date-picker>
|
|
</el-form-item>
|
|
</el-form-item>
|
|
<el-form-item label="标签" prop="tagIds">
|
|
<el-form-item label="标签" prop="tagIds">
|
|
@@ -525,6 +539,9 @@ export default {
|
|
open: false,
|
|
open: false,
|
|
updateOpen:false,
|
|
updateOpen:false,
|
|
// 查询参数
|
|
// 查询参数
|
|
|
|
+
|
|
|
|
+ scheduleEntryTime:null,
|
|
|
|
+
|
|
queryParams: {
|
|
queryParams: {
|
|
pageNum: 1,
|
|
pageNum: 1,
|
|
pageSize: 10,
|
|
pageSize: 10,
|
|
@@ -542,6 +559,8 @@ export default {
|
|
externalUserName: null,
|
|
externalUserName: null,
|
|
createTime: null,
|
|
createTime: null,
|
|
entryTime: null,
|
|
entryTime: null,
|
|
|
|
+ inComingSTime: null,
|
|
|
|
+ inComingETime: null,
|
|
},
|
|
},
|
|
|
|
|
|
tagGroupList: [],
|
|
tagGroupList: [],
|
|
@@ -1099,6 +1118,16 @@ export default {
|
|
this.resetForm("msgForm");
|
|
this.resetForm("msgForm");
|
|
},
|
|
},
|
|
|
|
|
|
|
|
+ handleScheduleTimeChange(val) {
|
|
|
|
+ if (val) {
|
|
|
|
+ this.queryParams.inComingSTime = val[0];
|
|
|
|
+ this.queryParams.inComingETime = val[1];
|
|
|
|
+ } else {
|
|
|
|
+ this.queryParams.inComingSTime = null;
|
|
|
|
+ this.queryParams.inComingETime = null;
|
|
|
|
+ }
|
|
|
|
+ },
|
|
|
|
+
|
|
/** 搜索按钮操作 */
|
|
/** 搜索按钮操作 */
|
|
handleQuery() {
|
|
handleQuery() {
|
|
|
|
|
|
@@ -1127,6 +1156,9 @@ export default {
|
|
/** 重置按钮操作 */
|
|
/** 重置按钮操作 */
|
|
resetQuery() {
|
|
resetQuery() {
|
|
this.selectTags=[];
|
|
this.selectTags=[];
|
|
|
|
+ this.scheduleEntryTime=null;
|
|
|
|
+ this.queryParams.inComingSTime=null;
|
|
|
|
+ this.queryParams.inComingETime=null;
|
|
this.resetForm("queryForm");
|
|
this.resetForm("queryForm");
|
|
this.handleQuery();
|
|
this.handleQuery();
|
|
},
|
|
},
|