flat: 合并

src/views/manage/mission/supplyDemand/index.vue

@@ -19,7 +19,7 @@
             </el-select>
           </el-form-item>
           <el-form-item label="日期类型：" v-if="query.type === 2">
-            <el-select v-model="query.timeType" @blur="delete query.stime">
+            <el-select v-model="query.timeType" @blur="delete query.time">
               <el-option
                 v-for="(item, index) in times"
                 :key="index"
@@ -30,10 +30,17 @@
           </el-form-item>
           <el-form-item label="日期：" v-if="query.type === 2">
             <el-date-picker
-              v-model="query.stime"
+              v-if="timeEleType[query.timeType] === 'monthrange'"
+              v-model="query.time"
               :type="timeEleType[query.timeType]"
-              placeholder="选择日期">
+              placeholder="选择开始日期"
+              start-placeholder="开始日期"
+              end-placeholder="结束日期">
             </el-date-picker>
+            <YearRange
+              v-else
+              v-model="query.time"
+            ></YearRange>
           </el-form-item>
           <div class="searchBtn">
             <el-button
@@ -67,6 +74,7 @@
 import {
   getAllCountWorkCount
 } from "@/api/manage/mission";
+import YearRange from "@/components/yearRange/index.vue";
 import {missionState} from "@/common/dic";
 import {dateFormat} from "@/util/date";
 
@@ -82,11 +90,12 @@ let times = [
 ]
 let timeEleType = {
   3: 'year',
-  1: 'month',
+  1: 'monthrange',
   // 3: 'week',
 }
 export default {
   name: 'supplyDemand',
+  components: {YearRange},
   data() {
     return {
       types,
@@ -153,25 +162,12 @@ export default {
   },
   methods: {
     searchTabs() {
-      let date = null
-      switch (this.query.timeType) {
-        case 3:
-          date = new Date(this.query.stime);
-          date.setFullYear(date.getFullYear() + 1)
-          this.query.etime = date
-          break
-        case 1:
-          date = new Date(this.query.stime);
-          date.setMonth(date.getMonth() + 1)
-          this.query.etime = date
-          break
-      }
       this.getDetail()
     },
     searchReset() {
       this.query = {
         type: 0,
-        time: 1
+        timeType: 1
       }
       this.getDetail()
     },
@@ -179,12 +175,16 @@ export default {
       let params = {
         ...this.query,
       }
-      if (params.stime) {
-        params.stime = dateFormat(params.stime, 'yyyy-MM-dd hh:mm:ss')
-      }
-      if (params.etime) {
-        params.etime = dateFormat(params.etime, 'yyyy-MM-dd hh:mm:ss')
+      if (params.type === 2 && params.timeType) {
+        if (params.time && params.time.length === 2) {
+          params.stime = dateFormat(typeof params.time[0] === 'string' ? new Date(params.time[0]) : params.time[0], 'yyyy-MM-dd hh:mm:ss')
+          params.etime = dateFormat(typeof params.time[1] === 'string' ? new Date(params.time[1]) : params.time[1], 'yyyy-MM-dd hh:mm:ss')
+          delete params.time
+        } else {
+          return this.$message({type: "info", message: "请选择日期"});
+        }
       }
+
       let resData = await getAllCountWorkCount(params)
       if (resData.data.code === 200) {
         console.log(resData.data)