diff --git a/src/pages/statistics/businessOverview.vue b/src/PagesStatistics/businessOverview.vue similarity index 100% rename from src/pages/statistics/businessOverview.vue rename to src/PagesStatistics/businessOverview.vue diff --git a/src/pages/statistics/components/FilterDialog.vue b/src/PagesStatistics/components/FilterDialog.vue similarity index 100% rename from src/pages/statistics/components/FilterDialog.vue rename to src/PagesStatistics/components/FilterDialog.vue diff --git a/src/pages/statistics/components/ProductDialog.vue b/src/PagesStatistics/components/ProductDialog.vue similarity index 100% rename from src/pages/statistics/components/ProductDialog.vue rename to src/PagesStatistics/components/ProductDialog.vue diff --git a/src/pages/statistics/components/ProductTypeDialog.vue b/src/PagesStatistics/components/ProductTypeDialog.vue similarity index 100% rename from src/pages/statistics/components/ProductTypeDialog.vue rename to src/PagesStatistics/components/ProductTypeDialog.vue diff --git a/src/pages/statistics/components/StatusDialog.vue b/src/PagesStatistics/components/StatusDialog.vue similarity index 100% rename from src/pages/statistics/components/StatusDialog.vue rename to src/PagesStatistics/components/StatusDialog.vue diff --git a/src/pages/statistics/components/SupplierDialog.vue b/src/PagesStatistics/components/SupplierDialog.vue similarity index 100% rename from src/pages/statistics/components/SupplierDialog.vue rename to src/PagesStatistics/components/SupplierDialog.vue diff --git a/src/pages/statistics/components/TimeDialog.vue b/src/PagesStatistics/components/TimeDialog.vue similarity index 100% rename from src/pages/statistics/components/TimeDialog.vue rename to src/PagesStatistics/components/TimeDialog.vue diff --git a/src/pages/statistics/components/TimeRangeFilter.vue b/src/PagesStatistics/components/TimeRangeFilter.vue similarity index 100% rename from src/pages/statistics/components/TimeRangeFilter.vue rename to src/PagesStatistics/components/TimeRangeFilter.vue diff --git a/src/pages/statistics/customer/billDetail.vue b/src/PagesStatistics/customer/billDetail.vue similarity index 93% rename from src/pages/statistics/customer/billDetail.vue rename to src/PagesStatistics/customer/billDetail.vue index 51fb8cb..ae4ba37 100644 --- a/src/pages/statistics/customer/billDetail.vue +++ b/src/PagesStatistics/customer/billDetail.vue @@ -12,7 +12,7 @@ diff --git a/src/pages/statistics/customer/detail.vue b/src/PagesStatistics/customer/detail.vue similarity index 100% rename from src/pages/statistics/customer/detail.vue rename to src/PagesStatistics/customer/detail.vue diff --git a/src/pages/statistics/customerChecking.vue b/src/PagesStatistics/customerChecking.vue similarity index 94% rename from src/pages/statistics/customerChecking.vue rename to src/PagesStatistics/customerChecking.vue index c9bdc19..140ee3b 100644 --- a/src/pages/statistics/customerChecking.vue +++ b/src/PagesStatistics/customerChecking.vue @@ -25,7 +25,7 @@ const list = reactive([ ]); const getDetail = (item: any) => { uni.navigateTo({ - url: "/pages/statistics/customer/billDetail", // 要跳转到的页面路径 + url: "/pagesStatistics/customer/billDetail", // 要跳转到的页面路径 }); }; diff --git a/src/pages/statistics/customerRanking.vue b/src/PagesStatistics/customerRanking.vue similarity index 97% rename from src/pages/statistics/customerRanking.vue rename to src/PagesStatistics/customerRanking.vue index 0f7d49b..8953abd 100644 --- a/src/pages/statistics/customerRanking.vue +++ b/src/PagesStatistics/customerRanking.vue @@ -31,7 +31,7 @@ diff --git a/src/pages/statistics/supplier/detail.vue b/src/PagesStatistics/supplier/detail.vue similarity index 100% rename from src/pages/statistics/supplier/detail.vue rename to src/PagesStatistics/supplier/detail.vue diff --git a/src/pages/statistics/supplierChecking.vue b/src/PagesStatistics/supplierChecking.vue similarity index 94% rename from src/pages/statistics/supplierChecking.vue rename to src/PagesStatistics/supplierChecking.vue index a0ff02d..fddbd0d 100644 --- a/src/pages/statistics/supplierChecking.vue +++ b/src/PagesStatistics/supplierChecking.vue @@ -25,7 +25,7 @@ const list = reactive([ ]); const getDetail = (item: any) => { uni.navigateTo({ - url: "/pages/statistics/supplier/billDetail", // 要跳转到的页面路径 + url: "/pagesStatistics/supplier/billDetail", // 要跳转到的页面路径 }); }; diff --git a/src/pages/statistics/supplierRanking.vue b/src/PagesStatistics/supplierRanking.vue similarity index 97% rename from src/pages/statistics/supplierRanking.vue rename to src/PagesStatistics/supplierRanking.vue index 39237d9..859484f 100644 --- a/src/pages/statistics/supplierRanking.vue +++ b/src/PagesStatistics/supplierRanking.vue @@ -31,7 +31,7 @@ - diff --git a/src/pages/index/index.vue b/src/pages/index/index.vue index 69244f5..ef14c47 100644 --- a/src/pages/index/index.vue +++ b/src/pages/index/index.vue @@ -259,7 +259,7 @@ const shipmentList = reactive([ num: 0, fn: () => { uni.navigateTo({ - url: "/pages/index/grossWeight", // 要跳转到的页面路径 + url: "/pagesShipment/grossWeight", // 要跳转到的页面路径 }); }, }, @@ -268,7 +268,7 @@ const shipmentList = reactive([ num: 0, fn: () => { uni.navigateTo({ - url: "/pagesReceive/payReview", // 要跳转到的页面路径 + url: "/pagesShipment/shipmentSettlement?scaleStatus=2", // 要跳转到的页面路径 }); }, }, @@ -277,7 +277,7 @@ const shipmentList = reactive([ num: 0, fn: () => { uni.navigateTo({ - url: "/pagesReceive/payReview", // 要跳转到的页面路径 + url: "/pagesShipment/shipmentSettlement?scaleStatus=3", // 要跳转到的页面路径 }); }, }, @@ -289,7 +289,7 @@ const appList = reactive([ title: "收货补单", fn: () => { uni.navigateTo({ - url: "/pages/app/receiveSpl", // 要跳转到的页面路径 + url: "/pagesApp/receiveSpl", // 要跳转到的页面路径 }); }, }, @@ -298,7 +298,7 @@ const appList = reactive([ title: "出货补单", fn: () => { uni.navigateTo({ - url: "/pages/app/shipmentSpl", // 要跳转到的页面路径 + url: "/pagesApp/shipmentSpl", // 要跳转到的页面路径 }); }, }, @@ -307,7 +307,7 @@ const appList = reactive([ title: "收货明细", fn: () => { uni.navigateTo({ - url: "/pages/app/receiveDetail", // 要跳转到的页面路径 + url: "/pagesApp/receiveDetail", // 要跳转到的页面路径 }); }, }, @@ -316,7 +316,7 @@ const appList = reactive([ title: "出货明细", fn: () => { uni.navigateTo({ - url: "/pages/app/shipmentDetail", // 要跳转到的页面路径 + url: "/pagesApp/shipmentDetail", // 要跳转到的页面路径 }); }, }, @@ -325,7 +325,7 @@ const appList = reactive([ title: "收货作废", fn: () => { uni.navigateTo({ - url: "/pages/app/receiveCl", // 要跳转到的页面路径 + url: "/pagesApp/receiveCl", // 要跳转到的页面路径 }); }, }, @@ -334,7 +334,7 @@ const appList = reactive([ title: "出货作废", fn: () => { uni.navigateTo({ - url: "/pages/app/shipmentCl", // 要跳转到的页面路径 + url: "/pagesApp/shipmentCl", // 要跳转到的页面路径 }); }, }, @@ -343,7 +343,7 @@ const appList = reactive([ title: "供应商管理", fn: () => { uni.navigateTo({ - url: "/pages/app/supplierMgt", // 要跳转到的页面路径 + url: "/pagesApp/supplierMgt", // 要跳转到的页面路径 }); }, }, @@ -352,7 +352,7 @@ const appList = reactive([ title: "客户管理", fn: () => { uni.navigateTo({ - url: "/pages/app/customerMgt", // 要跳转到的页面路径 + url: "/pagesApp/customerMgt", // 要跳转到的页面路径 }); }, }, @@ -364,7 +364,7 @@ const tabMenuList = reactive([ title: "统计", fn: () => { uni.navigateTo({ - url: "/pages/statistics/index", // 要跳转到的页面路径 + url: "/pagesStatistics/index", // 要跳转到的页面路径 }); }, }, diff --git a/src/pages/app/customerMgt.vue b/src/pagesApp/customerMgt.vue similarity index 100% rename from src/pages/app/customerMgt.vue rename to src/pagesApp/customerMgt.vue diff --git a/src/pages/app/receiveCl.vue b/src/pagesApp/receiveCl.vue similarity index 100% rename from src/pages/app/receiveCl.vue rename to src/pagesApp/receiveCl.vue diff --git a/src/pages/app/receiveDetail.vue b/src/pagesApp/receiveDetail.vue similarity index 100% rename from src/pages/app/receiveDetail.vue rename to src/pagesApp/receiveDetail.vue diff --git a/src/pages/app/receiveSpl.vue b/src/pagesApp/receiveSpl.vue similarity index 100% rename from src/pages/app/receiveSpl.vue rename to src/pagesApp/receiveSpl.vue diff --git a/src/pages/app/shipmentCl.vue b/src/pagesApp/shipmentCl.vue similarity index 100% rename from src/pages/app/shipmentCl.vue rename to src/pagesApp/shipmentCl.vue diff --git a/src/pages/app/shipmentDetail.vue b/src/pagesApp/shipmentDetail.vue similarity index 100% rename from src/pages/app/shipmentDetail.vue rename to src/pagesApp/shipmentDetail.vue diff --git a/src/pages/app/shipmentSpl.vue b/src/pagesApp/shipmentSpl.vue similarity index 100% rename from src/pages/app/shipmentSpl.vue rename to src/pagesApp/shipmentSpl.vue diff --git a/src/pages/app/supplierMgt.vue b/src/pagesApp/supplierMgt.vue similarity index 100% rename from src/pages/app/supplierMgt.vue rename to src/pagesApp/supplierMgt.vue diff --git a/src/pages/launch/index.vue b/src/pagesLaunch/index.vue similarity index 95% rename from src/pages/launch/index.vue rename to src/pagesLaunch/index.vue index 327ba58..11b7fc7 100644 --- a/src/pages/launch/index.vue +++ b/src/pagesLaunch/index.vue @@ -10,7 +10,7 @@ > - + {{ item.title }} diff --git a/src/static/img/launch/1.png b/src/pagesLaunch/static/1.png similarity index 100% rename from src/static/img/launch/1.png rename to src/pagesLaunch/static/1.png diff --git a/src/static/img/launch/2.png b/src/pagesLaunch/static/2.png similarity index 100% rename from src/static/img/launch/2.png rename to src/pagesLaunch/static/2.png diff --git a/src/static/img/launch/3.png b/src/pagesLaunch/static/3.png similarity index 100% rename from src/static/img/launch/3.png rename to src/pagesLaunch/static/3.png diff --git a/src/static/img/launch/4.png b/src/pagesLaunch/static/4.png similarity index 100% rename from src/static/img/launch/4.png rename to src/pagesLaunch/static/4.png diff --git a/src/pagesShipment/form/settlementForm.vue b/src/pagesShipment/form/settlementForm.vue new file mode 100644 index 0000000..1b8dd68 --- /dev/null +++ b/src/pagesShipment/form/settlementForm.vue @@ -0,0 +1,318 @@ + + + diff --git a/src/pagesShipment/form/shipmentForm.vue b/src/pagesShipment/form/shipmentForm.vue index e61e9d8..1b8dd68 100644 --- a/src/pagesShipment/form/shipmentForm.vue +++ b/src/pagesShipment/form/shipmentForm.vue @@ -199,7 +199,7 @@ const formAttrList = reactive([ }, { name: "备注", - key: "remark", + key: "notes", type: "textarea", }, { diff --git a/src/pagesShipment/grossWeight.vue b/src/pagesShipment/grossWeight.vue new file mode 100644 index 0000000..b3a5e99 --- /dev/null +++ b/src/pagesShipment/grossWeight.vue @@ -0,0 +1,165 @@ + + + diff --git a/src/pagesShipment/review/index.vue b/src/pagesShipment/review/index.vue new file mode 100644 index 0000000..e4d5e07 --- /dev/null +++ b/src/pagesShipment/review/index.vue @@ -0,0 +1,514 @@ + + + + diff --git a/src/pagesShipment/shipmentSettlement.vue b/src/pagesShipment/shipmentSettlement.vue new file mode 100644 index 0000000..b96f209 --- /dev/null +++ b/src/pagesShipment/shipmentSettlement.vue @@ -0,0 +1,275 @@ + + + diff --git a/src/pagesShipment/shipmenting.vue b/src/pagesShipment/shipmenting.vue index 1937c48..fbb9416 100644 --- a/src/pagesShipment/shipmenting.vue +++ b/src/pagesShipment/shipmenting.vue @@ -3,7 +3,6 @@ - {{ item.id }} {{ item.deviceName || "-" }} diff --git a/src/services/demo copy.ts b/src/services/demo copy.ts deleted file mode 100644 index dc63488..0000000 --- a/src/services/demo copy.ts +++ /dev/null @@ -1,48 +0,0 @@ -// 存放路径: src/services/home.ts - -import { http } from '@/utils/http' - -/** - * 首页-广告区域-小程序 - * @param distributionSite 广告区域展示位置（投放位置 投放位置，1为首页，2为分类商品页） 默认是1 - */ -export const getHomeBannerAPI = (distributionSite = 1) => { - return http({ - method: 'GET', - url: '/home/banner', - data: { - distributionSite, - }, - }) -} -// services/home.ts -/** - * 首页-前台分类-小程序 - */ -export const getHomeCategoryAPI = () => { - return http({ - method: 'GET', - url: '/home/category/mutli', - }) -} -// services/home.ts -/** - * 首页-热门推荐-小程序 - */ -export const getHomeHotAPI = () => { - return http({ - method: 'GET', - url: '/home/hot/mutli', - }) -} -// src/services/home.ts -/** - * 猜你喜欢-小程序 - */ -export const getHomeGoodsGuessLikeAPI = (data: any) => { - return http({ - method: 'GET', - url: '/home/goods/guessLike', - data, - }) -} diff --git a/src/services/demo.ts b/src/services/demo.ts deleted file mode 100644 index dc63488..0000000 --- a/src/services/demo.ts +++ /dev/null @@ -1,48 +0,0 @@ -// 存放路径: src/services/home.ts - -import { http } from '@/utils/http' - -/** - * 首页-广告区域-小程序 - * @param distributionSite 广告区域展示位置（投放位置 投放位置，1为首页，2为分类商品页） 默认是1 - */ -export const getHomeBannerAPI = (distributionSite = 1) => { - return http({ - method: 'GET', - url: '/home/banner', - data: { - distributionSite, - }, - }) -} -// services/home.ts -/** - * 首页-前台分类-小程序 - */ -export const getHomeCategoryAPI = () => { - return http({ - method: 'GET', - url: '/home/category/mutli', - }) -} -// services/home.ts -/** - * 首页-热门推荐-小程序 - */ -export const getHomeHotAPI = () => { - return http({ - method: 'GET', - url: '/home/hot/mutli', - }) -} -// src/services/home.ts -/** - * 猜你喜欢-小程序 - */ -export const getHomeGoodsGuessLikeAPI = (data: any) => { - return http({ - method: 'GET', - url: '/home/goods/guessLike', - data, - }) -} diff --git a/src/services/device.ts b/src/services/device.ts new file mode 100644 index 0000000..e6574eb --- /dev/null +++ b/src/services/device.ts @@ -0,0 +1,46 @@ +import { http } from '@/utils/http' + +// 设备信息新增 +export const addDevice = (data: any) => { + return http({ + method: 'POST', + url: '/api/device/addDevice', + data, + }) +} +// 设备信息修改 +export const editDevice = (data: any) => { + return http({ + method: 'POST', + url: '/api/device/edit', + data, + }) +} + +// 设备信息逻辑删除 +export const deleteDevice = (data: any) => { + return http({ + method: 'POST', + url: '/api/device/deleteDevice', + data, + }) +} +// 设备信息根据id查询 +export const selectDeviceId = (data: any) => { + return http({ + method: 'POST', + url: '/api/device/selectDeviceId', + data, + }) +} + +// 设备信息根据id查询 +export const getDeviceList = (data: any) => { + return http({ + method: 'POST', + url: '/api/device/getDeviceList', + data, + }) +} + + diff --git a/src/services/goods.ts b/src/services/goods.ts new file mode 100644 index 0000000..d5d21ea --- /dev/null +++ b/src/services/goods.ts @@ -0,0 +1,181 @@ +import { http } from '@/utils/http' + +// 收货分类新增 +export const getStockCardList = (data: any) => { + return http({ + method: 'POST', + url: '/api/recategory/addReCategory', + data, + }) +} + +// 收货分类逻辑删除 +export const deleteReceiveCategory = (data: any) => { + return http({ + method: 'POST', + url: '/api/recategory/deleteCategory', + data, + }) +} + +// 收货根据分类id查询 +export const selectReCyById = (data: any) => { + return http({ + method: 'GET', + url: '/api/recategory/selectReCyById', + data, + }) +} + +//收货分类分页查询 +export const getPage = (data: any) => { + return http({ + method: 'GET', + url: '/api/recategory/getPage', + data, + }) +} + +// 收货分类修改信息 +export const editReceiveCategory = (data: any) => { + return http({ + method: 'POST', + url: '/api/recategory/edit', + data, + }) +} + +// 收货产品新增 +export const addReProducts = (data: any) => { + return http({ + method: 'POST', + url: '/api/reproducts/addReProducts', + data, + }) +} + +// 收货产品编辑 +export const EditReceiveProduct = (data: any) => { + return http({ + method: 'POST', + url: '/api/reproducts/edit', + data, + }) +} + +// 收货产品逻辑删除 +export const deleteReceiveProduct = (data: any) => { + return http({ + method: 'POST', + url: '/api/reproducts/deleteCategory', + data, + }) +} + +// 收货产品根据产品id查询 +export const getReceiveProductById = (data: any) => { + return http({ + method: 'POST', + url: '/api/reproducts/selectReCyById', + data, + }) +} + +// 收货产品分页查询 +export const getReceiveProductListByPage = (data: any) => { + return http({ + method: 'GET', + url: '/api/reproducts/getPage', + data, + }) +} + +// 收货产品查询所有 +export const getReceiveProductList = (data: any) => { + return http({ + method: 'GET', + url: '/api/reproducts/allReProducts', + data, + }) +} + +// 出货分类新增 +export const addShmCategory = (data: any) => { + return http({ + method: 'POST', + url: '/api/shmcategory/addShmCategory', + data, + }) +} + +// 出货分类树显示 +export const getShipmentCategory = (data: any) => { + return http({ + method: 'GET', + url: '/api/shmcategory/getChinaList', + data, + }) +} + +// 出货分类根据id查询 +export const getShipmentCategoryById = (data: any) => { + return http({ + method: 'POST', + url: '/api/shmcategory/selectShCyById', + data, + }) +} + +// 出货分类根据id逻辑删除 +export const deleteById = (data: any) => { + return http({ + method: 'POST', + url: '/api/shmcategory/deleteShmCategory', + data, + }) +} + +// 出货分类根据id编辑 +export const editShipmentCategory = (data: any) => { + return http({ + method: 'POST', + url: '/api/shmcategory/edit', + data, + }) +} + +// 出货产品根据id查询 +export const getShipmentProductById = (data: any) => { + return http({ + method: 'POST', + url: '/api/shmproducts/selectRePsById', + data, + }) +} + +// 出货产品新增 +export const addShipmentProduct = (data: any) => { + return http({ + method: 'POST', + url: '/api/shmproducts/addShmProducts', + data, + }) +} + +// 出货产品分页查询 +export const getShipmentProductByPage = (data: any) => { + return http({ + method: 'GET', + url: '/api/shmproducts/getPage', + data, + }) +} + +// 出货产品查询所有 +export const getShipmentProductList = (data: any) => { + return http({ + method: 'GET', + url: '/api/shmproducts/allShmProducts', + data, + }) +} diff --git a/src/services/index.ts b/src/services/index.ts index edda03c..9062f69 100644 --- a/src/services/index.ts +++ b/src/services/index.ts @@ -2,4 +2,7 @@ export * as ProfileApi from './profile' export * as ReceiveApi from './receive' export * as ShipmentApi from './shipment' export * as PictureApi from './picture' -export * as ReceiveProductApi from './receiveProduct' \ No newline at end of file +export * as ReceiveProductApi from './receiveProduct' +export * as DeviceApi from './device' +export * as StockCardApi from './stockCard' +export * as GoodsApi from './goods' \ No newline at end of file diff --git a/src/services/profile.ts b/src/services/profile.ts index 2fdf5f4..93d33c9 100644 --- a/src/services/profile.ts +++ b/src/services/profile.ts @@ -39,6 +39,16 @@ export const sendMsg = (data: { phone: string }) => { }); }; + +// 修改密码 +export const updateUserPwd = (data: any) => { + return http({ + method: "POST", + url: "/api/user/updateUserPwd", + data + }); +}; + // 创建角色 export const addRole = (data: { roleCode: string; roleName: string }) => { return http({ @@ -61,13 +71,14 @@ export const updateRole = (data: { }); }; -// 发送验证码 +// 查询角色列表 export const getRoleList = () => { return http({ method: "GET", url: "/api/role/getRoleList", }); }; + // 验证角色是否重复 1=code 2=名称 3=全部 export const verifyRole = (data: { roleCode: string; @@ -95,7 +106,95 @@ export const addMenusRole = (data: { }); }; +// 查询角色菜单权限 +export const getMenusRole = (data: any) => { + return http({ + method: "GET", + url: "/api/role/getMenusRole", + data + }); +}; +// 查询分页菜单 +export const getMenuByPage = (data: any) => { + return http({ + method: "GET", + url: "/api/menus/getPage", + data + }); +}; + +// 创建菜单 +export const addMenus = (data: any) => { + return http({ + method: "POST", + url: "/api/menus/addMenus", + data + }); +}; + +// 查询菜单List +export const getMenuList = (data: any) => { + return http({ + method: "GET", + url: "/api/menus/getList", + data + }); +}; + +// 修改菜单 +export const updateMenus = (data: any) => { + return http({ + method: "POST", + url: "/api/menus/updateMenus", + data + }); +}; + +// 查询省市区 +export const getProvinceList = (data: any) => { + return http({ + method: "GET", + url: "/api/user/getChinaList", + data + }); +}; + +// 添加用户 +export const addUser = (data: any) => { + return http({ + method: "POST", + url: "/api/user/addUser", + data + }); +}; + +// 查询用户分页 +export const getUserListByPage = (data: any) => { + return http({ + method: "GET", + url: "/api/user/getUserPage", + data + }); +}; + +// 获取用户信息 +export const getUserInfo = (data: any) => { + return http({ + method: "GET", + url: "/api/user/getUserInfo", + data + }); +}; + +// 添加用户角色关系 +export const addUserRole = (data: any) => { + return http({ + method: "POST", + url: "/api/user/addUserRole", + data + }); +}; // 查询用户列表 export const getUserList = (data: { name?: string; diff --git a/src/services/receive.ts b/src/services/receive.ts index 59e65de..84f22ae 100644 --- a/src/services/receive.ts +++ b/src/services/receive.ts @@ -81,6 +81,25 @@ export const updateOne = (data: any) => { }); }; +// 收货汇总 +export const OrderInReceipt = () => { + return http({ + method: "GET", + url: "/api/orderIn/OrderInReceipt" + }); +}; + +// 收货单排行榜 +export const OrderInRanking = () => { + return http({ + method: "GET", + url: "/api/orderIn/OrderInRanking" + }); +}; + + + + diff --git a/src/services/shipment.ts b/src/services/shipment.ts index 9b1622c..aed529c 100644 --- a/src/services/shipment.ts +++ b/src/services/shipment.ts @@ -10,7 +10,7 @@ type ShipmentSummary = { toBeSettled: number, // 待结算 } // 根据id查询出货单 -export const getDetailById = (data: {id: number}) => { +export const getDetailById = (data: {id: string}) => { return http({ method: "GET", url: "/api/orderOut/getOne", diff --git a/src/services/stockCard.ts b/src/services/stockCard.ts new file mode 100644 index 0000000..b612f8b --- /dev/null +++ b/src/services/stockCard.ts @@ -0,0 +1,26 @@ +import { http } from '@/utils/http' + +// 库存卡查询分页 +export const getStockCardList = (data: any) => { + return http({ + method: 'GET', + url: '/api/card/getStockCardList', + data, + }) +} +// 添加库存卡 +export const addStockCard = (data: any) => { + return http({ + method: 'POST', + url: '/api/card/addStockCard', + data, + }) +} +// 修改库存卡 +export const updateStockCard = (data: any) => { + return http({ + method: 'POST', + url: '/api/card/updateStockCard', + data, + }) +} diff --git a/src/static/img/temp/car.png b/src/static/img/temp/car.png deleted file mode 100644 index 95b2202..0000000 Binary files a/src/static/img/temp/car.png and /dev/null differ diff --git a/src/static/style/common.scss b/src/static/style/common.scss index 2b6c5ec..10c4705 100644 --- a/src/static/style/common.scss +++ b/src/static/style/common.scss @@ -27,4 +27,7 @@ body { } .l-h-28 { line-height: 28px; +} +.mt-30 { + margin-top: 30rpx; } \ No newline at end of file diff --git a/src/types/order.d.ts b/src/types/order.d.ts index e7b8a73..f1c1a1f 100644 --- a/src/types/order.d.ts +++ b/src/types/order.d.ts @@ -42,6 +42,33 @@ interface Order { isChecked?: boolean; [attrName: string]: any; } +// 分页结构 +interface OrderPage { + total: number; + list: T; + pageNum: number; + pageSize: number; +} + +interface ReceiveSummary { + totalReceipt: number; // 本月总出货 + totalExpenditure: number; // 本月总收入 + toBePriced: number; // 待收货 + toBeTare: number; // 待过皮重 + audit: number; // 付款审核 + toBePaid: number; // 待支付 +} + +type PageParams = { + pageNumber: number; + pageSize: number; + pricingUserId?: string; // 定价人 + userId?: string; // 供应商id + productId?: string; // 产品id + repairFlag?: boolean; // 是否为补单,true 是未补单，false是补单 + scaleStatus?: number; // 磅单状态:0：待定价1：待过皮2：待审核3：已审核待支付4：已支付 +}; + interface Shipment { id?: string; userId?: number; //供应商id @@ -84,29 +111,28 @@ interface Shipment { isDeleted?: string; //删除标识true删除，false未删除 [attrName: string]: any; } -// 分页结构 -interface OrderPage { - total: number; - list: T; - pageNum: number; - pageSize: number; + +// 出货单排行 +interface ShipmentRank { + userId: number; + userName: string; + productId: number; + productName: string; // 产品名称 + totalAmount: number; // 总收货量 + totalPayment: number; //总应付总额 + totalOrderNumber: number; // 收货单数量 + averagePrice: number; // 均价 } -interface ReceiveSummary { - totalReceipt: number; // 本月总出货 - totalExpenditure: number; // 本月总收入 - toBePriced: number; // 待收货 - toBeTare: number; // 待过皮重 - audit: number; // 付款审核 - toBePaid: number; // 待支付 +// 出库分类 +interface ShipmentTypeCount { + totalAmount: number; // 收货汇总：审核过收货总量 + totalPayShipment: number; // 已支付的出货总量 + totalUnPayShipment: number; // 未支付的出货总量 + totalCollection: number; // 总收款 + totalPayCollection: number; // 已经收到的收款 + totalUnPayCollection: number; // 未收到的收款 + totalReceipt: number; // 收货单数量已审核的 + averagePrice: number; // 平均单价 + rankings: ShipmentRank[]; // 出货产品汇总 } - -type PageParams = { - pageNumber: number; - pageSize: number; - pricingUserId?: string; // 定价人 - userId?: string; // 供应商id - productId?: string; // 产品id - repairFlag?: boolean; // 是否为补单,true 是未补单，false是补单 - scaleStatus?: number; // 磅单状态:0：待定价1：待过皮2：待审核3：已审核待支付4：已支付 -}; diff --git a/src/utils/enum.ts b/src/utils/enum.ts index 1853f4b..6519e9e 100644 --- a/src/utils/enum.ts +++ b/src/utils/enum.ts @@ -52,4 +52,10 @@ export enum PaymentMethod { export enum UserType { Face = 0, Card = 1, +} + +// 提货方式:0:送货1:自提 +export enum DeliveryMethod { + Deliver = 0, + SelfPickup = 1 } \ No newline at end of file