diff --git a/src/views/modules/shequzhili/statics/cEvent.vue b/src/views/modules/shequzhili/statics/cEvent.vue
index 03d2aad5b..80b02473b 100644
--- a/src/views/modules/shequzhili/statics/cEvent.vue
+++ b/src/views/modules/shequzhili/statics/cEvent.vue
@@ -13,16 +13,16 @@
-->
+ prop="startDate">
+ value-format="yyyyMMddHHmmss">
@@ -48,8 +48,14 @@
:height="tableHeight">
+
+
+ {{scope.row.orgName}}
+ {{scope.row.orgName}}
+
+
-
+
@@ -78,8 +84,9 @@
style="width: 100%"
height="200">
-
+
+
@@ -109,15 +116,15 @@ export default {
totalVisible: false,
pickerOptions: {
disabledDate(time) {
- return time.getTime() > (Date.now() - 3600 * 1000 * 24);
+ return time.getTime() > Date.now();
},
},
dataList: [],
timeRange: '',
dataForm: {
agencyId: '',
- startTime: '',
- endTime: '',
+ startDate: '',
+ endDate: '',
type: ''
},
total: 0,
@@ -137,11 +144,11 @@ export default {
watch: {
timeRange (val) {
if (Array.isArray(val) && val.length == 2) {
- this.dataForm.startTime = val[0];
- this.dataForm.endTime = val[1];
+ this.dataForm.startDate = val[0];
+ this.dataForm.endDate = val[1];
} else {
- this.dataForm.startTime = "";
- this.dataForm.endTime = "";
+ this.dataForm.startDate = "";
+ this.dataForm.endDate = "";
}
}
},
@@ -154,11 +161,15 @@ export default {
},
},
methods: {
+ handleClick(row) {
+ this.dataForm.agencyId = row.orgId
+ this.handleSearch()
+ },
resetForm(formName) {
this.$refs[formName].resetFields();
this.timeRange = "";
- this.dataForm.startTime = "";
- this.dataForm.endTime = "";
+ this.dataForm.startDate = "";
+ this.dataForm.endDate = "";
this.dataForm.type = "";
this.pageNo = 1
this.getTableList()
diff --git a/src/views/modules/shequzhili/statics/gridEvent.vue b/src/views/modules/shequzhili/statics/gridEvent.vue
index af24a50e8..55cf91432 100644
--- a/src/views/modules/shequzhili/statics/gridEvent.vue
+++ b/src/views/modules/shequzhili/statics/gridEvent.vue
@@ -17,16 +17,16 @@
-->
+ prop="startDate">
+ value-format="yyyyMMddHHmmss">
@@ -52,6 +52,7 @@
:height="tableHeight">
+
@@ -110,14 +111,14 @@ export default {
totalVisible: false,
pickerOptions: {
disabledDate(time) {
- return time.getTime() > (Date.now() - 3600 * 1000 * 24);
+ return time.getTime() > Date.now();
},
},
timeRange: '',
dataForm: {
orgId: '',
- startTime: '',
- endTime: '',
+ startDate: '',
+ endDate: '',
orgType: ''
},
total: 0,
@@ -138,11 +139,11 @@ export default {
watch: {
timeRange (val) {
if (Array.isArray(val) && val.length == 2) {
- this.dataForm.startTime = val[0];
- this.dataForm.endTime = val[1];
+ this.dataForm.startDate = val[0];
+ this.dataForm.endDate = val[1];
} else {
- this.dataForm.startTime = "";
- this.dataForm.endTime = "";
+ this.dataForm.startDate = "";
+ this.dataForm.endDate = "";
}
}
},
@@ -165,8 +166,8 @@ export default {
this.$refs[formName].resetFields();
this.timeRange = "";
this.orgId = ''
- this.dataForm.startTime = "";
- this.dataForm.endTime = "";
+ this.dataForm.startDate = "";
+ this.dataForm.endDate = "";
this.dataForm.orgType = "";
this.handleSearch();
},