修复bug

operationSupport/src/views/newWorkBench/components/collectionRate.vue

@@ -3,22 +3,41 @@
         <div class="model-title">
             <div class="model-title-text">收款率分析</div>
             <div class="model-title-right">
-                <el-select v-model="mixins_query.communityId" placeholder="所有社区" clearable class="saveColumn-select" @change="getData">
-                    <el-option v-for="(item, index) in communityList" :label="item.communityName" :value="item.id" :key="index"></el-option>
-                </el-select>
-                <el-select v-model="mixins_query.chargeType" placeholder="所有费用" clearable class="saveColumn-select" @change="getData">
-                    <el-option v-for="(item, index) in amountType" :label="item.name" :value="item.value" :key="index"></el-option>
-                </el-select>
                 <el-date-picker
                     value-format="yyyy-MM"
                     v-model="date"
                     type="month"
                     placeholder="选择月"
-                    class="saveColumn-select"
+                    class="saveColumn-select saveColumn-select-time"
                     @change="changeTime"
                     :clearable="false"
                 >
                 </el-date-picker>
+                <div>
+                    <el-select
+                        v-model="mixins_query.communityId"
+                        placeholder="所有社区"
+                        clearable
+                        class="saveColumn-select"
+                        @change="getData"
+                    >
+                        <el-option
+                            v-for="(item, index) in communityList"
+                            :label="item.communityName"
+                            :value="item.id"
+                            :key="index"
+                        ></el-option>
+                    </el-select>
+                    <el-select
+                        v-model="mixins_query.chargeType"
+                        placeholder="所有费用"
+                        clearable
+                        class="saveColumn-select"
+                        @change="getData"
+                    >
+                        <el-option v-for="(item, index) in amountType" :label="item.name" :value="item.value" :key="index"></el-option>
+                    </el-select>
+                </div>
             </div>
         </div>
         <div class="model-content">
@@ -141,12 +160,22 @@ export default {
 <style scoped lang="scss">
 @import './style.scss';
 .modelBlock {
+    .model-content {
+        height: calc(100% - #{rem(80)});
+    }
     .model-title {
         .saveColumn-select {
-            width: rem(80);
+            width: calc(50% - 5px);
+        }
+        .saveColumn-select-time {
+            width: 100%;
+            margin-bottom: rem(5);
         }
     }
 }
+.model-title-right {
+    width: calc(100% - #{rem(100)});
+}
 // .indexWorkbench {
 //     .modelBlock {
 //         .model-title {

operationSupport/src/views/patrolManagement/patrolRoute.vue

@@ -22,7 +22,9 @@
                 :pageset="mixins_pageset"
                 @page-change="pageChange"
             >
-                <template slot-scope="scope" slot="startDate"> {{ checkDateType(scope.row.startDate) }}</template>
+                <template slot-scope="scope" slot="startDate">
+                    {{ checkDateType(scope.row.startDate)}}{{ '至' + checkDateType(scope.row.endDate) }}</template
+                >
                 <template slot-scope="scope" slot="periodValue">{{
                     scope.row.periodType == 1 ? `每周${periodValueType(scope.row.periodValue)}` : `每隔${scope.row.periodValue}天`
                 }}</template>

operationSupport/src/views/patrolManagement/popups/scheduling.vue

@@ -97,8 +97,8 @@ export default {
                 let time = new Date(timeArr[0], Number(timeArr[1]), 0);
                 this.getShiftInformation({
                     patrolRouteId: this.thisObj.id,
-                    startTime: `${timeArr[0]}-${timeArr[1]}-01`,
-                    endTime: `${timeArr[0]}-${timeArr[1]}-${time.getDate()}`
+                    startTime: `${timeArr[0]}-${timeArr[1]}-01 00:00:00`,
+                    endTime: `${timeArr[0]}-${timeArr[1]}-${time.getDate()} 23:59:59`
                 });
             } catch {}
         }