From 96ed35405b32ec41eda70ea52cd2d7616f59adbc Mon Sep 17 00:00:00 2001
From: gaoyunqi <gaoyunqi@gdyd.com>
Date: Fri, 23 Feb 2024 20:36:59 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20=E9=87=8D=E6=96=B0=E6=8F=90=E4=BA=A4?=
 =?UTF-8?q?=E5=9B=A0=E4=B8=BAgit=20hooks=E8=A2=AB=E5=9B=9E=E6=BB=9A?=
 =?UTF-8?q?=E7=9A=84=E4=BB=A3=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .husky/commit-msg                             |   6 -
 .husky/common.sh                              |   9 --
 .husky/pre-commit                             |   8 -
 src/components/ModalPanel/src/DesignLogo.vue  |  12 +-
 src/views/secondDev/processTasksPage.vue      |   2 +-
 .../components/processTasks/ToDoTasksV2.vue   | 150 ++++++++++++++++++
 6 files changed, 157 insertions(+), 30 deletions(-)
 delete mode 100644 .husky/commit-msg
 delete mode 100644 .husky/common.sh
 delete mode 100644 .husky/pre-commit
 create mode 100644 src/views/workflow/task/components/processTasks/ToDoTasksV2.vue

diff --git a/.husky/commit-msg b/.husky/commit-msg
deleted file mode 100644
index 567ff71..0000000
--- a/.husky/commit-msg
+++ /dev/null
@@ -1,6 +0,0 @@
-#!/bin/sh
-
-# shellcheck source=./_/husky.sh
-. "$(dirname "$0")/_/husky.sh"
-
-npx --no-install commitlint --edit "$1"
diff --git a/.husky/common.sh b/.husky/common.sh
deleted file mode 100644
index 9d5129b..0000000
--- a/.husky/common.sh
+++ /dev/null
@@ -1,9 +0,0 @@
-#!/bin/sh
-command_exists () {
-  command -v "$1" >/dev/null 2>&1
-}
-
-# Workaround for Windows 10, Git Bash and Yarn
-if command_exists winpty && test -t 1; then
-  exec < /dev/tty
-fi
diff --git a/.husky/pre-commit b/.husky/pre-commit
deleted file mode 100644
index 35f9242..0000000
--- a/.husky/pre-commit
+++ /dev/null
@@ -1,8 +0,0 @@
-#!/bin/sh
-. "$(dirname "$0")/_/husky.sh"
-. "$(dirname "$0")/common.sh"
-
-[ -n "$CI" ] && exit 0
-
-# Format and submit code according to lintstagedrc.js configuration
-npm run lint:lint-staged
diff --git a/src/components/ModalPanel/src/DesignLogo.vue b/src/components/ModalPanel/src/DesignLogo.vue
index 91f9f38..9b85c0d 100644
--- a/src/components/ModalPanel/src/DesignLogo.vue
+++ b/src/components/ModalPanel/src/DesignLogo.vue
@@ -1,11 +1,11 @@
 <template>
-  <img :src="logoImg" width="208" style="height: 64px" />
+  <img :src="logoImg" width="208" style="height: 64px; transform: scale(0.8)" />
 </template>
 <script lang="ts" setup>
-  import logo from '/@/assets/images/design/logo.png';
-  import { useAppStore } from '/@/store/modules/app';
-  const appStore = useAppStore();
+    import logo from '/@/assets/images/design/logo.png';
+    import { useAppStore } from '/@/store/modules/app';
+    const appStore = useAppStore();
 
-  const logoConfig = appStore.getLogoConfig;
-  const logoImg = logoConfig.designerLogoUrl || logo;
+    const logoConfig = appStore.getLogoConfig;
+    const logoImg = logoConfig.designerLogoUrl || logo;
 </script>
diff --git a/src/views/secondDev/processTasksPage.vue b/src/views/secondDev/processTasksPage.vue
index b06513d..cfba8fd 100644
--- a/src/views/secondDev/processTasksPage.vue
+++ b/src/views/secondDev/processTasksPage.vue
@@ -7,7 +7,7 @@
 <script lang="ts" setup>
     import { reactive, shallowRef, defineAsyncComponent, unref, ref } from 'vue';
     import { PageWrapper } from '/@/components/Page';
-    import ToDoTasks from '/@/views/workflow/task/components/processTasks/ToDoTasks.vue';
+    import ToDoTasks from '/@/views/workflow/task/components/processTasks/ToDoTasksV2.vue';
     import { useRouter } from 'vue-router';
     import { useI18n } from '/@/hooks/web/useI18n';
     import { useMultipleTabStore } from '/@/store/modules/multipleTab';
diff --git a/src/views/workflow/task/components/processTasks/ToDoTasksV2.vue b/src/views/workflow/task/components/processTasks/ToDoTasksV2.vue
new file mode 100644
index 0000000..66e7134
--- /dev/null
+++ b/src/views/workflow/task/components/processTasks/ToDoTasksV2.vue
@@ -0,0 +1,150 @@
+<template>
+    <BasicTable @register="registerTable" @row-dbClick="onRowDblClick"
+                @selection-change="selectionChange">
+        <template #toolbar>
+            <BatchApprovalProcess
+                v-if="showBatchApproval"
+                :selectedRows="data.selectedRows"
+                @close="BatchClearHandler"
+            >
+                <a-button v-auth="'processtasks:batchApproval'">{{ t('批量审批') }}</a-button>
+            </BatchApprovalProcess>
+            <ApprovalProcess
+                v-else
+                :processId="processId"
+                :schemaId="schemaId"
+                :taskId="taskId"
+                :visible="false"
+                @close="clearHandler"
+            >
+                <a-button v-auth="'processtasks:approve'">{{ t('审批') }}</a-button>
+            </ApprovalProcess>
+            <LookProcess :processId="processId" :taskId="taskId" @close="clearHandler">
+                <a-button v-auth="'processtasks:view'">{{ t('查看') }}</a-button>
+            </LookProcess>
+        </template>
+
+        <template #currentProgress="{ record }">
+            <a-progress v-if="record.currentProgress" :percent="record.currentProgress"
+                        size="small" />
+        </template>
+    </BasicTable>
+    <InfoModal @register="registerModal" @success="reload" />
+</template>
+
+<script lang="ts" setup>
+    import userTaskTable from "./../../hooks/userTaskTable";
+    import { useModal } from "/@/components/Modal";
+    import LookProcess from "./../LookProcess.vue";
+    import ApprovalProcess from "./../ApprovalProcess.vue";
+    import BatchApprovalProcess from "./../BatchApprovalProcess.vue";
+    import InfoModal from "../BatchApprovalInfo.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";
+    import { unref, watch } from "vue";
+    import { useRouter } from "vue-router";
+
+    const { t } = useI18n();
+    const configColumns: BasicColumn[] = [
+        {
+            title: t("流水号"),
+            dataIndex: "serialNumber",
+            width: 80,
+            align: "left"
+        },
+        {
+            title: t("流程名称"),
+            dataIndex: "processName",
+            width: "32%",
+            align: "left"
+        },
+        {
+            title: t("任务名称"),
+            dataIndex: "taskName",
+            width: "17%",
+            align: "left"
+        },
+        {
+            title: t("当前进度"),
+            dataIndex: "currentProgress",
+            width: "17%",
+            align: "left",
+            slots: { customRender: "currentProgress" }
+        },
+        {
+            title: t("发起人"),
+            dataIndex: "startUserName",
+            width: 80,
+            align: "left"
+        },
+        {
+            title: t("发起时间"),
+            width: 120,
+            dataIndex: "startTime",
+            align: "left"
+        }
+    ];
+    const [registerModal, { openModal }] = useModal();
+    const { formConfig, data, processId, taskId, schemaId, selectionChange, showBatchApproval } =
+        userTaskTable();
+
+    function BatchClearHandler(v) {
+        if (v) {
+            openModal(true, v);
+        }
+        clearSelectedRowKeys();
+    }
+
+    const clearHandler = () => {
+        clearSelectedRowKeys();
+        reload();
+    };
+    const [registerTable, { reload, clearSelectedRowKeys }] = useTable({
+        title: t("待办任务列表"),
+        api: getSchemaTask,
+        rowKey: "id",
+        columns: configColumns,
+        formConfig: formConfig(),
+        beforeFetch: (params) => {
+            return { data: params, taskUrl: TaskTypeUrl.PENDING_TASKS };
+        },
+        rowSelection: {
+            type: "checkbox"
+        },
+        useSearchForm: true,
+        showTableSetting: true,
+        striped: false,
+        pagination: {
+            pageSize: 18
+        },
+        tableSetting: {
+            size: false,
+            setting: false
+        }
+    });
+    const router = useRouter();
+    const { currentRoute } = router;
+    watch(
+        () => unref(currentRoute),
+        (val) => {
+            if (val.name == "ProcessTasks") reload();
+        },
+        { deep: true }
+    );
+    const onRowDblClick = (record, index) => {
+        const { processId, taskId, schemaId } = record;
+        router.push({
+            path: "/flow/approveFlow",
+            query: {
+                schemaId,
+                taskId,
+                processId,
+                tabKey: "approve_" + taskId
+            }
+        });
+    };
+</script>
+
+<style scoped></style>