From 4ff36649632c609587f5896dbab791501eb62200 Mon Sep 17 00:00:00 2001
From: woody <woody@gmail.com>
Date: Thu, 24 Apr 2025 19:37:56 +0800
Subject: [PATCH 1/6] =?UTF-8?q?chore(env):=20=E6=9B=B4=E6=96=B0=E7=94=9F?=
 =?UTF-8?q?=E4=BA=A7=E7=8E=AF=E5=A2=83=E5=AE=A2=E6=88=B7=E7=AB=AF=E7=99=BB?=
 =?UTF-8?q?=E5=BD=95=E5=9C=B0=E5=9D=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .env.production | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.env.production b/.env.production
index 28ab620..402a0de 100644
--- a/.env.production
+++ b/.env.production
@@ -3,8 +3,8 @@ ENV = 'production'
 
 # base api
 VUE_APP_BASE_API = '/prod-api'
-VUE_APP_CLIENT_ADDRESS = 'http://t-app.beida413.com/#/'
-VUE_APP_APP_ADDRESS = 'http://t-app.beida413.com/#/'
+VUE_APP_CLIENT_ADDRESS = 'http://app.beida413.com/#/'
+VUE_APP_APP_ADDRESS = 'http://app.beida413.com/#/'
 # 打包：
 # npm run build:prod
 

From 7bb1edc0ff61795629a6eed49c1870cea4944750 Mon Sep 17 00:00:00 2001
From: woody <woody@163>
Date: Tue, 3 Jun 2025 09:10:30 +0800
Subject: [PATCH 2/6] =?UTF-8?q?fix(underDirect):=20=E4=BF=AE=E5=A4=8D?=
 =?UTF-8?q?=E4=BC=9E=E4=B8=8B=E4=BC=9A=E5=91=98=E7=BC=96=E5=8F=B7=E6=97=A0?=
 =?UTF-8?q?=E6=B3=95=E7=BC=96=E8=BE=91=20bug-140?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/announcement/noticeList/details.vue | 8 ++++----
 src/views/statistics/underDirectAdd.vue       | 3 ++-
 src/views/statistics/underDirectAddNew.vue    | 3 ++-
 src/views/statistics/underPlacementPer.vue    | 3 ++-
 src/views/statistics/underPlacementPerNew.vue | 3 ++-
 5 files changed, 12 insertions(+), 8 deletions(-)

diff --git a/src/views/announcement/noticeList/details.vue b/src/views/announcement/noticeList/details.vue
index 438e189..b61f64e 100644
--- a/src/views/announcement/noticeList/details.vue
+++ b/src/views/announcement/noticeList/details.vue
@@ -295,10 +295,10 @@ export default {
           label: '会员系统',
           value: 0
         },
-        {
-          label: '海圣优选',
-          value: 1
-        },
+        // {
+        //   label: '海圣优选',
+        //   value: 1
+        // },
         {
           label: '全部',
           value: 9
diff --git a/src/views/statistics/underDirectAdd.vue b/src/views/statistics/underDirectAdd.vue
index 382d1ef..891961b 100644
--- a/src/views/statistics/underDirectAdd.vue
+++ b/src/views/statistics/underDirectAdd.vue
@@ -280,7 +280,8 @@ export default {
     return {
       creationTime: [],
       select: {
-        orderType: 1
+        orderType: 1,
+        memberCode: ''
       },
       // 查询参数
       queryParams: {
diff --git a/src/views/statistics/underDirectAddNew.vue b/src/views/statistics/underDirectAddNew.vue
index 128a321..3489f51 100644
--- a/src/views/statistics/underDirectAddNew.vue
+++ b/src/views/statistics/underDirectAddNew.vue
@@ -240,7 +240,8 @@ export default {
     return {
       creationTime: [],
       select: {
-        orderType: 1
+        orderType: 1,
+        memberCode: ''
       },
       // 查询参数
       queryParams: {
diff --git a/src/views/statistics/underPlacementPer.vue b/src/views/statistics/underPlacementPer.vue
index dbc37b6..2a32d4b 100644
--- a/src/views/statistics/underPlacementPer.vue
+++ b/src/views/statistics/underPlacementPer.vue
@@ -282,7 +282,8 @@ export default {
       queryParams: {
         pageNum: 1,
         pageSize: 50,
-        thetimes: []
+        thetimes: [],
+        memberCode: ''
       },
       total: 0,
       multipleSelection: [],
diff --git a/src/views/statistics/underPlacementPerNew.vue b/src/views/statistics/underPlacementPerNew.vue
index 6afdbca..8f7b975 100644
--- a/src/views/statistics/underPlacementPerNew.vue
+++ b/src/views/statistics/underPlacementPerNew.vue
@@ -279,7 +279,8 @@ export default {
       queryParams: {
         pageNum: 1,
         pageSize: 50,
-        thetimes: []
+        thetimes: [],
+        memberCode: ''
       },
       total: 0,
       multipleSelection: [],

From 3e507f9367217ee01d1c61b6590697ae3b712a0c Mon Sep 17 00:00:00 2001
From: woody <woody@163>
Date: Thu, 7 Aug 2025 16:58:55 +0800
Subject: [PATCH 3/6] =?UTF-8?q?fix(yihandeled):=20=E6=B5=B7=E4=B9=8B?=
 =?UTF-8?q?=E5=9C=A3=E6=96=87=E6=A1=88=E6=9B=BF=E6=8D=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/Delivery/yihandeled.vue | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/src/components/Delivery/yihandeled.vue b/src/components/Delivery/yihandeled.vue
index f0e7644..f8f9e8e 100644
--- a/src/components/Delivery/yihandeled.vue
+++ b/src/components/Delivery/yihandeled.vue
@@ -521,15 +521,13 @@
             <div class="rowcontent" style="width: 260px">制单人：</div>
             <div class="rowcontent" style="width: 260px">出库人：</div>
             <div class="rowcontent" style="width: 260px">出库时间：</div>
-            <div class="rowcontent" style="width: 260px">
-              客服热线：4001112818
-            </div>
+
           </div>
           <div>
             <span style="font-weight: bold; font-size: 12px">温馨提示：</span>
             <span
               style="font-size:10px;!important"
-            >尊敬的各位家人，感谢您长期以来对海之圣的支持与厚爱，当您收到货物时，请检查货物是否有破损，当场开箱验货确认无误后再签收哦，如有问题请第一时间致电公司客服热线，我们将一如既往的为您提供优质、快捷的物流服务。</span>
+            >尊敬的各位家人，感谢您长期以来对北方大陆的支持与厚爱，当您收到货物时，请检查货物是否有破损，当场开箱验货确认无误后再签收哦，如有问题请第一时间致电公司客服热线，我们将一如既往的为您提供优质、快捷的物流服务。</span>
           </div>
           <div style="page-break-after: always" />
         </div>
@@ -666,7 +664,7 @@
             <span style="font-weight: bold; font-size: 12px">温馨提示：</span>
             <span
               style="font-size:10px;!important"
-            >尊敬的各位家人，感谢您长期以来对海之圣的支持与厚爱，当您收到货物时，请检查货物是否有破损，当场开箱验货确认无误后再签收哦，如有问题请第一时间致电公司客服热线，我们将一如既往的为您提供优质、快捷的物流服务。</span>
+            >尊敬的各位家人，感谢您长期以来对北方大陆的支持与厚爱，当您收到货物时，请检查货物是否有破损，当场开箱验货确认无误后再签收哦，如有问题请第一时间致电公司客服热线，我们将一如既往的为您提供优质、快捷的物流服务。</span>
           </div>
           <div style="page-break-after: always" />
         </div>

From 8d70c09f9a74790b067f52aab7bc8e68304c08b0 Mon Sep 17 00:00:00 2001
From: woody <woody@163>
Date: Thu, 7 Aug 2025 17:10:55 +0800
Subject: [PATCH 4/6] =?UTF-8?q?fix(yihandeled):=20=E5=87=BA=E5=BA=93?=
 =?UTF-8?q?=E6=B1=87=E6=80=BB=E5=8D=95=E5=AE=A2=E6=9C=8D=E7=94=B5=E8=AF=9D?=
 =?UTF-8?q?=E6=9B=B4=E6=96=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/Delivery/yihandeled.vue | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/components/Delivery/yihandeled.vue b/src/components/Delivery/yihandeled.vue
index f8f9e8e..f206e6e 100644
--- a/src/components/Delivery/yihandeled.vue
+++ b/src/components/Delivery/yihandeled.vue
@@ -521,7 +521,9 @@
             <div class="rowcontent" style="width: 260px">制单人：</div>
             <div class="rowcontent" style="width: 260px">出库人：</div>
             <div class="rowcontent" style="width: 260px">出库时间：</div>
-
+            <div class="rowcontent" style="width: 260px">
+              客服热线：4001112818
+            </div>
           </div>
           <div>
             <span style="font-weight: bold; font-size: 12px">温馨提示：</span>
@@ -656,7 +658,7 @@
             <div class="rowcontent" style="width: 260px">出库人：</div>
 
             <div class="rowcontent" style="width: 260px">
-              客服热线：4001112818
+              客服热线：4007655887
             </div>
             <div class="rowcontent" style="width: 260px" />
           </div>

From 752a779c6010fe126833f80c229d5d3c1785abde Mon Sep 17 00:00:00 2001
From: woody <woody@163>
Date: Thu, 7 Aug 2025 17:11:56 +0800
Subject: [PATCH 5/6] =?UTF-8?q?fix(yihandeled):=20=E6=9B=B4=E6=96=B0?=
 =?UTF-8?q?=E5=AE=A2=E6=9C=8D=E7=83=AD=E7=BA=BF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/Delivery/yihandeled.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/components/Delivery/yihandeled.vue b/src/components/Delivery/yihandeled.vue
index f206e6e..1ddf2d6 100644
--- a/src/components/Delivery/yihandeled.vue
+++ b/src/components/Delivery/yihandeled.vue
@@ -522,7 +522,7 @@
             <div class="rowcontent" style="width: 260px">出库人：</div>
             <div class="rowcontent" style="width: 260px">出库时间：</div>
             <div class="rowcontent" style="width: 260px">
-              客服热线：4001112818
+              客服热线：4007655887
             </div>
           </div>
           <div>

From ad344b9f82ed0e0de1887107bfff1bcf957dc851 Mon Sep 17 00:00:00 2001
From: woody <woody@163>
Date: Fri, 8 Aug 2025 14:37:30 +0800
Subject: [PATCH 6/6] =?UTF-8?q?feat(productSale):=20=E4=BA=A7=E5=93=81?=
 =?UTF-8?q?=E9=94=80=E5=94=AE=E7=BB=9F=E8=AE=A1=E5=88=97=E8=A1=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 i8n.js                                        |   2 +-
 src/api/logistics.js                          | 209 +++++------
 src/api/statistics.js                         |   8 +-
 src/assets/languages/zhCn.js                  |   2 +-
 src/router/index.js                           |  16 +-
 src/utils/date.js                             |   9 +
 src/views/goodsManage/productList/index.vue   |  11 +
 ...ryDetail.vue => productSaleStatistics.vue} | 207 +++++-----
 .../productSaleStatisticsDetail.vue           | 217 +++++++++++
 src/views/statistics/shippingSummary.vue      | 354 ------------------
 10 files changed, 458 insertions(+), 577 deletions(-)
 rename src/views/statistics/{shippingSummaryDetail.vue => productSaleStatistics.vue} (59%)
 create mode 100644 src/views/statistics/productSaleStatisticsDetail.vue
 delete mode 100644 src/views/statistics/shippingSummary.vue

diff --git a/i8n.js b/i8n.js
index b33651b..fd50653 100644
--- a/i8n.js
+++ b/i8n.js
@@ -53,7 +53,7 @@ module.exports = {
   CK_KS_121: '订单开票',
   CK_KS_122: '伞下新增安置业绩',
   CK_KS_123: '订单日期',
-  CK_KS_124: '出货明细汇总统计',
+  CK_KS_124: '产品销售统计',
   CK_KS_125: '报单汇总',
   CK_KS_126: '累计金额',
   CK_KS_127: '出库单',
diff --git a/src/api/logistics.js b/src/api/logistics.js
index e459b71..a2eed7b 100644
--- a/src/api/logistics.js
+++ b/src/api/logistics.js
@@ -2,76 +2,73 @@ import request from '@/utils/request'
 
 // 商品订单列表接口
 export function getOrderLists(params) {
-    return request({
-        url: '/sale/manage/order/order-invoicing-list',
-        method: 'get',
-        params
-    })
+  return request({
+    url: '/sale/manage/order/order-invoicing-list',
+    method: 'get',
+    params
+  })
 }
 export function getOrderList(params) {
-    return request({
-        url: '/sale/manage/order/query-order-list',
-        method: 'get',
-        params
-    })
+  return request({
+    url: '/sale/manage/order/query-order-list',
+    method: 'get',
+    params
+  })
 }
 // 查看商品订单列表接口
 export function getFindOrderList(params) {
-    return request({
-        url: '/sale/manage/order/get-order-list',
-        method: 'get',
-        params
-    })
+  return request({
+    url: '/sale/manage/order/get-order-list',
+    method: 'get',
+    params
+  })
 }
 
-//订单类型枚举
+// 订单类型枚举
 export function getOrderType(params) {
-    return request({
-        url: '/system/pub/enums/order-type',
-        method: 'get',
-        params
-    })
+  return request({
+    url: '/system/pub/enums/order-type',
+    method: 'get',
+    params
+  })
 }
-//撤单类型枚举
+// 撤单类型枚举
 export function getCancleType(params) {
-    return request({
-        url: 'system/pub/enums/cancel-the-order',
-        method: 'get',
-        params
-    })
+  return request({
+    url: 'system/pub/enums/cancel-the-order',
+    method: 'get',
+    params
+  })
 }
 
-//出货明细汇总统计订单类型下拉选
+// 产品销售统计订单类型下拉选
 export function getOrderTypeRepurchaseAll(params) {
-    return request({
-        url: '/system/pub/enums/order-shipment',
-        method: 'get',
-        params
-    })
+  return request({
+    url: '/system/pub/enums/order-shipment',
+    method: 'get',
+    params
+  })
 }
 
-
-
-//伞下直推新增业绩-订单类型下拉选
+// 伞下直推新增业绩-订单类型下拉选
 export function getUnderAddOrderType(params) {
-    return request({
-        url: '/system/pub/enums/order-business',
-        method: 'get',
-        params
-    })
+  return request({
+    url: '/system/pub/enums/order-business',
+    method: 'get',
+    params
+  })
 }
 
-//伞下直推新增业绩（新）订单类型下拉选
+// 伞下直推新增业绩（新）订单类型下拉选
 export function getUnderAddOrderTypeNew(params) {
-    return request({
-        url: '/system/pub/enums/orderUp-business',
-        method: 'get',
-        params
-    })
+  return request({
+    url: '/system/pub/enums/orderUp-business',
+    method: 'get',
+    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,87 +85,83 @@ export function getYieldStatus(params) {
   })
 }
 
-//发货方式
+// 发货方式
 export function getDeliveryList(params) {
-    return request({
-        url: '/system/pub/enums/delivery-list',
-        method: 'get',
-        params
-    })
+  return request({
+    url: '/system/pub/enums/delivery-list',
+    method: 'get',
+    params
+  })
 }
 
-
-
-//支付方式
+// 支付方式
 export function getOrderPayType(params) {
-    return request({
-        url: '/system/pub/enums/order-pay-type',
-        method: 'get',
-        params
-    })
+  return request({
+    url: '/system/pub/enums/order-pay-type',
+    method: 'get',
+    params
+  })
 }
 
-//查询自提清单
+// 查询自提清单
 export function getOrderSelfList(data) {
-    return request({
-        url: '/sale/manage/order-business/self-list?pageNum=' + data.pageNum + '&pageSize=' + data.pageSize,
-        method: 'post',
-        data
-    })
+  return request({
+    url: '/sale/manage/order-business/self-list?pageNum=' + data.pageNum + '&pageSize=' + data.pageSize,
+    method: 'post',
+    data
+  })
 }
 
-//自提清单-同意1/驳回3
+// 自提清单-同意1/驳回3
 export function selfApprove(data) {
-    return request({
-        url: '/sale/manage/order-business/self-approve',
-        method: 'post',
-        data
-    })
+  return request({
+    url: '/sale/manage/order-business/self-approve',
+    method: 'post',
+    data
+  })
 }
 
-
-//查询修改地址列表
+// 查询修改地址列表
 export function getModifyAddress(params) {
-    return request({
-        url: '/member/manage/self-modify-address/list',
-        method: 'get',
-        params
-    })
+  return request({
+    url: '/member/manage/self-modify-address/list',
+    method: 'get',
+    params
+  })
 }
 
-//自提清单-申请自提
+// 自提清单-申请自提
 export function saveSelfOrder(data) {
-    return request({
-        url: '/sale/manage/order-business/self-order',
-        method: 'post',
-        data
-    })
+  return request({
+    url: '/sale/manage/order-business/self-order',
+    method: 'post',
+    data
+  })
 }
-//修改地址查询详情
+// 修改地址查询详情
 export function queryPass(data) {
-    return request({
-        url: '/member/manage/self-modify-address/queryPass',
-        method: 'post',
-        data
-    })
+  return request({
+    url: '/member/manage/self-modify-address/queryPass',
+    method: 'post',
+    data
+  })
 }
 
-//修改地址驳回
+// 修改地址驳回
 export function rejectAddress(data) {
-    return request({
-        url: '/member/manage/self-modify-address/reject',
-        method: 'post',
-        data
-    })
+  return request({
+    url: '/member/manage/self-modify-address/reject',
+    method: 'post',
+    data
+  })
 }
 
-//订单添加开票备注
+// 订单添加开票备注
 export function updateOrderRemarks(data) {
-    return request({
-        url: '/sale/manage/order/update-order-remarks',
-        method: 'post',
-        data
-    })
+  return request({
+    url: '/sale/manage/order/update-order-remarks',
+    method: 'post',
+    data
+  })
 }
 
-
diff --git a/src/api/statistics.js b/src/api/statistics.js
index 3e7a050..5636375 100644
--- a/src/api/statistics.js
+++ b/src/api/statistics.js
@@ -125,19 +125,19 @@ 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
   })
diff --git a/src/assets/languages/zhCn.js b/src/assets/languages/zhCn.js
index 281f0b2..9a9fa3d 100644
--- a/src/assets/languages/zhCn.js
+++ b/src/assets/languages/zhCn.js
@@ -1443,7 +1443,7 @@ const zhCn = {
     PleaseEnterTheDetailedAddress: "请输入详细地址",
     PrefectureAndCity: "地市",
     districtAndCounty: "区县",
-    ShipmentDetailsSummaryStatistics: "出货明细汇总统计",
+    ShipmentDetailsSummaryStatistics: "产品销售统计",
     ConsumptionType: "消费类型",
     quantity: "数量",
     NewResettlementPerformanceUnderTheUmbrella: "伞下新增安置业绩",
diff --git a/src/router/index.js b/src/router/index.js
index 1b7fe34..5701616 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -2252,16 +2252,16 @@ export const constantRoutes = [
         meta: { title: '伞下直推' }
       },
       {
-        path: 'shippingSummary',
-        name: 'ShippingSummary',
-        component: () => import('@/views/statistics/shippingSummary'),
-        meta: { title: '出货明细汇总统计' }
+        path: 'productSaleStatistics',
+        name: 'ProductSaleStatistics',
+        component: () => import('@/views/statistics/productSaleStatistics'),
+        meta: { title: '产品销售统计' }
       },
       {
-        path: 'shippingSummaryDetail',
-        name: 'ShippingSummaryDetail',
-        component: () => import('@/views/statistics/shippingSummaryDetail'),
-        meta: { title: '出货明细汇总统计' },
+        path: 'productSaleStatisticsDetail',
+        name: 'ProductSaleStatisticsDetail',
+        component: () => import('@/views/statistics/productSaleStatisticsDetail'),
+        meta: { title: '产品销售统计详情' },
         hidden: true
       },
       {
diff --git a/src/utils/date.js b/src/utils/date.js
index fc15ef7..a89836b 100644
--- a/src/utils/date.js
+++ b/src/utils/date.js
@@ -4,3 +4,12 @@ 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')
+}
diff --git a/src/views/goodsManage/productList/index.vue b/src/views/goodsManage/productList/index.vue
index d374ba4..5c7c800 100644
--- a/src/views/goodsManage/productList/index.vue
+++ b/src/views/goodsManage/productList/index.vue
@@ -21,6 +21,11 @@
                 <el-input v-model="select.productCode" clearable />
               </el-form-item>
             </el-col>
+            <el-col :span="4">
+              <el-form-item label="仓储编号">
+                <el-input v-model="select.wmsCode" clearable />
+              </el-form-item>
+            </el-col>
             <el-col :span="4">
               <el-form-item :label="'产品属性'">
                 <el-select v-model="select.productAttr" clearable>
@@ -271,6 +276,12 @@
             width="120"
             :label="'产品编号'"
           />
+          <el-table-column
+            align="center"
+            prop="wmsCode"
+            width="120"
+            label="仓储编号"
+          />
           <el-table-column
             align="center"
             prop="custName"
diff --git a/src/views/statistics/shippingSummaryDetail.vue b/src/views/statistics/productSaleStatistics.vue
similarity index 59%
rename from src/views/statistics/shippingSummaryDetail.vue
rename to src/views/statistics/productSaleStatistics.vue
index 60eceb7..8ca8092 100644
--- a/src/views/statistics/shippingSummaryDetail.vue
+++ b/src/views/statistics/productSaleStatistics.vue
@@ -9,41 +9,33 @@
       <el-form label-width="100px">
         <el-row>
           <el-col :span="4">
-            <el-form-item :label="'产品名称'" prop="productName">
-              <el-input v-model="queryParams.productName" clearable />
+            <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="4">
-            <el-form-item :label="'产品分类'" prop="pkClassify">
-              <el-select
-                v-model="queryParams.pkClassify"
-                clearable
-                :placeholder="'请选择'"
-              >
-                <el-option
-                  v-for="item in classifyAllList"
-                  :key="item.pkId"
-                  :label="item.name"
-                  :value="item.pkId"
-                />
-              </el-select>
-            </el-form-item>
-          </el-col>
-          <el-col :span="4">
-            <el-form-item :label="'荣誉奖衔'" prop="pkAwards">
-              <el-select
-                v-model="queryParams.pkAwards"
-                clearable
-                :placeholder="'请选择'"
-              >
-                <el-option
-                  v-for="item in awardsList"
-                  :key="item.pkId"
-                  :label="item.awardsName"
-                  :value="item.pkId"
-                />
-              </el-select>
+          <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">
@@ -58,7 +50,7 @@
                 "
               >
                 {{ '搜索' }}</el-button>
-              <el-button class="my_reset" @click="reChongzhi">
+              <el-button class="my_reset" @click="resetHandle">
                 {{ '重置' }}</el-button>
             </div>
           </el-col>
@@ -82,58 +74,40 @@
           @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="'产品编号'"
+            label="产品编号"
           />
           <el-table-column
             align="center"
             prop="productName"
-            :label="'产品名称'"
+            label="产品名称"
             min-width="180px"
           />
-          <el-table-column
-            align="center"
-            prop="classifyName"
-            :label="'产品分类'"
-          />
-          <el-table-column
-            align="center"
-            prop="price"
-            :label="'产品价格' + `(${isLocalSymbol()})`"
-          >
-            <template slot-scope="scope">
-              {{ scope.row.price | numFilter }}
-            </template>
-          </el-table-column>
-          <el-table-column
-            align="center"
-            prop="awardsName"
-            :label="'荣誉奖衔'"
-          />
-          <el-table-column
-            align="center"
-            prop="awardsPrice"
-            :label="'奖衔' + '价格' + `(${isLocalSymbol()})`"
-          >
-            <template slot-scope="scope">
-              {{ (scope.row.awardsPrice | numFilter) || "0.00" }}
-            </template>
-          </el-table-column>
           <el-table-column
             align="center"
             prop="quantity"
-            :label="'数量'"
+            label="销量"
           />
-
           <el-table-column
             align="center"
-            prop="priceTotal"
-            :label="'总价格' + `(${isLocalSymbol()})`"
+            prop="colsele"
+            label="操作"
           >
             <template slot-scope="scope">
-              {{ scope.row.priceTotal | numFilter }}
+              <el-button
+                type="text"
+                style="color: #48b2fd; padding: 0"
+                @click.native.prevent="goDetail(scope.row)"
+              >
+                查看详情
+              </el-button>
             </template>
           </el-table-column>
         </el-table>
@@ -152,11 +126,16 @@
 <script>
 import topBar from '@/components/topBar'
 import * as sta from '@/api/statistics'
-import * as del from '@/api/delivery.js'
-import { getAwardsListChiose } from '@/api/level'
+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: 'ShippingSummaryDetail',
+  name: 'ProductSaleStatistics',
   components: {
     topBar
   },
@@ -169,47 +148,59 @@ export default {
   },
   data() {
     return {
-      moren: 'shippingSummaryDetail',
+      moren: 'productSaleStatisticsDetail',
       topList: [
         {
-          name: '出货明细汇总统计',
-          path: 'shippingSummaryDetail'
+          name: '产品销售统计',
+          path: 'productSaleStatisticsDetail'
         }
       ],
       tableData: [],
       loading: false,
       queryParams: {
         pageNum: 1,
-        pageSize: 50,
-        pkProduct: '',
-        orderType: ''
+        pageSize: 50
+      },
+      timeRange: [
+        getMonthFirstDay(),
+        getMonthLastDay()
+      ],
+      select: {
+        ...initSearch
       },
       total: 0,
-      pkProduct: '',
       multipleSelection: [],
-      classifyAllList: [],
-      awardsList: [],
-      params: {}
+      orderTypeList: []
     }
   },
   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()
     this.getOthers()
   },
   methods: {
     isLocalSymbol,
     isLocals,
-    getOthers() {
-      // 获取产品分类
-      del.getClassifyAll().then((res) => {
-        this.classifyAllList = res.data
+    goDetail(val) {
+      this.$router.push({
+        path: 'productSaleStatisticsDetail',
+        query: {
+          params: JSON.stringify({
+            ...this.select,
+            wmsCode: val.wmsCode,
+            startTime: this.timeRange[0],
+            endTime: this.timeRange[1]
+          })
+        }
       })
-      getAwardsListChiose().then((res) => {
-        this.awardsList = res.rows
+    },
+    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
       })
     },
     // 导出
@@ -220,29 +211,43 @@ export default {
         type: 'warning'
       }).then((_) => {
         this.download(
-          '/report/manager/member-report/product-shipping-details-info-list-export',
-          { ...this.queryParams },
-          `${'出货明细汇总统计'}${new Date().getTime()}.xlsx`
+          '/report/manager/member-report/product-shipping-export',
+          Object.assign({}, this.queryParams, this.select),
+          `${'产品销售统计'}${new Date().getTime()}.xlsx`
         )
       })
     },
     handleSelectionChange(val) {
       this.multipleSelection = val
     },
-    reChongzhi() {
+    resetHandle() {
       this.queryParams = {
         pageNum: 1,
-        pageSize: 50,
-        pkProduct: ''
+        pageSize: 50
+      }
+
+      this.timeRange = [
+        getMonthFirstDay(),
+        getMonthLastDay()
+      ]
+      this.select = {
+        ...initSearch,
+        startTime: this.timeRange[0],
+        endTime: this.timeRange[1]
       }
       this.getSearch()
     },
     getSearch() {
       this.loading = true
-      this.queryParams.pkProduct = this.pkProduct
-      sta.getShippingSummaryDetail(Object.assign({}, this.queryParams, this.params)).then((res) => {
+      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) {
+        if (res.code === 200) {
           this.tableData = res.rows
           this.total = res.total
         }
@@ -255,7 +260,7 @@ export default {
 }
 </script>
 
-        <style lang="scss" scoped>
+      <style lang="scss" scoped>
 ::v-deep .el-image-viewer__close {
   right: 500px;
 }
diff --git a/src/views/statistics/productSaleStatisticsDetail.vue b/src/views/statistics/productSaleStatisticsDetail.vue
new file mode 100644
index 0000000..b12450d
--- /dev/null
+++ b/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 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>
diff --git a/src/views/statistics/shippingSummary.vue b/src/views/statistics/shippingSummary.vue
deleted file mode 100644
index 390d8c7..0000000
--- a/src/views/statistics/shippingSummary.vue
+++ /dev/null
@@ -1,354 +0,0 @@
-<template>
-  <div class="page">
-    <topBar
-      v-if="topList.length > 0"
-      :topList="topList"
-      :moren="moren"
-    ></topBar>
-    <div class="thetopbox">
-      <el-form label-width="100px">
-        <el-row>
-          <el-col :span="4">
-            <el-form-item :label="'产品名称'" prop="productName">
-              <el-input clearable v-model="select.productName"></el-input>
-            </el-form-item>
-          </el-col>
-
-          <el-col :span="4">
-            <el-form-item :label="'订单类型'" prop="orderType">
-              <el-select
-                clearable
-                :placeholder="'请选择'"
-                v-model="select.orderType"
-              >
-                <el-option
-                  v-for="item in orderTypeList"
-                  :key="item.value"
-                  :label="item.label"
-                  :value="item.value"
-                ></el-option>
-              </el-select>
-            </el-form-item>
-          </el-col>
-          <el-col :span="8">
-            <el-form-item :label="'订单日期'" prop="thetimes">
-              <el-date-picker
-                v-model="select.thetimes"
-                @change="changeTime"
-                value-format="yyyy-MM-dd"
-                type="daterange"
-                :clearable="false"
-                :range-separator="'至'"
-                :start-placeholder="'开始日期'"
-                :end-placeholder="'结束日期'"
-              >
-              </el-date-picker>
-            </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="reChongzhi">
-                {{ '重置' }}</el-button
-              >
-            </div>
-          </el-col>
-        </el-row>
-      </el-form>
-    </div>
-    <div class="main">
-      <div class="maintop">
-        <div class="mainbtn">
-          <el-button size="small" class="thebtn1" @click="handleExport">
-            {{ '导出' }}</el-button
-          >
-        </div>
-      </div>
-      <div class="maintable">
-        <el-table
-          :data="tableData"
-          v-loading="loading"
-          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>
-          <el-table-column
-            align="center"
-            prop="productCode"
-            :label="'产品编号'"
-          >
-          </el-table-column>
-          <el-table-column
-            align="center"
-            prop="productName"
-            :label="'产品名称'"
-            min-width="180px"
-          >
-          </el-table-column>
-          <el-table-column
-            align="center"
-            prop="classifyName"
-            :label="'产品分类'"
-          >
-          </el-table-column>
-
-          <!-- <el-table-column
-            align="center"
-            prop="productPrice"
-            :label="'产品价格' + `(${isLocalSymbol()})`"
-          >
-            <template slot-scope="scope">
-              {{ scope.row.productPrice | numFilter }}
-            </template>
-          </el-table-column> -->
-          <el-table-column
-            align="center"
-            prop="productUnit"
-            :label="'产品单位'"
-          >
-          </el-table-column>
-          <el-table-column
-            align="center"
-            prop="orderTypeStr"
-            :label="'订单类型'"
-          >
-          </el-table-column>
-          <el-table-column
-            align="center"
-            prop="quantity"
-            :label="'数量'"
-          >
-          </el-table-column>
-
-          <el-table-column
-            align="center"
-            prop="productTotalPrice"
-            :label="'合计' + '价格' + `(${isLocalSymbol()})`"
-          >
-            <template slot-scope="scope">
-              {{ scope.row.productTotalPrice | numFilter }}
-            </template>
-          </el-table-column>
-          <el-table-column
-            align="center"
-            prop="colsele"
-            :label="'操作'"
-          >
-            <template slot-scope="scope">
-              <el-button
-                @click.native.prevent="goDetail(scope.row)"
-                type="text"
-                style="color: #48b2fd; padding: 0"
-              >
-                {{ '查看详情' }}
-              </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";
-export default {
-  name: "ShippingSummaryDetail",
-  components: {
-    topBar,
-  },
-  filters: {
-    numFilter(value) {
-      // 截取当前数据到小数点后两位
-      let realVal = parseFloat(value).toFixed(2);
-      return realVal;
-    },
-  },
-  data() {
-    return {
-      moren: "shippingSummaryDetail",
-      topList: [
-        {
-          name: '出货明细汇总统计',
-          path: "shippingSummaryDetail",
-        },
-      ],
-      tableData: [],
-      loading: false,
-      queryParams: {
-        pageNum: 1,
-        pageSize: 50,
-      },
-      select: {
-        thetimes: [],
-      },
-      total: 0,
-      multipleSelection: [],
-      orderTypeList: [],
-    };
-  },
-  created() {
-    this.getSearch();
-    this.getOthers();
-  },
-  methods: {
-    isLocalSymbol,
-    isLocals,
-    goDetail(val) {
-      this.$router.push({
-        path: "shippingSummaryDetail",
-        query: {
-          pkProduct: val.pkProduct,
-          orderType: val.orderType,
-          params: JSON.stringify(this.select),
-        },
-      });
-    },
-    changeTime(val) {
-      this.select.startTime=val ? val[0] : "";
-      this.select.endTime =val? val[1] : "";
-    },
-    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-details-export",
-          Object.assign({}, this.queryParams, this.select),
-          `${'出货明细汇总统计'}${new Date().getTime()}.xlsx`
-        );
-      });
-    },
-    handleSelectionChange(val) {
-      this.multipleSelection = val;
-    },
-    reChongzhi() {
-      this.queryParams = {
-        pageNum: 1,
-        pageSize: 50,
-      };
-      this.select={}
-      this.getSearch();
-    },
-    getSearch() {
-      this.loading = true;
-      sta.getShippingSummary(Object.assign({}, this.queryParams, this.select)).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>
-      
\ No newline at end of file