manager/my-spring
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

初始化项目

Browse Source
This commit is contained in:
gaoxq
2026-03-22 14:53:19 +08:00
parent 7888164aff
commit bd55405817
19 changed files with 362 additions and 258 deletions
Download Patch File Download Diff File Expand all files Collapse all files

44
web-vue/packages/erp/views/erp/account/select.ts → web-vue/packages/core/components/ListSelect/src/selectType/erpAccountSelect.ts
View File

@@ -1,6 +1,6 @@
import { useI18n } from '@jeesite/core/hooks/web/useI18n';
import { BasicColumn, BasicTableProps, FormProps } from '@jeesite/core/components/Table';
import { erpAccountListData } from '@jeesite/erp/api/erp/account';
import { ErpAccount, erpAccountListData } from '@jeesite/erp/api/erp/account';
const { t } = useI18n('erp.account');
@@ -20,12 +20,20 @@ const searchForm: FormProps<ErpAccount> = {
{
label: t('账户类型'),
field: 'accountType',
component: 'Input',
component: 'Select',
componentProps: {
dictType: 'account_type',
allowClear: true,
},
},
{
label: t('是否激活'),
field: 'isActive',
component: 'Input',
component: 'Select',
componentProps: {
dictType: 'is_active',
allowClear: true,
},
},
],
};
@@ -36,16 +44,16 @@ const tableColumns: BasicColumn<ErpAccount>[] = [
dataIndex: 'createTime',
key: 'a.create_time',
sorter: true,
width: 230,
align: 'left',
slot: 'firstColumn',
width: 150,
align: 'center',
fixed: 'left',
},
{
title: t('账户名称'),
dataIndex: 'accountName',
key: 'a.account_name',
sorter: true,
width: 130,
width: 200,
align: 'left',
},
{
@@ -55,6 +63,7 @@ const tableColumns: BasicColumn<ErpAccount>[] = [
sorter: true,
width: 130,
align: 'left',
dictType: 'account_type',
},
{
title: t('账户卡号'),
@@ -64,14 +73,6 @@ const tableColumns: BasicColumn<ErpAccount>[] = [
width: 130,
align: 'left',
},
{
title: t('初始余额'),
dataIndex: 'initialBalance',
key: 'a.initial_balance',
sorter: true,
width: 130,
align: 'right',
},
{
title: t('当前余额'),
dataIndex: 'currentBalance',
@@ -87,14 +88,7 @@ const tableColumns: BasicColumn<ErpAccount>[] = [
sorter: true,
width: 130,
align: 'left',
},
{
title: t('更新时间'),
dataIndex: 'updateTime',
key: 'a.update_time',
sorter: true,
width: 130,
align: 'center',
dictType: 'is_active',
},
];
@@ -113,6 +107,6 @@ export default {
modalProps,
tableProps,
itemCode: 'accountId',
itemName: 'accountId',
isShowCode: false,
itemName: 'accountName',
isShowCode: true,
};

28
web-vue/packages/erp/views/erp/category/select.ts → web-vue/packages/core/components/ListSelect/src/selectType/erpCategorySelect.ts
View File

@@ -1,6 +1,6 @@
import { useI18n } from '@jeesite/core/hooks/web/useI18n';
import { BasicColumn, BasicTableProps, FormProps } from '@jeesite/core/components/Table';
import { erpCategoryListData } from '@jeesite/erp/api/erp/category';
import { ErpCategory, erpCategoryListData } from '@jeesite/erp/api/erp/category';
const { t } = useI18n('erp.category');
@@ -20,12 +20,20 @@ const searchForm: FormProps<ErpCategory> = {
{
label: t('分类类型'),
field: 'categoryType',
component: 'Input',
component: 'Select',
componentProps: {
dictType: 'erp_type',
allowClear: true,
},
},
{
label: t('是否启用'),
field: 'isActive',
component: 'Input',
component: 'Select',
componentProps: {
dictType: 'is_active',
allowClear: true,
},
},
],
};
@@ -36,9 +44,9 @@ const tableColumns: BasicColumn<ErpCategory>[] = [
dataIndex: 'createTime',
key: 'a.create_time',
sorter: true,
width: 230,
align: 'left',
slot: 'firstColumn',
width: 150,
align: 'center',
fixed: 'left',
},
{
title: t('父级名称'),
@@ -63,6 +71,7 @@ const tableColumns: BasicColumn<ErpCategory>[] = [
sorter: true,
width: 130,
align: 'left',
dictType: 'erp_type',
},
{
title: t('排序序号'),
@@ -79,13 +88,14 @@ const tableColumns: BasicColumn<ErpCategory>[] = [
sorter: true,
width: 130,
align: 'left',
dictType: 'is_active',
},
{
title: t('更新时间'),
dataIndex: 'updateTime',
key: 'a.update_time',
sorter: true,
width: 130,
width: 150,
align: 'center',
},
];
@@ -105,6 +115,6 @@ export default {
modalProps,
tableProps,
itemCode: 'categoryId',
itemName: 'categoryId',
isShowCode: false,
itemName: 'categoryName',
isShowCode: true,
};

3
web-vue/packages/erp/api/erp/category.ts
View File

@@ -26,6 +26,9 @@ export interface ErpCategory extends BasicModel<ErpCategory> {
export const erpCategoryList = (params?: ErpCategory | any) =>
defHttp.get<ErpCategory>({ url: adminPath + '/erp/category/list', params });
export const erpCategoryListAll = (params?: ErpCategory | any) =>
defHttp.get<ErpCategory[]>({ url: adminPath + '/erp/category/listAll', params });
export const erpCategoryListData = (params?: ErpCategory | any) =>
defHttp.post<Page<ErpCategory>>({ url: adminPath + '/erp/category/listData', params });

44
web-vue/packages/erp/views/erp/account/form.vue
View File

@@ -4,20 +4,20 @@
* @author gaoxq
-->
<template>
<BasicDrawer
<BasicModal
v-bind="$attrs"
:showFooter="true"
:okAuth="'erp:account:edit'"
@register="registerDrawer"
@register="registerModal"
@ok="handleSubmit"
width="70%"
width="60%"
>
<template #title>
<Icon :icon="getTitle.icon" class="m-1 pr-1" />
<span> {{ getTitle.value }} </span>
</template>
<BasicForm @register="registerForm" />
</BasicDrawer>
</BasicModal>
</template>
<script lang="ts" setup name="ViewsErpAccountForm">
import { ref, unref, computed } from 'vue';
@@ -26,7 +26,7 @@
import { router } from '@jeesite/core/router';
import { Icon } from '@jeesite/core/components/Icon';
import { BasicForm, FormSchema, useForm } from '@jeesite/core/components/Form';
import { BasicDrawer, useDrawerInner } from '@jeesite/core/components/Drawer';
import { BasicModal, useModalInner } from '@jeesite/core/components/Modal';
import { ErpAccount, erpAccountSave, erpAccountForm } from '@jeesite/erp/api/erp/account';
import { formatToDateTime } from '@jeesite/core/utils/dateUtil';
@@ -61,10 +61,11 @@
{
label: t('账户类型'),
field: 'accountType',
component: 'Input',
componentProps: {
maxlength: 12,
},
component: 'Select',
componentProps: {
dictType: 'account_type',
allowClear: true,
},
required: true,
},
{
@@ -79,7 +80,7 @@
{
label: t('初始余额'),
field: 'initialBalance',
component: 'Input',
component: 'InputNumber',
componentProps: {
maxlength: 10,
},
@@ -88,7 +89,7 @@
{
label: t('当前余额'),
field: 'currentBalance',
component: 'Input',
component: 'InputNumber',
componentProps: {
maxlength: 10,
},
@@ -97,10 +98,11 @@
{
label: t('是否激活'),
field: 'isActive',
component: 'Input',
componentProps: {
maxlength: 12,
},
component: 'Select',
componentProps: {
dictType: 'is_active',
allowClear: true,
},
required: true,
},
];
@@ -111,20 +113,20 @@
baseColProps: { md: 24, lg: 12 },
});
const [registerDrawer, { setDrawerProps, closeDrawer }] = useDrawerInner(async (data) => {
setDrawerProps({ loading: true });
const [registerModal, { setModalProps, closeModal }] = useModalInner(async (data) => {
setModalProps({ loading: true });
await resetFields();
const res = await erpAccountForm(data);
record.value = (res.erpAccount || {}) as ErpAccount;
record.value.__t = new Date().getTime();
await setFieldsValue(record.value);
setDrawerProps({ loading: false });
setModalProps({ loading: false });
});
async function handleSubmit() {
try {
const data = await validate();
setDrawerProps({ confirmLoading: true });
setModalProps({ confirmLoading: true });
const params: any = {
isNewRecord: record.value.isNewRecord,
accountId: record.value.accountId || data.accountId,
@@ -135,7 +137,7 @@
// console.log('submit', params, data, record);
const res = await erpAccountSave(params, data);
showMessage(res.message);
setTimeout(closeDrawer);
setTimeout(closeModal);
emit('success', data);
} catch (error: any) {
if (error && error.errorFields) {
@@ -143,7 +145,7 @@
}
console.log('error', error);
} finally {
setDrawerProps({ confirmLoading: false });
setModalProps({ confirmLoading: false });
}
}
</script>

21
web-vue/packages/erp/views/erp/account/list.vue
View File

@@ -27,7 +27,7 @@
{{ desensitizeBankCard(text) }}
</template>
</BasicTable>
<InputForm @register="registerDrawer" @success="handleSuccess" />
<InputForm @register="registerModal" @success="handleSuccess" />
</div>
</template>
<script lang="ts" setup name="ViewsErpAccountList">
@@ -41,7 +41,6 @@
import { BasicTable, BasicColumn, useTable } from '@jeesite/core/components/Table';
import { ErpAccount, erpAccountList } from '@jeesite/erp/api/erp/account';
import { erpAccountDelete, erpAccountListData } from '@jeesite/erp/api/erp/account';
import { useDrawer } from '@jeesite/core/components/Drawer';
import { useModal } from '@jeesite/core/components/Modal';
import { FormProps } from '@jeesite/core/components/Form';
import InputForm from './form.vue';
@@ -70,12 +69,20 @@
{
label: t('账户类型'),
field: 'accountType',
component: 'Input',
component: 'Select',
componentProps: {
dictType: 'account_type',
allowClear: true,
},
},
{
label: t('是否激活'),
field: 'isActive',
component: 'Input',
component: 'Select',
componentProps: {
dictType: 'is_active',
allowClear: true,
},
},
],
};
@@ -106,6 +113,7 @@
sorter: true,
width: 130,
align: 'left',
dictType: 'account_type',
},
{
title: t('账户卡号'),
@@ -139,6 +147,7 @@
sorter: true,
width: 130,
align: 'left',
dictType: 'is_active',
},
{
title: t('更新时间'),
@@ -192,10 +201,10 @@
await getForm().setFieldsValue(record.value);
});
const [registerDrawer, { openDrawer }] = useDrawer();
const [registerModal, { openModal }] = useModal();
function handleForm(record: Recordable) {
openDrawer(true, record);
openModal(true, record);
}
async function handleExport() {

43
web-vue/packages/erp/views/erp/category/form.vue
View File

@@ -4,20 +4,20 @@
* @author gaoxq
-->
<template>
<BasicDrawer
<BasicModal
v-bind="$attrs"
:showFooter="true"
:okAuth="'erp:category:edit'"
@register="registerDrawer"
@register="registerModal"
@ok="handleSubmit"
width="70%"
width="60%"
>
<template #title>
<Icon :icon="getTitle.icon" class="m-1 pr-1" />
<span> {{ getTitle.value }} </span>
</template>
<BasicForm @register="registerForm" />
</BasicDrawer>
</BasicModal>
</template>
<script lang="ts" setup name="ViewsErpCategoryForm">
import { ref, unref, computed } from 'vue';
@@ -26,7 +26,7 @@
import { router } from '@jeesite/core/router';
import { Icon } from '@jeesite/core/components/Icon';
import { BasicForm, FormSchema, useForm } from '@jeesite/core/components/Form';
import { BasicDrawer, useDrawerInner } from '@jeesite/core/components/Drawer';
import { BasicModal, useModalInner } from '@jeesite/core/components/Modal';
import { ErpCategory, erpCategorySave, erpCategoryForm } from '@jeesite/erp/api/erp/category';
import { formatToDateTime } from '@jeesite/core/utils/dateUtil';
@@ -57,6 +57,7 @@
maxlength: 32,
},
required: true,
colProps: { md: 24, lg: 24 },
},
{
label: t('分类名称'),
@@ -70,16 +71,17 @@
{
label: t('分类类型'),
field: 'categoryType',
component: 'Input',
componentProps: {
maxlength: 12,
},
component: 'Select',
componentProps: {
dictType: 'erp_type',
allowClear: true,
},
required: true,
},
{
label: t('排序序号'),
field: 'sortOrder',
component: 'Input',
component: 'InputNumber',
componentProps: {
maxlength: 18,
},
@@ -88,10 +90,11 @@
{
label: t('是否启用'),
field: 'isActive',
component: 'Input',
componentProps: {
maxlength: 12,
},
component: 'Select',
componentProps: {
dictType: 'is_active',
allowClear: true,
},
required: true,
},
];
@@ -102,20 +105,20 @@
baseColProps: { md: 24, lg: 12 },
});
const [registerDrawer, { setDrawerProps, closeDrawer }] = useDrawerInner(async (data) => {
setDrawerProps({ loading: true });
const [registerModal, { setModalProps, closeModal }] = useModalInner(async (data) => {
setModalProps({ loading: true });
await resetFields();
const res = await erpCategoryForm(data);
record.value = (res.erpCategory || {}) as ErpCategory;
record.value.__t = new Date().getTime();
await setFieldsValue(record.value);
setDrawerProps({ loading: false });
setModalProps({ loading: false });
});
async function handleSubmit() {
try {
const data = await validate();
setDrawerProps({ confirmLoading: true });
setModalProps({ confirmLoading: true });
const params: any = {
isNewRecord: record.value.isNewRecord,
categoryId: record.value.categoryId || data.categoryId,
@@ -126,7 +129,7 @@
// console.log('submit', params, data, record);
const res = await erpCategorySave(params, data);
showMessage(res.message);
setTimeout(closeDrawer);
setTimeout(closeModal);
emit('success', data);
} catch (error: any) {
if (error && error.errorFields) {
@@ -134,7 +137,7 @@
}
console.log('error', error);
} finally {
setDrawerProps({ confirmLoading: false });
setModalProps({ confirmLoading: false });
}
}
</script>

21
web-vue/packages/erp/views/erp/category/list.vue
View File

@@ -24,7 +24,7 @@
</a>
</template>
</BasicTable>
<InputForm @register="registerDrawer" @success="handleSuccess" />
<InputForm @register="registerModal" @success="handleSuccess" />
</div>
</template>
<script lang="ts" setup name="ViewsErpCategoryList">
@@ -38,7 +38,6 @@
import { BasicTable, BasicColumn, useTable } from '@jeesite/core/components/Table';
import { ErpCategory, erpCategoryList } from '@jeesite/erp/api/erp/category';
import { erpCategoryDelete, erpCategoryListData } from '@jeesite/erp/api/erp/category';
import { useDrawer } from '@jeesite/core/components/Drawer';
import { useModal } from '@jeesite/core/components/Modal';
import { FormProps } from '@jeesite/core/components/Form';
import InputForm from './form.vue';
@@ -66,12 +65,20 @@
{
label: t('分类类型'),
field: 'categoryType',
component: 'Input',
component: 'Select',
componentProps: {
dictType: 'erp_type',
allowClear: true,
},
},
{
label: t('是否启用'),
field: 'isActive',
component: 'Input',
component: 'Select',
componentProps: {
dictType: 'is_active',
allowClear: true,
},
},
],
};
@@ -110,6 +117,7 @@
sorter: true,
width: 130,
align: 'left',
dictType: 'erp_type',
},
{
title: t('排序序号'),
@@ -126,6 +134,7 @@
sorter: true,
width: 130,
align: 'left',
dictType: 'is_active',
},
{
title: t('更新时间'),
@@ -179,10 +188,10 @@
await getForm().setFieldsValue(record.value);
});
const [registerDrawer, { openDrawer }] = useDrawer();
const [registerModal, { openModal }] = useModal();
function handleForm(record: Recordable) {
openDrawer(true, record);
openModal(true, record);
}
async function handleExport() {

46
web-vue/packages/erp/views/erp/income/form.vue
View File

@@ -4,11 +4,11 @@
* @author gaoxq
-->
<template>
<BasicDrawer
<BasicModal
v-bind="$attrs"
:showFooter="true"
:okAuth="'erp:income:edit'"
@register="registerDrawer"
@register="registerModal"
@ok="handleSubmit"
width="70%"
>
@@ -17,7 +17,7 @@
<span> {{ getTitle.value }} </span>
</template>
<BasicForm @register="registerForm" />
</BasicDrawer>
</BasicModal>
</template>
<script lang="ts" setup name="ViewsErpIncomeForm">
import { ref, unref, computed } from 'vue';
@@ -26,7 +26,8 @@
import { router } from '@jeesite/core/router';
import { Icon } from '@jeesite/core/components/Icon';
import { BasicForm, FormSchema, useForm } from '@jeesite/core/components/Form';
import { BasicDrawer, useDrawerInner } from '@jeesite/core/components/Drawer';
import { BasicModal, useModalInner } from '@jeesite/core/components/Modal';
import { ErpCategory, erpCategoryListAll } from '@jeesite/erp/api/erp/category';
import { ErpIncome, erpIncomeSave, erpIncomeForm } from '@jeesite/erp/api/erp/income';
import { formatToDateTime } from '@jeesite/core/utils/dateUtil';
@@ -61,25 +62,30 @@
{
label: t('收入账户'),
field: 'accountId',
component: 'Input',
componentProps: {
maxlength: 52,
},
fieldLabel: 'accountName',
component: 'ListSelect',
componentProps: {
selectType: 'erpAccountSelect',
},
required: true,
},
{
label: t('收入分类'),
field: 'categoryId',
component: 'Input',
componentProps: {
maxlength: 52,
},
required: true,
component: 'Select',
componentProps: {
api: erpCategoryListAll,
params: {
categoryType: '2'
},
fieldNames: { label: 'categoryName', value: 'categoryId' },
},
required: true,
},
{
label: t('交易金额'),
field: 'amount',
component: 'Input',
component: 'InputNumber',
componentProps: {
maxlength: 10,
},
@@ -93,20 +99,20 @@
baseColProps: { md: 24, lg: 12 },
});
const [registerDrawer, { setDrawerProps, closeDrawer }] = useDrawerInner(async (data) => {
setDrawerProps({ loading: true });
const [registerModal, { setModalProps, closeModal }] = useModalInner(async (data) => {
setModalProps({ loading: true });
await resetFields();
const res = await erpIncomeForm(data);
record.value = (res.erpIncome || {}) as ErpIncome;
record.value.__t = new Date().getTime();
await setFieldsValue(record.value);
setDrawerProps({ loading: false });
setModalProps({ loading: false });
});
async function handleSubmit() {
try {
const data = await validate();
setDrawerProps({ confirmLoading: true });
setModalProps({ confirmLoading: true });
const params: any = {
isNewRecord: record.value.isNewRecord,
incomeId: record.value.incomeId || data.incomeId,
@@ -117,7 +123,7 @@
// console.log('submit', params, data, record);
const res = await erpIncomeSave(params, data);
showMessage(res.message);
setTimeout(closeDrawer);
setTimeout(closeModal);
emit('success', data);
} catch (error: any) {
if (error && error.errorFields) {
@@ -125,7 +131,7 @@
}
console.log('error', error);
} finally {
setDrawerProps({ confirmLoading: false });
setModalProps({ confirmLoading: false });
}
}
</script>

60
web-vue/packages/erp/views/erp/income/list.vue
View File

@@ -24,7 +24,7 @@
</a>
</template>
</BasicTable>
<InputForm @register="registerDrawer" @success="handleSuccess" />
<InputForm @register="registerModal" @success="handleSuccess" />
</div>
</template>
<script lang="ts" setup name="ViewsErpIncomeList">
@@ -37,8 +37,8 @@
import { Icon } from '@jeesite/core/components/Icon';
import { BasicTable, BasicColumn, useTable } from '@jeesite/core/components/Table';
import { ErpIncome, erpIncomeList } from '@jeesite/erp/api/erp/income';
import { ErpCategory, erpCategoryListAll } from '@jeesite/erp/api/erp/category';
import { erpIncomeDelete, erpIncomeListData } from '@jeesite/erp/api/erp/income';
import { useDrawer } from '@jeesite/core/components/Drawer';
import { useModal } from '@jeesite/core/components/Modal';
import { FormProps } from '@jeesite/core/components/Form';
import InputForm from './form.vue';
@@ -66,12 +66,23 @@
{
label: t('收入账户'),
field: 'accountId',
component: 'Input',
fieldLabel: 'accountName',
component: 'ListSelect',
componentProps: {
selectType: 'erpAccountSelect',
},
},
{
label: t('收入分类'),
field: 'categoryId',
component: 'Input',
component: 'Select',
componentProps: {
api: erpCategoryListAll,
params: {
categoryType: '2'
},
fieldNames: { label: 'categoryName', value: 'categoryId' },
},
},
],
};
@@ -82,35 +93,43 @@
dataIndex: 'createTime',
key: 'a.create_time',
sorter: true,
width: 230,
align: 'left',
slot: 'firstColumn',
width: 150,
align: 'center',
fixed: 'left',
},
{
title: t('收入名称'),
dataIndex: 'incomeName',
key: 'a.income_name',
sorter: true,
width: 130,
width: 200,
align: 'left',
slot: 'bizScopeKey',
},
{
title: t('收入账户'),
dataIndex: 'accountId',
key: 'a.account_id',
dataIndex: 'accountName',
key: 'b.account_name',
sorter: true,
width: 130,
width: 200,
align: 'left',
},
{
title: t('收入分类'),
dataIndex: 'categoryId',
key: 'a.category_id',
title: t('父级分类'),
dataIndex: 'parentName',
key: 'c.parent_name',
sorter: true,
width: 130,
align: 'left',
},
{
title: t('收入分类'),
dataIndex: 'categoryName',
key: 'c.category_name',
sorter: true,
width: 130,
align: 'left',
},
{
title: t('交易金额'),
dataIndex: 'amount',
@@ -124,26 +143,27 @@
dataIndex: 'updateTime',
key: 'a.update_time',
sorter: true,
width: 130,
width: 150,
align: 'center',
},
];
const actionColumn: BasicColumn<ErpIncome> = {
width: 160,
align: 'center',
actions: (record: ErpIncome) => [
{
icon: 'i-clarity:note-edit-line',
title: t('编辑收入'),
title: t('编辑'),
onClick: handleForm.bind(this, { incomeId: record.incomeId }),
auth: 'erp:income:edit',
},
{
icon: 'i-ant-design:delete-outlined',
color: 'error',
title: t('删除收入'),
title: t('删除'),
popConfirm: {
title: t('是否确认删除收入'),
title: t('是否确认删除收入?'),
confirm: handleDelete.bind(this, record),
},
auth: 'erp:income:edit',
@@ -170,10 +190,10 @@
await getForm().setFieldsValue(record.value);
});
const [registerDrawer, { openDrawer }] = useDrawer();
const [registerModal, { openModal }] = useModal();
function handleForm(record: Recordable) {
openDrawer(true, record);
openModal(true, record);
}
async function handleExport() {