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

shuishen

2023-12-23 4cfcbd0261cb7f360f9650cf07b5a3bbc07ae4a9

 src/views/work/done.vue

@@ -20,9 +20,16 @@
</template>

<script>
import { mapGetters } from "vuex"
import { doneList } from "@/api/work/work"
import { flowCategory, flowRoute } from "@/util/flow"
  import {
    mapGetters
  } from "vuex"
  import {
    doneList
  } from "@/api/work/work"
  import {
    flowCategory,
    flowRoute
  } from "@/util/flow"

export default {
    data () {
@@ -48,7 +55,7 @@
                searchMenuSpan: 6,
                border: true,
                index: true,
                selection: true,
          // selection: true,
                editBtn: false,
                addBtn: false,
                viewBtn: false,
@@ -56,8 +63,7 @@
                dialogWidth: 900,
                menuWidth: 280,
                dialogClickModal: false,
                column: [
                    {
          column: [{
                        label: "流程分类",
                        type: "select",
                        row: true,
@@ -69,25 +75,53 @@
                        dataType: "number",
                        slot: true,
                        prop: "category",
                        search: true,
              // search: true,
                        hide: true,
                        width: 100,
                    },
                    {
                        label: '流程名称',
                        prop: 'processDefinitionName',
                        search: true,
              label: '申请类型',
              prop: 'categoryName',
              // search: 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,
              labelWidth: 120,
              width: 220,
              overHidden: true,
            }, {
              label: '联系人',
              prop: 'linkman',
              // search: true,
            }, {
              label: '联系电话',
              prop: 'linkPhone',
              // search: true,
            }, {
              label: '项目名称',
              prop: 'name',
              // search: true,
                    },
                    {
                        label: '当前步骤',
                        prop: 'taskName',
                    },
                    {
                        label: '流程版本',
                        prop: 'processDefinitionVersion',
                        slot: true,
                        width: 80,
                    },
            // {
            //     label: '流程版本',
            //     prop: 'processDefinitionVersion',
            //     slot: true,
            //     width: 80,
            // },
                    {
                        label: '申请时间',
                        prop: 'createTime',
@@ -127,7 +161,9 @@
            this.$refs.crud.toggleSelection()
        },
        handleDetail (row) {
            this.$router.push({ path: `/work/process/${flowRoute(this.flowRoutes, row.category)}/detail/${row.processInstanceId}/${row.businessId}` })
        this.$router.push({
          path: `/work/process/${flowRoute(this.flowRoutes, row.category)}/detail/${row.processInstanceId}/${row.businessId}`
        })
        },
        handleImage (row) {
            this.processInstanceId = row.processInstanceId