From 6c5b4b6272ec0cdc0155e33ed37a2656da2ae4a2 Mon Sep 17 00:00:00 2001
From: gaoyunqi <gaoyunqi@gdyd.com>
Date: Mon, 22 Jul 2024 19:46:51 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E5=A2=9E=E5=8A=A0=E5=B7=B2=E5=8A=9E?=
 =?UTF-8?q?=E9=A1=B5=E9=9D=A2=E7=9A=84=E7=8B=AC=E7=AB=8B=E9=93=BE=E6=8E=A5?=
 =?UTF-8?q?=20fix:=20=E7=BB=84=E7=BB=87=E7=AE=A1=E7=90=86=E7=9A=84?=
 =?UTF-8?q?=E4=B8=BB=E5=88=97=E8=A1=A8=E6=94=B9=E4=B8=BA=E6=87=92=E5=8A=A0?=
 =?UTF-8?q?=E8=BD=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/Table/src/hooks/useColumns.ts  |   2 +-
 src/router/routes/basic.ts                    |   8 +
 src/views/secondDev/processTasksPage.vue      |   4 +-
 src/views/system/department/index.vue         | 503 +++++++++---------
 .../components/processTasks/TaskDoneV2.vue    | 111 ++++
 5 files changed, 384 insertions(+), 244 deletions(-)
 create mode 100644 src/views/workflow/task/components/processTasks/TaskDoneV2.vue

diff --git a/src/components/Table/src/hooks/useColumns.ts b/src/components/Table/src/hooks/useColumns.ts
index 5c108dd..32e18f7 100644
--- a/src/components/Table/src/hooks/useColumns.ts
+++ b/src/components/Table/src/hooks/useColumns.ts
@@ -67,7 +67,7 @@ function handleIndexColumn(
     flag: INDEX_COLUMN_FLAG,
     width: 50,
     title: t('序号'),
-    align: 'right',
+    align: 'center',
     customRender: ({ index }) => {
       const getPagination = unref(getPaginationRef);
       if (isBoolean(getPagination)) {
diff --git a/src/router/routes/basic.ts b/src/router/routes/basic.ts
index 0de6e4c..8cf1cd9 100644
--- a/src/router/routes/basic.ts
+++ b/src/router/routes/basic.ts
@@ -182,6 +182,14 @@ export const FLOW_ROUTE: AppRouteRecordRaw[] = [{
             meta: {
                 title: '我发起的'
             }
+        },
+        {
+            path: 'done',
+            name: 'FlowListPage4',
+            component: () => import('/@/views/secondDev/processTasksPage.vue'),
+            meta: {
+                title: '已办'
+            }
         }
     ]
 }, {
diff --git a/src/views/secondDev/processTasksPage.vue b/src/views/secondDev/processTasksPage.vue
index e73ebe8..9eea0c4 100644
--- a/src/views/secondDev/processTasksPage.vue
+++ b/src/views/secondDev/processTasksPage.vue
@@ -24,7 +24,7 @@
         loader: () => import('../workflow/task/components/processTasks/MyProcessV2.vue')
     });
     const TaskDone = defineAsyncComponent({
-        loader: () => import('../workflow/task/components/processTasks/TaskDone.vue')
+        loader: () => import('../workflow/task/components/processTasks/TaskDoneV2.vue')
     });
 
     const RecycleBin = defineAsyncComponent({
@@ -100,6 +100,8 @@
         id = 'Drafts';
     } else if (lHash.indexOf('/myProcess') > 0) {
         id = 'MyProcess';
+    } else if (lHash.indexOf('/done') > 0) {
+        id = 'TaskDone';
     }
     let data = reactive({
         componentName: shallowRef(ToDoTasks)
diff --git a/src/views/system/department/index.vue b/src/views/system/department/index.vue
index 7996b44..7c20b5b 100644
--- a/src/views/system/department/index.vue
+++ b/src/views/system/department/index.vue
@@ -1,261 +1,280 @@
 <template>
-  <PageWrapper dense contentFullHeight fixedHeight>
-    <BasicTable @register="registerTable">
-      <template #toolbar>
-        <a-button type="primary" v-auth="'department:add'" @click="handleCreate">
-          {{ t('新增组织') }}
-        </a-button>
-      </template>
-      <template #bodyCell="{ column, record }">
-        <template v-if="column.dataIndex == 'name'">
-          <a-tag color="processing" v-if="record.departmentType === 1">公司</a-tag>
-          <a-tag color="warning" v-else-if="record.departmentType === 0">部门</a-tag>
-          &nbsp;{{ record.name }}
-        </template>
-        <template v-if="column.dataIndex == 'action'">
-          <TableAction
-            :actions="[
-              {
-                icon: 'ant-design:user-add-outlined',
-                auth: 'department:addUser',
-                tooltip: '添加人员',
-                onClick: handleAddUser.bind(null, record),
-              },
-              {
-                icon: 'clarity:note-edit-line',
-                auth: 'department:edit',
-                onClick: handleEdit.bind(null, record),
-              },
-              {
-                icon: 'ant-design:delete-outlined',
-                color: 'error',
-                auth: 'department:delete',
-                popConfirm: {
-                  title: t('是否确认删除'),
-                  confirm: handleDelete.bind(null, record),
-                },
-              },
-            ]"
-          />
-        </template>
-      </template>
-    </BasicTable>
-    <DeptDrawer @register="registerDrawer" @success="handleSuccess" />
-    <SelectMember
-      v-if="visible"
-      :visible="visible"
-      :multiple="true"
-      :selectedIds="selectedUserIds"
-      :isShowTree="false"
-      @close="
-        () => {
-          visible = false;
-        }
-      "
-      @change="handleDeptUser"
-    />
-  </PageWrapper>
+    <PageWrapper contentFullHeight dense fixedHeight>
+        <BasicTable @expand="handleExpand" @register="registerTable">
+            <template #toolbar>
+                <a-button v-auth="'department:add'" type="primary" @click="handleCreate">
+                    {{ t('新增组织') }}
+                </a-button>
+            </template>
+            <template #bodyCell="{ column, record }">
+                <template v-if="column.dataIndex == 'name'">
+                    <a-tag v-if="record.departmentType === 1" color="processing">公司</a-tag>
+                    <a-tag v-else-if="record.departmentType === 0" color="warning">部门</a-tag>
+                    &nbsp;{{ record.name }}
+                </template>
+                <template v-if="column.dataIndex == 'action'">
+                    <TableAction
+                        :actions="[
+                            {
+                                icon: 'ant-design:user-add-outlined',
+                                auth: 'department:addUser',
+                                tooltip: '添加人员',
+                                onClick: handleAddUser.bind(null, record)
+                            },
+                            {
+                                icon: 'clarity:note-edit-line',
+                                auth: 'department:edit',
+                                onClick: handleEdit.bind(null, record)
+                            },
+                            {
+                                icon: 'ant-design:delete-outlined',
+                                color: 'error',
+                                auth: 'department:delete',
+                                popConfirm: {
+                                    title: t('是否确认删除'),
+                                    confirm: handleDelete.bind(null, record)
+                                }
+                            }
+                        ]"
+                    />
+                </template>
+            </template>
+        </BasicTable>
+        <DeptDrawer @register="registerDrawer" @success="handleSuccess" />
+        <SelectMember
+            v-if="visible"
+            :isShowTree="false"
+            :multiple="true"
+            :selectedIds="selectedUserIds"
+            :visible="visible"
+            @change="handleDeptUser"
+            @close="
+                () => {
+                    visible = false;
+                }
+            "
+        />
+    </PageWrapper>
 </template>
 <script lang="ts">
-  import { defineComponent, h, ref } from 'vue';
+    import { defineComponent, h, ref } from 'vue';
 
-  import { BasicTable, useTable, TableAction, BasicColumn, FormSchema } from '/@/components/Table';
+    import { BasicTable, useTable, TableAction, BasicColumn, FormSchema } from '/@/components/Table';
 
-  import { useModal } from '/@/components/Modal';
-  import { PageWrapper } from '/@/components/Page';
-  import DeptDrawer from './components/DeptDrawer.vue';
-  import { Switch } from 'ant-design-vue';
-  import { useMessage } from '/@/hooks/web/useMessage';
-  // import { useI18n } from 'vue-i18n';
-  import { SelectMember } from '/@/components/SelectOrganizational/index';
-  import {
-    deleteDepartment,
-    getDepartmentEnabledTree,
-    getDepartmentUserList,
-    updateDepartmentUser,
-  } from '/@/api/system/department';
-  import { useI18n } from '/@/hooks/web/useI18n';
-  const { t } = useI18n();
-  export const columns: BasicColumn[] = [
-    {
-      title: t('组织名称'),
-      dataIndex: 'name',
-      width: 400,
-      align: 'left',
-      sorter: true,
-    },
-    {
-      title: '组织编码',
-      dataIndex: 'code',
-      sorter: true,
-      align: 'left',
-      width: 100,
-    },
+    import { useModal } from '/@/components/Modal';
+    import { PageWrapper } from '/@/components/Page';
+    import DeptDrawer from './components/DeptDrawer.vue';
+    import { Switch } from 'ant-design-vue';
+    import { useMessage } from '/@/hooks/web/useMessage';
+    // import { useI18n } from 'vue-i18n';
+    import { SelectMember } from '/@/components/SelectOrganizational/index';
+    import { deleteDepartment, getDepartmentEnabledTree, getDepartmentTrees, getDepartmentUserList, updateDepartmentUser } from '/@/api/system/department';
+    import { useI18n } from '/@/hooks/web/useI18n';
 
-    {
-      title: t('状态'),
-      dataIndex: 'enabledMark',
-      width: 80,
-      sorter: true,
-      align: 'left',
-      customRender: ({ record }) => {
-        const enabledMark = record.enabledMark == 1 ? true : false;
-
-        return h(Switch, { checked: enabledMark });
-      },
-    },
-    {
-      title: t('主页'),
-      dataIndex: 'website',
-      width: 200,
-      align: 'left',
-      sorter: true,
-    },
-    {
-      title: t('地址'),
-      dataIndex: 'address',
-      width: 200,
-      align: 'left',
-      sorter: true,
-    },
-    {
-      title: t('备注'),
-      dataIndex: 'remark',
-      align: 'left',
-      width: 150,
-      sorter: true,
-    },
-  ];
-
-  export const searchFormSchema: FormSchema[] = [
-    {
-      field: 'name',
-      label: t('组织名称'),
-      component: 'Input',
-    },
-    {
-      field: 'code',
-      label: t('组织编码'),
-      component: 'Input',
-    },
-    {
-      field: 'enabledMark',
-      label: t('状态'),
-      component: 'Select',
-      componentProps: {
-        options: [
-          { label: t('启用'), value: 1 },
-          { label: t('停用'), value: 0 },
-        ],
-      },
-    },
-  ];
-
-  export default defineComponent({
-    name: 'DeptManagement',
-    components: { BasicTable, TableAction, DeptDrawer, PageWrapper, SelectMember },
-    setup() {
-      const { notification } = useMessage();
-      const [registerDrawer, { openModal }] = useModal();
-      const [registerTable, { reload }] = useTable({
-        title: t('组织列表'),
-        api: getDepartmentEnabledTree,
-        columns,
-        formConfig: {
-          rowProps: {
-            gutter: 16,
-          },
-          schemas: searchFormSchema,
-          actionColOptions: { span: 16 },
-          showResetButton: false,
+    const { t } = useI18n();
+    export const columns: BasicColumn[] = [
+        {
+            title: t('组织名称'),
+            dataIndex: 'name',
+            width: 400,
+            align: 'left',
+            sorter: true
         },
-        beforeFetch: (params) => {
-          return {
-            ...params,
-            isOrg: 1,
-          };
+        {
+            title: '组织编码',
+            dataIndex: 'code',
+            sorter: true,
+            align: 'left',
+            width: 100
         },
-        pagination: {
-          pageSize: 20,
+
+        {
+            title: t('状态'),
+            dataIndex: 'enabledMark',
+            width: 80,
+            sorter: true,
+            align: 'left',
+            customRender: ({ record }) => {
+                const enabledMark = record.enabledMark == 1 ? true : false;
+
+                return h(Switch, { checked: enabledMark });
+            }
         },
-        striped: false,
-        useSearchForm: true,
-        showTableSetting: true,
-        showIndexColumn: false,
-        actionColumn: {
-          width: 100,
-          title: t('操作'),
-          dataIndex: 'action',
-          slots: { customRender: 'action' },
+        {
+            title: t('主页'),
+            dataIndex: 'website',
+            width: 200,
+            align: 'left',
+            sorter: true
         },
-        tableSetting: {
-          size: false,
-          setting: false,
+        {
+            title: t('地址'),
+            dataIndex: 'address',
+            width: 200,
+            align: 'left',
+            sorter: true
         },
-      });
+        {
+            title: t('备注'),
+            dataIndex: 'remark',
+            align: 'left',
+            width: 150,
+            sorter: true
+        }
+    ];
 
-      const visible = ref<boolean>(false);
-      const selectedUserIds = ref<string[]>([]);
-      const deptId = ref('');
+    export const searchFormSchema: FormSchema[] = [
+        {
+            field: 'name',
+            label: t('组织名称'),
+            component: 'Input'
+        },
+        {
+            field: 'code',
+            label: t('组织编码'),
+            component: 'Input'
+        },
+        {
+            field: 'enabledMark',
+            label: t('状态'),
+            component: 'Select',
+            componentProps: {
+                options: [
+                    { label: t('启用'), value: 1 },
+                    { label: t('停用'), value: 0 }
+                ]
+            }
+        }
+    ];
 
-      function handleCreate() {
-        openModal(true, {
-          isUpdate: false,
-        });
-      }
+    export default defineComponent({
+        name: 'DeptManagement',
+        components: { BasicTable, TableAction, DeptDrawer, PageWrapper, SelectMember },
+        setup() {
+            const { notification } = useMessage();
+            const [registerDrawer, { openModal }] = useModal();
+            const [registerTable, { reload }] = useTable({
+                title: t('组织列表'),
+                api: getDepartmentTrees,
+                columns,
+                formConfig: {
+                    rowProps: {
+                        gutter: 16
+                    },
+                    schemas: searchFormSchema,
+                    actionColOptions: { span: 16 },
+                    showResetButton: false
+                },
+                beforeFetch: (params) => {
+                    return {
+                        ...params,
+                        isOrg: 1
+                    };
+                },
+                pagination: {
+                    pageSize: 20
+                },
+                striped: false,
+                useSearchForm: true,
+                showTableSetting: true,
+                showIndexColumn: false,
+                actionColumn: {
+                    width: 100,
+                    title: t('操作'),
+                    dataIndex: 'action',
+                    slots: { customRender: 'action' }
+                },
+                tableSetting: {
+                    size: false,
+                    setting: false
+                }
+            });
 
-      function handleEdit(record: Recordable) {
-        openModal(true, {
-          record,
-          isUpdate: true,
-        });
-      }
+            const visible = ref<boolean>(false);
+            const selectedUserIds = ref<string[]>([]);
+            const deptId = ref('');
 
-      function handleDelete(record: Recordable) {
-        deleteDepartment([record.id]).then((_) => {
-          reload();
-          notification.success({
-            message: t('提示'),
-            description: t('删除成功'),
-          }); //提示消息
-        });
-      }
-      function handleAddUser(record: Recordable) {
-        deptId.value = record.id;
-        getDepartmentUserList({ id: record.id }).then((res) => {
-          selectedUserIds.value = res.map((it) => {
-            return it.id;
-          });
-          visible.value = true;
-        });
-      }
+            function handleCreate() {
+                openModal(true, {
+                    isUpdate: false
+                });
+            }
 
-      function handleDeptUser(v) {
-        updateDepartmentUser({ id: deptId.value, userIds: v }).then(() => {
-          notification.success({
-            message: '添加人员',
-            description: t('成功'),
-          });
-        });
-      }
+            function handleEdit(record: Recordable) {
+                openModal(true, {
+                    record,
+                    isUpdate: true
+                });
+            }
 
-      function handleSuccess() {
-        reload();
-      }
+            function handleDelete(record: Recordable) {
+                deleteDepartment([record.id]).then((_) => {
+                    reload();
+                    notification.success({
+                        message: t('提示'),
+                        description: t('删除成功')
+                    }); //提示消息
+                });
+            }
 
-      return {
-        registerTable,
-        registerDrawer,
-        handleCreate,
-        handleEdit,
-        handleDelete,
-        handleAddUser,
-        handleDeptUser,
-        handleSuccess,
-        visible,
-        selectedUserIds,
-        t,
-      };
-    },
-  });
+            function handleAddUser(record: Recordable) {
+                deptId.value = record.id;
+                getDepartmentUserList({ id: record.id }).then((res) => {
+                    selectedUserIds.value = res.map((it) => {
+                        return it.id;
+                    });
+                    visible.value = true;
+                });
+            }
+
+            function handleDeptUser(v) {
+                updateDepartmentUser({ id: deptId.value, userIds: v }).then(() => {
+                    notification.success({
+                        message: '添加人员',
+                        description: t('成功')
+                    });
+                });
+            }
+
+            function handleSuccess() {
+                reload();
+            }
+
+            function handleExpand(expanded, record) {
+                if (!expanded) {
+                    return;
+                }
+                const { id } = record;
+                if (record?.children.length || record._loaded) {
+                    return;
+                }
+                getDepartmentTrees({ id }).then((result) => {
+                    const node = result[0];
+                    if (node?.children.length) {
+                        node.children.forEach((item) => {
+                            item.children = [];
+                            item.key = item.id;
+                        });
+                        record.children = node.children;
+                    }
+                    record._loaded = true;
+                });
+            }
+
+            return {
+                registerTable,
+                registerDrawer,
+                handleCreate,
+                handleEdit,
+                handleDelete,
+                handleAddUser,
+                handleDeptUser,
+                handleSuccess,
+                handleExpand,
+                visible,
+                selectedUserIds,
+                t
+            };
+        }
+    });
 </script>
diff --git a/src/views/workflow/task/components/processTasks/TaskDoneV2.vue b/src/views/workflow/task/components/processTasks/TaskDoneV2.vue
new file mode 100644
index 0000000..125a343
--- /dev/null
+++ b/src/views/workflow/task/components/processTasks/TaskDoneV2.vue
@@ -0,0 +1,111 @@
+<template>
+  <BasicTable @register="registerTable" @selection-change="selectionChange">
+    <template #toolbar>
+      <div class="button-box">
+        <RejectProcess
+          :taskId="taskId"
+          :processId="processId"
+          @close="reload"
+          @restart="restartProcess"
+          class="mr-2"
+          ><a-button v-auth="'processtasks:withdraw'">{{ t('撤回') }}</a-button></RejectProcess
+        >
+      </div>
+    </template>
+
+    <template #currentProgress="{ record }">
+      <a-progress v-if="record.currentProgress" :percent="record.currentProgress" size="small" />
+    </template>
+  </BasicTable>
+  <LaunchProcess
+    v-if="restartProcessVisible"
+    :schemaId="schemaId"
+    :taskId="taskId"
+    @close="restartProcessClose"
+  />
+</template>
+
+<script setup lang="ts">
+  import userTaskTable from './../../hooks/userTaskTable';
+
+  import { ref } from 'vue';
+
+  import LookProcess from './../LookProcess.vue';
+  import LaunchProcess from './../LaunchProcess.vue';
+  import RejectProcess from './../RejectProcess.vue';
+
+  import { BasicTable, useTable, BasicColumn } from '/@/components/Table';
+  import { getSchemaTask } from '/@/api/workflow/process';
+  import { TaskTypeUrl } from '/@/enums/workflowEnum';
+  import { useI18n } from '/@/hooks/web/useI18n';
+  const { t } = useI18n();
+  const restartProcessVisible = ref(false);
+  const configColumns: BasicColumn[] = [
+    {
+      title: t('流水号'),
+      dataIndex: 'serialNumber',
+      width: 80,
+    },
+    {
+      title: t('流程名称'),
+      dataIndex: 'processName',
+      width: '32%',
+      align: 'left',
+    },
+    {
+      title: t('任务名称'),
+      dataIndex: 'currentTaskName',
+      width: '17%',
+      align: 'left',
+    },
+    {
+      title: t('当前进度'),
+      dataIndex: 'currentProgress',
+      width: '17%',
+      slots: { customRender: 'currentProgress' },
+    },
+    {
+      title: t('发起人'),
+      dataIndex: 'originator',
+      align: 'left',
+      width: 80,
+    },
+    {
+      title: t('发起时间'),
+      dataIndex: 'createTime',
+      align: 'left',
+      width: 120,
+    },
+  ];
+
+  const { formConfig, processId, taskId, schemaId, selectionChange } = userTaskTable();
+  const [registerTable, { reload }] = useTable({
+    title: t('已办任务列表'),
+    api: getSchemaTask,
+    rowKey: 'id',
+    columns: configColumns,
+    formConfig: formConfig(),
+    beforeFetch: (params) => {
+      return { data: params, taskUrl: TaskTypeUrl.FINISHED_TASKS };
+    },
+    useSearchForm: true,
+    showTableSetting: true,
+    striped: false,
+    pagination: {
+      pageSize: 18,
+    },
+    indexColumnProps: {
+      width: 50,
+    },
+  });
+
+  function restartProcess() {
+    restartProcessVisible.value = true;
+  }
+  function restartProcessClose() {
+    restartProcessVisible.value = false;
+    reload();
+  }
+</script>
+
+<style scoped></style>