diff --git a/src/views/modules/base/community/community.vue b/src/views/modules/base/community/community.vue
index 6f3f31ad1..1d77ba215 100644
--- a/src/views/modules/base/community/community.vue
+++ b/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();
diff --git a/src/views/modules/base/community/communityForm.vue b/src/views/modules/base/community/communityForm.vue
index 38165d01e..542d2549b 100644
--- a/src/views/modules/base/community/communityForm.vue
+++ b/src/views/modules/base/community/communityForm.vue
@@ -54,7 +54,7 @@
style="display: block">
diff --git a/src/views/modules/base/community/roomForm.vue b/src/views/modules/base/community/roomForm.vue
index 4272d894b..2174f6213 100644
--- a/src/views/modules/base/community/roomForm.vue
+++ b/src/views/modules/base/community/roomForm.vue
@@ -42,7 +42,7 @@
style="display: block">
@@ -55,14 +55,14 @@
-
-
+ -->
-
diff --git a/src/views/modules/base/resi.vue b/src/views/modules/base/resi.vue
index 8ff6492bb..943865d47 100644
--- a/src/views/modules/base/resi.vue
+++ b/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 = "";