diff --git a/src/apis/store.js b/src/apis/store.js index fdd363f..1dcc57f 100644 --- a/src/apis/store.js +++ b/src/apis/store.js @@ -1033,6 +1033,51 @@ async function jxPrinterList(json) { } } +/** + * 统计门店订单结算以及京西收益,与美团订单对比 + * @Param token header string true "认证token" + * @Param storeIDs query string false "京西门店ID列表[1,2,3]，缺省不限制" + * @Param vendorIds query string false "京西门店ID列表[1,2,3]，缺省不限制" + * @Param start query string true "起始时间1970-01-01 00:00:00" + * @Param end query string true "结束时间1970-01-01 23:59:59" + * @Param size query int true "每页最大数" + * @Param offset query int true "跳过数量" + */ +export const getStoreSettlementInfo = async(params,noLoading = true) => { + try { + let res = await api('v2/store/GetStoreSettlementInfo', { + params, + noLoading + }) + return res + } catch (error) { + throw error + } +} + + +/** + * 根据城市code统计京西收益 + * @Param token header string true "认证token" + * @Param cityCode query string false "京西门店城市列表["1","2","3"]，缺省不限制" + * @Param vendorIds query string false "京西门店ID列表[1,2,3]，缺省不限制" + * @Param start query string true "起始时间1970-01-01 00:00:00" + * @Param end query string true "结束时间1970-01-01 23:59:59" + * @Param size query int true "每页最大数" + * @Param offset query int true "跳过数量" + */ +export const getCitySettlementInfo = async (params,noLoading = true) => { + try { + let res = await api('v2/store/GetCitySettlementInfo', { + params, + noLoading + }) + return res + } catch (error) { + throw error + } +} + export { setMTStoreAutoText, getMTStoreAutoText, diff --git a/src/components/menu/menu.js b/src/components/menu/menu.js index 409458b..79491c4 100644 --- a/src/components/menu/menu.js +++ b/src/components/menu/menu.js @@ -172,6 +172,21 @@ export const newMenu2 = [ type: 0, updatedAt: '2021-01-21T17:21:50+08:00', url: '/storeMerPage', + }, + { + children: [], + color: '', + createdAt: '2021-01-21T17:21:47+08:00', + deletedAt: '1970-01-01T00:00:00+08:00', + id: 7848, + imgURL: '', + lastOperator: 'suyl', + level: 2, + name: '结算统计', + parentID: 42, + type: 0, + updatedAt: '2021-01-21T17:21:50+08:00', + url: '/settleStatic', } // { // children: [], diff --git a/src/pages/createOrderTemp/checkstand.scss b/src/pages/financial/createOrderTemp/checkstand.scss similarity index 100% rename from src/pages/createOrderTemp/checkstand.scss rename to src/pages/financial/createOrderTemp/checkstand.scss diff --git a/src/pages/createOrderTemp/index.vue b/src/pages/financial/createOrderTemp/index.vue similarity index 100% rename from src/pages/createOrderTemp/index.vue rename to src/pages/financial/createOrderTemp/index.vue diff --git a/src/pages/financial/settleStatic/settleStatic.vue b/src/pages/financial/settleStatic/settleStatic.vue new file mode 100644 index 0000000..7e39f5c --- /dev/null +++ b/src/pages/financial/settleStatic/settleStatic.vue @@ -0,0 +1,563 @@ + + + + + diff --git a/src/pages/storeMerLka/index.scss b/src/pages/financial/storeMerLka/index.scss similarity index 100% rename from src/pages/storeMerLka/index.scss rename to src/pages/financial/storeMerLka/index.scss diff --git a/src/pages/storeMerLka/index.vue b/src/pages/financial/storeMerLka/index.vue similarity index 100% rename from src/pages/storeMerLka/index.vue rename to src/pages/financial/storeMerLka/index.vue diff --git a/src/router/index.js b/src/router/index.js index 5cf9f0b..6277133 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -53,7 +53,8 @@ const SystemLog = () => import('@/pages/system/system-log') const CityConfig = () => import('@/pages/system/cityConfig') // 系统管理-城市管理 const SystemTool = () => import('@/components/system/systemTool/system-tool.vue') // 系统管理-系统工具 -const storeMerLka = () => import('@/pages/storeMerLka/index.vue') // 拉卡拉 +const storeMerLka = () => import('@/pages/financial/storeMerLka/index.vue') // 拉卡拉 +const SettleStatic = () => import('@/pages/financial/settleStatic/settleStatic.vue') // 拉卡拉 const JDSettlement = () => import('@/components/finance/jd-settlement') // 财务-京东结算 const StoreGoodsCheck = () => import('@/components/storegoodscheck/store-goods-check') // 门店商品价格审核 @@ -160,7 +161,7 @@ const Convert2JDSPU = () => import('@/components/temporary/convert-JDSPU') // 测试页面 const Test01 = () => import('@/components/temporary/test01') const Test02 = () => import('@/components/temporary/test02') -const CreateOrder = () => import('@/pages/createOrderTemp/index.vue') +const CreateOrder = () => import('@/pages/financial/createOrderTemp/index.vue') /* ---------门店管理--------- */ // 京西门店管理 @@ -479,6 +480,14 @@ const router = new Router({ title: '商户入驻' } }, + { + path: 'settleStatic', + name: 'settleStatic', + component: SettleStatic, + meta: { + title: '结算统计' + } + }, { path: 'jdCatManager', name: 'jdCatManager', diff --git a/src/utils/api.js b/src/utils/api.js index b8df4d9..cf9dd3b 100644 --- a/src/utils/api.js +++ b/src/utils/api.js @@ -68,6 +68,8 @@ export default async (url, options) => { return desc }else if(code === '-1' && url.includes('v2/order/SelfDelivered')){ return desc + }else if(code === '-1' && url.includes('v2/sku/GetMTProductRule')){ + return [] // 防止淘宝闪购报错，后续东西不加载 } /* eslint-disable-line */ else if (code === '-105') {