会员管理页面

src/components/Form/src/components/ArrCom.vue

@@ -17,7 +17,7 @@
           <Input v-model:value="item.name" @change="onChange" />
         </div>
         <div class="value-content">
-          <Input v-model:value="item.age" @change="onChange" />
+          <Input type="number" v-model:value="item.age" @change="onChange" />
         </div>
         <div class="value-content">
           <Input v-model:value="item.company" @change="onChange" />

src/store/modules/permission.ts

@@ -171,6 +171,15 @@ export const usePermissionStore = defineStore({
                   title: '个人管理',
                 },
               },
+              {
+                path: 'member',
+                name: 'Member',
+                component: '/member/member/index',
+                meta: {
+                  affix: true,
+                  title: '会员管理',
+                },
+              },
             ],
           };
           routeList.unshift(member);

src/views/admin/group/index.vue

@@ -46,6 +46,7 @@
     editGroup,
     deleteGroup,
     deleteBatchesGroup,
+    getGroupById,
   } from '/@/api/sys/user';
   import {
     BasicTable,
@@ -81,7 +82,6 @@
       const { createMessage } = useMessage();
       const { success /*, error */ } = createMessage;
       const tableRef = ref<Nullable<TableActionType>>(null);
-      const currentEditKeyRef = ref('');
       const popupData = reactive<PopupData>({
         title: '添加',
         treeData: [{}],
@@ -121,6 +121,7 @@
 
       function afterFetch(result) {
         popupData.treeData = result;
+        console.log(`result`, result);
       }
 
       function getTableAction() {
@@ -160,16 +161,19 @@
         if (group_ids.includes(record.id)) {
           return;
         }
-        currentEditKeyRef.value = record.id; // record.key
+        // currentEditKeyRef.value = record.id; // record.key
         popupData.title = '编辑';
 
-        const data = getTableAction().getDataSource();
-        data.map((item) => {
-          if (item.id === record.id) {
-            record = item;
-          }
+        // const data = getTableAction().getDataSource();
+        // data.map((item) => {
+        //   if (item.id === record.id) {
+        //     record = item;
+        //   }
+        // });
+        getGroupById({ id: record.id }).then((res) => {
+          console.log(`res`, res);
+          // openPopup(true, record);
         });
-        openPopup(true, record);
       }
 
       async function handleDelete(record: Recordable) {

src/views/admin/rule/index.vue

@@ -38,7 +38,14 @@
   import { useModal } from '/@/components/Modal';
   import { useMessage } from '/@/hooks/web/useMessage';
   import { columns } from './data';
-  import { getRuleTree, addRule, editRule, deleteRule, deleteBatchesRule } from '/@/api/sys/user';
+  import {
+    getRuleTree,
+    addRule,
+    editRule,
+    deleteRule,
+    deleteBatchesRule,
+    getRuleById,
+  } from '/@/api/sys/user';
   import { jsonToSheetXlsx, ExpExcelModel, ExportModalResult } from '/@/components/Excel';
   import { Modal } from 'ant-design-vue';
   import { ExclamationCircleOutlined } from '@ant-design/icons-vue';
@@ -70,7 +77,6 @@
       const { createMessage } = useMessage();
       const { success /*, error */ } = createMessage;
       const tableRef = ref<Nullable<TableActionType>>(null);
-      const currentEditKeyRef = ref('');
       const popupData = reactive<PopupData>({
         title: '添加',
         treeData: [{}],
@@ -139,16 +145,12 @@
       }
 
       function handleEdit(record: EditRecordRow) {
-        currentEditKeyRef.value = record.id; // record.key
         popupData.title = '编辑';
 
-        const data = getTableAction().getDataSource();
-        data.map((item) => {
-          if (item.id === record.id) {
-            record = item;
-          }
+        getRuleById({ id: record.id }).then((res) => {
+          const data = res.row;
+          openAdd(true, data);
         });
-        openAdd(true, record);
       }
 
       async function handleDelete(record: Recordable) {

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

@@ -0,0 +1,65 @@
+<template>
+  <!-- <BasicTable @register="registerTable" /> -->
+  <div class="wrap">
+    <div class="content">
+      <Input :placeholder="placeholder" disabled v-model:value="value" @change="onChange" />
+      <a-button class="mr-2 add-btn" color="success">添加</a-button>
+    </div>
+  </div>
+</template>
+<script lang="ts">
+  import { defineComponent, onUpdated, reactive, nextTick, toRefs, watch } from 'vue';
+  import { Input } from 'ant-design-vue';
+
+  const props = {
+    value: { type: String, default: '' },
+    placeholder: { type: String, default: '' },
+  };
+
+  export default defineComponent({
+    name: 'CustomInput',
+    components: { Input },
+    props,
+    emits: ['change'],
+    setup(props, { emit }) {
+      const state = reactive({
+        value: '',
+        placeholder: props.placeholder,
+      });
+      // 初始化
+      function init() {
+        // setTimeout(() => {
+
+        // }, 200);
+        nextTick(() => {
+          if (state.value === '') {
+            state.value = props.value;
+          }
+        });
+      }
+
+      onUpdated(() => {
+        init();
+      });
+
+      function onChange(e) {
+        console.log(`e`, e)
+        // emit('change', state.list);
+      }
+
+      return {
+        onChange,
+        ...toRefs(state),
+      };
+    },
+  });
+</script>
+<style scoped>
+  .content {
+    display: flex;
+  }
+
+  .add-btn {
+    margin-left: 2px;
+  }
+</style>

src/views/member/member/data.ts

@@ -0,0 +1,424 @@
+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: 'status',
+    width: 130,
+    sorter: true,
+  },
+  {
+    title: '职务',
+    dataIndex: 'duty',
+    width: 130,
+    sorter: true,
+  },
+  {
+    title: '入会时间',
+    dataIndex: 'birthday',
+    width: 150,
+    sorter: true,
+    customRender({ record }) {
+      return moment(record.foundingtime).format('YYYY-MM-DD');
+    },
+  },
+  {
+    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',
+        colProps: {
+          xl: 12,
+          xxl: 8,
+        },
+      },
+      {
+        field: `username`,
+        label: `用户名`,
+        component: 'Input',
+        colProps: {
+          xl: 12,
+          xxl: 8,
+        },
+      },
+      {
+        field: `nickname`,
+        label: `昵称`,
+        component: 'Input',
+        colProps: {
+          xl: 12,
+          xxl: 8,
+        },
+      },
+      {
+        field: `email`,
+        label: `Email`,
+        component: 'Input',
+        colProps: {
+          xl: 12,
+          xxl: 8,
+        },
+      },
+      {
+        field: `logintime`,
+        label: `最后登录`,
+        component: 'RangePicker',
+        colProps: {
+          xl: 12,
+          xxl: 8,
+        },
+      },
+      {
+        field: `status`,
+        label: `状态`,
+        component: 'Select',
+        componentProps: {
+          options: [
+            {
+              label: '启用',
+              value: 'normal',
+              key: 'status',
+            },
+            {
+              label: '停用',
+              value: 'locked',
+              key: 'status',
+            },
+          ],
+        },
+        colProps: {
+          xl: 12,
+          xxl: 8,
+        },
+      },
+      {
+        field: `sort`,
+        label: `排序字段`,
+        component: 'Select',
+        componentProps: {
+          options: [
+            {
+              label: 'ID',
+              value: 'id',
+              key: 'id',
+            },
+            {
+              label: '用户名',
+              value: 'username',
+              key: 'username',
+            },
+            {
+              label: '昵称',
+              value: 'nickname',
+              key: 'nickname',
+            },
+            {
+              label: 'Email',
+              value: 'email',
+              key: 'email',
+            },
+            {
+              label: '最后登录',
+              value: 'logintime',
+              key: 'logintime',
+            },
+          ],
+        },
+        colProps: {
+          xl: 12,
+          xxl: 8,
+        },
+      },
+      {
+        field: `order`,
+        label: `排序方式`,
+        component: 'Select',
+        componentProps: {
+          options: [
+            {
+              label: '升序',
+              value: 'asc',
+              key: 'order',
+            },
+            {
+              label: '降序',
+              value: 'desc',
+              key: 'order',
+            },
+          ],
+        },
+        colProps: {
+          xl: 12,
+          xxl: 8,
+        },
+      },
+      {
+        field: `filter`,
+        label: `筛选字段`,
+        component: 'CheckboxGroup',
+        componentProps: {
+          options: [
+            {
+              label: 'ID',
+              value: 'id',
+              key: 'filter1',
+            },
+            {
+              label: '用户名',
+              value: 'username',
+              key: 'filter2',
+            },
+            {
+              label: '昵称',
+              value: 'nickname',
+              key: 'filter3',
+            },
+            {
+              label: 'Email',
+              value: 'email',
+              key: 'filter4',
+            },
+            {
+              label: '昵称',
+              value: 'logintime',
+              key: 'filter5',
+            },
+          ],
+        },
+        colProps: {
+          xl: 12,
+          xxl: 8,
+        },
+      },
+    ],
+  };
+}
+
+// =================popup================================
+export const schemas: FormSchema[] = [
+  {
+    field: 'status',
+    label: '会员身份',
+    component: 'RadioButtonGroup',
+    labelWidth: adaptWidth.labelWidth,
+    colProps: {
+      span: adaptWidth.elContainer,
+    },
+    componentProps: {
+      options: [
+        { label: '个人', value: 0 },
+        { label: '单位', value: 1 },
+      ],
+    },
+    defaultValue: 0,
+  },
+  {
+    field: 'name',
+    component: 'Input',
+    label: '姓名',
+    labelWidth: adaptWidth.labelWidth,
+    colProps: {
+      span: adaptWidth.elContainer,
+    },
+    componentProps: {
+      placeholder: '姓名',
+    },
+    render: ({ model, field }) => {
+      return h(CustomInput, {
+        value: model[field],
+        placeholder: '姓名',
+        onChang(value) {
+          console.log(`value`, value);
+        },
+      });
+    },
+    show: ({ values }) => {
+      console.log(`values`, values);
+      if (!values.status) {
+        return true;
+      }
+      return false;
+    },
+    required: ({ values }) => {
+      if (!values.status) {
+        return true;
+      }
+      return false;
+    },
+  },
+  {
+    field: 'title',
+    component: 'Input',
+    label: '名称',
+    labelWidth: adaptWidth.labelWidth,
+    colProps: {
+      span: adaptWidth.elContainer,
+    },
+    componentProps: {
+      placeholder: '名称',
+    },
+    show: ({ values }) => {
+      console.log(`values`, values);
+      if (values.status) {
+        return true;
+      }
+      return false;
+    },
+    required: ({ values }) => {
+      if (values.status) {
+        return true;
+      }
+      return false;
+    },
+  },
+  {
+    field: 'unit',
+    component: 'Input',
+    label: '相关单位',
+    labelWidth: adaptWidth.labelWidth,
+    colProps: {
+      span: adaptWidth.elContainer,
+    },
+    componentProps: {
+      placeholder: '相关单位',
+    },
+    required: true,
+  },
+  {
+    field: 'person',
+    component: 'Input',
+    label: '相关个人',
+    labelWidth: adaptWidth.labelWidth,
+    colProps: {
+      span: adaptWidth.elContainer,
+    },
+    componentProps: {
+      placeholder: '相关个人',
+    },
+    required: true,
+  },
+  {
+    field: 'duty',
+    component: 'Select',
+    label: '职务',
+    labelWidth: adaptWidth.labelWidth,
+    colProps: {
+      span: adaptWidth.elContainer,
+    },
+    componentProps: {
+      placeholder: '职务',
+      options: [
+        {
+          label: '会长',
+          value: 0,
+        },
+        {
+          label: '副会长',
+          value: 2,
+        },
+        {
+          label: '秘书长',
+          value: 3,
+        },
+        {
+          label: '副秘书长',
+          value: 4,
+        },
+        {
+          label: '理事',
+          value: 5,
+        },
+        {
+          label: '会员',
+          value: 6,
+        },
+      ],
+    },
+    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/member/member/index.vue

@@ -0,0 +1,275 @@
+<template>
+  <CollapseContainer
+    class="sys-container"
+    title="会员管理"
+    :canExpan="false"
+    helpMessage="会员管理"
+  >
+    <BasicTable
+      ref="tableRef"
+      @register="registerTable"
+      rowKey="id"
+      @selectionChange="selectionChange"
+      @rowClick="rowClick"
+      @rowDbClick="handleEdit"
+      showTableSetting
+      :canResize="true"
+      :pagination="{
+        pageSize: 10,
+        defaultPageSize: 10,
+        showSizeChanger: false,
+      }"
+    >
+      <template #toolbar>
+        <a-button type="primary" @click="addRole"> 添加 </a-button>
+        <a-button color="error" :disabled="disable_btn" @click="deleteBatches"> 删除 </a-button>
+        <a-button @click="openModal"> 导出 </a-button>
+      </template>
+      <template #form-custom> custom-slot </template>
+      <template #action="{ record }">
+        <TableAction :actions="createActions(record)" stopButtonPropagation />
+      </template>
+    </BasicTable>
+    <ExpExcelModel @register="register" @success="defaultHeader" />
+    <Popup @register="addRegister" :popupData="popupData" @saveData="saveData" />
+  </CollapseContainer>
+</template>
+<script lang="ts">
+  import { defineComponent, reactive, ref, toRefs, unref, createVNode } from 'vue';
+  import { CollapseContainer } from '/@/components/Container/index';
+  import Popup from './popup.vue';
+  import { useMessage } from '/@/hooks/web/useMessage';
+  import { useModal } from '/@/components/Modal';
+  import { jsonToSheetXlsx, ExpExcelModel, ExportModalResult } from '/@/components/Excel';
+  import { Modal } from 'ant-design-vue';
+  import { ExclamationCircleOutlined } from '@ant-design/icons-vue';
+  import { getFormConfig, columns } from './data';
+  import {
+    getPersonList,
+    addPerson,
+    deleteBatchesPerson,
+    getPerson,
+    editPerson,
+    deletePerson,
+  } from '/@/api/sys/member';
+  import {
+    BasicTable,
+    useTable,
+    TableAction,
+    ActionItem,
+    EditRecordRow,
+    TableActionType,
+  } from '/@/components/Table';
+
+  interface PopupData {
+    title: string;
+  }
+
+  interface Btn {
+    disable_btn: boolean;
+  }
+
+  export default defineComponent({
+    name: 'Member',
+    components: { CollapseContainer, BasicTable, TableAction, Popup, ExpExcelModel },
+    setup() {
+      const { createMessage } = useMessage();
+      const { success /*, error*/ } = createMessage;
+      const tableRef = ref<Nullable<TableActionType>>(null);
+      const popupData = reactive<PopupData>({
+        title: '添加',
+      });
+      const btn = reactive<Btn>({
+        disable_btn: true,
+      });
+      const [registerTable] = useTable({
+        rowSelection: { type: 'checkbox' },
+        columns: columns,
+        // clickToRowSelect: false, // 点击行不勾选
+        api: getPersonList,
+        useSearchForm: true,
+        afterFetch: afterFetch,
+        formConfig: getFormConfig(),
+        actionColumn: {
+          width: 160,
+          title: '操作',
+          dataIndex: 'action',
+          slots: { customRender: 'action' },
+          fixed: undefined,
+        },
+        showIndexColumn: false,
+        bordered: true,
+      });
+      const [register, { openModal }] = useModal();
+      const [addRegister, { openModal: openPopup }] = useModal();
+      function getTableAction() {
+        // 获取组件
+        const tableAction = unref(tableRef);
+        if (!tableAction) {
+          throw new Error('tableAction is null');
+        }
+        return tableAction;
+      }
+
+      function afterFetch(result) {
+        console.log(`result`, result);
+        // tableData.result = result;
+      }
+
+      function addRole() {
+        popupData.title = '添加';
+        openPopup(true, { family: [] });
+      }
+
+      async function handleEdit(record: EditRecordRow) {
+        popupData.title = '编辑';
+        getPerson({ id: record.id }).then((res) => {
+          const data = res.row;
+          openPopup(true, data);
+        });
+      }
+
+      async function handleDelete(record: Recordable) {
+        console.log(record);
+        await deletePerson({ id: record.id }).then((res) => {
+          console.log(res);
+          getTableAction().reload();
+          success('删除成功!');
+        });
+      }
+
+      function selectionChange() {
+        const keys = getTableAction().getSelectRowKeys();
+        if (keys.length) {
+          btn.disable_btn = false;
+        } else {
+          btn.disable_btn = true;
+        }
+      }
+      function rowClick() {
+        const keys = getTableAction().getSelectRowKeys();
+        if (keys.length) {
+          btn.disable_btn = false;
+        } else {
+          btn.disable_btn = true;
+        }
+      }
+
+      async function deleteBatches() {
+        const keys = await getTableAction().getSelectRowKeys();
+        const count = keys.length;
+        const ids = keys.toString();
+        if (!ids) {
+          return;
+        }
+        Modal.confirm({
+          title: '删除提示',
+          icon: createVNode(ExclamationCircleOutlined),
+          content: '确定删除选中的' + count + '项?',
+          okText: '确定',
+          okType: 'danger',
+          cancelText: '取消',
+          maskClosable: true,
+          async onOk() {
+            await deleteBatchesPerson({ ids }).then((res) => {
+              console.log(res);
+              getTableAction().reload();
+              success('删除成功!');
+              getTableAction().setSelectedRowKeys([]);
+            });
+          },
+          onCancel() {
+            console.log('Cancel');
+          },
+        });
+      }
+
+      async function saveData(params: any) {
+        const data = params.data;
+        const closeModel = params.closeModal;
+        console.log(`data`, data);
+        if (!data.id) {
+          await addPerson(data).then((res) => {
+            console.log(res);
+            getTableAction().reload();
+            closeModel();
+            success('创建成功!');
+          });
+          console.log('----------add---');
+        } else {
+          await editPerson(data).then((res) => {
+            console.log(res);
+            getTableAction().reload();
+            closeModel();
+            success('修改成功!');
+          });
+          console.log('----------edit---');
+        }
+      }
+
+      // 导出
+      function defaultHeader({ filename, bookType }: ExportModalResult) {
+        // 默认Object.keys(data[0])作为header
+        jsonToSheetXlsx({
+          data: getTableAction().getDataSource(),
+          filename,
+          write2excelOpts: {
+            bookType,
+          },
+        });
+      }
+
+      function createActions(record: EditRecordRow): ActionItem[] {
+        return [
+          {
+            label: '编辑',
+            icon: 'ant-design:edit-outlined',
+            color: 'warning',
+            onClick: handleEdit.bind(null, record),
+          },
+          {
+            label: '删除',
+            color: 'error',
+            icon: 'ic:outline-delete-outline',
+            popConfirm: {
+              title: '是否确认删除',
+              confirm: handleDelete.bind(null, record),
+            },
+          },
+        ];
+      }
+      return {
+        popupData,
+        tableRef,
+        registerTable,
+        addRole,
+        handleEdit,
+        deleteBatches,
+        createActions,
+        getTableAction,
+        rowClick,
+        selectionChange,
+        addRegister,
+        saveData,
+        defaultHeader,
+        openModal,
+        register,
+        ...toRefs(btn),
+      };
+    },
+  });
+</script>
+<style>
+  .ant-calendar-picker {
+    width: 100%;
+  }
+  @media (max-width: 639px) {
+    .sys-container .vben-basic-table-header__toolbar > * {
+      margin-right: 3px;
+    }
+
+    .sys-container .vben-basic-table .ant-table-wrapper {
+      padding: 3px;
+    }
+  }
+</style>

src/views/member/member/popup.vue

@@ -0,0 +1,110 @@
+<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 popupData = props.popupData as PopupData;
+      const modelRef = ref({});
+      const role = reactive<Role>({
+        id: 0,
+      });
+      const { createMessage } = useMessage();
+      const { error } = createMessage;
+
+      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();
+        console.log(`data ----id?`, data.id);
+        if (data.id) {
+          role.id = data.id;
+        } else {
+          role.id = 0;
+        }
+        setFieldsValue(data);
+      });
+
+      async function confirm() {
+        const data = await validate();
+        console.log(`确定`, data);
+        const not_validate = data.family.some((item) => {
+          if (item.relation === '' || item.age === '' || item.job === '' || item.company === '') {
+            error('家庭成员信息不能为空');
+            return true;
+          } else if (typeof item.age !== 'number') {
+            error('年龄必须为阿拉伯数字');
+            return true;
+          }
+        });
+        if (not_validate) {
+          return;
+        }
+        data.id = role.id;
+        data.birthday = moment(data.birthday).format('YYYY-MM-DD');
+        data.family = JSON.stringify(data.family);
+        const popupData = { closeModal, data };
+        emit('saveData', popupData);
+        // closeModal(); // 关闭弹窗
+      }
+      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/member/person/data.ts

@@ -563,15 +563,12 @@ export const schemas: FormSchema[] = [
     colProps: {
       span: adaptWidth.elContainer,
     },
-    defaultValue: '',
+    defaultValue: [],
     componentProps: ({ formModel }) => {
-      console.log(`componentProps-----value`, formModel.family);
       return {
         placeholder: '家庭主要成员',
         value: formModel.family,
-        onChange: (e) => {
-          console.log(e);
-        },
+        onChange: () => {},
       };
     },
     required: true,

src/views/member/person/data.ts.rej

@@ -0,0 +1,20 @@
+diff a/src/views/member/person/data.ts b/src/views/member/person/data.ts	(rejected hunks)
+@@ -564,18 +564,6 @@
+       span: adaptWidth.elContainer,
+     },
+     defaultValue: '',
+-    // render: ({ model, field }) => {
+-    //   if (!model[field]) {
+-    //     model[field] = [];
+-    //   }
+-    //   return h(Table, {
+-    //     value: model[field],
+-    //     onChange: (value) => {
+-    //       console.log(`e----onchange`, value);
+-    //       model[field] = value;
+-    //     },
+-    //   });
+-    // },
+     componentProps: ({ formModel }) => {
+       console.log(`componentProps-----value`, formModel.family);
+       return {

src/views/member/person/index.vue

@@ -118,7 +118,7 @@
 
       function addRole() {
         popupData.title = '添加';
-        openPopup(true, {});
+        openPopup(true, { family: [] });
       }
 
       async function handleEdit(record: EditRecordRow) {

src/views/member/person/popup.vue

@@ -7,12 +7,7 @@
   import { defineComponent, PropType, reactive, ref, toRefs } from 'vue';
   import { BasicModal, useModalInner } from '/@/components/Modal';
   import { BasicForm, useForm } from '/@/components/Form/index';
-  // import {
-  //   getPersonList,
-  //   addPerson,
-  //   deleteBatchesPerson,
-  //   // getPerson,
-  // } from '/@/api/sys/member';
+  import { useMessage } from '/@/hooks/web/useMessage';
   import { schemas } from './data';
   import moment from 'moment';
   interface PopupData {
@@ -37,6 +32,9 @@
       const role = reactive<Role>({
         id: 0,
       });
+      const { createMessage } = useMessage();
+      const { error } = createMessage;
+
       const [registerForm, { setFieldsValue, resetFields, validate }] = useForm({
         labelWidth: 120,
         schemas,
@@ -55,6 +53,8 @@
         console.log(`data ----id?`, data.id);
         if (data.id) {
           role.id = data.id;
+        } else {
+          role.id = 0;
         }
         setFieldsValue(data);
       });
@@ -62,6 +62,18 @@
       async function confirm() {
         const data = await validate();
         console.log(`确定`, data);
+        const not_validate = data.family.some((item) => {
+          if (item.relation === '' || item.age === '' || item.job === '' || item.company === '') {
+            error('家庭成员信息不能为空');
+            return true;
+          } else if (typeof item.age !== 'number') {
+            error('年龄必须为阿拉伯数字');
+            return true;
+          }
+        });
+        if (not_validate) {
+          return;
+        }
         data.id = role.id;
         data.birthday = moment(data.birthday).format('YYYY-MM-DD');
         data.family = JSON.stringify(data.family);

src/views/member/unit/popup.vue

@@ -56,6 +56,8 @@
         console.log(`确定`, data);
         if (role.id) {
           data.id = role.id;
+        } else {
+          role.id = 0;
         }
         if (data.technology) {
           data.technology = 1;