feat: 会员相关

src/api/sys/member.ts

@@ -11,15 +11,15 @@ import {
   PersonIdParams,
   AddPersonParams,
   EditPersonParams,
-  GetMemberListModel,
-  GetMemberModel,
-  MemberIdParams,
-  AddMemberParams,
-  EditMemberParams,
+  GetUserListModel,
+  GetUserModel,
+  UserIdParams,
+  AddUserParams,
+  EditUserParams,
 } from './model/memberModel';
 
 enum Api {
-  MemberUrl = '/member/',
+  UserUrl = '/member/user',
   UnitUrl = '/member/unit',
   PersonUrl = '/member/person',
 }
@@ -149,23 +149,23 @@ export function deletePerson(params: PersonIdParams) {
 }
 
 /**
- * @description: GetMemberList -----------------------------------------------
+ * @description: GetUserList -----------------------------------------------
  */
-export function getMemberList(params) {
-  console.log('-------------------getMemberList---------------');
-  return defHttp.request<GetMemberListModel>({
-    url: Api.MemberUrl,
+export function getUserList(params) {
+  console.log('-------------------getUserList---------------');
+  return defHttp.request<GetUserListModel>({
+    url: Api.UserUrl,
     method: 'GET',
     params,
   });
 }
 
 /**
- * @description: addMember
+ * @description: addUser
  */
-export function addMember(params: AddMemberParams) {
-  return defHttp.request<GetMemberListModel>({
-    url: Api.MemberUrl,
+export function addUser(params: AddUserParams) {
+  return defHttp.request<GetUserListModel>({
+    url: Api.UserUrl,
     method: 'POST',
     params,
   });
@@ -173,9 +173,9 @@ export function addMember(params: AddMemberParams) {
 /**
  * @description: 批量删除会员
  */
-export function deleteBatchesMember(params: DeleteBatchesParams) {
-  return defHttp.request<GetMemberListModel>({
-    url: Api.MemberUrl,
+export function deleteBatchesUser(params: DeleteBatchesParams) {
+  return defHttp.request<GetUserListModel>({
+    url: Api.UserUrl,
     method: 'DELETE',
     params,
   });
@@ -184,18 +184,18 @@ export function deleteBatchesMember(params: DeleteBatchesParams) {
 /**
  * @description: 获取单个会员
  */
-export function getMember(params: MemberIdParams) {
-  return defHttp.request<GetMemberModel>({
-    url: Api.MemberUrl + params.id,
+export function getUser(params: UserIdParams) {
+  return defHttp.request<GetUserModel>({
+    url: Api.UserUrl + '/' + params.id,
     method: 'GET',
   });
 }
 /**
  * @description: 修改单个会员
  */
-export function editMember(params: EditMemberParams) {
-  return defHttp.request<GetMemberListModel>({
-    url: Api.MemberUrl + params.id,
+export function editUser(params: EditUserParams) {
+  return defHttp.request<GetUserListModel>({
+    url: Api.UserUrl + '/' + params.id,
     method: 'PUT',
     params,
   });
@@ -203,9 +203,9 @@ export function editMember(params: EditMemberParams) {
 /**
  * @description: 删除单个会员
  */
-export function deleteMember(params: MemberIdParams) {
-  return defHttp.request<GetMemberListModel>({
-    url: Api.MemberUrl + params.id,
+export function deleteUser(params: UserIdParams) {
+  return defHttp.request<GetUserListModel>({
+    url: Api.UserUrl + '/' + params.id,
     method: 'DELETE',
   });
 }

src/api/sys/model/memberModel.ts

@@ -72,16 +72,16 @@ export interface PersonIdParams {
   id: string | number;
 }
 /**
- * @description: Get Member
+ * @description: Get User
  */
-export interface GetMemberModel {
+export interface GetUserModel {
   row: object;
 }
 
 /**
  * @description: id
  */
-export interface MemberIdParams {
+export interface UserIdParams {
   id: string | number;
 }
 /**
@@ -91,21 +91,21 @@ export interface EditPersonParams {
   id: number;
 }
 /**
- * @description: Get Member list----------------------
+ * @description: Get User list----------------------
  */
-export interface GetMemberListModel {
+export interface GetUserListModel {
   count: number;
   list: object[];
 }
 /**
- * @description: add Member
+ * @description: add User
  */
-export interface AddMemberParams {
+export interface AddUserParams {
   id: number;
 }
 /**
- * @description: edit Member
+ * @description: edit User
  */
-export interface EditMemberParams {
+export interface EditUserParams {
   id: number;
 }

src/api/sys/model/moneyModel.ts

@@ -149,7 +149,7 @@ export interface EditBillParams {
 }
 export interface GetFeeParams {
   year: number;
-  member_id: number;
+  user_id: number;
 }
 export interface GetFeeModel {
   money: number;

src/views/department/department/customCom/member/index.vue

@@ -30,7 +30,7 @@
   import { useModal } from '/@/components/Modal';
   import { getFormConfig, columns } from './data';
   import moment from 'moment';
-  import { getMemberList, addMember } from '/@/api/sys/member';
+  import { getUserList, addUser } from '/@/api/sys/member';
   import { BasicTable, useTable, EditRecordRow, TableActionType } from '/@/components/Table';
 
   interface PopupData {
@@ -42,7 +42,7 @@
   }
 
   export default defineComponent({
-    name: 'Member',
+    name: 'User',
     components: { BasicTable, Popup },
     emits: ['select'],
     setup(_, { emit }) {
@@ -58,7 +58,7 @@
       const [registerTable] = useTable({
         columns: columns,
         // clickToRowSelect: false, // 点击行不勾选
-        api: getMemberList,
+        api: getUserList,
         useSearchForm: true,
         beforeFetch: beforeFetch,
         showTableSetting: true,
@@ -129,7 +129,7 @@
         const data = params.data;
         const closeModel = params.closeModal;
         console.log(`data`, data);
-        await addMember(data).then((res) => {
+        await addUser(data).then((res) => {
           console.log(res);
           getTableAction().reload();
           closeModel();

src/views/department/department/data.ts

@@ -214,7 +214,7 @@ export const schemas: FormSchema[] = [
     },
   },
   {
-    field: 'member',
+    field: 'user',
     component: 'Input',
     label: '部门人员',
     labelWidth: adaptWidth.labelWidth,

src/views/event/activity/data.ts

@@ -356,13 +356,13 @@ export const schemas: FormSchema[] = [
   {
     field: 'hire',
     component: 'InputTextArea',
-    label: '集体租聘',
+    label: '集体租赁',
     labelWidth: adaptWidth.labelWidth,
     colProps: {
       span: adaptWidth.elContainer,
     },
     componentProps: {
-      placeholder: '集体租聘',
+      placeholder: '集体租赁',
     },
     required: true,
   },

src/views/member/member/data.ts

@@ -30,7 +30,7 @@ export const columns: BasicColumn[] = [
     width: 130,
     customRender: ({ record }) => {
       const type = record.type;
-      const enable = type === 'person';
+      const enable = type === '2';
       const color = enable ? 'green' : 'red';
       const text = enable ? '个人' : '单位';
       return h(Tag, { color: color }, () => text);
@@ -129,8 +129,8 @@ export function getFormConfig(): Partial<FormProps> {
         componentProps: {
           placeholder: '会员身份',
           options: [
-            { label: '个人', value: 'person' },
-            { label: '单位', value: 'unit' },
+            { label: '个人', value: '2' },
+            { label: '单位', value: '1' },
           ],
         },
         colProps: {
@@ -217,12 +217,12 @@ export const schemas: FormSchema[] = [
       return {
         // disabled: true,
         options: [
-          { label: '个人', value: 'person' },
-          { label: '单位', value: 'unit' },
+          { label: '个人', value: '2' },
+          { label: '单位', value: '1' },
         ],
       };
     },
-    defaultValue: 'person',
+    defaultValue: '1',
   },
   {
     field: 'name',

src/views/member/member/index.vue

@@ -47,12 +47,12 @@
   import { getFormConfig, columns } from './data';
   import moment from 'moment';
   import {
-    getMemberList,
-    addMember,
-    deleteBatchesMember,
-    getMember,
-    editMember,
-    deleteMember,
+    getUserList,
+    addUser,
+    deleteBatchesUser,
+    getUser,
+    editUser,
+    deleteUser,
   } from '/@/api/sys/member';
   import {
     BasicTable,
@@ -72,7 +72,7 @@
   }
 
   export default defineComponent({
-    name: 'Member',
+    name: 'User',
     components: { CollapseContainer, BasicTable, TableAction, Popup, ExpExcelModel },
     setup() {
       const { createMessage } = useMessage();
@@ -88,7 +88,7 @@
         rowSelection: { type: 'checkbox' },
         columns: columns,
         // clickToRowSelect: false, // 点击行不勾选
-        api: getMemberList,
+        api: getUserList,
         useSearchForm: true,
         beforeFetch: beforeFetch,
         afterFetch: afterFetch,
@@ -157,7 +157,7 @@
 
       async function handleEdit(record: EditRecordRow) {
         popupData.title = '编辑';
-        getMember({ id: record.id }).then((res) => {
+        getUser({ id: record.id }).then((res) => {
           const data = res.row;
           console.log(`edit----data`, data);
           openPopup(true, data);
@@ -166,7 +166,7 @@
 
       async function handleDelete(record: Recordable) {
         console.log(record);
-        await deleteMember({ id: record.id }).then((res) => {
+        await deleteUser({ id: record.id }).then((res) => {
           console.log(res);
           getTableAction().reload();
           success('删除成功!');
@@ -206,7 +206,7 @@
           cancelText: '取消',
           maskClosable: true,
           async onOk() {
-            await deleteBatchesMember({ ids }).then((res) => {
+            await deleteBatchesUser({ ids }).then((res) => {
               console.log(res);
               getTableAction().reload();
               success('删除成功!');
@@ -224,7 +224,7 @@
         const closeModel = params.closeModal;
         console.log(`data`, data);
         if (!data.id) {
-          await addMember(data).then((res) => {
+          await addUser(data).then((res) => {
             console.log(res);
             getTableAction().reload();
             closeModel();
@@ -232,7 +232,7 @@
           });
           console.log('----------add---');
         } else {
-          await editMember(data).then((res) => {
+          await editUser(data).then((res) => {
             console.log(res);
             getTableAction().reload();
             closeModel();

src/views/member/member/popup.vue

@@ -53,8 +53,8 @@
               componentProps: {
                 disabled: true,
                 options: [
-                  { label: '个人', value: 'person' },
-                  { label: '单位', value: 'unit' },
+                  { label: '个人', value: '2' },
+                  { label: '单位', value: '1' },
                 ],
               },
             },
@@ -80,8 +80,8 @@
               componentProps: {
                 disabled: false,
                 options: [
-                  { label: '个人', value: 'person' },
-                  { label: '单位', value: 'unit' },
+                  { label: '个人', value: '2' },
+                  { label: '单位', value: '1' },
                 ],
               },
             },

src/views/money/account/customCom/accountrecord/data.ts

@@ -31,7 +31,7 @@ export const columns: BasicColumn[] = [
   },
   {
     title: '相关会员',
-    dataIndex: 'member',
+    dataIndex: 'user',
     width: 130,
   },
   {

src/views/money/account/data.ts

@@ -70,7 +70,7 @@ export const info_columns: BasicColumn[] = [
   },
   {
     title: '相关会员',
-    dataIndex: 'member',
+    dataIndex: 'user',
     width: 140,
   },
   {

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

@@ -30,7 +30,7 @@
   import { useModal } from '/@/components/Modal';
   import { getFormConfig, columns } from './data';
   import moment from 'moment';
-  import { getMemberList, addMember } from '/@/api/sys/member';
+  import { getUserList, addUser } from '/@/api/sys/member';
   import { BasicTable, useTable, EditRecordRow, TableActionType } from '/@/components/Table';
 
   interface PopupData {
@@ -42,7 +42,7 @@
   }
 
   export default defineComponent({
-    name: 'Member',
+    name: 'User',
     components: { BasicTable, Popup },
     emits: ['select'],
     setup(_, { emit }) {
@@ -58,7 +58,7 @@
       const [registerTable] = useTable({
         columns: columns,
         // clickToRowSelect: false, // 点击行不勾选
-        api: getMemberList,
+        api: getUserList,
         useSearchForm: true,
         beforeFetch: beforeFetch,
         showTableSetting: true,
@@ -129,7 +129,7 @@
         const data = params.data;
         const closeModel = params.closeModal;
         console.log(`data`, data);
-        await addMember(data).then((res) => {
+        await addUser(data).then((res) => {
           console.log(res);
           getTableAction().reload();
           closeModel();

src/views/money/bill/data.ts

@@ -78,7 +78,7 @@ export const columns: BasicColumn[] = [
   },
   {
     title: '相关会员',
-    dataIndex: 'member',
+    dataIndex: 'user',
     width: 160,
     sorter: true,
   },
@@ -187,7 +187,7 @@ export function getFormConfig(): Partial<FormProps> {
         },
       },
       {
-        field: `member`,
+        field: `user`,
         label: `相关会员`,
         component: 'Input',
         componentProps: {
@@ -357,14 +357,14 @@ export const schemas: FormSchema[] = [
         value: model.year,
         onChange(value) {
           model[field] = value;
-          if (model.member && model.member.id && model.year) {
+          if (model.user && model.user.id && model.year) {
             let year = 0;
             if (model.year.year) {
               year = model.year.year;
             } else {
               year = model.year;
             }
-            getYearFee({ member_id: model.member.id, year }).then((res) => {
+            getYearFee({ user_id: model.user.id, year }).then((res) => {
               if (res.money) {
                 model.money = res.money;
               }
@@ -387,7 +387,7 @@ export const schemas: FormSchema[] = [
     },
   },
   {
-    field: 'member',
+    field: 'user',
     component: 'Select',
     label: '相关会员',
     labelWidth: adaptWidth.labelWidth,
@@ -396,18 +396,18 @@ export const schemas: FormSchema[] = [
     },
     render: ({ model, field }) => {
       return h(CustomInput, {
-        value: model.member,
+        value: model.user,
         placeholder: '添加会员',
         onChange(value) {
           model[field] = value;
-          if (model.member.id && model.year) {
+          if (model.user.id && model.year) {
             let year = 0;
             if (model.year.year) {
               year = model.year.year;
             } else {
               year = model.year;
             }
-            getYearFee({ member_id: model.member.id, year }).then((res) => {
+            getYearFee({ user_id: model.user.id, year }).then((res) => {
               if (res.money) {
                 model.money = res.money;
               }

src/views/money/bill/index.vue

@@ -119,7 +119,7 @@
             k !== 'type' &&
             k !== 'typename' &&
             k !== 'account' &&
-            k !== 'member'
+            k !== 'user'
           ) {
             if (params[k] === '') {
               delete params[k];
@@ -216,7 +216,7 @@
             typename: '',
             account: '',
             money: '',
-            member: '',
+            user: '',
             isCode: '',
             remark: '',
             tradetime: '',
@@ -227,7 +227,7 @@
           data.typename = item.typename;
           data.account = item.account;
           data.money = item.money.toFixed(2);
-          data.member = item.member;
+          data.user = item.user;
           data.isCode = item.isCode ? '是' : '否';
           data.remark = item.remark;
           data.tradetime = moment(item.tradetime).format('YYYY-MM-DD');
@@ -242,7 +242,7 @@
             typename: '交易名称',
             account: '交易账户',
             money: '金额',
-            member: '相关会员',
+            user: '相关会员',
             isCode: '是否开票',
             remark: '备注',
             tradetime: '交易日期',

src/views/money/bill/popup.vue

@@ -101,10 +101,10 @@
           data.id = role.id;
           data.accountId = data.account.id;
           data.typeId = data.typename.id;
-          data.memberId = data.member.id;
+          data.userId = data.user.id;
           delete data.account;
           delete data.typename;
-          delete data.member;
+          delete data.user;
           if (data.year.year) {
             data.year = data.year.year;
           }