feat: 修改账目管理

src/api/sys/model/moneyModel.ts

@@ -71,6 +71,13 @@ export interface EditAccountParams {
   id: number;
 }
 /**
+ * @description: Get AccountRecord list----------------------
+ */
+export interface GetAccountRecordListModel {
+  count: number;
+  list: object[];
+}
+/**
  * @description: Get Dues list----------------------
  */
 export interface GetDuesListModel {

src/api/sys/money.ts

@@ -11,6 +11,7 @@ import {
   AccountIdParams,
   AddAccountParams,
   EditAccountParams,
+  GetAccountRecordListModel,
   GetDuesListModel,
   GetDuesModel,
   DuesIdParams,
@@ -136,6 +137,16 @@ export function getAccount(params: AccountIdParams) {
   });
 }
 /**
+ * @description: GetAccountRecordList -----------------------------------------------
+ */
+export function getAccountRecordList(params) {
+  return defHttp.request<GetAccountRecordListModel>({
+    url: Api.AccountUrl + '/' + params.id,
+    method: 'POST',
+    params,
+  });
+}
+/**
  * @description: 修改单个账户
  */
 export function editAccount(params: EditAccountParams) {

src/views/money/account/data.ts

@@ -28,12 +28,6 @@ export const columns: BasicColumn[] = [
     sorter: true,
   },
   {
-    title: '操作人',
-    dataIndex: 'manager',
-    width: 150,
-    sorter: true,
-  },
-  {
     title: '创建日期',
     dataIndex: 'createdate',
     width: 200,

src/views/money/account/index.vue

@@ -50,6 +50,7 @@
     addAccount,
     deleteBatchesAccount,
     getAccount,
+    getAccountRecordList,
     editAccount,
     deleteAccount,
   } from '/@/api/sys/money';
@@ -168,6 +169,14 @@
         });
       }
 
+      async function handleInfo(record: Recordable) {
+        popupData.title = '详情';
+        getAccountRecordList({ id: record.id }).then((res) => {
+          const data = res.list;
+          openPopup(true, data);
+        });
+      }
+
       async function handleDelete(record: Recordable) {
         console.log(record);
         await deleteAccount({ id: record.id }).then((res) => {
@@ -261,6 +270,12 @@
       function createActions(record: EditRecordRow): ActionItem[] {
         return [
           {
+            label: '详情',
+            icon: 'ant-design:info-outlined',
+            color: 'normal',
+            onClick: handleInfo.bind(null, record),
+          },
+          {
             label: '编辑',
             icon: 'ant-design:edit-outlined',
             color: 'warning',

src/views/money/bill/customCom/account/index.vue

@@ -1,5 +1,4 @@
 <template>
-  <a-button type="primary" @click="handleAdd"> 添加 </a-button>
   <BasicTable
     ref="tableRef"
     @register="registerTable"

src/views/money/bill/customCom/dues/index.vue

@@ -1,5 +1,4 @@
 <template>
-  <a-button type="primary" @click="handleAdd"> 添加 </a-button>
   <BasicTable
     ref="tableRef"
     @register="registerTable"

src/views/money/bill/customCom/member/customCom/CustomInput.vue

@@ -0,0 +1,96 @@
+<template>
+  <!-- <BasicTable @register="registerTable" /> -->
+  <div class="wrap">
+    <div class="content">
+      <Input :placeholder="placeholder" disabled v-model:value="value" />
+      <a-button
+        class="mr-2 add-btn"
+        color="success"
+        :disabled="disabled"
+        @click="openAddPop(placeholder)"
+      >
+        添加
+      </a-button>
+    </div>
+    <Popup @register="register" @select="select" />
+  </div>
+</template>
+<script lang="ts">
+  import { defineComponent, onUpdated, reactive, nextTick, toRefs } from 'vue';
+  import { Input } from 'ant-design-vue';
+  import Popup from './popup.vue';
+  import { useModal } from '/@/components/Modal';
+
+  const props = {
+    value: { type: Object, default: '' },
+    placeholder: { type: String, default: '' },
+  };
+  interface State {
+    value: object | string;
+    placeholder: string;
+    disabled: boolean;
+  }
+
+  export default defineComponent({
+    name: 'CustomInput',
+    components: { Input, Popup },
+    props,
+    emits: ['change'],
+    setup(props, { emit }) {
+      const state = reactive<State>({
+        value: '',
+        placeholder: props.placeholder,
+        disabled: false,
+      });
+      const [register, { openModal: openPopup }] = useModal();
+      // 初始化
+      function init() {
+        nextTick(() => {
+          if (props.value.name) {
+            console.log(`props.value.name`, props.value.name);
+            state.value = props.value.name;
+          } else {
+            state.value = props.value;
+          }
+          if (state.value !== '' && typeof props.value === 'string') {
+            state.disabled = true;
+          } else {
+            state.disabled = false;
+          }
+        });
+      }
+      onUpdated(() => {
+        init();
+      });
+      function openAddPop(title) {
+        if (title === '添加相关个人') {
+          title = '添加个人';
+        }
+        if (title === '添加相关单位') {
+          title = '添加单位';
+        }
+        openPopup(true, title);
+      }
+      function select(data) {
+        emit('change', data);
+      }
+
+      return {
+        openAddPop,
+        select,
+        openPopup,
+        register,
+        ...toRefs(state),
+      };
+    },
+  });
+</script>
+<style scoped>
+  .content {
+    display: flex;
+  }
+
+  .add-btn {
+    margin-left: 2px;
+  }
+</style>

src/views/money/bill/customCom/member/customCom/popup.vue

@@ -0,0 +1,43 @@
+<template>
+  <BasicModal
+    :showCancelBtn="false"
+    :showOkBtn="false"
+    width="800px"
+    v-bind="$attrs"
+    @register="register"
+    :title="title"
+    helpMessage="点击最右侧选择按钮"
+  >
+    <Person v-if="title === '添加个人'" @select="select" />
+    <Unit v-if="title === '添加单位'" @select="select" />
+  </BasicModal>
+</template>
+<script lang="ts">
+  import Person from './person/index.vue';
+  import Unit from './unit/index.vue';
+  import { BasicModal, useModalInner } from '/@/components/Modal';
+  import { defineComponent, reactive, toRefs } from 'vue';
+
+  export default defineComponent({
+    components: { BasicModal, Person, Unit },
+    emits: ['select'],
+    setup(_, { emit }) {
+      const state = reactive({
+        title: '',
+      });
+      const [register, { closeModal }] = useModalInner((data) => {
+        state.title = data;
+      });
+
+      function select(data) {
+        emit('select', data);
+        closeModal();
+      }
+      return {
+        register,
+        select,
+        ...toRefs(state),
+      };
+    },
+  });
+</script>

src/views/money/bill/customCom/member/customCom/unit/data.ts

@@ -0,0 +1,682 @@
+import { FormProps, BasicColumn } from '/@/components/Table';
+import { FormSchema } from '/@/components/Form/index';
+import { adapt } from '/@/utils/adapt';
+import moment from 'moment';
+
+const adaptWidth = adapt();
+export const columns: BasicColumn[] = [
+  {
+    title: 'ID',
+    dataIndex: 'id',
+    editComponentProps: {
+      prefix: '$',
+    },
+    width: 100,
+    sorter: true,
+  },
+  {
+    title: '企业名称',
+    dataIndex: 'name',
+    width: 130,
+    sorter: true,
+  },
+  {
+    title: '法人代表',
+    dataIndex: 'legalman',
+    width: 130,
+    sorter: true,
+  },
+  {
+    title: '成立时间',
+    dataIndex: 'foundingtime',
+    width: 150,
+    customRender({ record }) {
+      return moment(record.foundingtime).format('YYYY-MM-DD');
+    },
+    sorter: true,
+  },
+  {
+    title: '工商登记号',
+    dataIndex: 'businessNo',
+    width: 350,
+    sorter: true,
+  },
+  {
+    title: '单位性质',
+    dataIndex: 'nature',
+    width: 160,
+    customRender: ({ record }) => {
+      const options = [
+        '国有企业',
+        '集体所有制',
+        '私营企业',
+        '股份制企业',
+        '有限合伙企业',
+        '联营企业',
+        '外商投资企业',
+        '个人独资企业',
+      ];
+      return options[record.nature];
+    },
+    sorter: true,
+  },
+  {
+    title: '行业分类',
+    dataIndex: 'job',
+    width: 160,
+    sorter: true,
+  },
+  {
+    title: '注册资金',
+    dataIndex: 'regMoney',
+    width: 160,
+    sorter: true,
+  },
+  {
+    title: '职工人数',
+    dataIndex: 'jobnum',
+    width: 160,
+    sorter: true,
+  },
+];
+
+export function getFormConfig(): Partial<FormProps> {
+  return {
+    labelWidth: 100,
+    schemas: [
+      {
+        field: `id`,
+        label: `ID`,
+        component: 'Input',
+        componentProps: {
+          placeholder: 'ID',
+        },
+        colProps: {
+          xl: 12,
+          xxl: 8,
+        },
+      },
+      {
+        field: `name`,
+        label: `企业名称`,
+        component: 'Input',
+        componentProps: {
+          placeholder: '企业名称',
+        },
+        colProps: {
+          xl: 12,
+          xxl: 8,
+        },
+      },
+      {
+        field: `legalman`,
+        label: `法人代表`,
+        component: 'Input',
+        componentProps: {
+          placeholder: '法人代表',
+        },
+        colProps: {
+          xl: 12,
+          xxl: 8,
+        },
+      },
+      {
+        field: `foundingtime`,
+        label: `成立时间`,
+        component: 'DatePicker',
+        componentProps: {
+          placeholder: '成立时间',
+        },
+        colProps: {
+          xl: 12,
+          xxl: 8,
+        },
+      },
+      {
+        field: `businessNo`,
+        label: `工商登记号`,
+        component: 'Input',
+        componentProps: {
+          placeholder: '工商登记号',
+        },
+        colProps: {
+          xl: 12,
+          xxl: 8,
+        },
+      },
+      {
+        field: `nature`,
+        label: `单位性质`,
+        component: 'Select',
+        componentProps: {
+          placeholder: '单位性质',
+          options: [
+            {
+              label: '国有企业',
+              value: 0,
+            },
+            {
+              label: '集体所有制',
+              value: 1,
+            },
+            {
+              label: '私营企业',
+              value: 2,
+            },
+            {
+              label: '股份制企业',
+              value: 3,
+            },
+            {
+              label: '有限合伙企业',
+              value: 4,
+            },
+            {
+              label: '联营企业',
+              value: 5,
+            },
+            {
+              label: '外商投资企业',
+              value: 6,
+            },
+            {
+              label: '个人独资企业',
+              value: 7,
+            },
+          ],
+        },
+        colProps: {
+          xl: 12,
+          xxl: 8,
+        },
+      },
+      {
+        field: `job`,
+        label: `行业分类`,
+        component: 'Input',
+        componentProps: {
+          placeholder: '行业分类',
+        },
+        colProps: {
+          xl: 12,
+          xxl: 8,
+        },
+      },
+      {
+        field: `regMoney`,
+        label: `注册资金`,
+        component: 'Input',
+        componentProps: {
+          placeholder: '注册资金',
+        },
+        colProps: {
+          xl: 12,
+          xxl: 8,
+        },
+      },
+      {
+        field: `jobnum`,
+        label: `职工人数`,
+        component: 'Input',
+        componentProps: {
+          placeholder: '职工人数',
+        },
+        colProps: {
+          xl: 12,
+          xxl: 8,
+        },
+      },
+    ],
+  };
+}
+
+// =================popup================================
+export const schemas: FormSchema[] = [
+  {
+    field: 'name',
+    component: 'Input',
+    label: '企业名称',
+    labelWidth: adaptWidth.labelWidth,
+    colProps: {
+      span: adaptWidth.elContainer,
+    },
+    componentProps: {
+      placeholder: '企业名称',
+    },
+    required: true,
+  },
+  {
+    field: 'legalman',
+    component: 'Input',
+    label: '法人代表',
+    labelWidth: adaptWidth.labelWidth,
+    colProps: {
+      span: adaptWidth.elContainer,
+    },
+    componentProps: {
+      placeholder: '法人代表',
+    },
+    required: true,
+  },
+  {
+    field: 'businessNo',
+    component: 'Input',
+    label: '工商登记号',
+    labelWidth: adaptWidth.labelWidth,
+    colProps: {
+      span: adaptWidth.elContainer,
+    },
+    componentProps: {
+      placeholder: '工商登记号',
+    },
+    required: true,
+  },
+  {
+    field: 'centralTax',
+    component: 'Input',
+    label: '国税税号',
+    labelWidth: adaptWidth.labelWidth,
+    colProps: {
+      span: adaptWidth.elContainer,
+    },
+    componentProps: {
+      placeholder: '国税税号',
+    },
+  },
+  {
+    field: 'landTax',
+    component: 'Input',
+    label: '地税税号',
+    labelWidth: adaptWidth.labelWidth,
+    colProps: {
+      span: adaptWidth.elContainer,
+    },
+    componentProps: {
+      placeholder: '地税税号',
+    },
+  },
+  {
+    field: 'nature',
+    label: '单位性质',
+    component: 'Select',
+    componentProps: {
+      placeholder: '单位性质',
+      options: [
+        {
+          label: '国有企业',
+          value: 0,
+        },
+        {
+          label: '集体所有制',
+          value: 1,
+        },
+        {
+          label: '私营企业',
+          value: 2,
+        },
+        {
+          label: '股份制企业',
+          value: 3,
+        },
+        {
+          label: '有限合伙企业',
+          value: 4,
+        },
+        {
+          label: '联营企业',
+          value: 5,
+        },
+        {
+          label: '外商投资企业',
+          value: 6,
+        },
+        {
+          label: '个人独资企业',
+          value: 7,
+        },
+      ],
+    },
+    labelWidth: adaptWidth.labelWidth,
+    colProps: {
+      span: adaptWidth.elContainer,
+    },
+    required: true,
+  },
+  {
+    field: 'foundingtime',
+    component: 'DatePicker',
+    label: '成立时间',
+    labelWidth: adaptWidth.labelWidth,
+    colProps: {
+      span: adaptWidth.elContainer,
+    },
+    componentProps: {
+      placeholder: '成立时间',
+    },
+    required: true,
+  },
+  {
+    field: 'job',
+    component: 'Input',
+    label: '行业分类',
+    labelWidth: adaptWidth.labelWidth,
+    colProps: {
+      span: adaptWidth.elContainer,
+    },
+    componentProps: {
+      placeholder: '行业分类',
+    },
+    required: true,
+  },
+  {
+    field: 'jobnum',
+    component: 'Input',
+    label: '职工人数',
+    labelWidth: adaptWidth.labelWidth,
+    colProps: {
+      span: adaptWidth.elContainer,
+    },
+    componentProps: {
+      type: 'number',
+      placeholder: '职工人数',
+    },
+  },
+  {
+    field: 'partynum',
+    component: 'Input',
+    label: '党员数',
+    labelWidth: adaptWidth.labelWidth,
+    colProps: {
+      span: adaptWidth.elContainer,
+    },
+    componentProps: {
+      type: 'number',
+      placeholder: '党员数',
+    },
+  },
+  {
+    field: 'tel',
+    component: 'Input',
+    label: '电话',
+    labelWidth: adaptWidth.labelWidth,
+    colProps: {
+      span: adaptWidth.elContainer,
+    },
+    componentProps: {
+      placeholder: '电话',
+    },
+  },
+  {
+    field: 'fax',
+    component: 'Input',
+    label: '传真',
+    labelWidth: adaptWidth.labelWidth,
+    colProps: {
+      span: adaptWidth.elContainer,
+    },
+    componentProps: {
+      placeholder: '传真',
+    },
+  },
+  {
+    field: 'zipcode',
+    component: 'Input',
+    label: '邮编',
+    labelWidth: adaptWidth.labelWidth,
+    colProps: {
+      span: adaptWidth.elContainer,
+    },
+    componentProps: {
+      placeholder: '邮箱',
+    },
+  },
+  {
+    field: 'address',
+    component: 'Input',
+    label: '地址',
+    labelWidth: adaptWidth.labelWidth,
+    colProps: {
+      span: adaptWidth.elContainer,
+    },
+    componentProps: {
+      placeholder: '地址',
+    },
+    required: true,
+  },
+  {
+    field: 'culturalnum',
+    component: 'Input',
+    label: '大专以上文化人数',
+    labelWidth: adaptWidth.labelWidth,
+    colProps: {
+      span: adaptWidth.elContainer,
+    },
+    componentProps: {
+      type: 'number',
+      placeholder: '大专以上文化人数',
+    },
+  },
+  {
+    field: 'laidnum',
+    component: 'Input',
+    label: '安置下岗人数',
+    labelWidth: adaptWidth.labelWidth,
+    colProps: {
+      span: adaptWidth.elContainer,
+    },
+    componentProps: {
+      type: 'number',
+      placeholder: '安置下岗人数',
+    },
+  },
+  {
+    field: 'partyCase',
+    component: 'Input',
+    label: '党、团工会情况',
+    labelWidth: adaptWidth.labelWidth,
+    colProps: {
+      span: adaptWidth.elContainer,
+    },
+    componentProps: {
+      placeholder: '党、团工会情况',
+    },
+  },
+  {
+    field: 'web',
+    component: 'Input',
+    label: '网址',
+    labelWidth: adaptWidth.labelWidth,
+    colProps: {
+      span: adaptWidth.elContainer,
+    },
+    componentProps: {
+      placeholder: '网址',
+    },
+  },
+  {
+    field: 'email',
+    component: 'Input',
+    label: '电子邮箱',
+    labelWidth: adaptWidth.labelWidth,
+    colProps: {
+      span: adaptWidth.elContainer,
+    },
+    componentProps: {
+      placeholder: '电子邮箱',
+    },
+  },
+  {
+    field: 'technology',
+    label: '高新技术企业认证',
+    component: 'Switch',
+    labelWidth: adaptWidth.labelWidth,
+    colProps: {
+      span: adaptWidth.elContainer,
+    },
+    componentProps: {
+      placeholder: '高新技术企业认证',
+    },
+  },
+  {
+    field: 'technologyDept',
+    component: 'Input',
+    label: '高新技术企业认证部门',
+    labelWidth: adaptWidth.labelWidth,
+    colProps: {
+      span: adaptWidth.elContainer,
+    },
+    show: ({ values }) => {
+      if (values.technology) {
+        return true;
+      }
+      return false;
+    },
+    componentProps: {
+      placeholder: '高新技术企业认证部门',
+    },
+    required: ({ values }) => {
+      if (values.technology) {
+        return true;
+      }
+      return false;
+    },
+  },
+  {
+    field: 'foreignTrade',
+    label: '外贸自营进出口权',
+    component: 'Switch',
+    labelWidth: adaptWidth.labelWidth,
+    colProps: {
+      span: adaptWidth.elContainer,
+    },
+    componentProps: {
+      placeholder: '外贸自营进出口权',
+    },
+  },
+  {
+    field: 'foreignTradeDept',
+    component: 'Input',
+    label: '外贸自营进出口权批准部门',
+    labelWidth: adaptWidth.labelWidth,
+    colProps: {
+      span: adaptWidth.elContainer,
+    },
+    show: ({ values }) => {
+      if (values.foreignTrade) {
+        return true;
+      }
+      return false;
+    },
+    componentProps: {
+      placeholder: '外贸自营进出口权批准部门',
+    },
+    required: ({ values }) => {
+      if (values.foreignTrade) {
+        return true;
+      }
+      return false;
+    },
+  },
+  {
+    field: 'quality',
+    label: '质量管理、质量保证系列认证标准',
+    component: 'Switch',
+    labelWidth: adaptWidth.labelWidth,
+    colProps: {
+      span: adaptWidth.elContainer,
+    },
+    componentProps: {
+      placeholder: '质量管理、质量保证系列认证标准',
+    },
+  },
+  {
+    field: 'qualityDept',
+    component: 'Input',
+    label: '质量管理、质量保证系列认证标准认证部门',
+    labelWidth: adaptWidth.labelWidth,
+    colProps: {
+      span: adaptWidth.elContainer,
+    },
+    show: ({ values }) => {
+      if (values.quality) {
+        return true;
+      }
+      return false;
+    },
+    componentProps: {
+      placeholder: '质量管理、质量保证系列认证标准认证部门',
+    },
+    required: ({ values }) => {
+      if (values.quality) {
+        return true;
+      }
+      return false;
+    },
+  },
+  {
+    field: 'regMoney',
+    component: 'Input',
+    label: '注册资金(万元)',
+    labelWidth: adaptWidth.labelWidth,
+    colProps: {
+      span: adaptWidth.elContainer,
+    },
+    componentProps: {
+      type: 'number',
+      placeholder: '注册资金(万元)',
+    },
+    required: true,
+  },
+  {
+    field: 'money',
+    component: 'Input',
+    label: '资产(万元)',
+    labelWidth: adaptWidth.labelWidth,
+    colProps: {
+      span: adaptWidth.elContainer,
+    },
+    componentProps: {
+      type: 'number',
+      placeholder: '资产(万元)',
+    },
+  },
+  {
+    field: 'ownerMoney',
+    component: 'Input',
+    label: '所有者权益(万元)',
+    labelWidth: adaptWidth.labelWidth,
+    colProps: {
+      span: adaptWidth.elContainer,
+    },
+    componentProps: {
+      type: 'number',
+      placeholder: '所有者权益(万元)',
+    },
+  },
+  {
+    field: 'sellMoney',
+    component: 'Input',
+    label: '销售收入(万元)',
+    labelWidth: adaptWidth.labelWidth,
+    colProps: {
+      span: adaptWidth.elContainer,
+    },
+    componentProps: {
+      type: 'number',
+      placeholder: '销售收入(万元)',
+    },
+  },
+  {
+    field: 'product',
+    component: 'InputTextArea',
+    label: '主要经营项目',
+    labelWidth: adaptWidth.labelWidth,
+    colProps: {
+      span: adaptWidth.elContainer,
+    },
+    componentProps: {
+      placeholder: '主要经营项目',
+    },
+    required: true,
+  },
+];

src/views/money/bill/customCom/member/customCom/unit/index.vue

@@ -0,0 +1,158 @@
+<template>
+  <a-button type="primary" @click="handleAdd"> 添加 </a-button>
+  <BasicTable
+    ref="tableRef"
+    @register="registerTable"
+    rowKey="id"
+    :pagination="{
+      pageSize: 10,
+      defaultPageSize: 10,
+      showSizeChanger: false,
+    }"
+  >
+    <template #form-custom> custom-slot </template>
+    <template #action="{ record }">
+      <TableAction :actions="createActions(record)" stopButtonPropagation />
+    </template>
+  </BasicTable>
+  <Popup @register="addRegister" @saveData="saveData" />
+</template>
+<script lang="ts">
+  import { defineComponent, ref, unref } from 'vue';
+  import Popup from './popup.vue';
+  import { useMessage } from '/@/hooks/web/useMessage';
+  import { useModal } from '/@/components/Modal';
+  import { getFormConfig, columns } from './data';
+  import { getUnitList, addUnit } from '/@/api/sys/member';
+  import moment from 'moment';
+  import {
+    BasicTable,
+    useTable,
+    TableAction,
+    ActionItem,
+    EditRecordRow,
+    TableActionType,
+  } from '/@/components/Table';
+
+  export default defineComponent({
+    name: 'Unit',
+    components: { BasicTable, TableAction, Popup },
+    emits: ['select'],
+    setup(_, { emit }) {
+      const { createMessage } = useMessage();
+      const { success /*, error*/ } = createMessage;
+      const tableRef = ref<Nullable<TableActionType>>(null);
+      const [registerTable] = useTable({
+        columns: columns,
+        clickToRowSelect: false, // 点击行不勾选
+        api: getUnitList,
+        useSearchForm: true,
+        showTableSetting: true,
+        tableSetting: {
+          redo: false,
+          size: false,
+        },
+        beforeFetch: beforeFetch,
+        afterFetch: afterFetch,
+        formConfig: getFormConfig(),
+        actionColumn: {
+          width: 160,
+          title: '操作',
+          dataIndex: 'action',
+          slots: { customRender: 'action' },
+          fixed: undefined,
+        },
+        maxHeight: 190,
+        showIndexColumn: false,
+        bordered: true,
+      });
+      const [addRegister, { openModal: openPopup }] = useModal();
+      function getTableAction() {
+        // 获取组件
+        const tableAction = unref(tableRef);
+        if (!tableAction) {
+          throw new Error('tableAction is null');
+        }
+        return tableAction;
+      }
+
+      // 请求之前处理参数
+      function beforeFetch(params) {
+        for (let k in params) {
+          if (k !== 'page' && k !== 'pageSize' && k !== 'field' && k !== 'order') {
+            if (params[k] === '') {
+              delete params[k];
+            } else {
+              if (!params.filter) {
+                params.filter = {};
+              }
+              if (params.foundingtime) {
+                params.foundingtime = moment(params.foundingtime).format('YYYY-MM-DD');
+              } else {
+                delete params.foundingtime;
+              }
+              params.filter[k] = params[k];
+              delete params[k];
+            }
+          }
+        }
+        params.filter = JSON.stringify(params.filter);
+        params.offset = params.page;
+        params.limit = params.pageSize;
+        delete params.page;
+        delete params.pageSize;
+      }
+
+      function afterFetch(result) {
+        console.log(`result`, result);
+        // tableData.result = result;
+      }
+
+      function handleAdd() {
+        // 开启弹窗
+        openPopup(true, { family: [] });
+      }
+      function handleSelect(record: EditRecordRow) {
+        emit('select', record);
+      }
+
+      async function saveData(params: any) {
+        const data = params.data;
+        const closeModel = params.closeModal;
+        console.log(`data`, data);
+        await addUnit(data).then((res) => {
+          console.log(res);
+          getTableAction().reload();
+          closeModel();
+          success('创建成功!');
+        });
+      }
+
+      function createActions(record: EditRecordRow): ActionItem[] {
+        return [
+          {
+            label: '选择',
+            icon: 'ant-design:edit-outlined',
+            color: 'warning',
+            onClick: handleSelect.bind(null, record),
+          },
+        ];
+      }
+      return {
+        tableRef,
+        registerTable,
+        handleAdd,
+        handleSelect,
+        createActions,
+        getTableAction,
+        addRegister,
+        saveData,
+      };
+    },
+  });
+</script>
+<style>
+  .ant-calendar-picker {
+    width: 100%;
+  }
+</style>

src/views/money/bill/customCom/member/customCom/unit/popup.vue

@@ -0,0 +1,115 @@
+<template>
+  <BasicModal v-bind="$attrs" @register="register" @ok="confirm" :title="title">
+    <BasicForm @register="registerForm" :model="model" />
+  </BasicModal>
+</template>
+<script lang="ts">
+  import { defineComponent, PropType, reactive, ref, toRefs } from 'vue';
+  import { BasicModal, useModalInner } from '/@/components/Modal';
+  import { BasicForm, useForm } from '/@/components/Form/index';
+  import { useMessage } from '/@/hooks/web/useMessage';
+  import { schemas } from './data';
+  import moment from 'moment';
+  interface PopupData {
+    title: string;
+  }
+  interface Role {
+    id: string | number;
+  }
+
+  export default defineComponent({
+    components: { BasicModal, BasicForm },
+    props: {
+      popupData: {
+        type: Object as PropType<PopupData>,
+        default: () => {},
+      },
+    },
+    emits: ['saveData'],
+    setup(props, { emit }) {
+      const { createMessage } = useMessage();
+      const { error } = createMessage;
+      const role = reactive<Role>({
+        id: 0,
+      });
+      const popupData = props.popupData as PopupData;
+      const modelRef = ref({});
+
+      const [registerForm, { setFieldsValue, resetFields, validate }] = useForm({
+        labelWidth: 120,
+        schemas,
+        showActionButtonGroup: false,
+        actionColOptions: {
+          span: 24,
+        },
+      });
+      //   const [register, { closeModal }] = useModalInner((data) => {
+      //     modelRef.value = data;
+
+      //
+      //   });
+      const [register, { closeModal }] = useModalInner((data) => {
+        resetFields();
+        setFieldsValue(data);
+        role.id = data.id;
+      });
+
+      async function confirm() {
+        try {
+          const data = await validate();
+          console.log(`确定`, data);
+          if (role.id) {
+            data.id = role.id;
+          } else {
+            role.id = 0;
+          }
+          if (data.technology) {
+            data.technology = 1;
+          } else {
+            data.technology = 0;
+          }
+          if (data.foreignTrade) {
+            data.foreignTrade = 1;
+          } else {
+            data.foreignTrade = 0;
+          }
+          if (data.quality) {
+            data.quality = 1;
+          } else {
+            data.quality = 0;
+          }
+          data.foundingtime = moment(data.foundingtime).format('YYYY-MM-DD');
+
+          const popupData = { closeModal, data };
+          emit('saveData', popupData);
+        } catch (err) {
+          error(err.errorFields[0].errors[0]);
+        }
+      }
+      return {
+        register,
+        schemas,
+        registerForm,
+        model: modelRef,
+        confirm,
+        ...toRefs(popupData),
+      };
+    },
+  });
+</script>
+<style lang="less">
+  .ant-form-item-label {
+    overflow: hidden;
+    text-align: center !important;
+    // white-space: pre-wrap !important;
+    text-overflow: ellipsis;
+    white-space: nowrap;
+  }
+
+  @media (max-width: 639px) {
+    .ant-form-item-label {
+      line-height: 2.5715 !important;
+      text-align: center !important;
+    }
+  }
+</style>

src/views/money/bill/customCom/member/data.ts

@@ -0,0 +1,415 @@
+import { FormProps, BasicColumn } from '/@/components/Table';
+import { FormSchema } from '/@/components/Form/index';
+import { adapt } from '/@/utils/adapt';
+import { h } from 'vue';
+import CustomInput from './customCom/CustomInput.vue';
+import moment from 'moment';
+
+const adaptWidth = adapt();
+
+export const columns: BasicColumn[] = [
+  {
+    title: 'ID',
+    dataIndex: 'id',
+    editComponentProps: {
+      prefix: '$',
+    },
+    width: 100,
+    sorter: true,
+  },
+  {
+    title: '姓名(名称)',
+    dataIndex: 'name',
+    width: 100,
+    sorter: true,
+  },
+  {
+    title: '会员身份',
+    dataIndex: 'status',
+    width: 130,
+    customRender({ record }) {
+      const options = ['个人', '单位'];
+      return options[record.status];
+    },
+    sorter: true,
+  },
+  {
+    title: '职务',
+    dataIndex: 'duty',
+    width: 130,
+    customRender({ record }) {
+      const options = ['会长', '副会长', '秘书长', '副秘书长', '理事', '会员'];
+      return options[record.duty];
+    },
+    sorter: true,
+  },
+  {
+    title: '入会时间',
+    dataIndex: 'jointime',
+    width: 150,
+    customRender({ record }) {
+      return moment(record.jointime).format('YYYY-MM-DD');
+    },
+    sorter: true,
+  },
+  {
+    title: '当年会费',
+    dataIndex: 'current',
+    width: 200,
+    sorter: true,
+  },
+  {
+    title: '去年会费',
+    dataIndex: 'party',
+    width: 150,
+    sorter: true,
+  },
+  {
+    title: '当年参会率',
+    dataIndex: 'nation',
+    width: 130,
+    sorter: true,
+  },
+  {
+    title: '去年参会率',
+    dataIndex: 'company',
+    width: 130,
+    sorter: true,
+  },
+];
+
+export function getFormConfig(): Partial<FormProps> {
+  return {
+    labelWidth: 100,
+    schemas: [
+      {
+        field: `id`,
+        label: `ID`,
+        component: 'Input',
+        componentProps: {
+          placeholder: 'ID',
+        },
+        colProps: {
+          xl: 12,
+          xxl: 8,
+        },
+      },
+      {
+        field: `name`,
+        label: `姓名(名称)`,
+        component: 'Input',
+        componentProps: {
+          placeholder: '姓名(名称)',
+        },
+        colProps: {
+          xl: 12,
+          xxl: 8,
+        },
+      },
+      {
+        field: `status`,
+        label: `会员身份`,
+        component: 'Select',
+        componentProps: {
+          placeholder: '会员身份',
+          options: [
+            { label: '个人', value: 0 },
+            { label: '单位', value: 1 },
+          ],
+        },
+        colProps: {
+          xl: 12,
+          xxl: 8,
+        },
+      },
+      {
+        field: `jointime`,
+        label: `入会时间`,
+        component: 'DatePicker',
+        componentProps: {
+          placeholder: '入会时间',
+        },
+        colProps: {
+          xl: 12,
+          xxl: 8,
+        },
+      },
+      {
+        field: `email`,
+        label: `当年费率`,
+        component: 'Input',
+        componentProps: {
+          placeholder: '全年费率',
+          disabled: true,
+        },
+        colProps: {
+          xl: 12,
+          xxl: 8,
+        },
+      },
+      {
+        field: `logintime`,
+        label: `去年费率`,
+        component: 'Input',
+        componentProps: {
+          placeholder: '去年费率',
+          disabled: true,
+        },
+        colProps: {
+          xl: 12,
+          xxl: 8,
+        },
+      },
+      {
+        field: `logintime1`,
+        label: `当年参会率`,
+        component: 'Input',
+        componentProps: {
+          placeholder: '当年参会率',
+          disabled: true,
+        },
+        colProps: {
+          xl: 12,
+          xxl: 8,
+        },
+      },
+      {
+        field: `logintime2`,
+        label: `去年参会率`,
+        component: 'Input',
+        componentProps: {
+          placeholder: '去年参会率',
+          disabled: true,
+        },
+        colProps: {
+          xl: 12,
+          xxl: 8,
+        },
+      },
+    ],
+  };
+}
+
+// =================popup================================
+export const schemas: FormSchema[] = [
+  {
+    field: 'status',
+    label: '会员身份',
+    component: 'RadioButtonGroup',
+    labelWidth: adaptWidth.labelWidth,
+    colProps: {
+      span: adaptWidth.elContainer,
+    },
+    componentProps: (value) => {
+      console.log(`value ---- status`, value);
+      return {
+        // disabled: true,
+        options: [
+          { label: '个人', value: 0 },
+          { label: '单位', value: 1 },
+        ],
+      };
+    },
+    defaultValue: 0,
+  },
+  {
+    field: 'name',
+    component: 'Select',
+    label: '姓名',
+    labelWidth: adaptWidth.labelWidth,
+    colProps: {
+      span: adaptWidth.elContainer,
+    },
+    render: ({ model, field }) => {
+      return h(CustomInput, {
+        value: model.name,
+        placeholder: '添加个人',
+        onChange(value) {
+          model[field] = value;
+        },
+      });
+    },
+    show: ({ values }) => {
+      if (!values.status) {
+        return true;
+      }
+      return false;
+    },
+    required: ({ values }) => {
+      if (!values.status) {
+        return true;
+      }
+      return false;
+    },
+  },
+  {
+    field: 'unitName',
+    component: 'Select',
+    label: '名称',
+    labelWidth: adaptWidth.labelWidth,
+    colProps: {
+      span: adaptWidth.elContainer,
+    },
+    render: ({ model, field }) => {
+      return h(CustomInput, {
+        value: model.name,
+        placeholder: '添加单位',
+        onChange(value) {
+          model.name = value;
+          model[field] = value;
+        },
+      });
+    },
+    show: ({ values }) => {
+      if (values.status) {
+        return true;
+      }
+      return false;
+    },
+    required: ({ values }) => {
+      if (values.status) {
+        return true;
+      }
+      return false;
+    },
+  },
+  // {
+  //   field: 'relationUnit',
+  //   component: 'Input',
+  //   label: '相关单位',
+  //   labelWidth: adaptWidth.labelWidth,
+  //   colProps: {
+  //     span: adaptWidth.elContainer,
+  //   },
+  //   render: ({ model, field }) => {
+  //     return h(CustomInput, {
+  //       value: model[field],
+  //       placeholder: '添加相关单位',
+  //       onChange(value) {
+  //         model[field] = value;
+  //       },
+  //     });
+  //   },
+  //   show: ({ values }) => {
+  //     if (values.status) {
+  //       return true;
+  //     }
+  //     return false;
+  //   },
+  //   required: ({ values }) => {
+  //     if (values.status) {
+  //       return true;
+  //     }
+  //     return false;
+  //   },
+  // },
+  // {
+  //   field: 'relation',
+  //   component: 'Input',
+  //   label: '相关个人',
+  //   labelWidth: adaptWidth.labelWidth,
+  //   colProps: {
+  //     span: adaptWidth.elContainer,
+  //   },
+  //   render: ({ model, field }) => {
+  //     return h(CustomInput, {
+  //       value: model[field],
+  //       placeholder: '添加相关个人',
+  //       onChange(value) {
+  //         model[field] = value;
+  //       },
+  //     });
+  //   },
+  //   show: ({ values }) => {
+  //     if (!values.status) {
+  //       return true;
+  //     }
+  //     return false;
+  //   },
+  //   required: ({ values }) => {
+  //     if (!values.status) {
+  //       return true;
+  //     }
+  //     return false;
+  //   },
+  // },
+  {
+    field: 'duty',
+    component: 'Select',
+    label: '职务',
+    labelWidth: adaptWidth.labelWidth,
+    colProps: {
+      span: adaptWidth.elContainer,
+    },
+    componentProps: {
+      placeholder: '职务',
+      options: [
+        {
+          label: '会长',
+          value: 0,
+        },
+        {
+          label: '副会长',
+          value: 1,
+        },
+        {
+          label: '秘书长',
+          value: 2,
+        },
+        {
+          label: '副秘书长',
+          value: 3,
+        },
+        {
+          label: '理事',
+          value: 4,
+        },
+        {
+          label: '会员',
+          value: 5,
+        },
+      ],
+    },
+    required: true,
+  },
+  {
+    field: 'jointime',
+    component: 'DatePicker',
+    label: '入会时间',
+    labelWidth: adaptWidth.labelWidth,
+    colProps: {
+      span: adaptWidth.elContainer,
+    },
+    componentProps: {
+      placeholder: '入会时间',
+    },
+    required: true,
+  },
+  {
+    field: 'username',
+    component: 'Input',
+    label: '用户名',
+    labelWidth: adaptWidth.labelWidth,
+    colProps: {
+      span: adaptWidth.elContainer,
+    },
+    componentProps: {
+      placeholder: '用户名',
+    },
+    required: true,
+  },
+  {
+    field: 'password',
+    component: 'InputPassword',
+    label: '密码',
+    labelWidth: adaptWidth.labelWidth,
+    defaultValue: '',
+    colProps: {
+      span: adaptWidth.elContainer,
+    },
+    componentProps: {
+      placeholder: '密码',
+    },
+    required: true,
+  },
+];

src/views/money/bill/customCom/member/index.vue

@@ -0,0 +1,167 @@
+<template>
+  <BasicTable
+    ref="tableRef"
+    @register="registerTable"
+    rowKey="id"
+    :pagination="{
+      pageSize: 10,
+      defaultPageSize: 10,
+      showSizeChanger: false,
+    }"
+  >
+    <template #form-custom> custom-slot </template>
+    <template #action="{ record }">
+      <TableAction :actions="createActions(record)" stopButtonPropagation />
+    </template>
+  </BasicTable>
+  <Popup @register="addRegister" @saveData="saveData" />
+</template>
+<script lang="ts">
+  import { defineComponent, ref, unref } from 'vue';
+  import Popup from './popup.vue';
+  import { useMessage } from '/@/hooks/web/useMessage';
+  import { useModal } from '/@/components/Modal';
+  import { getFormConfig, columns } from './data';
+  import { getMemberList, addMember } from '/@/api/sys/member';
+  import moment from 'moment';
+  import {
+    BasicTable,
+    useTable,
+    TableAction,
+    ActionItem,
+    EditRecordRow,
+    TableActionType,
+  } from '/@/components/Table';
+
+  export default defineComponent({
+    name: 'Member',
+    components: { BasicTable, TableAction, Popup },
+    emits: ['select'],
+    setup(_, { emit }) {
+      const { createMessage } = useMessage();
+      const { success /*, error*/ } = createMessage;
+      const tableRef = ref<Nullable<TableActionType>>(null);
+      const [registerTable] = useTable({
+        columns: columns,
+        clickToRowSelect: false, // 点击行不勾选
+        api: getMemberList,
+        useSearchForm: true,
+        showTableSetting: true,
+        tableSetting: {
+          redo: false,
+          size: false,
+        },
+        beforeFetch: beforeFetch,
+        afterFetch: afterFetch,
+        formConfig: getFormConfig(),
+        actionColumn: {
+          width: 160,
+          title: '操作',
+          dataIndex: 'action',
+          slots: { customRender: 'action' },
+          fixed: undefined,
+        },
+        maxHeight: 190,
+        showIndexColumn: false,
+        bordered: true,
+      });
+      const [addRegister, { openModal: openPopup }] = useModal();
+      function getTableAction() {
+        // 获取组件
+        const tableAction = unref(tableRef);
+        if (!tableAction) {
+          throw new Error('tableAction is null');
+        }
+        return tableAction;
+      }
+
+      function beforeFetch(params) {
+        for (let k in params) {
+          if (k !== 'page' && k !== 'pageSize' && k !== 'field' && k !== 'order') {
+            if (params[k] === '') {
+              delete params[k];
+            } else {
+              if (!params.filter) {
+                params.filter = {};
+              }
+              if (params.birthday) {
+                params.birthday = moment(params.birthday).format('YYYY-MM-DD');
+              } else {
+                delete params.birthday;
+              }
+              params.filter[k] = params[k];
+              delete params[k];
+            }
+          }
+        }
+        params.filter = JSON.stringify(params.filter);
+        params.offset = params.page;
+        params.limit = params.pageSize;
+        delete params.page;
+        delete params.pageSize;
+      }
+      function afterFetch(result) {
+        console.log(`result`, result);
+        // tableData.result = result;
+      }
+
+      function handleAdd() {
+        // 开启弹窗
+        openPopup(true, { family: [] });
+      }
+      function handleSelect(record: EditRecordRow) {
+        emit('select', record);
+      }
+
+      async function saveData(params: any) {
+        const data = params.data;
+        const closeModel = params.closeModal;
+        console.log(`data`, data);
+        await addMember(data).then((res) => {
+          console.log(res);
+          getTableAction().reload();
+          closeModel();
+          success('创建成功!');
+        });
+      }
+
+      function createActions(record: EditRecordRow): ActionItem[] {
+        return [
+          {
+            label: '选择',
+            icon: 'ant-design:edit-outlined',
+            color: 'warning',
+            onClick: handleSelect.bind(null, record),
+          },
+        ];
+      }
+      return {
+        tableRef,
+        registerTable,
+        handleAdd,
+        handleSelect,
+        createActions,
+        getTableAction,
+        addRegister,
+        saveData,
+      };
+    },
+  });
+</script>
+<style>
+  .ant-calendar-picker {
+    width: 100%;
+  }
+
+  /* @media (max-width: 639px) {
+    .sys-container .vben-basic-table-header__toolbar > * {
+      padding: 6px !important;
+      margin-right: 3px;
+      font-size: 12px !important;
+    }
+
+    .sys-container .vben-basic-table .ant-table-wrapper {
+      padding: 3px;
+    }
+  } */
+</style>

src/views/money/bill/customCom/member/popup.vue

@@ -0,0 +1,148 @@
+<template>
+  <BasicModal width="800px" v-bind="$attrs" @register="register" @ok="confirm" :title="title">
+    <BasicForm @register="registerForm" :model="model" />
+  </BasicModal>
+</template>
+<script lang="ts">
+  import { defineComponent, PropType, reactive, ref, toRefs } from 'vue';
+  import { BasicModal, useModalInner } from '/@/components/Modal';
+  import { BasicForm, useForm } from '/@/components/Form/index';
+  import { useMessage } from '/@/hooks/web/useMessage';
+  import { schemas } from './data';
+  import moment from 'moment';
+  interface PopupData {
+    title: string;
+  }
+  interface Role {
+    id: string | number;
+  }
+
+  export default defineComponent({
+    components: { BasicModal, BasicForm },
+    props: {
+      popupData: {
+        type: Object as PropType<PopupData>,
+        default: () => {},
+      },
+    },
+    emits: ['saveData'],
+    setup(props, { emit }) {
+      const { createMessage } = useMessage();
+      const { error } = createMessage;
+      const popupData = props.popupData as PopupData;
+      const modelRef = ref({});
+      const role = reactive<Role>({
+        id: 0,
+      });
+
+      const [registerForm, { updateSchema, setFieldsValue, resetFields, validate }] = useForm({
+        labelWidth: 120,
+        schemas,
+        showActionButtonGroup: false,
+        actionColOptions: {
+          span: 24,
+        },
+      });
+      const [register, { closeModal }] = useModalInner((data) => {
+        resetFields();
+        if (data.id) {
+          role.id = data.id;
+          updateSchema([
+            {
+              field: 'status',
+              componentProps: {
+                disabled: true,
+                options: [
+                  { label: '个人', value: 0 },
+                  { label: '单位', value: 1 },
+                ],
+              },
+            },
+            {
+              field: 'username',
+              componentProps: {
+                disabled: true,
+              },
+            },
+            {
+              field: 'password',
+              required: false,
+            },
+          ]);
+          data.username = data.admin.username;
+          setFieldsValue(data);
+        } else {
+          role.id = 0;
+          updateSchema([
+            {
+              field: 'status',
+              componentProps: {
+                disabled: false,
+                options: [
+                  { label: '个人', value: 0 },
+                  { label: '单位', value: 1 },
+                ],
+              },
+            },
+            {
+              field: 'username',
+              componentProps: {
+                disabled: false,
+              },
+            },
+            {
+              field: 'password',
+              required: true,
+            },
+          ]);
+        }
+      });
+
+      async function confirm() {
+        try {
+          const data = await validate();
+          console.log(`确定`, data);
+          data.id = role.id;
+          if (data.name) {
+            data.fromId = data.name.id;
+          } else {
+            data.fromId = data.unitName.id;
+          }
+          data.jointime = moment(data.jointime).format('YYYY-MM-DD');
+          delete data.relation;
+          delete data.relationUnit;
+          delete data.unitName;
+          delete data.name;
+          const popupData = { closeModal, data };
+          emit('saveData', popupData);
+        } catch (err) {
+          error(err.errorFields[0].errors[0]);
+        }
+      }
+      return {
+        register,
+        schemas,
+        registerForm,
+        model: modelRef,
+        confirm,
+        ...toRefs(popupData),
+      };
+    },
+  });
+</script>
+<style lang="less">
+  .ant-form-item-label {
+    overflow: hidden;
+    text-align: center !important;
+    // white-space: pre-wrap !important;
+    text-overflow: ellipsis;
+    white-space: nowrap;
+  }
+
+  @media (max-width: 639px) {
+    .ant-form-item-label {
+      line-height: 2.5715 !important;
+      text-align: center !important;
+    }
+  }
+</style>

src/views/money/bill/customCom/popup.vue

@@ -8,14 +8,14 @@
     :title="title"
     helpMessage="点击最右侧选择按钮"
   >
-    <Person v-if="title === '添加个人'" @select="select" />
+    <Member v-if="title === '添加会员'" @select="select" />
     <Account v-if="title === '添加账户'" @select="select" />
     <Type v-if="title === '交易名称'" @select="select" />
     <Dues v-if="title === '会员年份'" @select="select" />
   </BasicModal>
 </template>
 <script lang="ts">
-  import Person from './person/index.vue';
+  import Member from './member/index.vue';
   import Account from './account/index.vue';
   import Type from './type/index.vue';
   import Dues from './dues/index.vue';
@@ -23,7 +23,7 @@
   import { defineComponent, reactive, toRefs } from 'vue';
 
   export default defineComponent({
-    components: { BasicModal, Person, Account, Type, Dues },
+    components: { BasicModal, Member, Account, Type, Dues },
     emits: ['select'],
     setup(_, { emit }) {
       const state = reactive({

src/views/money/bill/customCom/type/index.vue

@@ -1,5 +1,4 @@
 <template>
-  <a-button type="primary" @click="handleAdd"> 添加 </a-button>
   <BasicTable
     ref="tableRef"
     @register="registerTable"

src/views/money/bill/data.ts

@@ -46,8 +46,8 @@ export const columns: BasicColumn[] = [
     sorter: true,
   },
   {
-    title: '相关人员',
-    dataIndex: 'person',
+    title: '相关会员',
+    dataIndex: 'member',
     width: 160,
     sorter: true,
   },
@@ -156,11 +156,11 @@ export function getFormConfig(): Partial<FormProps> {
         },
       },
       {
-        field: `person`,
-        label: `相关人员`,
+        field: `member`,
+        label: `相关会员`,
         component: 'Input',
         componentProps: {
-          placeholder: '相关人员',
+          placeholder: '相关会员',
         },
         colProps: {
           xl: 12,
@@ -246,7 +246,7 @@ export const schemas: FormSchema[] = [
     },
     render: ({ model, field }) => {
       return h(CustomInput, {
-        value: model.name,
+        value: model.typename,
         placeholder: '交易名称',
         onChange(value) {
           model[field] = value;
@@ -265,7 +265,7 @@ export const schemas: FormSchema[] = [
     },
     render: ({ model, field }) => {
       return h(CustomInput, {
-        value: model.name,
+        value: model.account,
         placeholder: '添加账户',
         onChange(value) {
           model[field] = value;
@@ -284,7 +284,7 @@ export const schemas: FormSchema[] = [
     },
     render: ({ model, field }) => {
       return h(CustomInput, {
-        value: model.name,
+        value: model.inaccount,
         placeholder: '添加账户',
         onChange(value) {
           model[field] = value;
@@ -305,7 +305,7 @@ export const schemas: FormSchema[] = [
     },
   },
   {
-    field: 'year',
+    field: 'duesyear',
     component: 'Select',
     label: '会员年份',
     labelWidth: adaptWidth.labelWidth,
@@ -314,14 +314,13 @@ export const schemas: FormSchema[] = [
     },
     render: ({ model, field }) => {
       return h(CustomInput, {
-        value: model.name,
+        value: model.duesyear,
         placeholder: '会员年份',
         onChange(value) {
           model[field] = value;
         },
       });
     },
-    required: true,
   },
   {
     field: 'money',
@@ -338,17 +337,17 @@ export const schemas: FormSchema[] = [
     required: true,
   },
   {
-    field: 'person',
+    field: 'member',
     component: 'Select',
-    label: '相关人员',
+    label: '相关会员',
     labelWidth: adaptWidth.labelWidth,
     colProps: {
       span: adaptWidth.elContainer,
     },
     render: ({ model, field }) => {
       return h(CustomInput, {
-        value: model.name,
-        placeholder: '添加个人',
+        value: model.member,
+        placeholder: '添加会员',
         onChange(value) {
           model[field] = value;
         },
@@ -359,14 +358,19 @@ export const schemas: FormSchema[] = [
   {
     field: 'isCode',
     label: '是否开票',
-    component: 'Switch',
+    component: 'RadioButtonGroup',
     labelWidth: adaptWidth.labelWidth,
     colProps: {
       span: adaptWidth.elContainer,
     },
     componentProps: {
-      placeholder: '是否开票',
+      options: [
+        { label: '否', value: 0 },
+        { label: '是', value: 1 },
+      ],
     },
+    defaultValue: 0,
+    required: true,
   },
   {
     field: 'code',

src/views/money/bill/index.vue

@@ -117,7 +117,7 @@
             k !== 'type' &&
             k !== 'typename' &&
             k !== 'account' &&
-            k !== 'person'
+            k !== 'member'
           ) {
             if (params[k] === '') {
               delete params[k];

src/views/money/bill/popup.vue

@@ -34,7 +34,7 @@
       const { createMessage } = useMessage();
       const { error } = createMessage;
 
-      const [registerForm, { setFieldsValue, resetFields, validate }] = useForm({
+      const [registerForm, { updateSchema, setFieldsValue, resetFields, validate }] = useForm({
         labelWidth: 120,
         schemas,
         showActionButtonGroup: false,
@@ -51,8 +51,36 @@
         resetFields();
         if (data.id) {
           role.id = data.id;
+          updateSchema([
+            {
+              field: 'money',
+              componentProps: {
+                disabled: true,
+              },
+            },
+            {
+              field: 'type',
+              componentProps: {
+                disabled: true,
+              },
+            },
+          ]);
         } else {
           role.id = 0;
+          updateSchema([
+            {
+              field: 'money',
+              componentProps: {
+                disabled: false,
+              },
+            },
+            {
+              field: 'type',
+              componentProps: {
+                disabled: false,
+              },
+            },
+          ]);
         }
         setFieldsValue(data);
       });
@@ -62,6 +90,19 @@
           const data = await validate();
           console.log(`确定`, data);
           data.id = role.id;
+          data.accountId = data.account.id;
+          data.typeId = data.typename.id;
+          data.memberId = data.member.id;
+          delete data.account;
+          delete data.typename;
+          delete data.member;
+          if (data.inAccount) {
+            data.accountInsideId = data.inAccount.id;
+            delete data.inAccount;
+          }
+          if (data.duesyear) {
+            data.duesId = data.duesyear.id;
+          }
           const popupData = { closeModal, data };
           emit('saveData', popupData);
         } catch (err) {

src/views/money/dues/popup.vue

@@ -34,7 +34,7 @@
       const { createMessage } = useMessage();
       const { error } = createMessage;
 
-      const [registerForm, { setFieldsValue, resetFields, validate }] = useForm({
+      const [registerForm, { updateSchema, setFieldsValue, resetFields, validate }] = useForm({
         labelWidth: 120,
         schemas,
         showActionButtonGroup: false,
@@ -51,8 +51,36 @@
         resetFields();
         if (data.id) {
           role.id = data.id;
+          updateSchema([
+            {
+              field: 'year',
+              componentProps: {
+                disabled: true,
+              },
+            },
+            {
+              field: 'duty',
+              componentProps: {
+                disabled: true,
+              },
+            },
+          ]);
         } else {
           role.id = 0;
+          updateSchema([
+            {
+              field: 'year',
+              componentProps: {
+                disabled: false,
+              },
+            },
+            {
+              field: 'duty',
+              componentProps: {
+                disabled: false,
+              },
+            },
+          ]);
         }
         setFieldsValue(data);
       });

src/views/money/type/data.ts

@@ -32,12 +32,6 @@ export const columns: BasicColumn[] = [
     sorter: true,
   },
   {
-    title: '操作人',
-    dataIndex: 'manager',
-    width: 150,
-    sorter: true,
-  },
-  {
     title: '备注',
     dataIndex: 'remark',
     width: 160,