Merge pull request #114 from Jzow/master

Add EditModal views
wansenai · Oct 26, 2023 · f6d00dc · f6d00dc
2 parents ce8682c + a358a4d
commit f6d00dc
Show file tree

Hide file tree

Showing 5 changed files with 124 additions and 70 deletions.
diff --git a/src/api/basic/member.ts b/src/api/basic/member.ts
@@ -10,15 +10,16 @@ import {
 
 enum API {
     List = '/basic/member/list',
+    PageList = '/basic/member/pageList',
     AddOrUpdateMember = '/basic/member/addOrUpdate',
     DeleteBatch = '/basic/member/deleteBatch',
     UpdateStatus = '/basic/member/updateStatus',
 }
 
-export function getMemberList(params: QueryMemberReq, mode: ErrorMessageMode = 'notice') {
+export function getMemberPageList(params: QueryMemberReq, mode: ErrorMessageMode = 'notice') {
     return defHttp.post<BaseDataResp<MemberResp>>(
         {
-            url: API.List,
+            url: API.PageList,
             params,
         },
         {

diff --git a/src/api/basic/warehouse.ts b/src/api/basic/warehouse.ts
@@ -9,17 +9,17 @@ import {
 
 
 enum API {
-    List = '/basic/warehouse/list',
+    PageList = '/basic/warehouse/pageList',
     AddOrUpdateWarehouse = '/basic/warehouse/addOrUpdate',
     DeleteBatch = '/basic/warehouse/delete',
     UpdateStatus = '/basic/warehouse/updateStatus',
     GetWarehouse = '/basic/warehouse/getWarehouse',
 }
 
-export function getWarehouseList(params: QueryWarehouseReq, mode: ErrorMessageMode = 'notice') {
+export function getWarehousePageList(params: QueryWarehouseReq, mode: ErrorMessageMode = 'notice') {
     return defHttp.post<BaseDataResp<WarehouseResp>>(
         {
-            url: API.List,
+            url: API.PageList,
             params,
         },
         {

diff --git a/src/views/basic/member/index.vue b/src/views/basic/member/index.vue
@@ -44,7 +44,7 @@ import {BasicTable, TableAction, useTable} from "@/components/Table";
 import {useModal} from "@/components/Modal";
 import {useMessage} from "@/hooks/web/useMessage";
 import {columns, searchFormSchema} from "@/views/basic/member/member.data";
-import {getMemberList, deleteBatchMember, updateMemberStatus} from "@/api/basic/member";
+import {getMemberPageList, deleteBatchMember, updateMemberStatus} from "@/api/basic/member";
 import MemberModal from "@/views/basic/member/components/MemberModal.vue";
 import ImportFileModal from '@/components/Tools/ImportFileModal.vue';
 import { exportXlsx } from '@/api/basic/common';
@@ -60,7 +60,7 @@ export default defineComponent({
     const importModalRef = ref(null);
     const [registerTable, { reload, getSelectRows }] = useTable({
       title: '会员信息列表',
-      api: getMemberList,
+      api: getMemberPageList,
       rowKey: 'id',
       columns: columns,
       rowSelection: {

diff --git a/src/views/basic/warehouse/index.vue b/src/views/basic/warehouse/index.vue
@@ -46,7 +46,7 @@ import {BasicTable, TableAction, useTable} from "@/components/Table";
 import {useModal} from "@/components/Modal";
 import {useMessage} from "@/hooks/web/useMessage";
 import {columns, searchFormSchema} from "@/views/basic/warehouse/warehouse.data";
-import {getWarehouseList, deleteBatchWarehouse, updateWarehouseStatus} from "@/api/basic/warehouse";
+import {getWarehousePageList, deleteBatchWarehouse, updateWarehouseStatus} from "@/api/basic/warehouse";
 import WarehouseModal from "@/views/basic/warehouse/components/WarehouseModal.vue";
 import {Tag} from "ant-design-vue";
 
@@ -58,7 +58,7 @@ export default defineComponent({
     const { createMessage } = useMessage();
     const [registerTable, { reload, getSelectRows }] = useTable({
       title: '仓库列表',
-      api: getWarehouseList,
+      api: getWarehousePageList,
       rowKey: 'id',
       columns: columns,
       rowSelection: {