Merge branch 'master' of http://s16s652780.51mypc.cn:49896/r/jczz_web

shuishen

2024-04-18 4522ab3fe8bd45ee753ef187448c1e884bbc601f

 src/views/property/components/done.vue

@@ -39,6 +39,7 @@
export default {
    data () {
        return {
        datetime: "",
            form: {},
            selectionId: '',
            selectionList: [],
@@ -73,8 +74,7 @@
                dialogWidth: 900,
                dialogClickModal: false,
                header: false,
                column: [
                    {
          column: [{
                        label: "流程分类",
                        type: "select",
                        row: true,
@@ -110,6 +110,39 @@
                        },
                        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: '联系人',
@@ -210,10 +243,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
            doneList(page.currentPage, page.pageSize, Object.assign(params, query)).then(res => {
                const data = {