From e4e1be720ccd1d864cf820ef116fe05167aca4fa Mon Sep 17 00:00:00 2001
From: lin <sbla5888@163.com>
Date: Sat, 23 Mar 2024 14:09:13 +0800
Subject: [PATCH] 维修基金筛选

---
 src/views/propertySupervision/components/done.vue |  473 +++++----
 src/views/property/components/todo.vue            |  742 +++++++------
 src/views/article/rotation.vue                    |   21 
 src/views/article/components/deitDiscussion.vue   |   36 
 src/views/property/components/done.vue            |  473 +++++----
 src/views/gzll/components/todo.vue                |   45 
 src/views/gzll/components/done.vue                |  473 +++++----
 src/views/propertySupervision/components/todo.vue |  744 +++++++------
 8 files changed, 1,653 insertions(+), 1,354 deletions(-)

diff --git a/src/views/article/components/deitDiscussion.vue b/src/views/article/components/deitDiscussion.vue
index a706041..d57f9fc 100644
--- a/src/views/article/components/deitDiscussion.vue
+++ b/src/views/article/components/deitDiscussion.vue
@@ -140,11 +140,11 @@
               button: true,
               row: true,
               dicData: [{
-                label: '多选',
-                value: 1
-              }, {
                 label: '单选',
                 value: 0
+              }, {
+                label: '多选',
+                value: 1
               }],
               rules: [{
                 required: true,
@@ -153,14 +153,40 @@
               }],
             },
             {
-              label: '最多选择数',
+              label: '选项必填',
+              prop: 'mandatoryFlag',
+              type: 'radio',
+              value: 1,
+              button: true,
+              row: true,
+              dicData: [{
+                label: '否',
+                value: 1
+              }, {
+                label: '是',
+                value: 2
+              }],
+              rules: [{
+                required: true,
+                message: '请选择是否必填',
+                trigger: 'blur'
+              }],
+            },
+            {
+              label: '最多可选',
               prop: 'optionNumber',
               display: false,
               min: 1,
               type: 'number',
               step: 1,
-              value: 1
+              value: 1,
+              rules: [{
+                required: true,
+                message: '请输入最多可选择数量',
+                trigger: 'blur'
+              }],
             },
+
             {
               label: '选项内容',
               prop: 'children',
diff --git a/src/views/article/rotation.vue b/src/views/article/rotation.vue
index 29b02be..195193e 100644
--- a/src/views/article/rotation.vue
+++ b/src/views/article/rotation.vue
@@ -102,6 +102,7 @@
               prop: "publicFlag",
               span: 12,
               searchSpan: 4,
+              type: "select",
               // search: true,
               // cascader: ["communityCode"],
               type: "select",
@@ -270,6 +271,13 @@
     },
     methods: {
       rowSave(row, done, loading) {
+        if (row.rotationRange) {
+          row.rotationRange = JSON.stringify(row.rotationRange)
+        }
+        if (row.publicFlag == 2) {
+          row.rotationRange = []
+          row.rotationRange = JSON.stringify(row.rotationRange)
+        }
         if (row.url.length > 0) {
           var urls = []
           var split = row.url.split(",")
@@ -295,6 +303,13 @@
         )
       },
       rowUpdate(row, index, done, loading) {
+        if (row.rotationRange) {
+          row.rotationRange = JSON.stringify(row.rotationRange)
+        }
+        if (row.publicFlag == 2) {
+          row.rotationRange = []
+          row.rotationRange = JSON.stringify(row.rotationRange)
+        }
         if (row.url.length > 0) {
           var urls = []
           var split = row.url.split(",")
@@ -379,6 +394,9 @@
         if (["edit", "view"].includes(type)) {
           getRotation(this.form.id).then((res) => {
             this.form = res.data.data
+            if (this.form.rotationRange) {
+              this.form.rotationRange = JSON.parse(this.form.rotationRange)
+            }
             if (this.form.url.length > 0) {
               var urls = []
               var names = this.form.url.split(",")
@@ -432,6 +450,9 @@
           this.page.total = data.total
           this.data = data.records
           this.data.forEach(item => {
+            if (item.rotationRange) {
+              item.rotationRange = JSON.parse(item.rotationRange)
+            }
             if (item.url.length > 0) {
               var urls = []
               var names = item.url.split(",")
diff --git a/src/views/gzll/components/done.vue b/src/views/gzll/components/done.vue
index 9d502e0..8384b6d 100644
--- a/src/views/gzll/components/done.vue
+++ b/src/views/gzll/components/done.vue
@@ -1,238 +1,281 @@
 <template>
-    <div>
-        <avue-crud :option="option" :table-loading="loading" :data="data" ref="crud" v-model="form" :page.sync="page"
-            @search-change="searchChange" @search-reset="searchReset" @selection-change="selectionChange"
-            @current-change="currentChange" @size-change="sizeChange" @refresh-change="refreshChange" @on-load="onLoad">
-            <template slot-scope="{row, size, index}" slot="menu">
-                <el-button type="text" :size="size" icon="el-icon-info" v-if="permission.gzll_todo_detail"
-                    @click.stop="handleDetail(row)">详情
-                </el-button>
-                <el-button type="text" :size="size" icon="el-icon-search" v-if="permission.gzll_todo_follow"
-                    @click.stop="handleImage(row, index)">流程图
-                </el-button>
-            </template>
-            <template slot-scope="{row, size}" slot="processDefinitionVersion">
-                <el-tag :size="size">v{{ row.processDefinitionVersion }}</el-tag>
-            </template>
-            <template slot-scope="{row, size}" slot="linkPhone">
-                <el-button :size="size" type="text" @click="showStringDispose(row, 'linkPhoneflag')"
-                    v-text="textDispose(row, 'linkPhoneflag', 'linkPhone')">
-                </el-button>
-            </template>
-        </avue-crud>
-        <flow-design is-dialog :is-display.sync="flowBox" :process-instance-id="processInstanceId"></flow-design>
-    </div>
+  <div>
+    <avue-crud :option="option" :table-loading="loading" :data="data" ref="crud" v-model="form" :page.sync="page"
+      @search-change="searchChange" @search-reset="searchReset" @selection-change="selectionChange"
+      @current-change="currentChange" @size-change="sizeChange" @refresh-change="refreshChange" @on-load="onLoad">
+      <template slot-scope="{row, size, index}" slot="menu">
+        <el-button type="text" :size="size" icon="el-icon-info" v-if="permission.gzll_todo_detail"
+          @click.stop="handleDetail(row)">详情
+        </el-button>
+        <el-button type="text" :size="size" icon="el-icon-search" v-if="permission.gzll_todo_follow"
+          @click.stop="handleImage(row, index)">流程图
+        </el-button>
+      </template>
+      <template slot-scope="{row, size}" slot="processDefinitionVersion">
+        <el-tag :size="size">v{{ row.processDefinitionVersion }}</el-tag>
+      </template>
+      <template slot-scope="{row, size}" slot="linkPhone">
+        <el-button :size="size" type="text" @click="showStringDispose(row, 'linkPhoneflag')"
+          v-text="textDispose(row, 'linkPhoneflag', 'linkPhone')">
+        </el-button>
+      </template>
+    </avue-crud>
+    <flow-design is-dialog :is-display.sync="flowBox" :process-instance-id="processInstanceId"></flow-design>
+  </div>
 </template>
 
 <script>
-import {
+  import {
     mapGetters
-} from "vuex"
-import {
+  } from "vuex"
+  import {
     doneList
-} from "@/api/work/work"
-import {
+  } from "@/api/work/work"
+  import {
     flowCategory,
     flowRoute
-} from "@/util/flow"
+  } from "@/util/flow"
 
-export default {
-    data () {
-        return {
-            form: {},
-            selectionId: '',
-            selectionList: [],
-            query: {},
-            loading: true,
-            page: {
-                pageSize: 10,
-                currentPage: 1,
-                total: 0
-            },
-            processInstanceId: '',
-            flowBox: false,
-            workBox: false,
-            option: {
-                labelWidth: 120,
-                searchLabelWidth: 96,
-                searchShow: true,
-                searchMenuSpan: 3,
-                menuWidth: 140,
+  export default {
+    data() {
+      return {
+        datetime: "",
+        form: {},
+        selectionId: '',
+        selectionList: [],
+        query: {},
+        loading: true,
+        page: {
+          pageSize: 10,
+          currentPage: 1,
+          total: 0
+        },
+        processInstanceId: '',
+        flowBox: false,
+        workBox: false,
+        option: {
+          labelWidth: 120,
+          searchLabelWidth: 96,
+          searchShow: true,
+          searchMenuSpan: 3,
+          menuWidth: 140,
 
-                height: 'auto',
-                calcHeight: 30,
-                tip: false,
-                border: true,
-                index: true,
-                // selection: true,
-                editBtn: false,
-                addBtn: false,
-                viewBtn: false,
-                delBtn: false,
-                columnBtn: false,
-                dialogWidth: 900,
-                dialogClickModal: false,
-                header: false,
-                column: [
-                    {
-                        label: "流程分类",
-                        type: "select",
-                        row: true,
-                        dicUrl: "/api/blade-system/dict/dictionary?code=flow",
-                        props: {
-                            label: "dictValue",
-                            value: "dictKey"
-                        },
-                        dataType: "number",
-                        slot: true,
-                        prop: "category",
-                        // search: true,
-                        hide: true,
-                        width: 100,
-                    },
-                    {
-                        width: 100,
-                        label: '申请类型',
-                        prop: 'categoryName',
-                        // search: true,
-                    }, {
-                        width: 220,
-                        overHidden: true,
-                        label: "小区",
-                        prop: "districtId",
-                        searchSpan: 5,
-                        // search: true,
-                        type: 'tree',
-                        dicUrl: `/api/blade-district/district/getDistrictTree`,
-                        props: {
-                            label: "name",
-                            value: "id"
-                        },
-                        defaultExpandedKeys: ["361102003"],
-                        span: 12,
-                    }, {
-                        width: 110,
-                        label: '联系人',
-                        prop: 'linkman',
-                        // search: true,
-                    }, {
-                        width: 120,
-                        label: '联系电话',
-                        prop: 'linkPhone',
-                        // search: true,
-                        slot: true
-                    }, {
-                        label: '项目名称',
-                        prop: 'name',
-                        // search: true,
-                    },
-                    {
-                        label: '当前步骤',
-                        prop: 'taskName',
-                    },
-                    // {
-                    //     label: '流程版本',
-                    //     prop: 'processDefinitionVersion',
-                    //     slot: true,
-                    //     width: 80,
-                    // },
-                    {
-                        width: 144,
-                        label: '申请时间',
-                        prop: 'createTime',
-                    },
-                ]
+          height: 'auto',
+          calcHeight: 30,
+          tip: false,
+          border: true,
+          index: true,
+          // selection: true,
+          editBtn: false,
+          addBtn: false,
+          viewBtn: false,
+          delBtn: false,
+          columnBtn: false,
+          dialogWidth: 900,
+          dialogClickModal: false,
+          header: false,
+          column: [{
+              label: "流程分类",
+              type: "select",
+              row: true,
+              dicUrl: "/api/blade-system/dict/dictionary?code=flow",
+              props: {
+                label: "dictValue",
+                value: "dictKey"
+              },
+              dataType: "number",
+              slot: true,
+              prop: "category",
+              // search: true,
+              hide: true,
+              width: 100,
             },
-            data: []
-        }
+            {
+              width: 110,
+              label: '小区名称',
+              prop: 'districtName',
+              search: true,
+              hide: true,
+            }, {
+              label: '项目名称',
+              prop: 'name',
+              search: true,
+            },
+            {
+              label: "申请时间",
+              prop: "dateTime",
+              type: "datetimerange",
+              defaultTime: ['00:00:00', '23:59:59'],
+              format: 'yyyy-MM-dd HH:mm:ss',
+              valueFormat: 'yyyy-MM-dd HH:mm:ss',
+              startPlaceholder: '开始范围自定义',
+              endPlaceholder: '结束范围自定义',
+              searchSpan: 5,
+              searchRange: true,
+              hide: true,
+              addDisplay: false,
+              editDisplay: false,
+              viewDisplay: false,
+              search: true,
+              rules: [{
+                required: true,
+                message: "请选择申请时间",
+                trigger: "blur",
+              }, ],
+            },
+            {
+              width: 100,
+              label: '申请类型',
+              prop: 'categoryName',
+              // search: true,
+            }, {
+              width: 220,
+              overHidden: true,
+              label: "小区",
+              prop: "districtId",
+              searchSpan: 5,
+              // search: true,
+              type: 'tree',
+              dicUrl: `/api/blade-district/district/getDistrictTree`,
+              props: {
+                label: "name",
+                value: "id"
+              },
+              defaultExpandedKeys: ["361102003"],
+              span: 12,
+            }, {
+              width: 110,
+              label: '联系人',
+              prop: 'linkman',
+              // search: true,
+            }, {
+              width: 120,
+              label: '联系电话',
+              prop: 'linkPhone',
+              // search: true,
+              slot: true
+            }, {
+              label: '项目名称',
+              prop: 'name',
+              // search: true,
+            },
+            {
+              label: '当前步骤',
+              prop: 'taskName',
+            },
+            // {
+            //     label: '流程版本',
+            //     prop: 'processDefinitionVersion',
+            //     slot: true,
+            //     width: 80,
+            // },
+            {
+              width: 144,
+              label: '申请时间',
+              prop: 'createTime',
+            },
+          ]
+        },
+        data: []
+      }
     },
 
     computed: {
-        ...mapGetters(["permission", "flowRoutes"]),
-        ids () {
-            let ids = []
-            this.selectionList.forEach(ele => {
-                ids.push(ele.id)
-            })
-            return ids.join(",")
-        },
-        textDispose () {
-            return (row, flag, type) => {
-                if (row[flag] || row[type] == null) {
-                    return row[type]
-                } else {
-                    if (type == 'principalIdCard') {
-                        return row[type].replace(/^(.{6})(?:\d+)(.{4})$/, "$1******$2")
-                    } else {
-                        return row[type].replace(/^(.{3})(?:\d+)(.{4})$/, "$1****$2")
-                    }
-                }
+      ...mapGetters(["permission", "flowRoutes"]),
+      ids() {
+        let ids = []
+        this.selectionList.forEach(ele => {
+          ids.push(ele.id)
+        })
+        return ids.join(",")
+      },
+      textDispose() {
+        return (row, flag, type) => {
+          if (row[flag] || row[type] == null) {
+            return row[type]
+          } else {
+            if (type == 'principalIdCard') {
+              return row[type].replace(/^(.{6})(?:\d+)(.{4})$/, "$1******$2")
+            } else {
+              return row[type].replace(/^(.{3})(?:\d+)(.{4})$/, "$1****$2")
             }
+          }
         }
+      }
     },
 
     methods: {
-        showStringDispose (row, type) {
-            row[type] = !row[type]
-        },
+      showStringDispose(row, type) {
+        row[type] = !row[type]
+      },
 
-        searchReset () {
-            this.query = {}
-            this.onLoad(this.page)
-        },
-        searchChange (params, done) {
-            this.query = params
-            this.page.currentPage = 1
-            this.onLoad(this.page, params)
-            done()
-        },
-        selectionChange (list) {
-            this.selectionList = list
-        },
-        selectionClear () {
-            this.selectionList = []
-            this.$refs.crud.toggleSelection()
-        },
-        handleDetail (row) {
-            this.$router.push({
-                path: `/gzll/process/${flowRoute(this.flowRoutes, row.category)}/detail/${row.processInstanceId}/${row.businessId}`
-            })
-        },
-        handleImage (row) {
-            this.processInstanceId = row.processInstanceId
-            this.flowBox = true
-        },
-        currentChange (currentPage) {
-            this.page.currentPage = currentPage
-        },
-        sizeChange (pageSize) {
-            this.page.pageSize = pageSize
-        },
-        refreshChange () {
-            this.onLoad(this.page, this.query)
-        },
-        onLoad (page, params = {}) {
-            const query = {
-                ...this.query,
-                category: (params.category) ? flowCategory(params.category) : null
-            }
-            this.loading = true
-            doneList(page.currentPage, page.pageSize, Object.assign(params, query)).then(res => {
-                const data = {
-                    ...res.data.data,
-                    records: res.data.data.records.map(item => {
-                        return {
-                            ...item,
-                            'linkPhoneflag': false
-                        }
-                    })
-                }
-                this.page.total = data.total
-                this.data = data.records
-                this.loading = false
-                this.selectionClear()
-            })
+      searchReset() {
+        this.query = {}
+        this.onLoad(this.page)
+      },
+      searchChange(params, done) {
+        this.query = params
+        this.page.currentPage = 1
+        this.onLoad(this.page, params)
+        done()
+      },
+      selectionChange(list) {
+        this.selectionList = list
+      },
+      selectionClear() {
+        this.selectionList = []
+        this.$refs.crud.toggleSelection()
+      },
+      handleDetail(row) {
+        this.$router.push({
+          path: `/gzll/process/${flowRoute(this.flowRoutes, row.category)}/detail/${row.processInstanceId}/${row.businessId}`
+        })
+      },
+      handleImage(row) {
+        this.processInstanceId = row.processInstanceId
+        this.flowBox = true
+      },
+      currentChange(currentPage) {
+        this.page.currentPage = currentPage
+      },
+      sizeChange(pageSize) {
+        this.page.pageSize = pageSize
+      },
+      refreshChange() {
+        this.onLoad(this.page, this.query)
+      },
+      onLoad(page, params = {}) {
+        let query = {
+          ...this.query,
+          category: (params.category) ? flowCategory(params.category) : null
         }
+        const {
+          dateTime
+        } = query
+
+        if (dateTime) {
+          query = {
+            startTimes: dateTime[0],
+            endTimes: dateTime[1],
+          }
+        }
+        this.loading = true
+        doneList(page.currentPage, page.pageSize, Object.assign(params, query)).then(res => {
+          const data = {
+            ...res.data.data,
+            records: res.data.data.records.map(item => {
+              return {
+                ...item,
+                'linkPhoneflag': false
+              }
+            })
+          }
+          this.page.total = data.total
+          this.data = data.records
+          this.loading = false
+          this.selectionClear()
+        })
+      }
     }
-}
+  }
 </script>
\ No newline at end of file
diff --git a/src/views/gzll/components/todo.vue b/src/views/gzll/components/todo.vue
index 1eb60ac..0f911ff 100644
--- a/src/views/gzll/components/todo.vue
+++ b/src/views/gzll/components/todo.vue
@@ -43,6 +43,7 @@
   export default {
     data() {
       return {
+        datetime: "",
         typeStatus: 1,
         form: {},
         selectionId: '',
@@ -123,6 +124,32 @@
               prop: 'districtName',
               search: true,
               hide: true,
+            }, {
+              label: '项目名称',
+              prop: 'name',
+              search: true,
+            },
+            {
+              label: "申请时间",
+              prop: "dateTime",
+              type: "datetimerange",
+              defaultTime: ['00:00:00', '23:59:59'],
+              format: 'yyyy-MM-dd HH:mm:ss',
+              valueFormat: 'yyyy-MM-dd HH:mm:ss',
+              startPlaceholder: '开始范围自定义',
+              endPlaceholder: '结束范围自定义',
+              searchSpan: 5,
+              searchRange: true,
+              hide: true,
+              addDisplay: false,
+              editDisplay: false,
+              viewDisplay: false,
+              search: true,
+              rules: [{
+                required: true,
+                message: "请选择申请时间",
+                trigger: "blur",
+              }, ],
             },
             {
               width: 110,
@@ -137,11 +164,7 @@
               // search: true,
               slot: true
             },
-            {
-              label: '项目名称',
-              prop: 'name',
-              search: true,
-            },
+
             {
               label: '当前步骤',
               prop: 'taskName',
@@ -239,10 +262,20 @@
         this.onLoad(this.page, this.query)
       },
       onLoad(page, params = {}) {
-        const query = {
+        let query = {
           ...this.query,
           category: (params.category) ? flowCategory(params.category) : null
         }
+        const {
+          dateTime
+        } = query
+
+        if (dateTime) {
+          query = {
+            startTimes: dateTime[0],
+            endTimes: dateTime[1],
+          }
+        }
         this.loading = true
         todoList(page.currentPage, page.pageSize, Object.assign(params, query)).then(res => {
           const data = {
diff --git a/src/views/property/components/done.vue b/src/views/property/components/done.vue
index 0d4451d..5bcca53 100644
--- a/src/views/property/components/done.vue
+++ b/src/views/property/components/done.vue
@@ -1,236 +1,279 @@
 <template>
-    <div>
-        <avue-crud :option="option" :table-loading="loading" :data="data" ref="crud" v-model="form" :page.sync="page"
-            @search-change="searchChange" @search-reset="searchReset" @selection-change="selectionChange"
-            @current-change="currentChange" @size-change="sizeChange" @refresh-change="refreshChange" @on-load="onLoad">
-            <template slot-scope="{row, size, index}" slot="menu">
-                <el-button type="text" :size="size" icon="el-icon-info" v-if="permission.property_todo_detail"
-                    @click.stop="handleDetail(row)">详情
-                </el-button>
-                <el-button type="text" :size="size" icon="el-icon-search" v-if="permission.property_todo_follow"
-                    @click.stop="handleImage(row, index)">流程图
-                </el-button>
-            </template>
-            <template slot-scope="{row, size}" slot="processDefinitionVersion">
-                <el-tag :size="size">v{{ row.processDefinitionVersion }}</el-tag>
-            </template>
-            <template slot-scope="{row, size}" slot="linkPhone">
-                <el-button :size="size" type="text" @click="showStringDispose(row, 'linkPhoneflag')"
-                    v-text="textDispose(row, 'linkPhoneflag', 'linkPhone')">
-                </el-button>
-            </template>
-        </avue-crud>
-        <flow-design is-dialog :is-display.sync="flowBox" :process-instance-id="processInstanceId"></flow-design>
-    </div>
+  <div>
+    <avue-crud :option="option" :table-loading="loading" :data="data" ref="crud" v-model="form" :page.sync="page"
+      @search-change="searchChange" @search-reset="searchReset" @selection-change="selectionChange"
+      @current-change="currentChange" @size-change="sizeChange" @refresh-change="refreshChange" @on-load="onLoad">
+      <template slot-scope="{row, size, index}" slot="menu">
+        <el-button type="text" :size="size" icon="el-icon-info" v-if="permission.property_todo_detail"
+          @click.stop="handleDetail(row)">详情
+        </el-button>
+        <el-button type="text" :size="size" icon="el-icon-search" v-if="permission.property_todo_follow"
+          @click.stop="handleImage(row, index)">流程图
+        </el-button>
+      </template>
+      <template slot-scope="{row, size}" slot="processDefinitionVersion">
+        <el-tag :size="size">v{{ row.processDefinitionVersion }}</el-tag>
+      </template>
+      <template slot-scope="{row, size}" slot="linkPhone">
+        <el-button :size="size" type="text" @click="showStringDispose(row, 'linkPhoneflag')"
+          v-text="textDispose(row, 'linkPhoneflag', 'linkPhone')">
+        </el-button>
+      </template>
+    </avue-crud>
+    <flow-design is-dialog :is-display.sync="flowBox" :process-instance-id="processInstanceId"></flow-design>
+  </div>
 </template>
 
 <script>
-import {
+  import {
     mapGetters
-} from "vuex"
-import {
+  } from "vuex"
+  import {
     doneList
-} from "@/api/work/work"
-import {
+  } from "@/api/work/work"
+  import {
     flowCategory,
     flowRoute
-} from "@/util/flow"
+  } from "@/util/flow"
 
-export default {
-    data () {
-        return {
-            form: {},
-            selectionId: '',
-            selectionList: [],
-            query: {},
-            loading: true,
-            page: {
-                pageSize: 10,
-                currentPage: 1,
-                total: 0
-            },
-            processInstanceId: '',
-            flowBox: false,
-            workBox: false,
-            option: {
-                labelWidth: 120,
-                searchLabelWidth: 96,
-                searchShow: true,
-                searchMenuSpan: 3,
-                menuWidth: 140,
+  export default {
+    data() {
+      return {
+        datetime: "",
+        form: {},
+        selectionId: '',
+        selectionList: [],
+        query: {},
+        loading: true,
+        page: {
+          pageSize: 10,
+          currentPage: 1,
+          total: 0
+        },
+        processInstanceId: '',
+        flowBox: false,
+        workBox: false,
+        option: {
+          labelWidth: 120,
+          searchLabelWidth: 96,
+          searchShow: true,
+          searchMenuSpan: 3,
+          menuWidth: 140,
 
-                height: 'auto',
-                calcHeight: 30,
-                tip: false,
-                border: true,
-                index: true,
-                // selection: true,
-                editBtn: false,
-                addBtn: false,
-                viewBtn: false,
-                delBtn: false,
-                columnBtn: false,
-                dialogWidth: 900,
-                dialogClickModal: false,
-                header: false,
-                column: [
-                    {
-                        label: "流程分类",
-                        type: "select",
-                        row: true,
-                        dicUrl: "/api/blade-system/dict/dictionary?code=flow",
-                        props: {
-                            label: "dictValue",
-                            value: "dictKey"
-                        },
-                        dataType: "number",
-                        slot: true,
-                        prop: "category",
-                        // search: true,
-                        hide: true,
-                        width: 100,
-                    },
-                    {
-                        width: 100,
-                        label: '申请类型',
-                        prop: 'categoryName',
-                        // search: true,
-                    }, {
-                        width: 220,
-                        overHidden: true,
-                        label: "小区",
-                        prop: "districtId",
-                        searchSpan: 5,
-                        // search: true,
-                        type: 'tree',
-                        dicUrl: `/api/blade-district/district/getDistrictTree`,
-                        props: {
-                            label: "name",
-                            value: "id"
-                        },
-                        defaultExpandedKeys: ["361102003"],
-                        span: 12,
-                    }, {
-                        width: 110,
-                        label: '联系人',
-                        prop: 'linkman',
-                        // search: true,
-                    }, {
-                        width: 120,
-                        label: '联系电话',
-                        prop: 'linkPhone',
-                        // search: true,
-                        slot: true
-                    }, {
-                        label: '项目名称',
-                        prop: 'name',
-                        // search: true,
-                    },
-                    {
-                        label: '当前步骤',
-                        prop: 'taskName',
-                    },
-                    // {
-                    //     label: '流程版本',
-                    //     prop: 'processDefinitionVersion',
-                    //     slot: true,
-                    //     width: 80,
-                    // },
-                    {
-                        width: 144,
-                        label: '申请时间',
-                        prop: 'createTime',
-                    },
-                ]
+          height: 'auto',
+          calcHeight: 30,
+          tip: false,
+          border: true,
+          index: true,
+          // selection: true,
+          editBtn: false,
+          addBtn: false,
+          viewBtn: false,
+          delBtn: false,
+          columnBtn: false,
+          dialogWidth: 900,
+          dialogClickModal: false,
+          header: false,
+          column: [{
+              label: "流程分类",
+              type: "select",
+              row: true,
+              dicUrl: "/api/blade-system/dict/dictionary?code=flow",
+              props: {
+                label: "dictValue",
+                value: "dictKey"
+              },
+              dataType: "number",
+              slot: true,
+              prop: "category",
+              // search: true,
+              hide: true,
+              width: 100,
             },
-            data: []
-        }
+            {
+              width: 100,
+              label: '申请类型',
+              prop: 'categoryName',
+              // search: true,
+            }, {
+              width: 220,
+              overHidden: true,
+              label: "小区",
+              prop: "districtId",
+              searchSpan: 5,
+              // search: true,
+              type: 'tree',
+              dicUrl: `/api/blade-district/district/getDistrictTree`,
+              props: {
+                label: "name",
+                value: "id"
+              },
+              defaultExpandedKeys: ["361102003"],
+              span: 12,
+            },
+            {
+              width: 110,
+              label: '小区名称',
+              prop: 'districtName',
+              search: true,
+              hide: true,
+            }, {
+              label: '项目名称',
+              prop: 'name',
+              search: true,
+            },
+            {
+              label: "申请时间",
+              prop: "dateTime",
+              type: "datetimerange",
+              defaultTime: ['00:00:00', '23:59:59'],
+              format: 'yyyy-MM-dd HH:mm:ss',
+              valueFormat: 'yyyy-MM-dd HH:mm:ss',
+              startPlaceholder: '开始范围自定义',
+              endPlaceholder: '结束范围自定义',
+              searchSpan: 5,
+              searchRange: true,
+              hide: true,
+              addDisplay: false,
+              editDisplay: false,
+              viewDisplay: false,
+              search: true,
+              rules: [{
+                required: true,
+                message: "请选择申请时间",
+                trigger: "blur",
+              }, ],
+            }, {
+              width: 110,
+              label: '联系人',
+              prop: 'linkman',
+              // search: true,
+            }, {
+              width: 120,
+              label: '联系电话',
+              prop: 'linkPhone',
+              // search: true,
+              slot: true
+            }, {
+              label: '项目名称',
+              prop: 'name',
+              // search: true,
+            },
+            {
+              label: '当前步骤',
+              prop: 'taskName',
+            },
+            // {
+            //     label: '流程版本',
+            //     prop: 'processDefinitionVersion',
+            //     slot: true,
+            //     width: 80,
+            // },
+            {
+              width: 144,
+              label: '申请时间',
+              prop: 'createTime',
+            },
+          ]
+        },
+        data: []
+      }
     },
     computed: {
-        ...mapGetters(["permission", "flowRoutes"]),
-        ids () {
-            let ids = []
-            this.selectionList.forEach(ele => {
-                ids.push(ele.id)
-            })
-            return ids.join(",")
-        },
-        textDispose () {
-            return (row, flag, type) => {
-                if (row[flag] || row[type] == null) {
-                    return row[type]
-                } else {
-                    if (type == 'principalIdCard') {
-                        return row[type].replace(/^(.{6})(?:\d+)(.{4})$/, "$1******$2")
-                    } else {
-                        return row[type].replace(/^(.{3})(?:\d+)(.{4})$/, "$1****$2")
-                    }
-                }
+      ...mapGetters(["permission", "flowRoutes"]),
+      ids() {
+        let ids = []
+        this.selectionList.forEach(ele => {
+          ids.push(ele.id)
+        })
+        return ids.join(",")
+      },
+      textDispose() {
+        return (row, flag, type) => {
+          if (row[flag] || row[type] == null) {
+            return row[type]
+          } else {
+            if (type == 'principalIdCard') {
+              return row[type].replace(/^(.{6})(?:\d+)(.{4})$/, "$1******$2")
+            } else {
+              return row[type].replace(/^(.{3})(?:\d+)(.{4})$/, "$1****$2")
             }
+          }
         }
+      }
     },
     methods: {
-        showStringDispose (row, type) {
-            row[type] = !row[type]
-        },
+      showStringDispose(row, type) {
+        row[type] = !row[type]
+      },
 
-        searchReset () {
-            this.query = {}
-            this.onLoad(this.page)
-        },
-        searchChange (params, done) {
-            this.query = params
-            this.page.currentPage = 1
-            this.onLoad(this.page, params)
-            done()
-        },
-        selectionChange (list) {
-            this.selectionList = list
-        },
-        selectionClear () {
-            this.selectionList = []
-            this.$refs.crud.toggleSelection()
-        },
-        handleDetail (row) {
-            this.$router.push({
-                path: `/property/process/${flowRoute(this.flowRoutes, row.category)}/detail/${row.processInstanceId}/${row.businessId}`
-            })
-        },
-        handleImage (row) {
-            this.processInstanceId = row.processInstanceId
-            this.flowBox = true
-        },
-        currentChange (currentPage) {
-            this.page.currentPage = currentPage
-        },
-        sizeChange (pageSize) {
-            this.page.pageSize = pageSize
-        },
-        refreshChange () {
-            this.onLoad(this.page, this.query)
-        },
-        onLoad (page, params = {}) {
-            const query = {
-                ...this.query,
-                category: (params.category) ? flowCategory(params.category) : null
-            }
-            this.loading = true
-            doneList(page.currentPage, page.pageSize, Object.assign(params, query)).then(res => {
-                const data = {
-                    ...res.data.data,
-                    records: res.data.data.records.map(item => {
-                        return {
-                            ...item,
-                            'linkPhoneflag': false
-                        }
-                    })
-                }
-                this.page.total = data.total
-                this.data = data.records
-                this.loading = false
-                this.selectionClear()
-            })
+      searchReset() {
+        this.query = {}
+        this.onLoad(this.page)
+      },
+      searchChange(params, done) {
+        this.query = params
+        this.page.currentPage = 1
+        this.onLoad(this.page, params)
+        done()
+      },
+      selectionChange(list) {
+        this.selectionList = list
+      },
+      selectionClear() {
+        this.selectionList = []
+        this.$refs.crud.toggleSelection()
+      },
+      handleDetail(row) {
+        this.$router.push({
+          path: `/property/process/${flowRoute(this.flowRoutes, row.category)}/detail/${row.processInstanceId}/${row.businessId}`
+        })
+      },
+      handleImage(row) {
+        this.processInstanceId = row.processInstanceId
+        this.flowBox = true
+      },
+      currentChange(currentPage) {
+        this.page.currentPage = currentPage
+      },
+      sizeChange(pageSize) {
+        this.page.pageSize = pageSize
+      },
+      refreshChange() {
+        this.onLoad(this.page, this.query)
+      },
+      onLoad(page, params = {}) {
+        let query = {
+          ...this.query,
+          category: (params.category) ? flowCategory(params.category) : null
         }
+        const {
+          dateTime
+        } = query
+
+        if (dateTime) {
+          query = {
+            startTimes: dateTime[0],
+            endTimes: dateTime[1],
+          }
+        }
+        this.loading = true
+        doneList(page.currentPage, page.pageSize, Object.assign(params, query)).then(res => {
+          const data = {
+            ...res.data.data,
+            records: res.data.data.records.map(item => {
+              return {
+                ...item,
+                'linkPhoneflag': false
+              }
+            })
+          }
+          this.page.total = data.total
+          this.data = data.records
+          this.loading = false
+          this.selectionClear()
+        })
+      }
     }
-}
+  }
 </script>
\ No newline at end of file
diff --git a/src/views/property/components/todo.vue b/src/views/property/components/todo.vue
index 16d83fa..6a43049 100644
--- a/src/views/property/components/todo.vue
+++ b/src/views/property/components/todo.vue
@@ -1,268 +1,312 @@
 <template>
-    <div>
-        <avue-crud :option="option" :table-loading="loading" :data="data" ref="crud" v-model="form"
-            @search-change="searchChange" @search-reset="searchReset" @selection-change="selectionChange"
-            @current-change="currentChange" @size-change="sizeChange" @refresh-change="refreshChange" @on-load="onLoad">
-            <template slot-scope="{row, size, index}" slot="menu">
-                <el-button type="text" :size="size" icon="el-icon-s-check" v-if="permission.property_todo_handle"
-                    @click.stop="handleWork(row)">处理
-                </el-button>
-                <el-button type="text" :size="size" icon="el-icon-info" v-if="permission.property_todo_detail"
-                    @click.stop="handleDetail(row)">详情
-                </el-button>
-                <el-button type="text" :size="size" icon="el-icon-search" v-if="permission.property_todo_follow"
-                    @click.stop="handleImage(row, index)">流程图
-                </el-button>
-            </template>
+  <div>
+    <avue-crud :option="option" :table-loading="loading" :data="data" ref="crud" v-model="form"
+      @search-change="searchChange" @search-reset="searchReset" @selection-change="selectionChange"
+      @current-change="currentChange" @size-change="sizeChange" @refresh-change="refreshChange" @on-load="onLoad">
+      <template slot-scope="{row, size, index}" slot="menu">
+        <el-button type="text" :size="size" icon="el-icon-s-check" v-if="permission.property_todo_handle"
+          @click.stop="handleWork(row)">处理
+        </el-button>
+        <el-button type="text" :size="size" icon="el-icon-info" v-if="permission.property_todo_detail"
+          @click.stop="handleDetail(row)">详情
+        </el-button>
+        <el-button type="text" :size="size" icon="el-icon-search" v-if="permission.property_todo_follow"
+          @click.stop="handleImage(row, index)">流程图
+        </el-button>
+      </template>
 
-            <template slot-scope="{row, size}" slot="processDefinitionVersion">
-                <el-tag :size="size">v{{ row.processDefinitionVersion }}</el-tag>
-            </template>
-            <template slot-scope="{row, size}" slot="linkPhone">
-                <el-button :size="size" type="text" @click="showStringDispose(row, 'linkPhoneflag')"
-                    v-text="textDispose(row, 'linkPhoneflag', 'linkPhone')">
-                </el-button>
-            </template>
-        </avue-crud>
-        <flow-design is-dialog :is-display.sync="flowBox" :process-instance-id="processInstanceId"></flow-design>
-    </div>
+      <template slot-scope="{row, size}" slot="processDefinitionVersion">
+        <el-tag :size="size">v{{ row.processDefinitionVersion }}</el-tag>
+      </template>
+      <template slot-scope="{row, size}" slot="linkPhone">
+        <el-button :size="size" type="text" @click="showStringDispose(row, 'linkPhoneflag')"
+          v-text="textDispose(row, 'linkPhoneflag', 'linkPhone')">
+        </el-button>
+      </template>
+    </avue-crud>
+    <flow-design is-dialog :is-display.sync="flowBox" :process-instance-id="processInstanceId"></flow-design>
+  </div>
 </template>
-  
+
 <script>
-import {
+  import {
     mapGetters
-} from "vuex"
-import {
+  } from "vuex"
+  import {
     todoList
-} from "@/api/work/work"
-import {
+  } from "@/api/work/work"
+  import {
     flowCategory,
     flowRoute
-} from "@/util/flow"
+  } from "@/util/flow"
 
-export default {
-    data () {
-        return {
-            typeStatus: 1,
-            form: {},
-            selectionId: '',
-            selectionList: [],
-            query: {},
-            loading: true,
-            page: {
-                pageSize: 10,
-                currentPage: 1,
-                total: 0
-            },
-            processInstanceId: '',
-            flowBox: false,
-            workBox: false,
-            option: {
-                labelWidth: 120,
-                searchLabelWidth: 96,
-                searchShow: true,
-                searchMenuSpan: 3,
-                menuWidth: 210,
+  export default {
+    data() {
+      return {
+        datetime: "",
+        typeStatus: 1,
+        form: {},
+        selectionId: '',
+        selectionList: [],
+        query: {},
+        loading: true,
+        page: {
+          pageSize: 10,
+          currentPage: 1,
+          total: 0
+        },
+        processInstanceId: '',
+        flowBox: false,
+        workBox: false,
+        option: {
+          labelWidth: 120,
+          searchLabelWidth: 96,
+          searchShow: true,
+          searchMenuSpan: 3,
+          menuWidth: 210,
 
-                height: 'auto',
-                calcHeight: 30,
-                tip: false,
-                simplePage: true,
-                border: true,
-                index: true,
-                // selection: true,
-                editBtn: false,
-                addBtn: false,
-                viewBtn: false,
-                delBtn: false,
-                columnBtn: false,
-                dialogWidth: 900,
-                dialogClickModal: false,
-                header: false,
-                column: [{
-                    label: "流程分类",
-                    type: "select",
-                    row: true,
-                    dicUrl: "/api/blade-system/dict/dictionary?code=flow",
-                    props: {
-                        label: "dictValue",
-                        value: "dictKey"
-                    },
-                    dataType: "number",
-                    slot: true,
-                    prop: "category",
-                    // search: true,
-                    hide: true,
-                    width: 100,
-                },
-                {
-                    width: 100,
-                    label: '申请类型',
-                    prop: 'categoryName',
-                    // search: true,
-                },
-                {
-                    width: 220,
-                    overHidden: true,
-                    label: "小区",
-                    prop: "districtId",
-                    // search: true,
-                    type: 'tree',
-                    dicUrl: `/api/blade-district/district/getDistrictTree`,
-                    props: {
-                        label: "name",
-                        value: "id"
-                    },
-                    defaultExpandedKeys: ["361102003"],
-                    searchSpan: 5,
-                    span: 12,
-                },
-                {
-                    width: 110,
-                    label: '联系人',
-                    prop: 'linkman',
-                    // search: true,
-                },
-                {
-                    width: 120,
-                    label: '联系电话',
-                    prop: 'linkPhone',
-                    // search: true,
-                    slot: true
-                },
-                {
-                    label: '项目名称',
-                    prop: 'name',
-                    // search: true,
-                },
-                {
-                    label: '当前步骤',
-                    prop: 'taskName',
-                },
-                // {
-                //   label: '流程版本',
-                //   prop: 'processDefinitionVersion',
-                //   // slot: true,
-                //   width: 80,
-                // },
-                {
-                    width: 144,
-                    label: '申请时间',
-                    prop: 'createTime',
-                },
-                ]
+          height: 'auto',
+          calcHeight: 30,
+          tip: false,
+          simplePage: true,
+          border: true,
+          index: true,
+          // selection: true,
+          editBtn: false,
+          addBtn: false,
+          viewBtn: false,
+          delBtn: false,
+          columnBtn: false,
+          dialogWidth: 900,
+          dialogClickModal: false,
+          header: false,
+          column: [{
+              label: "流程分类",
+              type: "select",
+              row: true,
+              dicUrl: "/api/blade-system/dict/dictionary?code=flow",
+              props: {
+                label: "dictValue",
+                value: "dictKey"
+              },
+              dataType: "number",
+              slot: true,
+              prop: "category",
+              // search: true,
+              hide: true,
+              width: 100,
             },
-            data: []
-        }
+            {
+              width: 110,
+              label: '小区名称',
+              prop: 'districtName',
+              search: true,
+              hide: true,
+            }, {
+              label: '项目名称',
+              prop: 'name',
+              search: true,
+            },
+            {
+              label: "申请时间",
+              prop: "dateTime",
+              type: "datetimerange",
+              defaultTime: ['00:00:00', '23:59:59'],
+              format: 'yyyy-MM-dd HH:mm:ss',
+              valueFormat: 'yyyy-MM-dd HH:mm:ss',
+              startPlaceholder: '开始范围自定义',
+              endPlaceholder: '结束范围自定义',
+              searchSpan: 5,
+              searchRange: true,
+              hide: true,
+              addDisplay: false,
+              editDisplay: false,
+              viewDisplay: false,
+              search: true,
+              rules: [{
+                required: true,
+                message: "请选择申请时间",
+                trigger: "blur",
+              }, ],
+            },
+            {
+              width: 100,
+              label: '申请类型',
+              prop: 'categoryName',
+              // search: true,
+            },
+            {
+              width: 220,
+              overHidden: true,
+              label: "小区",
+              prop: "districtId",
+              // search: true,
+              type: 'tree',
+              dicUrl: `/api/blade-district/district/getDistrictTree`,
+              props: {
+                label: "name",
+                value: "id"
+              },
+              defaultExpandedKeys: ["361102003"],
+              searchSpan: 5,
+              span: 12,
+            },
+            {
+              width: 110,
+              label: '联系人',
+              prop: 'linkman',
+              // search: true,
+            },
+            {
+              width: 120,
+              label: '联系电话',
+              prop: 'linkPhone',
+              // search: true,
+              slot: true
+            },
+            {
+              label: '项目名称',
+              prop: 'name',
+              // search: true,
+            },
+            {
+              label: '当前步骤',
+              prop: 'taskName',
+            },
+            // {
+            //   label: '流程版本',
+            //   prop: 'processDefinitionVersion',
+            //   // slot: true,
+            //   width: 80,
+            // },
+            {
+              width: 144,
+              label: '申请时间',
+              prop: 'createTime',
+            },
+          ]
+        },
+        data: []
+      }
     },
     computed: {
-        ...mapGetters(["permission", "flowRoutes"]),
-        ids () {
-            let ids = []
-            this.selectionList.forEach(ele => {
-                ids.push(ele.id)
-            })
-            return ids.join(",")
-        },
+      ...mapGetters(["permission", "flowRoutes"]),
+      ids() {
+        let ids = []
+        this.selectionList.forEach(ele => {
+          ids.push(ele.id)
+        })
+        return ids.join(",")
+      },
 
-        textDispose () {
-            return (row, flag, type) => {
-                if (row[flag] || row[type] == null) {
-                    return row[type]
-                } else {
-                    if (type == 'principalIdCard') {
-                        return row[type].replace(/^(.{6})(?:\d+)(.{4})$/, "$1******$2")
-                    } else {
-                        return row[type].replace(/^(.{3})(?:\d+)(.{4})$/, "$1****$2")
-                    }
-                }
+      textDispose() {
+        return (row, flag, type) => {
+          if (row[flag] || row[type] == null) {
+            return row[type]
+          } else {
+            if (type == 'principalIdCard') {
+              return row[type].replace(/^(.{6})(?:\d+)(.{4})$/, "$1******$2")
+            } else {
+              return row[type].replace(/^(.{3})(?:\d+)(.{4})$/, "$1****$2")
             }
+          }
         }
+      }
     },
     methods: {
 
-        changeType (type) {
-            this.typeStatus = type
-            this.page.currentPage = 1
-            // this.onLoad(this.page)
-        },
-        showStringDispose (row, type) {
-            row[type] = !row[type]
-        },
+      changeType(type) {
+        this.typeStatus = type
+        this.page.currentPage = 1
+        // this.onLoad(this.page)
+      },
+      showStringDispose(row, type) {
+        row[type] = !row[type]
+      },
 
-        searchReset () {
-            this.query = {}
-            this.onLoad(this.page)
-        },
-        searchChange (params, done) {
-            this.query = params
-            this.page.currentPage = 1
-            this.onLoad(this.page, params)
-            done()
-        },
-        selectionChange (list) {
-            this.selectionList = list
-        },
-        selectionClear () {
-            this.selectionList = []
-            this.$refs.crud.toggleSelection()
-        },
-        handleWork (row) {
-            this.$router.push({
-                path: `/property/process/${flowRoute(this.flowRoutes, row.category)}/handle/${row.taskId}/${row.processInstanceId}/${row.businessId}`
-            })
-        },
-        handleDetail (row) {
-            this.$router.push({
-                path: `/property/process/${flowRoute(this.flowRoutes, row.category)}/detail/${row.processInstanceId}/${row.businessId}`
-            })
-        },
-        handleImage (row) {
-            this.processInstanceId = row.processInstanceId
-            this.flowBox = true
-        },
-        currentChange (currentPage) {
-            this.page.currentPage = currentPage
-        },
-        sizeChange (pageSize) {
-            this.page.pageSize = pageSize
-        },
-        refreshChange () {
-            this.onLoad(this.page, this.query)
-        },
-        onLoad (page, params = {}) {
-            const query = {
-                ...this.query,
-                category: (params.category) ? flowCategory(params.category) : null
-            }
-            this.loading = true
-            todoList(page.currentPage, page.pageSize, Object.assign(params, query)).then(res => {
-                const data = {
-                    ...res.data.data,
-                    records: res.data.data.records.map(item => {
-                        return {
-                            ...item,
-                            'linkPhoneflag': false
-                        }
-                    })
-                }
-                this.page.total = data.total
-                this.data = data.records
-                this.loading = false
-                this.selectionClear()
-            })
+      searchReset() {
+        this.query = {}
+        this.onLoad(this.page)
+      },
+      searchChange(params, done) {
+        this.query = params
+        this.page.currentPage = 1
+        this.onLoad(this.page, params)
+        done()
+      },
+      selectionChange(list) {
+        this.selectionList = list
+      },
+      selectionClear() {
+        this.selectionList = []
+        this.$refs.crud.toggleSelection()
+      },
+      handleWork(row) {
+        this.$router.push({
+          path: `/property/process/${flowRoute(this.flowRoutes, row.category)}/handle/${row.taskId}/${row.processInstanceId}/${row.businessId}`
+        })
+      },
+      handleDetail(row) {
+        this.$router.push({
+          path: `/property/process/${flowRoute(this.flowRoutes, row.category)}/detail/${row.processInstanceId}/${row.businessId}`
+        })
+      },
+      handleImage(row) {
+        this.processInstanceId = row.processInstanceId
+        this.flowBox = true
+      },
+      currentChange(currentPage) {
+        this.page.currentPage = currentPage
+      },
+      sizeChange(pageSize) {
+        this.page.pageSize = pageSize
+      },
+      refreshChange() {
+        this.onLoad(this.page, this.query)
+      },
+      onLoad(page, params = {}) {
+        let query = {
+          ...this.query,
+          category: (params.category) ? flowCategory(params.category) : null
         }
-    }
-}
-</script>
-  
-  
-<style lang="scss" scoped>
-.avue-upload__icon {
-    line-height: 6;
-}
+        const {
+          dateTime
+        } = query
 
-.tab-list {
+        if (dateTime) {
+          query = {
+            startTimes: dateTime[0],
+            endTimes: dateTime[1],
+          }
+        }
+        this.loading = true
+        todoList(page.currentPage, page.pageSize, Object.assign(params, query)).then(res => {
+          const data = {
+            ...res.data.data,
+            records: res.data.data.records.map(item => {
+              return {
+                ...item,
+                'linkPhoneflag': false
+              }
+            })
+          }
+          this.page.total = data.total
+          this.data = data.records
+          this.loading = false
+          this.selectionClear()
+        })
+      }
+    }
+  }
+</script>
+
+
+<style lang="scss" scoped>
+  .avue-upload__icon {
+    line-height: 6;
+  }
+
+  .tab-list {
     display: flex;
     margin-right: 6px;
     border: 1px solid #dcdfe6;
@@ -272,55 +316,55 @@
     width: 121px;
 
     &>div {
-        display: flex;
-        align-items: center;
-        justify-content: center;
-        width: 60px;
-        cursor: pointer;
-        font-size: 12px;
+      display: flex;
+      align-items: center;
+      justify-content: center;
+      width: 60px;
+      cursor: pointer;
+      font-size: 12px;
     }
 
     &>div:nth-child(2) {
-        border-left: 1px solid #dcdfe6;
-        // border-right: 1px solid #dcdfe6;
+      border-left: 1px solid #dcdfe6;
+      // border-right: 1px solid #dcdfe6;
     }
 
     .choose {
-        color: #FFF;
-        background-color: #409dfe;
+      color: #FFF;
+      background-color: #409dfe;
     }
-}
+  }
 
-:deep(.avue-crud__left) {
+  :deep(.avue-crud__left) {
     display: flex;
     align-items: center;
-}
+  }
 
-:deep(.el-drawer__header) {
+  :deep(.el-drawer__header) {
     margin-bottom: 10px;
-}
+  }
 
-:deep(.el-radio__input.is-disabled+span.el-radio__label) {
+  :deep(.el-radio__input.is-disabled+span.el-radio__label) {
     color: #000;
-}
+  }
 
-:deep(.el-radio__input.is-checked+.el-radio__label) {
+  :deep(.el-radio__input.is-checked+.el-radio__label) {
     color: #409EFF !important;
-}
+  }
 
-:deep(.el-radio__input.is-checked .el-radio__inner::after) {
+  :deep(.el-radio__input.is-checked .el-radio__inner::after) {
     background-color: #FFF;
-}
+  }
 
-:deep(.el-radio__input.is-checked .el-radio__inner) {
+  :deep(.el-radio__input.is-checked .el-radio__inner) {
     background-color: #409EFF;
-}
+  }
 
-:deep(.el-radio) {
+  :deep(.el-radio) {
     margin-right: 20px;
-}
+  }
 
-.title {
+  .title {
     margin: 10px;
     height: 40px;
     background-color: #eee;
@@ -328,119 +372,119 @@
     align-items: center;
 
     .icon {
-        width: 4px;
-        height: 18px;
-        background-color: #409dfe;
-        margin: 0 10px;
-        color: transparent;
+      width: 4px;
+      height: 18px;
+      background-color: #409dfe;
+      margin: 0 10px;
+      color: transparent;
     }
-}
+  }
 
-.basic-info {
+  .basic-info {
     padding: 0 20px;
     font-size: 14px;
 
     .info-item {
+      display: flex;
+      padding: 10px;
+
+      .info-name {
+        width: 100px;
         display: flex;
-        padding: 10px;
+        align-items: center;
+      }
 
-        .info-name {
-            width: 100px;
-            display: flex;
-            align-items: center;
-        }
-
-        .info-value {
-            display: flex;
-            align-items: center;
-        }
+      .info-value {
+        display: flex;
+        align-items: center;
+      }
     }
-}
+  }
 
-.question-list {
+  .question-list {
     padding: 0 20px;
     font-size: 14px;
 
     .question-type {
-        height: 60px;
-        display: flex;
-        align-items: center;
-        cursor: pointer;
-        justify-content: space-between;
-        padding-right: 20px;
+      height: 60px;
+      display: flex;
+      align-items: center;
+      cursor: pointer;
+      justify-content: space-between;
+      padding-right: 20px;
 
-        .type-name {}
+      .type-name {}
 
-        .icon-box {}
+      .icon-box {}
     }
 
     .question-item {
-        margin-bottom: 20px;
-        padding: 10px;
-        background: #f5f7fa;
-        border-radius: 8px;
+      margin-bottom: 20px;
+      padding: 10px;
+      background: #f5f7fa;
+      border-radius: 8px;
 
-        &>div {
-            margin: 14px 0;
+      &>div {
+        margin: 14px 0;
+      }
+
+      .question-name {
+        display: flex;
+
+        .key {
+          width: 80%;
+          padding-right: 20px;
+          word-break: break-all;
         }
 
-        .question-name {
-            display: flex;
+        .value {
+          width: 20%;
+          display: flex;
+          align-items: center;
+          justify-content: center;
+        }
+      }
 
-            .key {
-                width: 80%;
-                padding-right: 20px;
-                word-break: break-all;
-            }
+      .yh-pic-box {
+        display: flex;
+        height: 100px;
 
-            .value {
-                width: 20%;
-                display: flex;
-                align-items: center;
-                justify-content: center;
-            }
+        .yh-pic-name {
+          width: 100px;
+          display: flex;
+          align-items: center;
+          justify-content: left;
         }
 
-        .yh-pic-box {
-            display: flex;
-            height: 100px;
+        .yh-pic-list {
+          width: 0;
+          flex: 1;
+          display: flex;
+        }
+      }
 
-            .yh-pic-name {
-                width: 100px;
-                display: flex;
-                align-items: center;
-                justify-content: left;
-            }
+      .yh-remark {
+        display: flex;
 
-            .yh-pic-list {
-                width: 0;
-                flex: 1;
-                display: flex;
-            }
+        .yh-remark-name {
+          width: 100px;
+          display: flex;
+          align-items: center;
+          justify-content: left;
         }
 
-        .yh-remark {
-            display: flex;
-
-            .yh-remark-name {
-                width: 100px;
-                display: flex;
-                align-items: center;
-                justify-content: left;
-            }
-
-            .yh-remark-value {
-                word-break: break-all;
-            }
+        .yh-remark-value {
+          word-break: break-all;
         }
+      }
     }
 
     .remark-box {
-        padding: 10px;
-        background-color: #f5f7fa;
-        border-radius: 8px;
-        min-height: 40px;
-        margin-bottom: 20px;
+      padding: 10px;
+      background-color: #f5f7fa;
+      border-radius: 8px;
+      min-height: 40px;
+      margin-bottom: 20px;
     }
-}
+  }
 </style>
\ No newline at end of file
diff --git a/src/views/propertySupervision/components/done.vue b/src/views/propertySupervision/components/done.vue
index dffa3b8..114be8a 100644
--- a/src/views/propertySupervision/components/done.vue
+++ b/src/views/propertySupervision/components/done.vue
@@ -1,236 +1,279 @@
 <template>
-    <div>
-        <avue-crud :option="option" :table-loading="loading" :data="data" ref="crud" v-model="form" :page.sync="page"
-            @search-change="searchChange" @search-reset="searchReset" @selection-change="selectionChange"
-            @current-change="currentChange" @size-change="sizeChange" @refresh-change="refreshChange" @on-load="onLoad">
-            <template slot-scope="{row, size, index}" slot="menu">
-                <el-button type="text" :size="size" icon="el-icon-info" v-if="permission.work_done_detail"
-                    @click.stop="handleDetail(row)">详情
-                </el-button>
-                <el-button type="text" :size="size" icon="el-icon-search" v-if="permission.work_done_follow"
-                    @click.stop="handleImage(row, index)">流程图
-                </el-button>
-            </template>
-            <template slot-scope="{row, size}" slot="processDefinitionVersion">
-                <el-tag :size="size">v{{ row.processDefinitionVersion }}</el-tag>
-            </template>
-            <template slot-scope="{row, size}" slot="linkPhone">
-                <el-button :size="size" type="text" @click="showStringDispose(row, 'linkPhoneflag')"
-                    v-text="textDispose(row, 'linkPhoneflag', 'linkPhone')">
-                </el-button>
-            </template>
-        </avue-crud>
-        <flow-design is-dialog :is-display.sync="flowBox" :process-instance-id="processInstanceId"></flow-design>
-    </div>
+  <div>
+    <avue-crud :option="option" :table-loading="loading" :data="data" ref="crud" v-model="form" :page.sync="page"
+      @search-change="searchChange" @search-reset="searchReset" @selection-change="selectionChange"
+      @current-change="currentChange" @size-change="sizeChange" @refresh-change="refreshChange" @on-load="onLoad">
+      <template slot-scope="{row, size, index}" slot="menu">
+        <el-button type="text" :size="size" icon="el-icon-info" v-if="permission.work_done_detail"
+          @click.stop="handleDetail(row)">详情
+        </el-button>
+        <el-button type="text" :size="size" icon="el-icon-search" v-if="permission.work_done_follow"
+          @click.stop="handleImage(row, index)">流程图
+        </el-button>
+      </template>
+      <template slot-scope="{row, size}" slot="processDefinitionVersion">
+        <el-tag :size="size">v{{ row.processDefinitionVersion }}</el-tag>
+      </template>
+      <template slot-scope="{row, size}" slot="linkPhone">
+        <el-button :size="size" type="text" @click="showStringDispose(row, 'linkPhoneflag')"
+          v-text="textDispose(row, 'linkPhoneflag', 'linkPhone')">
+        </el-button>
+      </template>
+    </avue-crud>
+    <flow-design is-dialog :is-display.sync="flowBox" :process-instance-id="processInstanceId"></flow-design>
+  </div>
 </template>
 
 <script>
-import {
+  import {
     mapGetters
-} from "vuex"
-import {
+  } from "vuex"
+  import {
     doneList
-} from "@/api/work/work"
-import {
+  } from "@/api/work/work"
+  import {
     flowCategory,
     flowRoute
-} from "@/util/flow"
+  } from "@/util/flow"
 
-export default {
-    data () {
-        return {
-            form: {},
-            selectionId: '',
-            selectionList: [],
-            query: {},
-            loading: true,
-            page: {
-                pageSize: 10,
-                currentPage: 1,
-                total: 0
-            },
-            processInstanceId: '',
-            flowBox: false,
-            workBox: false,
-            option: {
-                labelWidth: 120,
-                searchLabelWidth: 96,
-                searchShow: true,
-                searchMenuSpan: 3,
-                menuWidth: 140,
+  export default {
+    data() {
+      return {
+        form: {},
+        datetime: "",
+        selectionId: '',
+        selectionList: [],
+        query: {},
+        loading: true,
+        page: {
+          pageSize: 10,
+          currentPage: 1,
+          total: 0
+        },
+        processInstanceId: '',
+        flowBox: false,
+        workBox: false,
+        option: {
+          labelWidth: 120,
+          searchLabelWidth: 96,
+          searchShow: true,
+          searchMenuSpan: 3,
+          menuWidth: 140,
 
-                height: 'auto',
-                calcHeight: 30,
-                tip: false,
-                border: true,
-                index: true,
-                // selection: true,
-                editBtn: false,
-                addBtn: false,
-                viewBtn: false,
-                delBtn: false,
-                columnBtn: false,
-                dialogWidth: 900,
-                dialogClickModal: false,
-                header: false,
-                column: [
-                    {
-                        label: "流程分类",
-                        type: "select",
-                        row: true,
-                        dicUrl: "/api/blade-system/dict/dictionary?code=flow",
-                        props: {
-                            label: "dictValue",
-                            value: "dictKey"
-                        },
-                        dataType: "number",
-                        slot: true,
-                        prop: "category",
-                        // search: true,
-                        hide: true,
-                        width: 100,
-                    },
-                    {
-                        width: 100,
-                        label: '申请类型',
-                        prop: 'categoryName',
-                        // search: true,
-                    }, {
-                        width: 220,
-                        overHidden: true,
-                        label: "小区",
-                        prop: "districtId",
-                        searchSpan: 5,
-                        // search: true,
-                        type: 'tree',
-                        dicUrl: `/api/blade-district/district/getDistrictTree`,
-                        props: {
-                            label: "name",
-                            value: "id"
-                        },
-                        defaultExpandedKeys: ["361102003"],
-                        span: 12,
-                    }, {
-                        width: 110,
-                        label: '联系人',
-                        prop: 'linkman',
-                        // search: true,
-                    }, {
-                        width: 120,
-                        label: '联系电话',
-                        prop: 'linkPhone',
-                        // search: true,
-                        slot: true
-                    }, {
-                        label: '项目名称',
-                        prop: 'name',
-                        // search: true,
-                    },
-                    {
-                        label: '当前步骤',
-                        prop: 'taskName',
-                    },
-                    // {
-                    //     label: '流程版本',
-                    //     prop: 'processDefinitionVersion',
-                    //     slot: true,
-                    //     width: 80,
-                    // },
-                    {
-                        width: 144,
-                        label: '申请时间',
-                        prop: 'createTime',
-                    },
-                ]
+          height: 'auto',
+          calcHeight: 30,
+          tip: false,
+          border: true,
+          index: true,
+          // selection: true,
+          editBtn: false,
+          addBtn: false,
+          viewBtn: false,
+          delBtn: false,
+          columnBtn: false,
+          dialogWidth: 900,
+          dialogClickModal: false,
+          header: false,
+          column: [{
+              label: "流程分类",
+              type: "select",
+              row: true,
+              dicUrl: "/api/blade-system/dict/dictionary?code=flow",
+              props: {
+                label: "dictValue",
+                value: "dictKey"
+              },
+              dataType: "number",
+              slot: true,
+              prop: "category",
+              // search: true,
+              hide: true,
+              width: 100,
             },
-            data: []
-        }
+            {
+              width: 110,
+              label: '小区名称',
+              prop: 'districtName',
+              search: true,
+              hide: true,
+            }, {
+              label: '项目名称',
+              prop: 'name',
+              search: true,
+            },
+            {
+              label: "申请时间",
+              prop: "dateTime",
+              type: "datetimerange",
+              defaultTime: ['00:00:00', '23:59:59'],
+              format: 'yyyy-MM-dd HH:mm:ss',
+              valueFormat: 'yyyy-MM-dd HH:mm:ss',
+              startPlaceholder: '开始范围自定义',
+              endPlaceholder: '结束范围自定义',
+              searchSpan: 5,
+              searchRange: true,
+              hide: true,
+              addDisplay: false,
+              editDisplay: false,
+              viewDisplay: false,
+              search: true,
+              rules: [{
+                required: true,
+                message: "请选择申请时间",
+                trigger: "blur",
+              }, ],
+            },
+            {
+              width: 100,
+              label: '申请类型',
+              prop: 'categoryName',
+              // search: true,
+            }, {
+              width: 220,
+              overHidden: true,
+              label: "小区",
+              prop: "districtId",
+              searchSpan: 5,
+              // search: true,
+              type: 'tree',
+              dicUrl: `/api/blade-district/district/getDistrictTree`,
+              props: {
+                label: "name",
+                value: "id"
+              },
+              defaultExpandedKeys: ["361102003"],
+              span: 12,
+            }, {
+              width: 110,
+              label: '联系人',
+              prop: 'linkman',
+              // search: true,
+            }, {
+              width: 120,
+              label: '联系电话',
+              prop: 'linkPhone',
+              // search: true,
+              slot: true
+            }, {
+              label: '项目名称',
+              prop: 'name',
+              // search: true,
+            },
+            {
+              label: '当前步骤',
+              prop: 'taskName',
+            },
+            // {
+            //     label: '流程版本',
+            //     prop: 'processDefinitionVersion',
+            //     slot: true,
+            //     width: 80,
+            // },
+            {
+              width: 144,
+              label: '申请时间',
+              prop: 'createTime',
+            },
+          ]
+        },
+        data: []
+      }
     },
     computed: {
-        ...mapGetters(["permission", "flowRoutes"]),
-        ids () {
-            let ids = []
-            this.selectionList.forEach(ele => {
-                ids.push(ele.id)
-            })
-            return ids.join(",")
-        },
-        textDispose () {
-            return (row, flag, type) => {
-                if (row[flag] || row[type] == null) {
-                    return row[type]
-                } else {
-                    if (type == 'principalIdCard') {
-                        return row[type].replace(/^(.{6})(?:\d+)(.{4})$/, "$1******$2")
-                    } else {
-                        return row[type].replace(/^(.{3})(?:\d+)(.{4})$/, "$1****$2")
-                    }
-                }
+      ...mapGetters(["permission", "flowRoutes"]),
+      ids() {
+        let ids = []
+        this.selectionList.forEach(ele => {
+          ids.push(ele.id)
+        })
+        return ids.join(",")
+      },
+      textDispose() {
+        return (row, flag, type) => {
+          if (row[flag] || row[type] == null) {
+            return row[type]
+          } else {
+            if (type == 'principalIdCard') {
+              return row[type].replace(/^(.{6})(?:\d+)(.{4})$/, "$1******$2")
+            } else {
+              return row[type].replace(/^(.{3})(?:\d+)(.{4})$/, "$1****$2")
             }
+          }
         }
+      }
     },
     methods: {
-        showStringDispose (row, type) {
-            row[type] = !row[type]
-        },
+      showStringDispose(row, type) {
+        row[type] = !row[type]
+      },
 
-        searchReset () {
-            this.query = {}
-            this.onLoad(this.page)
-        },
-        searchChange (params, done) {
-            this.query = params
-            this.page.currentPage = 1
-            this.onLoad(this.page, params)
-            done()
-        },
-        selectionChange (list) {
-            this.selectionList = list
-        },
-        selectionClear () {
-            this.selectionList = []
-            this.$refs.crud.toggleSelection()
-        },
-        handleDetail (row) {
-            this.$router.push({
-                path: `/propertySupervision/process/${flowRoute(this.flowRoutes, row.category)}/detail/${row.processInstanceId}/${row.businessId}`
-            })
-        },
-        handleImage (row) {
-            this.processInstanceId = row.processInstanceId
-            this.flowBox = true
-        },
-        currentChange (currentPage) {
-            this.page.currentPage = currentPage
-        },
-        sizeChange (pageSize) {
-            this.page.pageSize = pageSize
-        },
-        refreshChange () {
-            this.onLoad(this.page, this.query)
-        },
-        onLoad (page, params = {}) {
-            const query = {
-                ...this.query,
-                category: (params.category) ? flowCategory(params.category) : null
-            }
-            this.loading = true
-            doneList(page.currentPage, page.pageSize, Object.assign(params, query)).then(res => {
-                const data = {
-                    ...res.data.data,
-                    records: res.data.data.records.map(item => {
-                        return {
-                            ...item,
-                            'linkPhoneflag': false
-                        }
-                    })
-                }
-                this.page.total = data.total
-                this.data = data.records
-                this.loading = false
-                this.selectionClear()
-            })
+      searchReset() {
+        this.query = {}
+        this.onLoad(this.page)
+      },
+      searchChange(params, done) {
+        this.query = params
+        this.page.currentPage = 1
+        this.onLoad(this.page, params)
+        done()
+      },
+      selectionChange(list) {
+        this.selectionList = list
+      },
+      selectionClear() {
+        this.selectionList = []
+        this.$refs.crud.toggleSelection()
+      },
+      handleDetail(row) {
+        this.$router.push({
+          path: `/propertySupervision/process/${flowRoute(this.flowRoutes, row.category)}/detail/${row.processInstanceId}/${row.businessId}`
+        })
+      },
+      handleImage(row) {
+        this.processInstanceId = row.processInstanceId
+        this.flowBox = true
+      },
+      currentChange(currentPage) {
+        this.page.currentPage = currentPage
+      },
+      sizeChange(pageSize) {
+        this.page.pageSize = pageSize
+      },
+      refreshChange() {
+        this.onLoad(this.page, this.query)
+      },
+      onLoad(page, params = {}) {
+        let query = {
+          ...this.query,
+          category: (params.category) ? flowCategory(params.category) : null
         }
+        const {
+          dateTime
+        } = query
+
+        if (dateTime) {
+          query = {
+            startTimes: dateTime[0],
+            endTimes: dateTime[1],
+          }
+        }
+        this.loading = true
+        doneList(page.currentPage, page.pageSize, Object.assign(params, query)).then(res => {
+          const data = {
+            ...res.data.data,
+            records: res.data.data.records.map(item => {
+              return {
+                ...item,
+                'linkPhoneflag': false
+              }
+            })
+          }
+          this.page.total = data.total
+          this.data = data.records
+          this.loading = false
+          this.selectionClear()
+        })
+      }
     }
-}
+  }
 </script>
\ No newline at end of file
diff --git a/src/views/propertySupervision/components/todo.vue b/src/views/propertySupervision/components/todo.vue
index 5ce4198..e042765 100644
--- a/src/views/propertySupervision/components/todo.vue
+++ b/src/views/propertySupervision/components/todo.vue
@@ -1,268 +1,314 @@
 <template>
-    <div>
-        <avue-crud :option="option" :table-loading="loading" :data="data" ref="crud" v-model="form"
-            @search-change="searchChange" @search-reset="searchReset" @selection-change="selectionChange"
-            @current-change="currentChange" @size-change="sizeChange" @refresh-change="refreshChange" @on-load="onLoad">
-            <template slot-scope="{row, size, index}" slot="menu">
-                <el-button type="text" :size="size" icon="el-icon-s-check" v-if="permission.work_todo_handle"
-                    @click.stop="handleWork(row)">处理
-                </el-button>
-                <el-button type="text" :size="size" icon="el-icon-info" v-if="permission.work_todo_detail"
-                    @click.stop="handleDetail(row)">详情
-                </el-button>
-                <el-button type="text" :size="size" icon="el-icon-search" v-if="permission.work_todo_follow"
-                    @click.stop="handleImage(row, index)">流程图
-                </el-button>
-            </template>
+  <div>
+    <avue-crud :option="option" :table-loading="loading" :data="data" ref="crud" v-model="form"
+      @search-change="searchChange" @search-reset="searchReset" @selection-change="selectionChange"
+      @current-change="currentChange" @size-change="sizeChange" @refresh-change="refreshChange" @on-load="onLoad">
+      <template slot-scope="{row, size, index}" slot="menu">
+        <el-button type="text" :size="size" icon="el-icon-s-check" v-if="permission.work_todo_handle"
+          @click.stop="handleWork(row)">处理
+        </el-button>
+        <el-button type="text" :size="size" icon="el-icon-info" v-if="permission.work_todo_detail"
+          @click.stop="handleDetail(row)">详情
+        </el-button>
+        <el-button type="text" :size="size" icon="el-icon-search" v-if="permission.work_todo_follow"
+          @click.stop="handleImage(row, index)">流程图
+        </el-button>
+      </template>
 
-            <template slot-scope="{row, size}" slot="processDefinitionVersion">
-                <el-tag :size="size">v{{ row.processDefinitionVersion }}</el-tag>
-            </template>
-            <template slot-scope="{row, size}" slot="linkPhone">
-                <el-button :size="size" type="text" @click="showStringDispose(row, 'linkPhoneflag')"
-                    v-text="textDispose(row, 'linkPhoneflag', 'linkPhone')">
-                </el-button>
-            </template>
-        </avue-crud>
-        <flow-design is-dialog :is-display.sync="flowBox" :process-instance-id="processInstanceId"></flow-design>
-    </div>
+      <template slot-scope="{row, size}" slot="processDefinitionVersion">
+        <el-tag :size="size">v{{ row.processDefinitionVersion }}</el-tag>
+      </template>
+      <template slot-scope="{row, size}" slot="linkPhone">
+        <el-button :size="size" type="text" @click="showStringDispose(row, 'linkPhoneflag')"
+          v-text="textDispose(row, 'linkPhoneflag', 'linkPhone')">
+        </el-button>
+      </template>
+    </avue-crud>
+    <flow-design is-dialog :is-display.sync="flowBox" :process-instance-id="processInstanceId"></flow-design>
+  </div>
 </template>
-  
+
 <script>
-import {
+  import {
     mapGetters
-} from "vuex"
-import {
+  } from "vuex"
+  import {
     todoList
-} from "@/api/work/work"
-import {
+  } from "@/api/work/work"
+  import {
     flowCategory,
     flowRoute
-} from "@/util/flow"
+  } from "@/util/flow"
 
-export default {
-    data () {
-        return {
-            typeStatus: 1,
-            form: {},
-            selectionId: '',
-            selectionList: [],
-            query: {},
-            loading: true,
-            page: {
-                pageSize: 10,
-                currentPage: 1,
-                total: 0
-            },
-            processInstanceId: '',
-            flowBox: false,
-            workBox: false,
-            option: {
-                labelWidth: 120,
-                searchLabelWidth: 96,
-                searchShow: true,
-                searchMenuSpan: 3,
-                menuWidth: 210,
+  export default {
+    data() {
+      return {
+        datetime: "",
+        typeStatus: 1,
+        form: {},
+        selectionId: '',
+        selectionList: [],
+        query: {},
+        loading: true,
+        page: {
+          pageSize: 10,
+          currentPage: 1,
+          total: 0
+        },
+        processInstanceId: '',
+        flowBox: false,
+        workBox: false,
+        option: {
+          labelWidth: 120,
+          searchLabelWidth: 96,
+          searchShow: true,
+          searchMenuSpan: 3,
+          menuWidth: 210,
 
-                height: 'auto',
-                calcHeight: 30,
-                tip: false,
-                simplePage: true,
-                border: true,
-                index: true,
-                // selection: true,
-                editBtn: false,
-                addBtn: false,
-                viewBtn: false,
-                delBtn: false,
-                columnBtn: false,
-                dialogWidth: 900,
-                dialogClickModal: false,
-                header: false,
-                column: [{
-                    label: "流程分类",
-                    type: "select",
-                    row: true,
-                    dicUrl: "/api/blade-system/dict/dictionary?code=flow",
-                    props: {
-                        label: "dictValue",
-                        value: "dictKey"
-                    },
-                    dataType: "number",
-                    slot: true,
-                    prop: "category",
-                    // search: true,
-                    hide: true,
-                    width: 100,
-                },
-                {
-                    width: 100,
-                    label: '申请类型',
-                    prop: 'categoryName',
-                    // search: true,
-                },
-                {
-                    width: 220,
-                    overHidden: true,
-                    label: "小区",
-                    prop: "districtId",
-                    // search: true,
-                    type: 'tree',
-                    dicUrl: `/api/blade-district/district/getDistrictTree`,
-                    props: {
-                        label: "name",
-                        value: "id"
-                    },
-                    defaultExpandedKeys: ["361102003"],
-                    searchSpan: 5,
-                    span: 12,
-                },
-                {
-                    width: 110,
-                    label: '联系人',
-                    prop: 'linkman',
-                    // search: true,
-                },
-                {
-                    width: 120,
-                    label: '联系电话',
-                    prop: 'linkPhone',
-                    // search: true,
-                    slot: true
-                },
-                {
-                    label: '项目名称',
-                    prop: 'name',
-                    // search: true,
-                },
-                {
-                    label: '当前步骤',
-                    prop: 'taskName',
-                },
-                // {
-                //   label: '流程版本',
-                //   prop: 'processDefinitionVersion',
-                //   // slot: true,
-                //   width: 80,
-                // },
-                {
-                    width: 144,
-                    label: '申请时间',
-                    prop: 'createTime',
-                },
-                ]
+          height: 'auto',
+          calcHeight: 30,
+          tip: false,
+          simplePage: true,
+          border: true,
+          index: true,
+          // selection: true,
+          editBtn: false,
+          addBtn: false,
+          viewBtn: false,
+          delBtn: false,
+          columnBtn: false,
+          dialogWidth: 900,
+          dialogClickModal: false,
+          header: false,
+          column: [{
+              label: "流程分类",
+              type: "select",
+              row: true,
+              dicUrl: "/api/blade-system/dict/dictionary?code=flow",
+              props: {
+                label: "dictValue",
+                value: "dictKey"
+              },
+              dataType: "number",
+              slot: true,
+              prop: "category",
+              // search: true,
+              hide: true,
+              width: 100,
             },
-            data: []
-        }
+            {
+              width: 100,
+              label: '申请类型',
+              prop: 'categoryName',
+              // search: true,
+            },
+            {
+              width: 220,
+              overHidden: true,
+              label: "小区",
+              prop: "districtId",
+              // search: true,
+              type: 'tree',
+              dicUrl: `/api/blade-district/district/getDistrictTree`,
+              props: {
+                label: "name",
+                value: "id"
+              },
+              defaultExpandedKeys: ["361102003"],
+              searchSpan: 5,
+              span: 12,
+            },
+            {
+              width: 110,
+              label: '小区名称',
+              prop: 'districtName',
+              search: true,
+              hide: true,
+            },
+            // {
+            //   label: '项目名称',
+            //   prop: 'name',
+            //   search: true,
+            // },
+            {
+              label: "申请时间",
+              prop: "dateTime",
+              type: "datetimerange",
+              defaultTime: ['00:00:00', '23:59:59'],
+              format: 'yyyy-MM-dd HH:mm:ss',
+              valueFormat: 'yyyy-MM-dd HH:mm:ss',
+              startPlaceholder: '开始范围自定义',
+              endPlaceholder: '结束范围自定义',
+              searchSpan: 5,
+              searchRange: true,
+              hide: true,
+              addDisplay: false,
+              editDisplay: false,
+              viewDisplay: false,
+              search: true,
+              rules: [{
+                required: true,
+                message: "请选择申请时间",
+                trigger: "blur",
+              }, ],
+            },
+
+            {
+              width: 110,
+              label: '联系人',
+              prop: 'linkman',
+              // search: true,
+            },
+            {
+              width: 120,
+              label: '联系电话',
+              prop: 'linkPhone',
+              // search: true,
+              slot: true
+            },
+            {
+              label: '项目名称',
+              prop: 'name',
+              // search: true,
+            },
+            {
+              label: '当前步骤',
+              prop: 'taskName',
+            },
+            // {
+            //   label: '流程版本',
+            //   prop: 'processDefinitionVersion',
+            //   // slot: true,
+            //   width: 80,
+            // },
+            {
+              width: 144,
+              label: '申请时间',
+              prop: 'createTime',
+            },
+          ]
+        },
+        data: []
+      }
     },
     computed: {
-        ...mapGetters(["permission", "flowRoutes"]),
-        ids () {
-            let ids = []
-            this.selectionList.forEach(ele => {
-                ids.push(ele.id)
-            })
-            return ids.join(",")
-        },
+      ...mapGetters(["permission", "flowRoutes"]),
+      ids() {
+        let ids = []
+        this.selectionList.forEach(ele => {
+          ids.push(ele.id)
+        })
+        return ids.join(",")
+      },
 
-        textDispose () {
-            return (row, flag, type) => {
-                if (row[flag] || row[type] == null) {
-                    return row[type]
-                } else {
-                    if (type == 'principalIdCard') {
-                        return row[type].replace(/^(.{6})(?:\d+)(.{4})$/, "$1******$2")
-                    } else {
-                        return row[type].replace(/^(.{3})(?:\d+)(.{4})$/, "$1****$2")
-                    }
-                }
+      textDispose() {
+        return (row, flag, type) => {
+          if (row[flag] || row[type] == null) {
+            return row[type]
+          } else {
+            if (type == 'principalIdCard') {
+              return row[type].replace(/^(.{6})(?:\d+)(.{4})$/, "$1******$2")
+            } else {
+              return row[type].replace(/^(.{3})(?:\d+)(.{4})$/, "$1****$2")
             }
+          }
         }
+      }
     },
     methods: {
 
-        changeType (type) {
-            this.typeStatus = type
-            this.page.currentPage = 1
-            // this.onLoad(this.page)
-        },
-        showStringDispose (row, type) {
-            row[type] = !row[type]
-        },
+      changeType(type) {
+        this.typeStatus = type
+        this.page.currentPage = 1
+        // this.onLoad(this.page)
+      },
+      showStringDispose(row, type) {
+        row[type] = !row[type]
+      },
 
-        searchReset () {
-            this.query = {}
-            this.onLoad(this.page)
-        },
-        searchChange (params, done) {
-            this.query = params
-            this.page.currentPage = 1
-            this.onLoad(this.page, params)
-            done()
-        },
-        selectionChange (list) {
-            this.selectionList = list
-        },
-        selectionClear () {
-            this.selectionList = []
-            this.$refs.crud.toggleSelection()
-        },
-        handleWork (row) {
-            this.$router.push({
-                path: `/propertySupervision/process/${flowRoute(this.flowRoutes, row.category)}/handle/${row.taskId}/${row.processInstanceId}/${row.businessId}`
-            })
-        },
-        handleDetail (row) {
-            this.$router.push({
-                path: `/propertySupervision/process/${flowRoute(this.flowRoutes, row.category)}/detail/${row.processInstanceId}/${row.businessId}`
-            })
-        },
-        handleImage (row) {
-            this.processInstanceId = row.processInstanceId
-            this.flowBox = true
-        },
-        currentChange (currentPage) {
-            this.page.currentPage = currentPage
-        },
-        sizeChange (pageSize) {
-            this.page.pageSize = pageSize
-        },
-        refreshChange () {
-            this.onLoad(this.page, this.query)
-        },
-        onLoad (page, params = {}) {
-            const query = {
-                ...this.query,
-                category: (params.category) ? flowCategory(params.category) : null
-            }
-            this.loading = true
-            todoList(page.currentPage, page.pageSize, Object.assign(params, query)).then(res => {
-                const data = {
-                    ...res.data.data,
-                    records: res.data.data.records.map(item => {
-                        return {
-                            ...item,
-                            'linkPhoneflag': false
-                        }
-                    })
-                }
-                this.page.total = data.total
-                this.data = data.records
-                this.loading = false
-                this.selectionClear()
-            })
+      searchReset() {
+        this.query = {}
+        this.onLoad(this.page)
+      },
+      searchChange(params, done) {
+        this.query = params
+        this.page.currentPage = 1
+        this.onLoad(this.page, params)
+        done()
+      },
+      selectionChange(list) {
+        this.selectionList = list
+      },
+      selectionClear() {
+        this.selectionList = []
+        this.$refs.crud.toggleSelection()
+      },
+      handleWork(row) {
+        this.$router.push({
+          path: `/propertySupervision/process/${flowRoute(this.flowRoutes, row.category)}/handle/${row.taskId}/${row.processInstanceId}/${row.businessId}`
+        })
+      },
+      handleDetail(row) {
+        this.$router.push({
+          path: `/propertySupervision/process/${flowRoute(this.flowRoutes, row.category)}/detail/${row.processInstanceId}/${row.businessId}`
+        })
+      },
+      handleImage(row) {
+        this.processInstanceId = row.processInstanceId
+        this.flowBox = true
+      },
+      currentChange(currentPage) {
+        this.page.currentPage = currentPage
+      },
+      sizeChange(pageSize) {
+        this.page.pageSize = pageSize
+      },
+      refreshChange() {
+        this.onLoad(this.page, this.query)
+      },
+      onLoad(page, params = {}) {
+        let query = {
+          ...this.query,
+          category: (params.category) ? flowCategory(params.category) : null
         }
-    }
-}
-</script>
-  
-  
-<style lang="scss" scoped>
-.avue-upload__icon {
-    line-height: 6;
-}
+        const {
+          dateTime
+        } = query
 
-.tab-list {
+        if (dateTime) {
+          query = {
+            startTimes: dateTime[0],
+            endTimes: dateTime[1],
+          }
+        }
+        this.loading = true
+        todoList(page.currentPage, page.pageSize, Object.assign(params, query)).then(res => {
+          const data = {
+            ...res.data.data,
+            records: res.data.data.records.map(item => {
+              return {
+                ...item,
+                'linkPhoneflag': false
+              }
+            })
+          }
+          this.page.total = data.total
+          this.data = data.records
+          this.loading = false
+          this.selectionClear()
+        })
+      }
+    }
+  }
+</script>
+
+
+<style lang="scss" scoped>
+  .avue-upload__icon {
+    line-height: 6;
+  }
+
+  .tab-list {
     display: flex;
     margin-right: 6px;
     border: 1px solid #dcdfe6;
@@ -272,55 +318,55 @@
     width: 121px;
 
     &>div {
-        display: flex;
-        align-items: center;
-        justify-content: center;
-        width: 60px;
-        cursor: pointer;
-        font-size: 12px;
+      display: flex;
+      align-items: center;
+      justify-content: center;
+      width: 60px;
+      cursor: pointer;
+      font-size: 12px;
     }
 
     &>div:nth-child(2) {
-        border-left: 1px solid #dcdfe6;
-        // border-right: 1px solid #dcdfe6;
+      border-left: 1px solid #dcdfe6;
+      // border-right: 1px solid #dcdfe6;
     }
 
     .choose {
-        color: #FFF;
-        background-color: #409dfe;
+      color: #FFF;
+      background-color: #409dfe;
     }
-}
+  }
 
-:deep(.avue-crud__left) {
+  :deep(.avue-crud__left) {
     display: flex;
     align-items: center;
-}
+  }
 
-:deep(.el-drawer__header) {
+  :deep(.el-drawer__header) {
     margin-bottom: 10px;
-}
+  }
 
-:deep(.el-radio__input.is-disabled+span.el-radio__label) {
+  :deep(.el-radio__input.is-disabled+span.el-radio__label) {
     color: #000;
-}
+  }
 
-:deep(.el-radio__input.is-checked+.el-radio__label) {
+  :deep(.el-radio__input.is-checked+.el-radio__label) {
     color: #409EFF !important;
-}
+  }
 
-:deep(.el-radio__input.is-checked .el-radio__inner::after) {
+  :deep(.el-radio__input.is-checked .el-radio__inner::after) {
     background-color: #FFF;
-}
+  }
 
-:deep(.el-radio__input.is-checked .el-radio__inner) {
+  :deep(.el-radio__input.is-checked .el-radio__inner) {
     background-color: #409EFF;
-}
+  }
 
-:deep(.el-radio) {
+  :deep(.el-radio) {
     margin-right: 20px;
-}
+  }
 
-.title {
+  .title {
     margin: 10px;
     height: 40px;
     background-color: #eee;
@@ -328,119 +374,119 @@
     align-items: center;
 
     .icon {
-        width: 4px;
-        height: 18px;
-        background-color: #409dfe;
-        margin: 0 10px;
-        color: transparent;
+      width: 4px;
+      height: 18px;
+      background-color: #409dfe;
+      margin: 0 10px;
+      color: transparent;
     }
-}
+  }
 
-.basic-info {
+  .basic-info {
     padding: 0 20px;
     font-size: 14px;
 
     .info-item {
+      display: flex;
+      padding: 10px;
+
+      .info-name {
+        width: 100px;
         display: flex;
-        padding: 10px;
+        align-items: center;
+      }
 
-        .info-name {
-            width: 100px;
-            display: flex;
-            align-items: center;
-        }
-
-        .info-value {
-            display: flex;
-            align-items: center;
-        }
+      .info-value {
+        display: flex;
+        align-items: center;
+      }
     }
-}
+  }
 
-.question-list {
+  .question-list {
     padding: 0 20px;
     font-size: 14px;
 
     .question-type {
-        height: 60px;
-        display: flex;
-        align-items: center;
-        cursor: pointer;
-        justify-content: space-between;
-        padding-right: 20px;
+      height: 60px;
+      display: flex;
+      align-items: center;
+      cursor: pointer;
+      justify-content: space-between;
+      padding-right: 20px;
 
-        .type-name {}
+      .type-name {}
 
-        .icon-box {}
+      .icon-box {}
     }
 
     .question-item {
-        margin-bottom: 20px;
-        padding: 10px;
-        background: #f5f7fa;
-        border-radius: 8px;
+      margin-bottom: 20px;
+      padding: 10px;
+      background: #f5f7fa;
+      border-radius: 8px;
 
-        &>div {
-            margin: 14px 0;
+      &>div {
+        margin: 14px 0;
+      }
+
+      .question-name {
+        display: flex;
+
+        .key {
+          width: 80%;
+          padding-right: 20px;
+          word-break: break-all;
         }
 
-        .question-name {
-            display: flex;
+        .value {
+          width: 20%;
+          display: flex;
+          align-items: center;
+          justify-content: center;
+        }
+      }
 
-            .key {
-                width: 80%;
-                padding-right: 20px;
-                word-break: break-all;
-            }
+      .yh-pic-box {
+        display: flex;
+        height: 100px;
 
-            .value {
-                width: 20%;
-                display: flex;
-                align-items: center;
-                justify-content: center;
-            }
+        .yh-pic-name {
+          width: 100px;
+          display: flex;
+          align-items: center;
+          justify-content: left;
         }
 
-        .yh-pic-box {
-            display: flex;
-            height: 100px;
+        .yh-pic-list {
+          width: 0;
+          flex: 1;
+          display: flex;
+        }
+      }
 
-            .yh-pic-name {
-                width: 100px;
-                display: flex;
-                align-items: center;
-                justify-content: left;
-            }
+      .yh-remark {
+        display: flex;
 
-            .yh-pic-list {
-                width: 0;
-                flex: 1;
-                display: flex;
-            }
+        .yh-remark-name {
+          width: 100px;
+          display: flex;
+          align-items: center;
+          justify-content: left;
         }
 
-        .yh-remark {
-            display: flex;
-
-            .yh-remark-name {
-                width: 100px;
-                display: flex;
-                align-items: center;
-                justify-content: left;
-            }
-
-            .yh-remark-value {
-                word-break: break-all;
-            }
+        .yh-remark-value {
+          word-break: break-all;
         }
+      }
     }
 
     .remark-box {
-        padding: 10px;
-        background-color: #f5f7fa;
-        border-radius: 8px;
-        min-height: 40px;
-        margin-bottom: 20px;
+      padding: 10px;
+      background-color: #f5f7fa;
+      border-radius: 8px;
+      min-height: 40px;
+      margin-bottom: 20px;
     }
-}
+  }
 </style>
\ No newline at end of file

--
Gitblit v1.9.3