Merge branch 'dev'

src/views/QuestManage/_questList/index.vue

@@ -24,11 +24,11 @@
                    </el-select>
                </el-form-item>
                <el-form-item label="开始时间">
-                   <el-date-picker value-format="YYYY-MM-DD HH:mm:ss" type="daterange" v-model="selTime" @change="dateRangeChange"></el-date-picker>
+                   <el-date-picker size="default" value-format="YYYY-MM-DD HH:mm:ss" type="daterange" v-model="selTime" @change="dateRangeChange"></el-date-picker>
+               </el-form-item>
+               <el-form-item label="结束时间">
+                   <el-date-picker size="default" value-format="YYYY-MM-DD HH:mm:ss" type="daterange" v-model="selTime2" @change="dateRangeChange2"></el-date-picker>
                </el-form-item>
-               <!-- <el-form-item label="结束时间">
-                   <el-date-picker value-format="YYYY-MM-DD HH:mm:ss" type="daterange"></el-date-picker>
-               </el-form-item> -->
                <el-form-item>
                    <el-button type="primary" @click="confirm">查 询</el-button>
                    <el-button @click="reset">重 置</el-button>
@@ -96,8 +96,10 @@ export default defineComponent({
             tagIdList: [],
             brandIdList: [],
             status: undefined,
-            beginTime: undefined,
+            beginTime1: undefined,
-            endTime: undefined,
+            beginTime2: undefined,
+            endTime1: undefined,
+            endTime2: undefined,
         });
         const tableData = reactive({
             data: [],
@@ -107,6 +109,7 @@ export default defineComponent({
             brandData: [],
         });
         const selTime = ref([]);
+        const selTime2 = ref([]);
         const { proxy } = getCurrentInstance();
         const pagination = reactive({
             total: 0,
@@ -115,7 +118,7 @@ export default defineComponent({
         });
         return {
             form,proxy,
-            apiData,tableData,selTime,
+            apiData,tableData,selTime,selTime2,
             statusFormatter,
             pagination
         }
@@ -163,9 +166,12 @@ export default defineComponent({
             this.form.tagIdList = [];
             this.form.brandIdList = [];
             this.form.status = undefined;
-            this.form.beginTime = undefined;
+            this.form.beginTime1 = undefined;
-            this.form.endTime = undefined;
+            this.form.beginTime2 = undefined;
+            this.form.endTime1 = undefined;
+            this.form.endTime2 = undefined;
             this.selTime = [];
+            this.selTime2 = [];
             this.getData()
         },
         hanlderStop(id) {
@@ -210,8 +216,14 @@ export default defineComponent({
         },
         dateRangeChange(value) {
             if(value) {
-                this.form.beginTime = value[0];
+                this.form.beginTime1 = value[0];
-                this.form.endTime = value[1]
+                this.form.beginTime2 = value[1];
+            }
+        },
+        dateRangeChange2(value) {
+            if(value) {
+                this.form.endTime1 = value[0];
+                this.form.endTime2 = value[1];
             }
         },
         goRelease() {