初始化项目

2026-03-22 22:09:11 +08:00
parent 6efba6e069
commit 3ec3a07cd3
33 changed files with 1087 additions and 647 deletions
--- a/web-vue/packages/core/components/ListSelect/src/selectType/erpDebtSelect.ts
+++ b/web-vue/packages/core/components/ListSelect/src/selectType/erpDebtSelect.ts
@@ -1,6 +1,6 @@
 import { useI18n } from '@jeesite/core/hooks/web/useI18n';
 import { BasicColumn, BasicTableProps, FormProps } from '@jeesite/core/components/Table';
-import { erpDebtsListData } from '@jeesite/erp/api/erp/debts';
+import { ErpDebts, erpDebtsListData } from '@jeesite/erp/api/erp/debts';

 const { t } = useI18n('erp.debts');

@@ -12,20 +12,28 @@ const searchForm: FormProps<ErpDebts> = {
  baseColProps: { md: 8, lg: 6 },
  labelWidth: 90,
  schemas: [
+	{
+	  label: t('借贷名称'),
+	  field: 'debtName',
+	  component: 'Input',
+	},
    {
      label: t('负债类型'),
      field: 'debtType',
-      component: 'Input',
+		component: 'Select',
+		componentProps: {
+		  dictType: 'debt_type',
+		  allowClear: true,
+		},
    },
    {
-      label: t('对方名称'),
-      field: 'debtName',
-      component: 'Input',
-    },
-    {
-      label: t('状态'),
+      label: t('借贷状态'),
      field: 'ustatus',
-      component: 'Input',
+		component: 'Select',
+		componentProps: {
+		  dictType: 'debt_status',
+		  allowClear: true,
+		},
    },
  ],
 };
@@ -36,9 +44,9 @@ const tableColumns: BasicColumn<ErpDebts>[] = [
    dataIndex: 'createTime',
    key: 'a.create_time',
    sorter: true,
-    width: 230,
-    align: 'left',
-    slot: 'firstColumn',
+    width: 150,
+    align: 'center',
+    fixed: 'left',
  },
  {
    title: t('负债类型'),
@@ -47,9 +55,10 @@ const tableColumns: BasicColumn<ErpDebts>[] = [
    sorter: true,
    width: 130,
    align: 'left',
+	dictType: 'debt_type',
  },
  {
-    title: t('对方名称'),
+    title: t('借贷名称'),
    dataIndex: 'debtName',
    key: 'a.debt_name',
    sorter: true,
@@ -72,14 +81,6 @@ const tableColumns: BasicColumn<ErpDebts>[] = [
    width: 130,
    align: 'right',
  },
-  {
-    title: t('结清时间'),
-    dataIndex: 'endTime',
-    key: 'a.end_time',
-    sorter: true,
-    width: 130,
-    align: 'center',
-  },
  {
    title: t('状态'),
    dataIndex: 'ustatus',
@@ -87,6 +88,7 @@ const tableColumns: BasicColumn<ErpDebts>[] = [
    sorter: true,
    width: 130,
    align: 'left',
+	dictType: 'debt_status',
  },
 ];

@@ -105,6 +107,6 @@ export default {
  modalProps,
  tableProps,
  itemCode: 'debtId',
-  itemName: 'debtId',
-  isShowCode: false,
+  itemName: 'debtName',
+  isShowCode: true,
 };
--- a/web-vue/packages/erp/api/erp/accountTransfer.ts
+++ b/web-vue/packages/erp/api/erp/accountTransfer.ts
@@ -50,3 +50,7 @@ export const erpAccountTransferImportData = (

 export const erpAccountTransferDelete = (params?: ErpAccountTransfer | any) =>
  defHttp.get<ErpAccountTransfer>({ url: adminPath + '/erp/accountTransfer/delete', params });
+
+export const erpAccountTransferRecorded = (params?: ErpAccountTransfer | any) =>
+  defHttp.get<ErpAccountTransfer>({ url: adminPath + '/erp/accountTransfer/recorded', params });
+
--- a/web-vue/packages/erp/api/erp/debtRecords.ts
+++ b/web-vue/packages/erp/api/erp/debtRecords.ts
@@ -19,6 +19,7 @@ export interface ErpDebtRecords extends BasicModel<ErpDebtRecords> {
  accountId: string; // 账户标识
  repayAmount: number; // 还款金额
  repayTime?: string; // 还款时间
+  categoryId?: string; // 分类标识
  remark?: string; // 备注说明
 }

@@ -48,3 +49,7 @@ export const erpDebtRecordsImportData = (

 export const erpDebtRecordsDelete = (params?: ErpDebtRecords | any) =>
  defHttp.get<ErpDebtRecords>({ url: adminPath + '/erp/debtRecords/delete', params });
+
+export const erpDebtRecordsRecorded = (params?: ErpDebtRecords | any) =>
+  defHttp.get<ErpDebtRecords>({ url: adminPath + '/erp/debtRecords/recorded', params });
+
--- a/web-vue/packages/erp/api/erp/debts.ts
+++ b/web-vue/packages/erp/api/erp/debts.ts
@@ -18,9 +18,10 @@ export interface ErpDebts extends BasicModel<ErpDebts> {
  debtType: string; // 负债类型
  debtName: string; // 对方名称
  debtAmount: number; // 借贷金额
-  remaining?: number; // 未还金额
+  remaining?: number; // 已还金额
  endTime?: string; // 结清时间
  ustatus: string; // 状态
+  remark?: string; // 交易备注
 }

 export const erpDebtsList = (params?: ErpDebts | any) =>
--- a/web-vue/packages/erp/api/erp/expense.ts
+++ b/web-vue/packages/erp/api/erp/expense.ts
@@ -20,6 +20,7 @@ export interface ErpExpense extends BasicModel<ErpExpense> {
  categoryId: string; // 支出分类
  amount: number; // 交易金额
  updateTime?: string; // 更新时间
+  remark?: string; // 交易备注
 }

 export const erpExpenseList = (params?: ErpExpense | any) =>
@@ -48,3 +49,6 @@ export const erpExpenseImportData = (

 export const erpExpenseDelete = (params?: ErpExpense | any) =>
  defHttp.get<ErpExpense>({ url: adminPath + '/erp/expense/delete', params });
+
+export const erpExpenseRecorded = (params?: ErpExpense | any) =>
+  defHttp.get<ErpExpense>({ url: adminPath + '/erp/expense/recorded', params });
--- a/web-vue/packages/erp/api/erp/income.ts
+++ b/web-vue/packages/erp/api/erp/income.ts
@@ -20,6 +20,7 @@ export interface ErpIncome extends BasicModel<ErpIncome> {
  categoryId: string; // 收入分类
  amount: number; // 交易金额
  updateTime?: string; // 更新时间
+  remark?: string; // 交易备注
 }

 export const erpIncomeList = (params?: ErpIncome | any) =>
@@ -48,3 +49,6 @@ export const erpIncomeImportData = (

 export const erpIncomeDelete = (params?: ErpIncome | any) =>
  defHttp.get<ErpIncome>({ url: adminPath + '/erp/income/delete', params });
+
+export const erpIncomeRecorded = (params?: ErpIncome | any) =>
+  defHttp.get<ErpIncome>({ url: adminPath + '/erp/income/recorded', params });
--- a/web-vue/packages/erp/views/erp/account/list.vue
+++ b/web-vue/packages/erp/views/erp/account/list.vue
@@ -178,6 +178,7 @@
          confirm: handleDelete.bind(this, record),
        },
        auth: 'erp:account:edit',
+		ifShow: record.isActive == '0'
      },
    ],
  };
--- a/web-vue/packages/erp/views/erp/accountTransfer/list.vue
+++ b/web-vue/packages/erp/views/erp/accountTransfer/list.vue
@@ -38,7 +38,7 @@
  import { BasicTable, BasicColumn, useTable } from '@jeesite/core/components/Table';
  import { ErpCategory, erpCategoryListAll } from '@jeesite/erp/api/erp/category';
  import { ErpAccountTransfer, erpAccountTransferList } from '@jeesite/erp/api/erp/accountTransfer';
-  import { erpAccountTransferDelete, erpAccountTransferListData } from '@jeesite/erp/api/erp/accountTransfer';
+  import { erpAccountTransferDelete, erpAccountTransferRecorded, erpAccountTransferListData } from '@jeesite/erp/api/erp/accountTransfer';
  import { useModal } from '@jeesite/core/components/Modal';
  import { FormProps } from '@jeesite/core/components/Form';
  import InputForm from './form.vue';
@@ -206,6 +206,7 @@
        title: t('编辑'),
        onClick: handleForm.bind(this, { transferId: record.transferId }),
        auth: 'erp:accountTransfer:edit',
+		ifShow: record.transferStatus == '0'
      },
      {
        icon: 'i-ant-design:delete-outlined',
@@ -216,7 +217,19 @@
          confirm: handleDelete.bind(this, record),
        },
        auth: 'erp:accountTransfer:edit',
+		ifShow: record.transferStatus == '0'
      },
+	  {
+	    icon: 'ant-design:check-outlined',
+	    color: 'warning',
+	    title: t('记账'),
+	    popConfirm: {
+	      title: t('是否确认记账?'),
+	      confirm: handleRecorded.bind(this, record),
+	    },
+	    auth: 'erp:income:edit',
+	  	ifShow: record.transferStatus == '0'
+	  },
    ],
  };

@@ -261,6 +274,13 @@
    showMessage(res.message);
    await handleSuccess(record);
  }
+  
+  async function handleRecorded(record: Recordable) {
+    const params = { transferId: record.transferId };
+    const res = await erpAccountTransferRecorded(params);
+    showMessage(res.message);
+    await handleSuccess(record);
+  }

  async function handleSuccess(record: Recordable) {
    await reload({ record });
--- a/web-vue/packages/erp/views/erp/budgets/form.vue
+++ b/web-vue/packages/erp/views/erp/budgets/form.vue
@@ -1,149 +0,0 @@
-<!--
- * Copyright (c) 2013-Now https://jeesite.com All rights reserved.
- * No deletion without permission, or be held responsible to law.
- * @author gaoxq
-->
-<template>
-  <BasicDrawer
-    v-bind="$attrs"
-    :showFooter="true"
-    :okAuth="'erp:budgets:edit'"
-    @register="registerDrawer"
-    @ok="handleSubmit"
-    width="70%"
-  >
-    <template #title>
-      <Icon :icon="getTitle.icon" class="m-1 pr-1" />
-      <span> {{ getTitle.value }} </span>
-    </template>
-    <BasicForm @register="registerForm" />
-  </BasicDrawer>
-</template>
-<script lang="ts" setup name="ViewsErpBudgetsForm">
-  import { ref, unref, computed } from 'vue';
-  import { useI18n } from '@jeesite/core/hooks/web/useI18n';
-  import { useMessage } from '@jeesite/core/hooks/web/useMessage';
-  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 { ErpBudgets, erpBudgetsSave, erpBudgetsForm } from '@jeesite/erp/api/erp/budgets';
-  import { formatToDateTime } from '@jeesite/core/utils/dateUtil';
-
-  const emit = defineEmits(['success', 'register']);
-
-  const { t } = useI18n('erp.budgets');
-  const { showMessage } = useMessage();
-  const { meta } = unref(router.currentRoute);
-  const record = ref<ErpBudgets>({} as ErpBudgets);
-
-  const getTitle = computed(() => ({
-    icon: meta.icon || 'i-ant-design:book-outlined',
-    value: record.value.isNewRecord ? t('新增预算') : t('编辑预算'),
-  }));
-
-  const inputFormSchemas: FormSchema<ErpBudgets>[] = [
-    {
-      label: t('基本信息'),
-      field: 'basicInfo',
-      component: 'FormGroup',
-      colProps: { md: 24, lg: 24 },
-    },
-    {
-      label: t('分类标识'),
-      field: 'categoryId',
-      component: 'Input',
-      componentProps: {
-        maxlength: 52,
-      },
-      required: true,
-    },
-    {
-      label: t('预算年月'),
-      field: 'budgetMonth',
-      component: 'Input',
-      componentProps: {
-        maxlength: 10,
-      },
-      required: true,
-    },
-    {
-      label: t('预算金额'),
-      field: 'budgetAmount',
-      component: 'Input',
-      componentProps: {
-        maxlength: 18,
-      },
-      required: true,
-    },
-    {
-      label: t('使用金额'),
-      field: 'usedAmount',
-      component: 'Input',
-      componentProps: {
-        maxlength: 18,
-      },
-      required: true,
-    },
-    {
-      label: t('预算占比'),
-      field: 'usedRatio',
-      component: 'Input',
-      componentProps: {
-        maxlength: 8,
-      },
-      required: true,
-    },
-    {
-      label: t('超支金额'),
-      field: 'overAmount',
-      component: 'Input',
-      componentProps: {
-        maxlength: 18,
-      },
-      required: true,
-    },
-  ];
-
-  const [registerForm, { resetFields, setFieldsValue, validate }] = useForm<ErpBudgets>({
-    labelWidth: 120,
-    schemas: inputFormSchemas,
-    baseColProps: { md: 24, lg: 12 },
-  });
-
-  const [registerDrawer, { setDrawerProps, closeDrawer }] = useDrawerInner(async (data) => {
-    setDrawerProps({ loading: true });
-    await resetFields();
-    const res = await erpBudgetsForm(data);
-    record.value = (res.erpBudgets || {}) as ErpBudgets;
-    record.value.__t = new Date().getTime();
-    await setFieldsValue(record.value);
-    setDrawerProps({ loading: false });
-  });
-
-  async function handleSubmit() {
-    try {
-      const data = await validate();
-      setDrawerProps({ confirmLoading: true });
-      const params: any = {
-        isNewRecord: record.value.isNewRecord,
-        budgetId: record.value.budgetId || data.budgetId,
-      };
-	  
-	  data[record.value.isNewRecord ? 'createTime' : 'updateTime'] = formatToDateTime(new Date());
-	  
-      // console.log('submit', params, data, record);
-      const res = await erpBudgetsSave(params, data);
-      showMessage(res.message);
-      setTimeout(closeDrawer);
-      emit('success', data);
-    } catch (error: any) {
-      if (error && error.errorFields) {
-        showMessage(error.message || t('common.validateError'));
-      }
-      console.log('error', error);
-    } finally {
-      setDrawerProps({ confirmLoading: false });
-    }
-  }
-</script>
--- a/web-vue/packages/erp/views/erp/budgets/list.vue
+++ b/web-vue/packages/erp/views/erp/budgets/list.vue
@@ -14,17 +14,9 @@
        <a-button type="default" :loading="loading" @click="handleExport()">
          <Icon icon="i-ant-design:download-outlined" /> {{ t('导出') }}
        </a-button>
-        <a-button type="primary" @click="handleForm({})" v-auth="'erp:budgets:edit'">
-          <Icon icon="i-fluent:add-12-filled" /> {{ t('新增') }}
-        </a-button>
-      </template>
-      <template #bizScopeKey="{ record, text, value }">
-        <a @click="handleForm({ budgetId: record.budgetId })" :title="value">
-          {{ text }}
-        </a>
      </template>
    </BasicTable>
-    <InputForm @register="registerDrawer" @success="handleSuccess" />
+    <InputForm @register="registerModal" @success="handleSuccess" />
  </div>
 </template>
 <script lang="ts" setup name="ViewsErpBudgetsList">
@@ -37,11 +29,10 @@
  import { Icon } from '@jeesite/core/components/Icon';
  import { BasicTable, BasicColumn, useTable } from '@jeesite/core/components/Table';
  import { ErpBudgets, erpBudgetsList } from '@jeesite/erp/api/erp/budgets';
+  import { ErpCategory, erpCategoryListAll } from '@jeesite/erp/api/erp/category';
  import { erpBudgetsDelete, erpBudgetsListData } from '@jeesite/erp/api/erp/budgets';
-  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';

  const { t } = useI18n('erp.budgets');
  const { showMessage } = useMessage();
@@ -59,27 +50,30 @@
    labelWidth: 90,
    schemas: [
      {
-        label: t('记录时间起'),
-        field: 'createTime_gte',
-        component: 'DatePicker',
+        label: t('预算年月'),
+        field: 'budgetMonth',
+        component: 'MonthPicker',
        componentProps: {
-          format: 'YYYY-MM-DD HH:mm',
-          showTime: { format: 'HH:mm' },
+          format: 'YYYY-MM',
+          valueFormat: 'YYYY-MM',
        },
      },
      {
-        label: t('记录时间止'),
-        field: 'createTime_lte',
-        component: 'DatePicker',
-        componentProps: {
-          format: 'YYYY-MM-DD HH:mm',
-          showTime: { format: 'HH:mm' },
-        },
+        label: t('预算金额'),
+        field: 'budgetAmount',
+        component: 'InputNumber',
      },
      {
-        label: t('分类标识'),
+        label: t('分类名称'),
        field: 'categoryId',
-        component: 'Input',
+		component: 'Select',
+		componentProps: {
+			api: erpCategoryListAll,
+			params: {
+				categoryType: '1'
+			},
+			fieldNames: { label: 'categoryName', value: 'categoryId' },
+		},
      },
    ],
  };
@@ -90,19 +84,26 @@
      dataIndex: 'createTime',
      key: 'a.create_time',
      sorter: true,
-      width: 230,
-      align: 'left',
-      slot: 'firstColumn',
+      width: 150,
+      align: 'center',
+	  fixed: 'left',
    },
    {
-      title: t('分类标识'),
-      dataIndex: 'categoryId',
-      key: 'a.category_id',
+      title: t('父级分类'),
+      dataIndex: 'parentName',
+      key: 'b.parent_name',
      sorter: true,
      width: 130,
      align: 'left',
-	  slot: 'bizScopeKey',
    },
+	{
+	  title: t('分类名称'),
+	  dataIndex: 'categoryName',
+	  key: 'b.category_name',
+	  sorter: true,
+	  width: 130,
+	  align: 'left',
+	},
    {
      title: t('预算年月'),
      dataIndex: 'budgetMonth',
@@ -148,20 +149,15 @@
      dataIndex: 'updateTime',
      key: 'a.update_time',
      sorter: true,
-      width: 130,
+      width: 150,
      align: 'center',
    },
  ];

  const actionColumn: BasicColumn<ErpBudgets> = {
-    width: 160,
+    width: 120,
+	align: 'center',
    actions: (record: ErpBudgets) => [
-      {
-        icon: 'i-clarity:note-edit-line',
-        title: t('编辑'),
-        onClick: handleForm.bind(this, { budgetId: record.budgetId }),
-        auth: 'erp:budgets:edit',
-      },
      {
        icon: 'i-ant-design:delete-outlined',
        color: 'error',
@@ -194,12 +190,6 @@
    await getForm().setFieldsValue(record.value);
  });

-  const [registerDrawer, { openDrawer }] = useDrawer();
-
-  function handleForm(record: Recordable) {
-    openDrawer(true, record);
-  }
-
  async function handleExport() {
    loading.value = true;
    const { ctxAdminPath } = useGlobSetting();
--- a/web-vue/packages/erp/views/erp/category/list.vue
+++ b/web-vue/packages/erp/views/erp/category/list.vue
@@ -165,6 +165,7 @@
          confirm: handleDelete.bind(this, record),
        },
        auth: 'erp:category:edit',
+		ifShow: record.isActive == '0'
      },
    ],
  };
--- a/web-vue/packages/erp/views/erp/debtRecords/form.vue
+++ b/web-vue/packages/erp/views/erp/debtRecords/form.vue
@@ -4,11 +4,11 @@
 * @author gaoxq
 -->
 <template>
-  <BasicDrawer
+  <BasicModal
    v-bind="$attrs"
    :showFooter="true"
    :okAuth="'erp:debtRecords: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="ViewsErpDebtRecordsForm">
  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 { ErpDebtRecords, erpDebtRecordsSave, erpDebtRecordsForm } from '@jeesite/erp/api/erp/debtRecords';
  import { formatToDateTime } from '@jeesite/core/utils/dateUtil';

@@ -50,40 +51,56 @@
      colProps: { md: 24, lg: 24 },
    },
    {
-      label: t('负债标识'),
+      label: t('负债名称'),
      field: 'debtId',
-      component: 'Input',
-      componentProps: {
-        maxlength: 52,
-      },
+	  fieldLabel: 'debtName',
+	  component: 'ListSelect',
+	  componentProps: {
+	    selectType: 'erpDebtSelect',
+	  },
      required: true,
    },
    {
      label: t('账户标识'),
      field: 'accountId',
-      component: 'Input',
-      componentProps: {
-        maxlength: 52,
-      },
+	  fieldLabel: 'accountName',
+	  component: 'ListSelect',
+	  componentProps: {
+	    selectType: 'erpAccountSelect',
+	  },
      required: true,
    },
+	{
+	  label: t('还款分类'),
+	  field: 'categoryId',
+	  component: 'Select',
+	  componentProps: {
+	  	api: erpCategoryListAll,
+	  	params: {
+	  		categoryType: '1'
+	  	},
+	  	fieldNames: { label: 'categoryName', value: 'categoryId' },
+	  },
+	  required: true,
+	},
    {
      label: t('还款金额'),
      field: 'repayAmount',
-      component: 'Input',
+      component: 'InputNumber',
      componentProps: {
        maxlength: 10,
      },
      required: true,
    },
-    {
-      label: t('备注说明'),
-      field: 'remark',
-      component: 'Input',
-      componentProps: {
-        maxlength: 200,
-      },
-    },
+	{
+	  label: t('备注说明'),
+	  field: 'remark',
+	  component: 'InputTextArea',
+	  componentProps: {
+	    maxlength: 200,
+	  },
+	  colProps: { md: 24, lg: 24 },
+	},
  ];

  const [registerForm, { resetFields, setFieldsValue, validate }] = useForm<ErpDebtRecords>({
@@ -92,31 +109,31 @@
    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 erpDebtRecordsForm(data);
    record.value = (res.erpDebtRecords || {}) as ErpDebtRecords;
    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,
        recordId: record.value.recordId || data.recordId,
      };
 	  
-	  data[record.value.isNewRecord ? 'createTime' : 'updateTime'] = formatToDateTime(new Date());
+	  data[record.value.isNewRecord ? 'createTime' : 'repayTime'] = formatToDateTime(new Date());
 	  
      // console.log('submit', params, data, record);
      const res = await erpDebtRecordsSave(params, data);
      showMessage(res.message);
-      setTimeout(closeDrawer);
+      setTimeout(closeModal);
      emit('success', data);
    } catch (error: any) {
      if (error && error.errorFields) {
@@ -124,7 +141,7 @@
      }
      console.log('error', error);
    } finally {
-      setDrawerProps({ confirmLoading: false });
+      setModalProps({ confirmLoading: false });
    }
  }
 </script>
--- a/web-vue/packages/erp/views/erp/debtRecords/list.vue
+++ b/web-vue/packages/erp/views/erp/debtRecords/list.vue
@@ -24,7 +24,7 @@
        </a>
      </template>
    </BasicTable>
-    <InputForm @register="registerDrawer" @success="handleSuccess" />
+    <InputForm @register="registerModal" @success="handleSuccess" />
  </div>
 </template>
 <script lang="ts" setup name="ViewsErpDebtRecordsList">
@@ -37,8 +37,7 @@
  import { Icon } from '@jeesite/core/components/Icon';
  import { BasicTable, BasicColumn, useTable } from '@jeesite/core/components/Table';
  import { ErpDebtRecords, erpDebtRecordsList } from '@jeesite/erp/api/erp/debtRecords';
-  import { erpDebtRecordsDelete, erpDebtRecordsListData } from '@jeesite/erp/api/erp/debtRecords';
-  import { useDrawer } from '@jeesite/core/components/Drawer';
+  import { erpDebtRecordsDelete, erpDebtRecordsRecorded, erpDebtRecordsListData } from '@jeesite/erp/api/erp/debtRecords';
  import { useModal } from '@jeesite/core/components/Modal';
  import { FormProps } from '@jeesite/core/components/Form';
  import InputForm from './form.vue';
@@ -59,14 +58,22 @@
    labelWidth: 90,
    schemas: [
      {
-        label: t('负债标识'),
+        label: t('负债名称'),
        field: 'debtId',
-        component: 'Input',
+		fieldLabel: 'debtName',
+		component: 'ListSelect',
+		componentProps: {
+		  selectType: 'erpDebtSelect',
+		},
      },
      {
        label: t('账户标识'),
        field: 'accountId',
-        component: 'Input',
+		fieldLabel: 'accountName',
+		component: 'ListSelect',
+		componentProps: {
+		  selectType: 'erpAccountSelect',
+		},
      },
      {
        label: t('备注说明'),
@@ -82,27 +89,42 @@
      dataIndex: 'createTime',
      key: 'a.create_time',
      sorter: true,
-      width: 230,
-      align: 'left',
-      slot: 'firstColumn',
+      width: 150,
+      align: 'center',
+      fixed: 'left',
    },
    {
-      title: t('负债标识'),
-      dataIndex: 'debtId',
-      key: 'a.debt_id',
-      sorter: true,
-      width: 130,
-      align: 'left',
-	  slot: 'bizScopeKey',
-    },
-    {
-      title: t('账户标识'),
-      dataIndex: 'accountId',
-      key: 'a.account_id',
+      title: t('账户名称'),
+      dataIndex: 'accountName',
+      key: 'b.account_name',
      sorter: true,
      width: 130,
      align: 'left',
    },
+	{
+	  title: t('负债名称'),
+	  dataIndex: 'debtName',
+	  key: 'c.debt_name',
+	  sorter: true,
+	  width: 130,
+	  align: 'left',
+	},
+	{
+	  title: t('父级分类'),
+	  dataIndex: 'parentName',
+	  key: 'd.parent_name',
+	  sorter: true,
+	  width: 130,
+	  align: 'left',
+	},
+	{
+	  title: t('还款分类'),
+	  dataIndex: 'categoryName',
+	  key: 'd.category_name',
+	  sorter: true,
+	  width: 130,
+	  align: 'left',
+	},
    {
      title: t('还款金额'),
      dataIndex: 'repayAmount',
@@ -116,27 +138,38 @@
      dataIndex: 'repayTime',
      key: 'a.repay_time',
      sorter: true,
-      width: 130,
+      width: 150,
      align: 'center',
    },
    {
-      title: t('备注说明'),
+      title: t('还款说明'),
      dataIndex: 'remark',
      key: 'a.remark',
      sorter: true,
      width: 130,
      align: 'left',
    },
+	{
+	  title: t('是否记账'),
+	  dataIndex: 'isRecorded',
+	  key: 'a.is_recorded',
+	  sorter: true,
+	  width: 120,
+	  align: 'right',
+	  dictType: 'is_recorded',
+	},
  ];

  const actionColumn: BasicColumn<ErpDebtRecords> = {
    width: 160,
+	align: 'center',
    actions: (record: ErpDebtRecords) => [
      {
        icon: 'i-clarity:note-edit-line',
        title: t('编辑'),
        onClick: handleForm.bind(this, { recordId: record.recordId }),
        auth: 'erp:debtRecords:edit',
+		ifShow: record.isRecorded == '0'
      },
      {
        icon: 'i-ant-design:delete-outlined',
@@ -147,7 +180,18 @@
          confirm: handleDelete.bind(this, record),
        },
        auth: 'erp:debtRecords:edit',
+		ifShow: record.isRecorded == '0'
      },
+	  {
+	    icon: 'ant-design:check-outlined',
+	    color: 'warning',
+	    title: t('记账'),
+	    popConfirm: {
+	      title: t('是否确认记账?'),
+	      confirm: handleRecorded.bind(this, record),
+	    },
+	  	ifShow: record.isRecorded == '0'
+	  },
    ],
  };

@@ -170,10 +214,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() {
@@ -192,7 +236,14 @@
    showMessage(res.message);
    await handleSuccess(record);
  }
-
+  
+  async function handleRecorded(record: Recordable) {
+    const params = { recordId: record.recordId };
+    const res = await erpDebtRecordsRecorded(params);
+    showMessage(res.message);
+    await handleSuccess(record);
+  }
+  
  async function handleSuccess(record: Recordable) {
    await reload({ record });
  }
--- a/web-vue/packages/erp/views/erp/debts/form.vue
+++ b/web-vue/packages/erp/views/erp/debts/form.vue
@@ -4,20 +4,20 @@
 * @author gaoxq
 -->
 <template>
-  <BasicDrawer
+  <BasicModal
    v-bind="$attrs"
    :showFooter="true"
    :okAuth="'erp:debts: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="ViewsErpDebtsForm">
  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 { ErpDebts, erpDebtsSave, erpDebtsForm } from '@jeesite/erp/api/erp/debts';
  import { formatToDateTime } from '@jeesite/core/utils/dateUtil';

@@ -49,42 +49,50 @@
      component: 'FormGroup',
      colProps: { md: 24, lg: 24 },
    },
+	{
+	  label: t('借贷名称'),
+	  field: 'debtName',
+	  component: 'Input',
+	  componentProps: {
+	    maxlength: 64,
+	  },
+	  required: true,
+	},
    {
      label: t('负债类型'),
      field: 'debtType',
-      component: 'Input',
-      componentProps: {
-        maxlength: 12,
-      },
-      required: true,
-    },
-    {
-      label: t('对方名称'),
-      field: 'debtName',
-      component: 'Input',
-      componentProps: {
-        maxlength: 64,
-      },
+	  component: 'Select',
+	  componentProps: {
+	    dictType: 'debt_type',
+	    allowClear: true,
+	  },
      required: true,
    },
    {
      label: t('借贷金额'),
      field: 'debtAmount',
-      component: 'Input',
+      component: 'InputNumber',
      componentProps: {
        maxlength: 10,
      },
      required: true,
    },
    {
-      label: t('状态'),
+      label: t('借贷状态'),
      field: 'ustatus',
-      component: 'Input',
-      componentProps: {
-        maxlength: 12,
-      },
+	  component: 'Select',
+	  componentProps: {
+	    dictType: 'debt_status',
+	    allowClear: true,
+	  },
      required: true,
    },
+	{
+	  label: t('交易说明'),
+	  field: 'remark',
+	  component: 'InputTextArea',
+	  colProps: { md: 24, lg: 24 },
+	},
  ];

  const [registerForm, { resetFields, setFieldsValue, validate }] = useForm<ErpDebts>({
@@ -93,20 +101,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 erpDebtsForm(data);
    record.value = (res.erpDebts || {}) as ErpDebts;
    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,
        debtId: record.value.debtId || data.debtId,
@@ -114,10 +122,10 @@
 	  
 	  data[record.value.isNewRecord ? 'createTime' : 'updateTime'] = formatToDateTime(new Date());
 	  
-      // console.log('submit', params, data, record);
+      console.log('submit', params, data, record);
      const res = await erpDebtsSave(params, data);
      showMessage(res.message);
-      setTimeout(closeDrawer);
+      setTimeout(closeModal);
      emit('success', data);
    } catch (error: any) {
      if (error && error.errorFields) {
@@ -125,7 +133,7 @@
      }
      console.log('error', error);
    } finally {
-      setDrawerProps({ confirmLoading: false });
+      setModalProps({ confirmLoading: false });
    }
  }
 </script>
--- a/web-vue/packages/erp/views/erp/debts/list.vue
+++ b/web-vue/packages/erp/views/erp/debts/list.vue
@@ -24,7 +24,7 @@
        </a>
      </template>
    </BasicTable>
-    <InputForm @register="registerDrawer" @success="handleSuccess" />
+    <InputForm @register="registerModal" @success="handleSuccess" />
  </div>
 </template>
 <script lang="ts" setup name="ViewsErpDebtsList">
@@ -38,7 +38,6 @@
  import { BasicTable, BasicColumn, useTable } from '@jeesite/core/components/Table';
  import { ErpDebts, erpDebtsList } from '@jeesite/erp/api/erp/debts';
  import { erpDebtsDelete, erpDebtsListData } from '@jeesite/erp/api/erp/debts';
-  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';
@@ -58,20 +57,28 @@
    baseColProps: { md: 8, lg: 6 },
    labelWidth: 90,
    schemas: [
+	  {
+	    label: t('借贷名称'),
+	    field: 'debtName',
+	    component: 'Input',
+	  },
      {
        label: t('负债类型'),
        field: 'debtType',
-        component: 'Input',
+		component: 'Select',
+		componentProps: {
+		  dictType: 'debt_type',
+		  allowClear: true,
+		},
      },
      {
-        label: t('对方名称'),
-        field: 'debtName',
-        component: 'Input',
-      },
-      {
-        label: t('状态'),
+        label: t('借贷状态'),
        field: 'ustatus',
-        component: 'Input',
+		component: 'Select',
+		componentProps: {
+		  dictType: 'debt_status',
+		  allowClear: true,
+		},
      },
    ],
  };
@@ -82,9 +89,9 @@
      dataIndex: 'createTime',
      key: 'a.create_time',
      sorter: true,
-      width: 230,
-      align: 'left',
-      slot: 'firstColumn',
+      width: 150,
+      align: 'center',
+	  fixed: 'left',
    },
    {
      title: t('负债类型'),
@@ -93,9 +100,10 @@
      sorter: true,
      width: 130,
      align: 'left',
+	  dictType: 'debt_type',
    },
    {
-      title: t('对方名称'),
+      title: t('借贷名称'),
      dataIndex: 'debtName',
      key: 'a.debt_name',
      sorter: true,
@@ -112,7 +120,7 @@
      align: 'right',
    },
    {
-      title: t('未还金额'),
+      title: t('已还金额'),
      dataIndex: 'remaining',
      key: 'a.remaining',
      sorter: true,
@@ -124,7 +132,7 @@
      dataIndex: 'endTime',
      key: 'a.end_time',
      sorter: true,
-      width: 130,
+      width: 150,
      align: 'center',
    },
    {
@@ -134,11 +142,13 @@
      sorter: true,
      width: 130,
      align: 'left',
+	  dictType: 'debt_status',
    },
  ];

  const actionColumn: BasicColumn<ErpDebts> = {
    width: 160,
+	align: 'center',
    actions: (record: ErpDebts) => [
      {
        icon: 'i-clarity:note-edit-line',
@@ -178,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() {
--- a/web-vue/packages/erp/views/erp/expense/form.vue
+++ b/web-vue/packages/erp/views/erp/expense/form.vue
@@ -91,6 +91,12 @@
      },
      required: true,
    },
+	{
+	  label: t('交易说明'),
+	  field: 'remark',
+	  component: 'InputTextArea',
+	  colProps: { md: 24, lg: 24 },
+	},
  ];

  const [registerForm, { resetFields, setFieldsValue, validate }] = useForm<ErpExpense>({
--- a/web-vue/packages/erp/views/erp/expense/list.vue
+++ b/web-vue/packages/erp/views/erp/expense/list.vue
@@ -38,7 +38,7 @@
  import { BasicTable, BasicColumn, useTable } from '@jeesite/core/components/Table';
  import { ErpExpense, erpExpenseList } from '@jeesite/erp/api/erp/expense';
  import { ErpCategory, erpCategoryListAll } from '@jeesite/erp/api/erp/category';
-  import { erpExpenseDelete, erpExpenseListData } from '@jeesite/erp/api/erp/expense';
+  import { erpExpenseDelete, erpExpenseRecorded, erpExpenseListData } from '@jeesite/erp/api/erp/expense';
  import { useModal } from '@jeesite/core/components/Modal';
  import { FormProps } from '@jeesite/core/components/Form';
  import InputForm from './form.vue';
@@ -146,6 +146,23 @@
      width: 150,
      align: 'center',
    },
+	{
+	  title: t('交易说明'),
+	  dataIndex: 'remark',
+	  key: 'a.remark',
+	  sorter: true,
+	  width: 130,
+	  align: 'right',
+	},
+	{
+	  title: t('是否记账'),
+	  dataIndex: 'isRecorded',
+	  key: 'a.is_recorded',
+	  sorter: true,
+	  width: 120,
+	  align: 'right',
+	  dictType: 'is_recorded',
+	},
  ];

  const actionColumn: BasicColumn<ErpExpense> = {
@@ -157,6 +174,7 @@
        title: t('编辑'),
        onClick: handleForm.bind(this, { expenseId: record.expenseId }),
        auth: 'erp:expense:edit',
+		ifShow: record.isRecorded == '0'
      },
      {
        icon: 'i-ant-design:delete-outlined',
@@ -167,7 +185,18 @@
          confirm: handleDelete.bind(this, record),
        },
        auth: 'erp:expense:edit',
+		ifShow: record.isRecorded == '0'
      },
+	  {
+	    icon: 'ant-design:check-outlined',
+	    color: 'warning',
+	    title: t('记账'),
+	    popConfirm: {
+	      title: t('是否确认记账?'),
+	      confirm: handleRecorded.bind(this, record),
+	    },
+	  	ifShow: record.isRecorded == '0'
+	  },
    ],
  };

@@ -212,7 +241,14 @@
    showMessage(res.message);
    await handleSuccess(record);
  }
-
+  
+  async function handleRecorded(record: Recordable) {
+    const params = { expenseId: record.expenseId };
+    const res = await erpExpenseRecorded(params);
+    showMessage(res.message);
+    await handleSuccess(record);
+  }
+  
  async function handleSuccess(record: Recordable) {
    await reload({ record });
  }
--- a/web-vue/packages/erp/views/erp/income/form.vue
+++ b/web-vue/packages/erp/views/erp/income/form.vue
@@ -91,6 +91,12 @@
      },
      required: true,
    },
+	{
+	  label: t('交易说明'),
+	  field: 'remark',
+	  component: 'InputTextArea',
+	  colProps: { md: 24, lg: 24 },
+	},
  ];

  const [registerForm, { resetFields, setFieldsValue, validate }] = useForm<ErpIncome>({
--- a/web-vue/packages/erp/views/erp/income/list.vue
+++ b/web-vue/packages/erp/views/erp/income/list.vue
@@ -38,7 +38,7 @@
  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 { erpIncomeDelete, erpIncomeRecorded, erpIncomeListData } from '@jeesite/erp/api/erp/income';
  import { useModal } from '@jeesite/core/components/Modal';
  import { FormProps } from '@jeesite/core/components/Form';
  import InputForm from './form.vue';
@@ -146,6 +146,23 @@
      width: 150,
      align: 'center',
    },
+	{
+	  title: t('交易说明'),
+	  dataIndex: 'remark',
+	  key: 'a.remark',
+	  sorter: true,
+	  width: 130,
+	  align: 'right',
+	},
+	{
+	  title: t('是否记账'),
+	  dataIndex: 'isRecorded',
+	  key: 'a.is_recorded',
+	  sorter: true,
+	  width: 120,
+	  align: 'right',
+	  dictType: 'is_recorded',
+	},
  ];

  const actionColumn: BasicColumn<ErpIncome> = {
@@ -157,6 +174,7 @@
        title: t('编辑'),
        onClick: handleForm.bind(this, { incomeId: record.incomeId }),
        auth: 'erp:income:edit',
+		ifShow: record.isRecorded == '0'
      },
      {
        icon: 'i-ant-design:delete-outlined',
@@ -167,7 +185,19 @@
          confirm: handleDelete.bind(this, record),
        },
        auth: 'erp:income:edit',
+		ifShow: record.isRecorded == '0'
      },
+	  {
+	    icon: 'ant-design:check-outlined',
+	    color: 'warning',
+	    title: t('记账'),
+	    popConfirm: {
+	      title: t('是否确认记账?'),
+	      confirm: handleRecorded.bind(this, record),
+	    },
+	    auth: 'erp:income:edit',
+	  	ifShow: record.isRecorded == '0'
+	  },
    ],
  };

@@ -212,6 +242,13 @@
    showMessage(res.message);
    await handleSuccess(record);
  }
+  
+  async function handleRecorded(record: Recordable) {
+    const params = { incomeId: record.incomeId };
+    const res = await erpIncomeRecorded(params);
+    showMessage(res.message);
+    await handleSuccess(record);
+  }

  async function handleSuccess(record: Recordable) {
    await reload({ record });
--- a/web-vue/packages/erp/views/erp/transactionFlow/list.vue
+++ b/web-vue/packages/erp/views/erp/transactionFlow/list.vue
@@ -179,6 +179,22 @@
      width: 130,
      align: 'left',
    },
+	{
+	  title: t('交易年份'),
+	  dataIndex: 'yearDate',
+	  key: 'a.year_date',
+	  sorter: true,
+	  width: 130,
+	  align: 'left',
+	},
+	{
+	  title: t('交易月份'),
+	  dataIndex: 'monthDate',
+	  key: 'a.month_date',
+	  sorter: true,
+	  width: 130,
+	  align: 'left',
+	},
    {
      title: t('交易备注'),
      dataIndex: 'remark',