diff --git a/.vscode/extensions.json b/.vscode/extensions.json index c67d983e2..e8dc9ed9b 100644 --- a/.vscode/extensions.json +++ b/.vscode/extensions.json @@ -21,8 +21,7 @@ // CSS 变量提示 "vunguyentuan.vscode-css-variables", // 在 package.json 中显示 PNPM catalog 的版本 - "antfu.pnpm-catalog-lens", - "augment.vscode-augment" + "antfu.pnpm-catalog-lens" ], "unwantedRecommendations": [ // 和 volar 冲突 diff --git a/apps/web-antd/src/api/basic/productunit/index.ts b/apps/web-antd/src/api/basic/productunit/index.ts deleted file mode 100644 index fc66df490..000000000 --- a/apps/web-antd/src/api/basic/productunit/index.ts +++ /dev/null @@ -1,57 +0,0 @@ -import type { PageParam, PageResult } from '@vben/request'; - -import { requestClient } from '#/api/request'; - -export namespace ProductUnitApi { - /** 产品单位信息 */ - export interface ProductUnit { - id: number; // 编号 - groupId?: number; // 分组编号 - name?: string; // 单位名称 - basic?: number; // 基础单位 - number?: number; // 单位数量/相对于基础单位 - usageType: number; // 用途 - } -} - -/** 查询产品单位分页 */ -export function getProductUnitPage(params: PageParam) { - return requestClient.get>( - '/basic/product-unit/page', - { params }, - ); -} - -/** 查询产品单位详情 */ -export function getProductUnit(id: number) { - return requestClient.get( - `/basic/product-unit/get?id=${id}`, - ); -} - -/** 新增产品单位 */ -export function createProductUnit(data: ProductUnitApi.ProductUnit) { - return requestClient.post('/basic/product-unit/create', data); -} - -/** 修改产品单位 */ -export function updateProductUnit(data: ProductUnitApi.ProductUnit) { - return requestClient.put('/basic/product-unit/update', data); -} - -/** 删除产品单位 */ -export function deleteProductUnit(id: number) { - return requestClient.delete(`/basic/product-unit/delete?id=${id}`); -} - -/** 批量删除产品单位 */ -export function deleteProductUnitListByIds(ids: number[]) { - return requestClient.delete( - `/basic/product-unit/delete-list?ids=${ids.join(',')}`, - ); -} - -/** 导出产品单位 */ -export function exportProductUnit(params: any) { - return requestClient.download('/basic/product-unit/export-excel', { params }); -} diff --git a/apps/web-antd/src/api/basic/productunitgroup/index.ts b/apps/web-antd/src/api/basic/productunitgroup/index.ts deleted file mode 100644 index 92b978bf7..000000000 --- a/apps/web-antd/src/api/basic/productunitgroup/index.ts +++ /dev/null @@ -1,61 +0,0 @@ -import type { PageParam, PageResult } from '@vben/request'; - -import { requestClient } from '#/api/request'; - -export namespace ProductUnitGroupApi { - /** 产品单位组信息 */ - export interface ProductUnitGroup { - id: number; // 编号 - name?: string; // 产品单位组名称 - status?: number; // 开启状态 - } -} - -/** 查询产品单位组分页 */ -export function getProductUnitGroupPage(params: PageParam) { - return requestClient.get>( - '/basic/product-unit-group/page', - { params }, - ); -} - -/** 查询产品单位组详情 */ -export function getProductUnitGroup(id: number) { - return requestClient.get( - `/basic/product-unit-group/get?id=${id}`, - ); -} - -/** 新增产品单位组 */ -export function createProductUnitGroup( - data: ProductUnitGroupApi.ProductUnitGroup, -) { - return requestClient.post('/basic/product-unit-group/create', data); -} - -/** 修改产品单位组 */ -export function updateProductUnitGroup( - data: ProductUnitGroupApi.ProductUnitGroup, -) { - return requestClient.put('/basic/product-unit-group/update', data); -} - -/** 删除产品单位组 */ -export function deleteProductUnitGroup(id: number) { - return requestClient.delete(`/basic/product-unit-group/delete?id=${id}`); -} - -/** 批量删除产品单位组 */ -export function deleteProductUnitGroupListByIds(ids: number[]) { - return requestClient.delete( - `/basic/product-unit-group/delete-list?ids=${ids.join(',')}`, - ); -} - -/** 导出产品单位组 */ -export function exportProductUnitGroup(params: any) { - return requestClient.download( - '/basic/product-unit-group/export-excel', - params, - ); -} diff --git a/apps/web-antd/src/router/routes/modules/leave.ts b/apps/web-antd/src/router/routes/modules/leave.ts index 7d0cff448..b2932c48a 100644 --- a/apps/web-antd/src/router/routes/modules/leave.ts +++ b/apps/web-antd/src/router/routes/modules/leave.ts @@ -1,6 +1,6 @@ import type { RouteRecordRaw } from 'vue-router'; -// OA请假相关路由配置 +// OA 请假相关路由配置 const routes: RouteRecordRaw[] = [ { path: '/bpm/oa', diff --git a/apps/web-antd/src/views/basic/productunit/data.ts b/apps/web-antd/src/views/basic/productunit/data.ts deleted file mode 100644 index d09355788..000000000 --- a/apps/web-antd/src/views/basic/productunit/data.ts +++ /dev/null @@ -1,174 +0,0 @@ -import type { VbenFormSchema } from '#/adapter/form'; -import type { VxeTableGridOptions } from '#/adapter/vxe-table'; -import type { ProductUnitApi } from '#/api/basic/productunit'; - -import { getRangePickerDefaultProps } from '#/utils'; - -/** 新增/修改的表单 */ -export function useFormSchema(): VbenFormSchema[] { - return [ - { - fieldName: 'id', - component: 'Input', - dependencies: { - triggerFields: [''], - show: () => false, - }, - }, - { - fieldName: 'groupId', - label: '分组编号', - rules: 'required', - component: 'Input', - componentProps: { - placeholder: '请输入分组编号', - }, - }, - { - fieldName: 'name', - label: '单位名称', - rules: 'required', - component: 'Input', - componentProps: { - placeholder: '请输入单位名称', - }, - }, - { - fieldName: 'basic', - label: '基础单位', - rules: 'required', - component: 'Input', - componentProps: { - placeholder: '请输入基础单位', - }, - }, - { - fieldName: 'number', - label: '单位数量/相对于基础单位', - rules: 'required', - component: 'Input', - componentProps: { - placeholder: '请输入单位数量/相对于基础单位', - }, - }, - { - fieldName: 'usageType', - label: '用途', - component: 'Select', - componentProps: { - options: [], - placeholder: '请选择用途', - }, - }, - ]; -} - -/** 列表的搜索表单 */ -export function useGridFormSchema(): VbenFormSchema[] { - return [ - { - fieldName: 'groupId', - label: '分组编号', - component: 'Input', - componentProps: { - allowClear: true, - placeholder: '请输入分组编号', - }, - }, - { - fieldName: 'name', - label: '单位名称', - component: 'Input', - componentProps: { - allowClear: true, - placeholder: '请输入单位名称', - }, - }, - { - fieldName: 'basic', - label: '基础单位', - component: 'Input', - componentProps: { - allowClear: true, - placeholder: '请输入基础单位', - }, - }, - { - fieldName: 'number', - label: '单位数量/相对于基础单位', - component: 'Input', - componentProps: { - allowClear: true, - placeholder: '请输入单位数量/相对于基础单位', - }, - }, - { - fieldName: 'usageType', - label: '用途', - component: 'Select', - componentProps: { - allowClear: true, - options: [], - placeholder: '请选择用途', - }, - }, - { - fieldName: 'createTime', - label: '创建时间', - component: 'RangePicker', - componentProps: { - ...getRangePickerDefaultProps(), - allowClear: true, - }, - }, - ]; -} - -/** 列表的字段 */ -export function useGridColumns(): VxeTableGridOptions['columns'] { - return [ - { type: 'checkbox', width: 40 }, - { - field: 'id', - title: '编号', - minWidth: 120, - }, - { - field: 'groupId', - title: '分组编号', - minWidth: 120, - }, - { - field: 'name', - title: '单位名称', - minWidth: 120, - }, - { - field: 'basic', - title: '基础单位', - minWidth: 120, - }, - { - field: 'number', - title: '单位数量/相对于基础单位', - minWidth: 120, - }, - { - field: 'usageType', - title: '用途', - minWidth: 120, - }, - { - field: 'createTime', - title: '创建时间', - minWidth: 120, - formatter: 'formatDateTime', - }, - { - title: '操作', - width: 200, - fixed: 'right', - slots: { default: 'actions' }, - }, - ]; -} diff --git a/apps/web-antd/src/views/basic/productunit/index.vue b/apps/web-antd/src/views/basic/productunit/index.vue deleted file mode 100644 index c5d533a45..000000000 --- a/apps/web-antd/src/views/basic/productunit/index.vue +++ /dev/null @@ -1,188 +0,0 @@ - - - diff --git a/apps/web-antd/src/views/basic/productunit/modules/form.vue b/apps/web-antd/src/views/basic/productunit/modules/form.vue deleted file mode 100644 index 1d834b427..000000000 --- a/apps/web-antd/src/views/basic/productunit/modules/form.vue +++ /dev/null @@ -1,91 +0,0 @@ - - - diff --git a/apps/web-antd/src/views/basic/productunitgroup/data.ts b/apps/web-antd/src/views/basic/productunitgroup/data.ts deleted file mode 100644 index 9ac9a9528..000000000 --- a/apps/web-antd/src/views/basic/productunitgroup/data.ts +++ /dev/null @@ -1,108 +0,0 @@ -import type { VbenFormSchema } from '#/adapter/form'; -import type { VxeTableGridOptions } from '#/adapter/vxe-table'; -import type { ProductUnitGroupApi } from '#/api/basic/productunitgroup'; - -import { DICT_TYPE, getDictOptions, getRangePickerDefaultProps } from '#/utils'; - -/** 新增/修改的表单 */ -export function useFormSchema(): VbenFormSchema[] { - return [ - { - fieldName: 'id', - component: 'Input', - dependencies: { - triggerFields: [''], - show: () => false, - }, - }, - { - fieldName: 'name', - label: '产品单位组名称', - rules: 'required', - component: 'Input', - componentProps: { - placeholder: '请输入产品单位组名称', - }, - }, - { - fieldName: 'status', - label: '开启状态', - rules: 'required', - component: 'RadioGroup', - componentProps: { - options: getDictOptions(DICT_TYPE.COMMON_STATUS, 'number'), - buttonStyle: 'solid', - optionType: 'button', - }, - defaultValue: 0, - }, - ]; -} - -/** 列表的搜索表单 */ -export function useGridFormSchema(): VbenFormSchema[] { - return [ - { - fieldName: 'name', - label: '产品单位组名称', - component: 'Input', - componentProps: { - allowClear: true, - placeholder: '请输入产品单位组名称', - }, - }, - { - fieldName: 'status', - label: '开启状态', - component: 'Select', - componentProps: { - allowClear: true, - options: [], - placeholder: '请选择开启状态', - }, - }, - { - fieldName: 'createTime', - label: '创建时间', - component: 'RangePicker', - componentProps: { - ...getRangePickerDefaultProps(), - allowClear: true, - }, - }, - ]; -} - -/** 列表的字段 */ -export function useGridColumns(): VxeTableGridOptions['columns'] { - return [ - { type: 'checkbox', width: 40 }, - { - field: 'id', - title: '编号', - minWidth: 120, - }, - { - field: 'name', - title: '产品单位组名称', - minWidth: 120, - }, - { - field: 'status', - title: '开启状态', - minWidth: 120, - }, - { - field: 'createTime', - title: '创建时间', - minWidth: 120, - formatter: 'formatDateTime', - }, - { - title: '操作', - width: 200, - fixed: 'right', - slots: { default: 'actions' }, - }, - ]; -} diff --git a/apps/web-antd/src/views/basic/productunitgroup/index.vue b/apps/web-antd/src/views/basic/productunitgroup/index.vue deleted file mode 100644 index 7e4e399bc..000000000 --- a/apps/web-antd/src/views/basic/productunitgroup/index.vue +++ /dev/null @@ -1,192 +0,0 @@ - - - diff --git a/apps/web-antd/src/views/basic/productunitgroup/modules/form.vue b/apps/web-antd/src/views/basic/productunitgroup/modules/form.vue deleted file mode 100644 index c50717e5a..000000000 --- a/apps/web-antd/src/views/basic/productunitgroup/modules/form.vue +++ /dev/null @@ -1,92 +0,0 @@ - - - diff --git a/apps/web-ele/src/api/basic/productunit/index.ts b/apps/web-ele/src/api/basic/productunit/index.ts deleted file mode 100644 index 84d04f6bd..000000000 --- a/apps/web-ele/src/api/basic/productunit/index.ts +++ /dev/null @@ -1,59 +0,0 @@ -import type { PageParam, PageResult } from '@vben/request'; - -import { requestClient } from '#/api/request'; - -// TODO @xingyu:貌似模块不对 - -export namespace ProductUnitApi { - /** 产品单位信息 */ - export interface ProductUnit { - id: number; // 编号 - groupId?: number; // 分组编号 - name?: string; // 单位名称 - basic?: number; // 基础单位 - number?: number; // 单位数量/相对于基础单位 - usageType: number; // 用途 - } -} - -/** 查询产品单位分页 */ -export function getProductUnitPage(params: PageParam) { - return requestClient.get>( - '/basic/product-unit/page', - { params }, - ); -} - -/** 查询产品单位详情 */ -export function getProductUnit(id: number) { - return requestClient.get( - `/basic/product-unit/get?id=${id}`, - ); -} - -/** 新增产品单位 */ -export function createProductUnit(data: ProductUnitApi.ProductUnit) { - return requestClient.post('/basic/product-unit/create', data); -} - -/** 修改产品单位 */ -export function updateProductUnit(data: ProductUnitApi.ProductUnit) { - return requestClient.put('/basic/product-unit/update', data); -} - -/** 删除产品单位 */ -export function deleteProductUnit(id: number) { - return requestClient.delete(`/basic/product-unit/delete?id=${id}`); -} - -/** 批量删除产品单位 */ -export function deleteProductUnitListByIds(ids: number[]) { - return requestClient.delete( - `/basic/product-unit/delete-list?ids=${ids.join(',')}`, - ); -} - -/** 导出产品单位 */ -export function exportProductUnit(params: any) { - return requestClient.download('/basic/product-unit/export-excel', { params }); -} diff --git a/apps/web-ele/src/api/basic/productunitgroup/index.ts b/apps/web-ele/src/api/basic/productunitgroup/index.ts deleted file mode 100644 index aa0334108..000000000 --- a/apps/web-ele/src/api/basic/productunitgroup/index.ts +++ /dev/null @@ -1,63 +0,0 @@ -import type { PageParam, PageResult } from '@vben/request'; - -import { requestClient } from '#/api/request'; - -// TODO @xingyu:貌似模块不对 - -export namespace ProductUnitGroupApi { - /** 产品单位组信息 */ - export interface ProductUnitGroup { - id: number; // 编号 - name?: string; // 产品单位组名称 - status?: number; // 开启状态 - } -} - -/** 查询产品单位组分页 */ -export function getProductUnitGroupPage(params: PageParam) { - return requestClient.get>( - '/basic/product-unit-group/page', - { params }, - ); -} - -/** 查询产品单位组详情 */ -export function getProductUnitGroup(id: number) { - return requestClient.get( - `/basic/product-unit-group/get?id=${id}`, - ); -} - -/** 新增产品单位组 */ -export function createProductUnitGroup( - data: ProductUnitGroupApi.ProductUnitGroup, -) { - return requestClient.post('/basic/product-unit-group/create', data); -} - -/** 修改产品单位组 */ -export function updateProductUnitGroup( - data: ProductUnitGroupApi.ProductUnitGroup, -) { - return requestClient.put('/basic/product-unit-group/update', data); -} - -/** 删除产品单位组 */ -export function deleteProductUnitGroup(id: number) { - return requestClient.delete(`/basic/product-unit-group/delete?id=${id}`); -} - -/** 批量删除产品单位组 */ -export function deleteProductUnitGroupListByIds(ids: number[]) { - return requestClient.delete( - `/basic/product-unit-group/delete-list?ids=${ids.join(',')}`, - ); -} - -/** 导出产品单位组 */ -export function exportProductUnitGroup(params: any) { - return requestClient.download( - '/basic/product-unit-group/export-excel', - params, - ); -} diff --git a/apps/web-ele/src/components/app-link-input/index.vue b/apps/web-ele/src/components/app-link-input/index.vue index 5b608c4e1..8604e581b 100644 --- a/apps/web-ele/src/components/app-link-input/index.vue +++ b/apps/web-ele/src/components/app-link-input/index.vue @@ -1,4 +1,5 @@