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

shuishen

2024-04-18 4522ab3fe8bd45ee753ef187448c1e884bbc601f

 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 = {