Merge branch 'dev' of http://git.elinkit.com.cn:7070/r/epmet-work-pc into dev

src/views/modules/base/community/community.vue

@@ -124,7 +124,7 @@
                 class="u-item-width-daterange"
                 size="small"
                 type="date"
-                value-format="yyyyMMdd"
+                value-format="yyyy-MM-dd HH:mm:ss"
                 value="yyyy-MM-dd"
                 placeholder="开始时间"
               >
@@ -136,7 +136,7 @@
                 class="u-item-width-daterange u-data-tag"
                 size="small"
                 type="date"
-                value-format="yyyyMMdd"
+                value-format="yyyy-MM-dd HH:mm:ss"
                 value="yyyy-MM-dd"
                 placeholder="结束时间"
               >
@@ -356,6 +356,30 @@ export default {
         return time.getTime() > nowData;
       }
     };
+    // let endDisabledDate = (time) => {
+    //   //这个关键属性我们一定要写在data的里面并且return的外面，这是动态改变区间的关键
+    //   let nowData = Date.now();
+    //   // if (this.updateStartDate) {
+    //   //   let startTime = new Date(this.updateStartDate);
+    //   //   return (
+    //   //     time.getTime() > nowData ||
+    //   //     time.getTime() < startTime ||
+    //   //     time.getTime() === startTime
+    //   //   );
+    //   // } else {
+    //   //   return time.getTime() > nowData;
+    //   // }
+    //   if (this.updateStartDate) {
+    //     let startTime = new Date(this.updateStartDate);
+    //     return (
+    //       time.getTime() > nowData ||
+    //       time.getTime() < startTime ||
+    //       time.getTime() === startTime
+    //     );
+    //   } else {
+    //     return time.getTime() > nowData;
+    //   }
+    // };
     let startDisabledDate = (time) => {
       //这个关键属性我们一定要写在data的里面并且return的外面，这是动态改变区间的关键
       let nowData = Date.now();

src/views/modules/base/community/communityForm.vue

@@ -54,7 +54,7 @@
                         style="display: block">
             <el-input class="u-edit-width-normal"
                       maxlength="50"
-                      placeholder="请输入楼栋编码"
+                      placeholder="请输入小区编码"
                       v-model="dataForm.coding">
 
             </el-input>

src/views/modules/base/community/roomForm.vue

@@ -42,7 +42,7 @@
                       style="display: block">
           <el-input class="u-edit-width-normal"
                     maxlength="50"
-                    placeholder="请输入楼栋编码"
+                    placeholder="请输入房屋编码"
                     v-model="dataForm.coding">
 
           </el-input>
@@ -55,14 +55,14 @@
 
         </el-form-item>
 
-        <el-form-item label="房屋编码"
+        <!-- <el-form-item label="房屋编码"
                       prop="houseCode"
                       style="display: block">
           <el-input class="u-edit-width-normal"
                     maxlength="30"
                     v-model="dataForm.houseCode">
           </el-input>
-        </el-form-item>
+        </el-form-item> -->
 
         <el-form-item v-if="dataForm.houseQrcodeUrl"
                       label="二维码"
@@ -148,12 +148,12 @@
                     v-model="dataForm.ownerName">
           </el-input>
         </el-form-item>
-        <el-form-item label="联系方式"
+        <el-form-item label="联系电话"
                       prop="ownerPhone"
                       style="display: block">
           <el-input class="u-edit-width-normal"
                     type='number'
-                    placeholder="请输入联系方式"
+                    placeholder="请输入联系电话"
                     v-model="dataForm.ownerPhone">
           </el-input>
         </el-form-item>

src/views/modules/base/resi.vue

@@ -989,6 +989,8 @@ export default {
 		handleCurrentChange(val) {
 			console.log(`当前页: ${val}`);
 			let obj = this.$refs.myResiSearch.form;
+			let categoryArr = this.$refs.myResiSearch.form.categoryKey;
+			let agencyId = this.$refs.myResiSearch.form.agencyId;
 			if (
 				typeof obj.categoryKey == "object" &&
 				obj.categoryKey.length != 0
@@ -1004,6 +1006,8 @@ export default {
 			}
 			this.currentPage = val;
 			this.getTableData(obj);
+			this.$refs.myResiSearch.form.categoryKey = categoryArr;
+			this.$refs.myResiSearch.form.agencyId = agencyId;
 		},
 		handleFilterSpan(row, item) {
 			let _val = "";