Merge branch 'test' of 47.94.45.65:angelo/web-retail-admin into base-online

package.json

@@ -18,6 +18,7 @@
     "@riophae/vue-treeselect": "^0.4.0",
     "axios": "0.18.1",
     "core-js": "3.6.5",
+    "dayjs": "^1.11.13",
     "echarts": "^5.4.2",
     "element-ui": "2.13.2",
     "file-saver": "^2.0.5",

src/api/logistics.js

@@ -24,7 +24,7 @@ export function getFindOrderList(params) {
   })
 }
 
-//订单类型枚举
+// 订单类型枚举
 export function getOrderType(params) {
   return request({
     url: '/system/pub/enums/order-type',
@@ -32,7 +32,7 @@ export function getOrderType(params) {
     params
   })
 }
-//撤单类型枚举
+// 撤单类型枚举
 export function getCancleType(params) {
   return request({
     url: 'system/pub/enums/cancel-the-order',
@@ -41,18 +41,16 @@ export function getCancleType(params) {
   })
 }
 
-//出货明细汇总统计订单类型下拉选
+// 产品销售统计订单类型下拉选
 export function getOrderTypeRepurchaseAll(params) {
   return request({
-        url: '/system/pub/enums/order-business',
+    url: '/system/pub/enums/order-shipment',
     method: 'get',
     params
   })
 }
 
-
-
-//伞下直推新增业绩-订单类型下拉选
+// 伞下直推新增业绩-订单类型下拉选
 export function getUnderAddOrderType(params) {
   return request({
     url: '/system/pub/enums/order-business',
@@ -61,7 +59,7 @@ export function getUnderAddOrderType(params) {
   })
 }
 
-//伞下直推新增业绩（新）订单类型下拉选
+// 伞下直推新增业绩（新）订单类型下拉选
 export function getUnderAddOrderTypeNew(params) {
   return request({
     url: '/system/pub/enums/orderUp-business',
@@ -70,8 +68,7 @@ export function getUnderAddOrderTypeNew(params) {
   })
 }
 
-
-//收益类型
+// 收益类型
 export function getYieldType(params) {
   return request({
     url: '/system/manage/bd-bonus-items/list',
@@ -79,7 +76,7 @@ export function getYieldType(params) {
     params
   })
 }
-//收益状态
+// 收益状态
 export function getYieldStatus(params) {
   return request({
     url: '/system/pub/enums/bonus-income-status',
@@ -88,7 +85,7 @@ export function getYieldStatus(params) {
   })
 }
 
-//发货方式
+// 发货方式
 export function getDeliveryList(params) {
   return request({
     url: '/system/pub/enums/delivery-list',
@@ -97,9 +94,7 @@ export function getDeliveryList(params) {
   })
 }
 
-
-
-//支付方式
+// 支付方式
 export function getOrderPayType(params) {
   return request({
     url: '/system/pub/enums/order-pay-type',
@@ -108,7 +103,7 @@ export function getOrderPayType(params) {
   })
 }
 
-//查询自提清单
+// 查询自提清单
 export function getOrderSelfList(data) {
   return request({
     url: '/sale/manage/order-business/self-list?pageNum=' + data.pageNum + '&pageSize=' + data.pageSize,
@@ -117,7 +112,7 @@ export function getOrderSelfList(data) {
   })
 }
 
-//自提清单-同意1/驳回3
+// 自提清单-同意1/驳回3
 export function selfApprove(data) {
   return request({
     url: '/sale/manage/order-business/self-approve',
@@ -126,8 +121,7 @@ export function selfApprove(data) {
   })
 }
 
-
-//查询修改地址列表
+// 查询修改地址列表
 export function getModifyAddress(params) {
   return request({
     url: '/member/manage/self-modify-address/list',
@@ -136,7 +130,7 @@ export function getModifyAddress(params) {
   })
 }
 
-//自提清单-申请自提
+// 自提清单-申请自提
 export function saveSelfOrder(data) {
   return request({
     url: '/sale/manage/order-business/self-order',
@@ -144,7 +138,7 @@ export function saveSelfOrder(data) {
     data
   })
 }
-//修改地址查询详情
+// 修改地址查询详情
 export function queryPass(data) {
   return request({
     url: '/member/manage/self-modify-address/queryPass',
@@ -153,7 +147,7 @@ export function queryPass(data) {
   })
 }
 
-//修改地址驳回
+// 修改地址驳回
 export function rejectAddress(data) {
   return request({
     url: '/member/manage/self-modify-address/reject',
@@ -162,7 +156,7 @@ export function rejectAddress(data) {
   })
 }
 
-//订单添加开票备注
+// 订单添加开票备注
 export function updateOrderRemarks(data) {
   return request({
     url: '/sale/manage/order/update-order-remarks',
@@ -171,4 +165,3 @@ export function updateOrderRemarks(data) {
   })
 }
 
-

src/api/statistics.js

@@ -1,5 +1,5 @@
 import request from '@/utils/request'
-//联创数据报表类型
+// 联创数据报表类型
 export function sheetTypeList(params) {
   return request({
     url: '/system/pub/enums/sheetType',
@@ -7,7 +7,7 @@ export function sheetTypeList(params) {
     params
   })
 }
-//收益区域数据
+// 收益区域数据
 export function getRevenueAreaList(params) {
   return request({
     url: '/report/manager/member-awards/revenueAreaList',
@@ -16,7 +16,7 @@ export function getRevenueAreaList(params) {
   })
 }
 
-//伞下账户余额
+// 伞下账户余额
 export function getUmbrellaList(params) {
   return request({
     url: '/report/manager/member-brolly/umbrella-list',
@@ -25,7 +25,7 @@ export function getUmbrellaList(params) {
   })
 }
 
-//真实业绩新增奖衔
+// 真实业绩新增奖衔
 export function getUmbrellaAwardsList(params) {
   return request({
     url: '/report/manager/member-awards/list',
@@ -33,7 +33,7 @@ export function getUmbrellaAwardsList(params) {
     params
   })
 }
-//结算等级升级记录
+// 结算等级升级记录
 export function getGradeRecordList(params) {
   return request({
     url: '/report/manager/member-awards/gradeRecord-list',
@@ -41,7 +41,7 @@ export function getGradeRecordList(params) {
     params
   })
 }
-//真实奖衔分析
+// 真实奖衔分析
 export function getUmbrellaAnalysisList(params) {
   return request({
     url: '/report/manager/member-awards/analysis-list',
@@ -50,7 +50,7 @@ export function getUmbrellaAnalysisList(params) {
   })
 }
 
-//真实奖衔分析穿透
+// 真实奖衔分析穿透
 export function getUmbrellaAnalysisDetailList(params) {
   return request({
     url: '/report/manager/member-awards/analysis-details-list',
@@ -59,7 +59,7 @@ export function getUmbrellaAnalysisDetailList(params) {
   })
 }
 
-//安置反查
+// 安置反查
 export function getPlaceCheckList(data) {
   return request({
     url: '/report/manager/member-report/place-peg?pageSize=' + data.pageSize + '&pageNum=' + data.pageNum,
@@ -68,7 +68,7 @@ export function getPlaceCheckList(data) {
   })
 }
 
-//推荐反查
+// 推荐反查
 export function getRecommendedCheckList(data) {
   return request({
     url: '/report/manager/member-report/parent-peg?pageSize=' + data.pageSize + '&pageNum=' + data.pageNum,
@@ -77,7 +77,7 @@ export function getRecommendedCheckList(data) {
   })
 }
 
-//业绩类型
+// 业绩类型
 export function getAchievementType(params) {
   return request({
     url: '/system/pub/enums/achievement-type',
@@ -86,7 +86,7 @@ export function getAchievementType(params) {
   })
 }
 
-//是否枚举
+// 是否枚举
 export function getYesornoList(params) {
   return request({
     url: '/system/pub/enums/dealer-yes-no',
@@ -95,8 +95,7 @@ export function getYesornoList(params) {
   })
 }
 
-
-//伞下直推列表
+// 伞下直推列表
 export function getUmbrellaPushList(params) {
   return request({
     url: '/report/manage/umbrella-below-push/list',
@@ -105,7 +104,7 @@ export function getUmbrellaPushList(params) {
   })
 }
 
-//复购PV统计列表
+// 复购PV统计列表
 export function getRepurchasepvList(params) {
   return request({
     url: '/report/manager/member-awards/repurchasepv-list',
@@ -114,7 +113,7 @@ export function getRepurchasepvList(params) {
   })
 }
 
-//商城BV统计列表
+// 商城BV统计列表
 export function getMallPvList(params) {
   return request({
     url: '/report/manager/member-awards/mallPv-list',
@@ -123,7 +122,7 @@ export function getMallPvList(params) {
   })
 }
 
-//考核状态下拉选
+// 考核状态下拉选
 export function getAssessStatus(params) {
   return request({
     url: '/system/pub/enums/assess-status',
@@ -132,7 +131,7 @@ export function getAssessStatus(params) {
   })
 }
 
-//伞下新增安置业绩列表
+// 伞下新增安置业绩列表
 export function getResettleAchieve(params) {
   return request({
     url: '/report/manager/member-report/member-resettle-achieve',
@@ -140,7 +139,7 @@ export function getResettleAchieve(params) {
     params
   })
 }
-//伞下新增安置业绩（新）列表
+// 伞下新增安置业绩（新）列表
 export function getResettleAchieveNew(params) {
   return request({
     url: '/report/manager/member-report/member-resettle-achieve_up',
@@ -149,25 +148,24 @@ export function getResettleAchieveNew(params) {
   })
 }
 
-
-//出货明细汇总统计列表
+// 产品销售统计列表
 export function getShippingSummary(params) {
   return request({
-        url: '/report/manager/member-report/product-shipping-details-list',
+    url: '/report/manager/member-report/product-shipping',
     method: 'get',
     params
   })
 }
 
-//出货明细汇总统计详情列表
+// 产品销售统计详情列表
 export function getShippingSummaryDetail(params) {
   return request({
-        url: '/report/manager/member-report/product-shipping-details-info-list',
+    url: '/report/manager/member-report/product-shipping-details',
     method: 'get',
     params
   })
 }
-//直推统计列表
+// 直推统计列表
 export function directPushStatList(params) {
   return request({
     url: '/report/manager/member-awards/directPushStatList',
@@ -175,7 +173,7 @@ export function directPushStatList(params) {
     params
   })
 }
-//会员订单分布统计
+// 会员订单分布统计
 export function memberOrderScatter(params) {
   return request({
     url: '/report/manager/member-awards/memberOrderScatter',
@@ -183,7 +181,7 @@ export function memberOrderScatter(params) {
     params
   })
 }
-//地区类型
+// 地区类型
 export function areaType(params) {
   return request({
     url: '/system/pub/enums/areaType',
@@ -191,7 +189,7 @@ export function areaType(params) {
     params
   })
 }
-//订单类型
+// 订单类型
 export function orderBusiness(params) {
   return request({
     url: '/system/pub/enums/order-business',
@@ -200,7 +198,7 @@ export function orderBusiness(params) {
   })
 }
 
-//报单汇总列表
+// 报单汇总列表
 export function getReportSummary(params) {
   return request({
     url: 'report/manager/member-report/report-summary-list',
@@ -208,7 +206,7 @@ export function getReportSummary(params) {
     params
   })
 }
-//收入明细list
+// 收入明细list
 export function revenueList(params) {
   return request({
     url: '/report/manager/member-awards/revenue-detai-list',
@@ -217,7 +215,7 @@ export function revenueList(params) {
   })
 }
 
-//产品明细查询列表
+// 产品明细查询列表
 export function getProductDetailQueryList(params) {
   return request({
     url: '/report/manager/member-report/product-detail-query-list',
@@ -226,7 +224,7 @@ export function getProductDetailQueryList(params) {
   })
 }
 
-//奖衔级别下拉选
+// 奖衔级别下拉选
 export function getAwardsLevelList(params) {
   return request({
     url: '/system/pub/enums/awardsLevelList',
@@ -235,7 +233,7 @@ export function getAwardsLevelList(params) {
   })
 }
 
-//伞下血缘去重列表
+// 伞下血缘去重列表
 export function getBloodRemoveSame(params) {
   return request({
     url: '/report/manager/member-awards/blood-remove-same',
@@ -244,7 +242,7 @@ export function getBloodRemoveSame(params) {
   })
 }
 
-//伞下血缘去重（新）列表
+// 伞下血缘去重（新）列表
 export function getBloodRemoveSameNew(params) {
   return request({
     url: '/report/manager/member-awards/blood-remove-same-history',
@@ -253,7 +251,7 @@ export function getBloodRemoveSameNew(params) {
   })
 }
 
-//数据报表-联创列表
+// 数据报表-联创列表
 export function getLianchuangDataList(params) {
   return request({
     url: '/report/manager/cu-lianchuang-data-stat/list',
@@ -262,7 +260,7 @@ export function getLianchuangDataList(params) {
   })
 }
 
-//数据报表-联创列表删除
+// 数据报表-联创列表删除
 export function deleteLcDataList(data) {
   return request({
     url: '/report/manager/cu-lianchuang-data-stat/delete-lcStat',
@@ -271,8 +269,7 @@ export function deleteLcDataList(data) {
   })
 }
 
-
-//数据报表-联创列表查询单条
+// 数据报表-联创列表查询单条
 export function getOneLcData(params) {
   return request({
     url: 'report/manager/cu-lianchuang-data-stat/getOne/' + params.pkId,
@@ -281,7 +278,7 @@ export function getOneLcData(params) {
   })
 }
 
-//数据报表-联创列表添加
+// 数据报表-联创列表添加
 export function saveLcDataStat(data) {
   return request({
     url: '/report/manager/cu-lianchuang-data-stat/save',
@@ -290,7 +287,7 @@ export function saveLcDataStat(data) {
   })
 }
 
-//数据报表-联创列表修改
+// 数据报表-联创列表修改
 export function updateLcDataStat(data) {
   return request({
     url: '/report/manager/cu-lianchuang-data-stat/update',
@@ -299,7 +296,7 @@ export function updateLcDataStat(data) {
   })
 }
 
-//查询方向下拉选
+// 查询方向下拉选
 export function getEnumsUpDown(params) {
   return request({
     url: '/system/pub/enums/up-down',
@@ -308,7 +305,7 @@ export function getEnumsUpDown(params) {
   })
 }
 
-//国内业绩查询列表
+// 国内业绩查询列表
 export function getChLcdataList(params) {
   return request({
     url: '/report/manager/cu-lianchuang-data-stat/home-list',
@@ -317,7 +314,7 @@ export function getChLcdataList(params) {
   })
 }
 
-//删除国内业绩查询
+// 删除国内业绩查询
 export function deleteLcStat(data) {
   return request({
     url: '/report/manager/cu-lianchuang-data-stat/delete-lcStat',
@@ -326,7 +323,7 @@ export function deleteLcStat(data) {
   })
 }
 
-//国内业绩查询列表单条查询
+// 国内业绩查询列表单条查询
 export function getOneChLcdataList(params) {
   return request({
     url: '/report/manager/cu-lianchuang-data-stat/getOne/' + params.pkId,
@@ -335,7 +332,7 @@ export function getOneChLcdataList(params) {
   })
 }
 
-//国内业绩查询修改
+// 国内业绩查询修改
 export function updateLcStat(data) {
   return request({
     url: '/report/manager/cu-lianchuang-data-stat/home-update',
@@ -344,7 +341,7 @@ export function updateLcStat(data) {
   })
 }
 
-//国内业绩查询添加
+// 国内业绩查询添加
 export function saveLcStat(data) {
   return request({
     url: '/report/manager/cu-lianchuang-data-stat/home-save',
@@ -353,7 +350,7 @@ export function saveLcStat(data) {
   })
 }
 
-//海外业绩查询列表
+// 海外业绩查询列表
 export function getAboardLcdataList(params) {
   return request({
     url: 'report/manager/cu-lianchuang-data-stat/abroad-list',
@@ -361,7 +358,7 @@ export function getAboardLcdataList(params) {
     params
   })
 }
-//直推数据
+// 直推数据
 export function directPushDataList(params) {
   return request({
     url: '/report/manager/member-awards/directPushDataList',
@@ -369,7 +366,7 @@ export function directPushDataList(params) {
     params
   })
 }
-//会员业绩数据查询
+// 会员业绩数据查询
 export function memberAchieve(params) {
   return request({
     url: '/report/manager/member-awards/member-achieve-list',
@@ -377,7 +374,7 @@ export function memberAchieve(params) {
     params
   })
 }
-//直推数据详情
+// 直推数据详情
 export function directPushDataDetails(params) {
   return request({
     url: '/report/manager/member-awards/directPushDataDetails',
@@ -385,7 +382,7 @@ export function directPushDataDetails(params) {
     params
   })
 }
-//安置血缘查询
+// 安置血缘查询
 export function bloodList(params) {
   return request({
     url: '/report/manager/member-awards/resettle-blood-list',
@@ -393,7 +390,7 @@ export function bloodList(params) {
     params
   })
 }
-//安置血缘左右区人数查询
+// 安置血缘左右区人数查询
 export function bloodDetails(params) {
   return request({
     url: '/report/manager/member-awards/resettle-details-list',
@@ -401,7 +398,7 @@ export function bloodDetails(params) {
     params
   })
 }
-//安置血缘左右区血缘人数查询
+// 安置血缘左右区血缘人数查询
 export function bloodBDetails(params) {
   return request({
     url: '/report/manager/member-awards/resettle-blood-details-list',
@@ -409,7 +406,7 @@ export function bloodBDetails(params) {
     params
   })
 }
-//发送站内信
+// 发送站内信
 export function sendingMessages(params) {
   return request({
     url: '/report/manager/member-awards/sendingMessages',
@@ -418,7 +415,7 @@ export function sendingMessages(params) {
   })
 }
 
-//奖衔晋升查询
+// 奖衔晋升查询
 export function getAwardPromotionList(params) {
   return request({
     url: '/report/manager/member-awards/promotion-list',
@@ -426,7 +423,7 @@ export function getAwardPromotionList(params) {
     params
   })
 }
-//大于小于
+// 大于小于
 export function getCondition(params) {
   return request({
     url: '/system/pub/enums/get-condition',
@@ -435,7 +432,7 @@ export function getCondition(params) {
   })
 }
 
-//个人复购统计
+// 个人复购统计
 export function getPersonRepurchaseList(params) {
   return request({
     url: '/report/manager/member-awards/personRepurchaseList',
@@ -444,7 +441,7 @@ export function getPersonRepurchaseList(params) {
   })
 }
 
-//安置业绩统计
+// 安置业绩统计
 export function getPositStatList(params) {
   return request({
     url: '/report/manager/member-awards/positStatList',
@@ -452,7 +449,7 @@ export function getPositStatList(params) {
     params
   })
 }
-//伞下直推产品查询
+// 伞下直推产品查询
 export function umbrellaList(params) {
   return request({
     url: '/report/manager/member-awards/umbrella-below-product',
@@ -460,7 +457,7 @@ export function umbrellaList(params) {
     params
   })
 }
-//伞下直推产品明细
+// 伞下直推产品明细
 export function umbrellaRepeat(params) {
   return request({
     url: '/report/manager/member-awards/umbrella-below-repeat',
@@ -468,7 +465,7 @@ export function umbrellaRepeat(params) {
     params
   })
 }
-//伞下直推产品统计
+// 伞下直推产品统计
 export function umbrellaStat(params) {
   return request({
     url: '/report/manager/member-awards/stat-product',
@@ -477,7 +474,7 @@ export function umbrellaStat(params) {
   })
 }
 
-//用户消费统计列表
+// 用户消费统计列表
 export function getMemberConsumptionList(params) {
   return request({
     url: '/member/manager/member/member_consumption_stat',
@@ -486,7 +483,7 @@ export function getMemberConsumptionList(params) {
   })
 }
 
-//小区新增业绩统计
+// 小区新增业绩统计
 export function getComNewlyAddPVList(data) {
   return request({
     url: '/report/manager/small-achieve/achieve-list?pageSize=' + data.pageSize + '&pageNum=' + data.pageNum,
@@ -495,7 +492,7 @@ export function getComNewlyAddPVList(data) {
   })
 }
 
-//会员户籍数据查询
+// 会员户籍数据查询
 export function getDomicileDataList(params) {
   return request({
     url: '/report/manager/member-awards/domicileDataList',
@@ -504,7 +501,7 @@ export function getDomicileDataList(params) {
   })
 }
 
-//伞下钱包明细
+// 伞下钱包明细
 export function getUmbrellaWalletDetailList(data) {
   return request({
     url: '/report/manager/wallet/detail-list?pageSize=' + data.pageSize + '&pageNum=' + data.pageNum,
@@ -513,7 +510,7 @@ export function getUmbrellaWalletDetailList(data) {
   })
 }
 
-//地区业绩统计列表
+// 地区业绩统计列表
 export function getAreaAchieveStatList(params) {
   return request({
     url: '/report/manager/member-awards/areaAchieveStat',
@@ -522,7 +519,7 @@ export function getAreaAchieveStatList(params) {
   })
 }
 
-//系统业绩统计列表
+// 系统业绩统计列表
 export function getVertexAchieveStatList(params) {
   return request({
     url: '/report/manager/member-awards/vertexAchieveStat',
@@ -531,8 +528,7 @@ export function getVertexAchieveStatList(params) {
   })
 }
 
-
-//订单类型枚举
+// 订单类型枚举
 export function getOrderType(params) {
   return request({
     url: '/system/pub/enums/order-type',
@@ -540,7 +536,7 @@ export function getOrderType(params) {
     params
   })
 }
-//单品销量统计
+// 单品销量统计
 export function orderSingle(params) {
   return request({
     url: '/sale/manage/order/single-item-stat',
@@ -548,7 +544,7 @@ export function orderSingle(params) {
     params
   })
 }
-//单品销量统计total
+// 单品销量统计total
 export function orderSingleTotal(params) {
   return request({
     url: '/sale/manage/order/get-single-item-stat-total',
@@ -557,7 +553,7 @@ export function orderSingleTotal(params) {
   })
 }
 
-//新联创列表
+// 新联创列表
 export function getNewLcList(params) {
   return request({
     url: '/report/manager/cu-lianchuang-data-stat/listHistory',
@@ -566,7 +562,7 @@ export function getNewLcList(params) {
   })
 }
 
-//月度职级名单查询
+// 月度职级名单查询
 export function getMonthlyRankList(params) {
   return request({
     url: '/report/manager/member-awards/monthly-job-level',
@@ -575,8 +571,7 @@ export function getMonthlyRankList(params) {
   })
 }
 
-
-//产品销量排行
+// 产品销量排行
 export function getProductSalesStat(params) {
   return request({
     url: '/report/manager/product-sales/product-sales-stat',
@@ -584,7 +579,7 @@ export function getProductSalesStat(params) {
     params
   })
 }
-//晋升方式
+// 晋升方式
 export function getUpListList(params) {
   return request({
     url: '/system/pub/enums/upgradeType',
@@ -592,7 +587,7 @@ export function getUpListList(params) {
     params
   })
 }
-//专区商品销量统计
+// 专区商品销量统计
 export function waresSales(params) {
   return request({
     url: 'report/api/wares-sales-volume/list',
@@ -601,7 +596,3 @@ export function waresSales(params) {
   })
 }
 
-
-
-
-

src/router/index.js

@@ -2826,6 +2826,19 @@ export const constantRoutes = [
         component: () => import('@/views/statistics/underDirectpush'),
         meta: { title: '伞下直推' }
       },
+      {
+        path: 'productSaleStatistics',
+        name: 'ProductSaleStatistics',
+        component: () => import('@/views/statistics/productSaleStatistics'),
+        meta: { title: '产品销售统计' }
+      },
+      {
+        path: 'productSaleStatisticsDetail',
+        name: 'ProductSaleStatisticsDetail',
+        component: () => import('@/views/statistics/productSaleStatisticsDetail'),
+        meta: { title: '产品销售统计详情' },
+        hidden: true
+      },
       {
         path: 'rePurchaseStatisitics',
         name: 'RePurchaseStatisitics',

src/utils/date.js

@@ -0,0 +1,15 @@
+import dayjs from 'dayjs'
+
+export function getBeforeDays(n = 1) {
+  return dayjs().subtract(n, 'day').format('YYYY-MM-DD')
+}
+
+// 获取本月第一天
+export function getMonthFirstDay() {
+  return dayjs().startOf('month').format('YYYY-MM-DD')
+}
+
+// 获取本月最后一天
+export function getMonthLastDay() {
+  return dayjs().endOf('month').format('YYYY-MM-DD')
+}

src/views/statistics/productSaleStatistics.vue

@@ -0,0 +1,336 @@
+<template>
+  <div class="page">
+    <topBar
+      v-if="topList.length > 0"
+      :top-list="topList"
+      :moren="moren"
+    />
+    <div class="thetopbox">
+      <el-form label-width="100px">
+        <el-row>
+          <el-col :span="4">
+            <el-form-item label="仓储编号" prop="productName">
+              <el-input v-model="select.wmsCode" clearable />
+            </el-form-item>
+          </el-col>
+          <el-col :span="4">
+            <el-form-item label="产品编号" prop="productName">
+              <el-input v-model="select.productCode" clearable />
+            </el-form-item>
+          </el-col>
+          <el-col :span="4">
+            <el-form-item label="产品名称" prop="productName">
+              <el-input v-model="select.productName" clearable />
+            </el-form-item>
+          </el-col>
+
+          <el-col :span="8">
+            <el-form-item label="时间范围" prop="timeRange">
+              <el-date-picker
+                v-model="timeRange"
+                value-format="yyyy-MM-dd"
+                type="daterange"
+                :clearable="false"
+                :range-separator="'至'"
+                :start-placeholder="'开始日期'"
+                :end-placeholder="'结束日期'"
+                @change="changeTime"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="4">
+            <div class="searchbox">
+              <el-button
+                class="my_search"
+                @click="
+                  () => {
+                    getSearch();
+                    getCzNum();
+                  }
+                "
+              >
+                {{ '搜索' }}</el-button>
+              <el-button class="my_reset" @click="resetHandle">
+                {{ '重置' }}</el-button>
+            </div>
+          </el-col>
+        </el-row>
+      </el-form>
+    </div>
+    <div class="main">
+      <div class="maintop">
+        <div class="mainbtn">
+          <el-button v-hasButtons="['ProductSaleStatisticsExport']" size="small" class="thebtn1" @click="handleExport">
+            导出</el-button>
+        </div>
+      </div>
+      <div class="maintable">
+        <el-table
+          v-loading="loading"
+          :data="tableData"
+          height="700px"
+          style="width: 100%"
+          :header-cell-style="{ background: '#EEEEEE' }"
+          @selection-change="handleSelectionChange"
+        >
+          <el-table-column prop="colsele" type="selection" width="55" />
+          <el-table-column
+            align="center"
+            prop="wmsCode"
+            label="仓储编号"
+          />
+          <el-table-column
+            align="center"
+            prop="productCode"
+            label="产品编号"
+          />
+          <el-table-column
+            align="center"
+            prop="productName"
+            label="产品名称"
+            min-width="180px"
+          />
+          <el-table-column
+            align="center"
+            prop="quantity"
+            label="销量"
+          />
+          <el-table-column
+            align="center"
+            prop="colsele"
+            label="操作"
+          >
+            <template slot-scope="scope">
+              <el-button
+                type="text"
+                style="color: #48b2fd; padding: 0"
+                @click.native.prevent="goDetail(scope.row)"
+              >
+                查看详情
+              </el-button>
+            </template>
+          </el-table-column>
+        </el-table>
+      </div>
+    </div>
+    <pagination
+      v-show="total > 0"
+      :total="total"
+      :page.sync="queryParams.pageNum"
+      :limit.sync="queryParams.pageSize"
+      @pagination="getSearch"
+    />
+  </div>
+</template>
+
+<script>
+import topBar from '@/components/topBar'
+import * as sta from '@/api/statistics'
+import * as log from '@/api/logistics.js'
+import { isLocals, isLocalSymbol } from '@/utils/numberToCurrency'
+import { getMonthFirstDay, getMonthLastDay } from '@/utils/date'
+const initSearch = {
+  productCode: '',
+  productName: '',
+  wmsCode: ''
+}
+export default {
+  name: 'ProductSaleStatistics',
+  components: {
+    topBar
+  },
+  filters: {
+    numFilter(value) {
+      // 截取当前数据到小数点后两位
+      const realVal = parseFloat(value).toFixed(2)
+      return realVal
+    }
+  },
+  data() {
+    return {
+      moren: 'productSaleStatistics',
+      topList: [
+        {
+          name: '产品销售统计',
+          path: 'productSaleStatistics'
+        }
+      ],
+      tableData: [],
+      loading: false,
+      queryParams: {
+        pageNum: 1,
+        pageSize: 50
+      },
+      timeRange: [
+        getMonthFirstDay(),
+        getMonthLastDay()
+      ],
+      select: {
+        ...initSearch,
+        startTime: getMonthFirstDay(),
+        endTime: getMonthLastDay()
+      },
+      total: 0,
+      multipleSelection: [],
+      orderTypeList: []
+    }
+  },
+  created() {
+    this.getSearch()
+    this.getOthers()
+  },
+  methods: {
+    isLocalSymbol,
+    isLocals,
+    goDetail(val) {
+      this.$router.push({
+        path: 'productSaleStatisticsDetail',
+        query: {
+          params: JSON.stringify({
+            ...this.select,
+            wmsCode: val.wmsCode,
+            startTime: this.timeRange[0],
+            endTime: this.timeRange[1]
+          })
+        }
+      })
+    },
+    changeTime(val) {
+      this.select.startTime = val ? val[0] : null
+      this.select.endTime = val ? val[1] : null
+    },
+    getOthers() {
+      // 获取订单类型
+      log.getOrderTypeRepurchaseAll().then((res) => {
+        this.orderTypeList = res.data
+      })
+    },
+    // 导出
+    handleExport() {
+      this.$confirm('是否确认导出所有数据项?', '警告', {
+        confirmButtonText: '确定',
+        cancelButtonText: '取消',
+        type: 'warning'
+      }).then((_) => {
+        this.download(
+          '/report/manager/member-report/product-shipping-export',
+          Object.assign({}, this.queryParams, this.select),
+          `${'产品销售统计'}${new Date().getTime()}.xlsx`
+        )
+      })
+    },
+    handleSelectionChange(val) {
+      this.multipleSelection = val
+    },
+    resetHandle() {
+      this.queryParams = {
+        pageNum: 1,
+        pageSize: 50
+      }
+
+      this.timeRange = [
+        getMonthFirstDay(),
+        getMonthLastDay()
+      ]
+      this.select = {
+        ...initSearch,
+        startTime: this.timeRange[0],
+        endTime: this.timeRange[1]
+      }
+      this.getSearch()
+    },
+    getSearch() {
+      this.loading = true
+      const params = {
+        ...this.queryParams,
+        ...this.select,
+        startTime: this.timeRange[0],
+        endTime: this.timeRange[1]
+      }
+      sta.getShippingSummary(params).then((res) => {
+        this.loading = false
+        if (res.code === 200) {
+          this.tableData = res.rows
+          this.total = res.total
+        }
+      })
+    },
+    getCzNum() {
+      this.queryParams.pageNum = 1
+    }
+  }
+}
+</script>
+
+      <style lang="scss" scoped>
+::v-deep .el-image-viewer__close {
+  right: 500px;
+}
+::v-deep .dizhi .el-cascader {
+  width: 100%;
+}
+::v-deep .el-range-editor.el-input__inner {
+  width: 100%;
+}
+::v-deep .el-table thead {
+  color: #000000;
+}
+::v-deep .el-table .warning-row {
+  background: #f9f9f9;
+}
+.page {
+  padding: 10px 20px;
+  background: #f9f9f9;
+  font-size: 14px;
+  .thetopbox {
+    padding: 15px 20px 15px 0;
+    background: #ffffff;
+    border-radius: 8px;
+    .searchbox {
+      display: flex;
+      align-items: center;
+      margin-left: 40px;
+    }
+    .searchtitle {
+      margin-right: 10px;
+    }
+    .searchbtn {
+      background: #08143f;
+      color: #ffffff;
+    }
+  }
+  .main {
+    //margin-top: 20px;
+    background: #f9f9f9;
+    //border-radius: 8px;
+    //box-shadow: 0px 2px 20px 0px rgba(238, 238, 238, 0.5);
+
+    .maintop {
+      display: flex;
+      // padding: 10px 0;
+      justify-content: space-between;
+      align-items: center;
+      .mainbtn {
+        .thebtn1 {
+          color: #ffffff;
+          background: #ffad41;
+          width: 68px;
+          height: 32px;
+        }
+        .thebtn2 {
+          color: #ffffff;
+          background: #009b58;
+          width: 68px;
+          height: 32px;
+        }
+        .thebtn3 {
+          color: #ffffff;
+          background: #c8161d;
+          width: 68px;
+          height: 32px;
+        }
+      }
+    }
+  }
+}
+</style>

src/views/statistics/productSaleStatisticsDetail.vue

@@ -0,0 +1,217 @@
+<template>
+  <div class="page">
+    <topBar
+      v-if="topList.length > 0"
+      :top-list="topList"
+      :moren="moren"
+    />
+    <div class="main">
+      <div class="maintop">
+        <div class="mainbtn">
+          <el-button v-hasButtons="['ProductSaleStatisticsDetailExport']" size="small" class="thebtn1" @click="handleExport">
+            {{ '导出' }}</el-button>
+        </div>
+      </div>
+      <div class="maintable">
+        <el-table
+          v-loading="loading"
+          :data="tableData"
+          height="700px"
+          style="width: 100%"
+          :header-cell-style="{ background: '#EEEEEE' }"
+        >
+          <el-table-column
+            align="center"
+            prop="wmsCode"
+            :label="'仓储编号'"
+          />
+          <el-table-column
+            align="center"
+            prop="specialAreaVal"
+            label="所属专区"
+            min-width="180px"
+          />
+          <el-table-column
+            align="center"
+            prop="isMakerGiftVal"
+            label="商品类型"
+          />
+          <el-table-column
+            align="center"
+            prop="quantity"
+            label="销量"
+          />
+        </el-table>
+      </div>
+    </div>
+    <pagination
+      v-show="total > 0"
+      :total="total"
+      :page.sync="queryParams.pageNum"
+      :limit.sync="queryParams.pageSize"
+      @pagination="getSearch"
+    />
+  </div>
+</template>
+
+<script>
+import topBar from '@/components/topBar'
+import * as sta from '@/api/statistics'
+export default {
+  name: 'ProductSaleStatisticsDetail',
+  components: {
+    topBar
+  },
+  filters: {
+    numFilter(value) {
+      // 截取当前数据到小数点后两位
+      const realVal = parseFloat(value).toFixed(2)
+      return realVal
+    }
+  },
+  data() {
+    return {
+      moren: 'productSaleStatisticsDetail',
+      topList: [
+        {
+          name: '产品销售统计',
+          path: 'productSaleStatisticsDetail'
+        }
+      ],
+      tableData: [],
+      loading: false,
+      queryParams: {
+        pageNum: 1,
+        pageSize: 50,
+        pkProduct: '',
+        orderType: ''
+      },
+      total: 0,
+      pkProduct: '',
+      multipleSelection: [],
+      classifyAllList: [],
+      awardsList: [],
+      params: {}
+    }
+  },
+  created() {
+    this.pkProduct = this.$route.query.pkProduct
+    this.queryParams.orderType = this.$route.query.orderType
+    this.params = JSON.parse(this.$route.query.params)
+    delete this.params.orderType
+    this.getSearch()
+  },
+  methods: {
+    // 导出
+    handleExport() {
+      this.$confirm('是否确认导出所有数据项?', '警告', {
+        confirmButtonText: '确定',
+        cancelButtonText: '取消',
+        type: 'warning'
+      }).then((_) => {
+        this.download(
+          '/report/manager/member-report/product-shipping-details-export',
+          { ...this.queryParams, ...this.params },
+          `${'产品销售统计'}${new Date().getTime()}.xlsx`
+        )
+      })
+    },
+
+    reChongzhi() {
+      this.queryParams = {
+        pageNum: 1,
+        pageSize: 50,
+        pkProduct: ''
+      }
+      this.getSearch()
+    },
+    getSearch() {
+      this.loading = true
+      this.queryParams.pkProduct = this.pkProduct
+      sta.getShippingSummaryDetail(Object.assign({}, this.queryParams, this.params)).then((res) => {
+        this.loading = false
+        if (res.code === 200) {
+          this.tableData = res.rows
+          this.total = res.total
+        }
+      })
+    },
+    getCzNum() {
+      this.queryParams.pageNum = 1
+    }
+  }
+}
+</script>
+
+<style lang="scss" scoped>
+::v-deep .el-image-viewer__close {
+  right: 500px;
+}
+::v-deep .dizhi .el-cascader {
+  width: 100%;
+}
+::v-deep .el-range-editor.el-input__inner {
+  width: 100%;
+}
+::v-deep .el-table thead {
+  color: #000000;
+}
+::v-deep .el-table .warning-row {
+  background: #f9f9f9;
+}
+.page {
+  padding: 10px 20px;
+  background: #f9f9f9;
+  font-size: 14px;
+  .thetopbox {
+    padding: 15px 20px 15px 0;
+    background: #ffffff;
+    border-radius: 8px;
+    .searchbox {
+      display: flex;
+      align-items: center;
+      margin-left: 40px;
+    }
+    .searchtitle {
+      margin-right: 10px;
+    }
+    .searchbtn {
+      background: #08143f;
+      color: #ffffff;
+    }
+  }
+  .main {
+    //margin-top: 20px;
+    background: #f9f9f9;
+    //border-radius: 8px;
+    //box-shadow: 0px 2px 20px 0px rgba(238, 238, 238, 0.5);
+
+    .maintop {
+      display: flex;
+      // padding: 10px 0;
+      justify-content: space-between;
+      align-items: center;
+      .mainbtn {
+        .thebtn1 {
+          color: #ffffff;
+          background: #ffad41;
+          width: 68px;
+          height: 32px;
+        }
+        .thebtn2 {
+          color: #ffffff;
+          background: #009b58;
+          width: 68px;
+          height: 32px;
+        }
+        .thebtn3 {
+          color: #ffffff;
+          background: #c8161d;
+          width: 68px;
+          height: 32px;
+        }
+      }
+    }
+  }
+}
+</style>