Merge branch 'dev-statics'

src/views/modules/shequzhili/statics/cEvent.vue

@@ -114,7 +114,7 @@ export default {
       totalVisible: false,
       pickerOptions: {
         disabledDate(time) {
-            return time.getTime() > (Date.now() - 3600 * 1000 * 24);
+            return time.getTime() > Date.now();
           },
       },
       dataList: [],

src/views/modules/shequzhili/statics/gridEvent.vue

@@ -52,8 +52,9 @@
       :height="tableHeight">
         <!-- <el-table-column type="selection" header-align="center" align="center" width="50"></el-table-column> -->
         <el-table-column type="index" label="序号" header-align="center" align="center" width="50"></el-table-column>
-        <el-table-column min-width="100" prop="staffName" label="网格员" header-align="center" align="center" />
         <el-table-column min-width="100" prop="orgName" label="所属社区" header-align="center" align="center" />
+        <el-table-column min-width="100" prop="staffName" label="网格员" header-align="center" align="center" />
+        
         <el-table-column min-width="100" prop="projectCount" label="上报数量" header-align="center" align="center" />
         <el-table-column min-width="110" prop="closedCount" label="办结数" header-align="center" align="center" />
       </el-table>
@@ -110,7 +111,7 @@ export default {
       totalVisible: false,
       pickerOptions: {
         disabledDate(time) {
-            return time.getTime() > (Date.now() - 3600 * 1000 * 24);
+            return time.getTime() > Date.now();
           },
       },
       timeRange: '',