Merge branch 'new5_25home' of http://39.108.172.131:3000/Shannon_mu/SmartCommunity into new5_25home

operationSupport/src/views/parkingLotAdministration/pageJump/parkingLotSaveEdits.vue

@@ -174,8 +174,9 @@ export default {
         },
 
         communityChoice(e) {
-            console.log(e);
             this.ruleForm.communityId = e;
+            this.ruleForm.garageAreaId = '';
+            this.ruleForm.garageId = ''
             this.garageNameList();
         },
 
@@ -196,6 +197,7 @@ export default {
 
         garageChoice(e) {
             this.ruleForm.garageId = e;
+            this.ruleForm.garageAreaId = '';
             this.garageAreaListQuery();
         },
 
@@ -223,6 +225,8 @@ export default {
         if (this.params.todo == 'edit') {
             this.codingStatus = false;
             this.ruleForm = this.params.data;
+            this.garageNameList()
+            this.garageAreaListQuery()
         }
     }
 };

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

@@ -23,10 +23,12 @@
                 <div class="schedulingUser">
                     <template v-for="(item, index) in calendarData">
                         <div :key="index" v-if="data.day == item.partrolDate">
-                            <div :key="itx" class="listTime" v-for="itx in item.rosterUserDtos">
-                                <span>{{ itx.partrolTime }}</span>
-                                <span>{{ itx.partolName }}</span>
-                            </div>
+                            <template v-for="(itx, inxs) in item.rosterUserDtos">
+                                <div :key="inxs" class="listTime" v-if="thisDayOfStaDay(data)">
+                                    <span>{{ itx.partrolTime }}</span>
+                                    <span>{{ itx.partolName }}</span>
+                                </div>
+                            </template>
                             <template
                                 v-if="
                                     date.getTime() <= $moment(zeroTetracosa(thisObj.endDate)).valueOf() &&
@@ -35,7 +37,9 @@
                             >
                                 <!-- 每周那几天 -->
                                 <span v-if="thisObj.periodType == 1">
-                                    <template v-if="periodValueType(thisObj.periodValue).includes(date.getDay() + '')">
+                                    <template
+                                        v-if="periodValueType(thisObj.periodValue).includes(date.getDay() + '') && thisDayOfStaDay(data)"
+                                    >
                                         <div class="pointSet" @click="addItem(date, data, item)">点击设置</div>
                                     </template>
                                 </span>
@@ -58,7 +62,7 @@
                     >
                         <!-- 每周那几天 -->
                         <span v-if="thisObj.periodType == 1">
-                            <template v-if="periodValueType(thisObj.periodValue).includes(date.getDay() + '')">
+                            <template v-if="periodValueType(thisObj.periodValue).includes(date.getDay() + '') && thisDayOfStaDay(data)">
                                 <div class="pointSet" @click="add(data)">点击设置</div>
                             </template>
                         </span>
@@ -256,6 +260,11 @@ export default {
 
             return sur;
         },
+        thisDayOfStaDay(data) {
+            let startDate = this.$moment(this.thisObj.startDate).valueOf();
+            let thisDate = this.$moment(data.day + ' 00:00:00').valueOf();
+            return startDate <= thisDate;
+        },
         thisTimeFF(s, arr) {
             let thisDate = this.$moment(new Date());
             let sur = false;