mod: 构建

apps/web-ele/src/views/workflow/leave/data.tsx

@@ -6,7 +6,7 @@ import { getPopupContainer } from '@vben/utils';
 
 import dayjs from 'dayjs';
 
-import { OptionsTag } from '#/components/table';
+// import { OptionsTag } from '#/components/table';
 import { renderDict } from '#/utils/render';
 
 export const leaveTypeOptions = [
@@ -52,11 +52,12 @@ export const columns: VxeGridProps['columns'] = [
   {
     title: '请假类型',
     field: 'leaveType',
-    slots: {
-      default: ({ row }) => {
-        return <OptionsTag options={leaveTypeOptions} value={row.leaveType} />;
-      },
-    },
+    // slots: {
+    //   default: ({ row }) => {
+    //     // return renderDict(row.leaveType, leaveTypeOptions);
+    //     // return <OptionsTag options={leaveTypeOptions} value={row.leaveType} />;
+    //   },
+    // },
   },
   {
     title: '开始时间',

apps/web-ele/src/views/workflow/leave/index.vue

@@ -8,9 +8,8 @@ import type { VxeGridProps } from '#/adapter/vxe-table';
 import { Page, useVbenDrawer, useVbenModal } from '@vben/common-ui';
 import { getVxePopupContainer } from '@vben/utils';
 
-import { Modal, Popconfirm, Space } from 'ant-design-vue';
-
-import { useVbenVxeGrid, vxeCheckboxChecked } from '#/adapter/vxe-table';
+// import { Modal, Popconfirm, Space } from 'ant-design-vue';
+import { useVbenVxeGrid } from '#/adapter/vxe-table';
 import { cancelProcessApply } from '#/api/workflow/instance';
 import { commonDownloadExcel } from '#/utils/file/download';
 

apps/web-ele/src/views/workflow/leave/leave-form.vue

@@ -11,7 +11,7 @@ import { useRoute, useRouter } from 'vue-router';
 import { useVbenModal } from '@vben/common-ui';
 import { useTabs } from '@vben/hooks';
 
-import { Card, Spin } from 'ant-design-vue';
+// import { Card, Spin } from 'ant-design-vue';
 import dayjs from 'dayjs';
 import { cloneDeep, omit } from 'lodash-es';
 

apps/web-ele/src/views/workflow/leave/leaveEdit.vue

@@ -8,8 +8,7 @@ import { useRoute, useRouter } from 'vue-router';
 
 import { useTabs } from '@vben/hooks';
 
-import { Spin } from 'ant-design-vue';
-
+// import { Spin } from 'ant-design-vue';
 import { useQueryId } from './hook';
 
 const router = useRouter();

apps/web-ele/src/views/workflow/task/allTaskWaiting.vue

@@ -8,18 +8,6 @@ import { computed, nextTick, onMounted, ref, useTemplateRef } from 'vue';
 import { Page } from '@vben/common-ui';
 import { useTabs } from '@vben/hooks';
 
-<<<<<<< HEAD
-import { Filter, Refresh } from '@element-plus/icons-vue';
-import {
-  ElButton,
-  ElForm,
-  ElFormItem,
-  ElInput,
-  ElMessage,
-  ElPopover,
-  ElTooltip,
-} from 'element-plus';
-=======
 // import {
 //   Empty,
 //   Form,
@@ -32,7 +20,6 @@ import {
 //   Tooltip,
 //   TreeSelect,
 // } from 'ant-design-vue';
->>>>>>> 0a5e399be8a3dc56c82fd915b6765781a5d30748
 import { cloneDeep, debounce, uniqueId } from 'lodash-es';
 
 import { categoryTree } from '#/api/workflow/category';