Merge branch 'bd-test' of gitee.com:cabbage_qd/web-base-admin into bd-online

2025-08-11 09:29:49 +08:00 · 2025-08-11 09:29:49 +08:00 · b95a2cdc08
parent 7fab298715 1027f76147
commit b95a2cdc08
16 changed files with 543 additions and 809 deletions
--- 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://app.beida666.com/#/'
-VUE_APP_APP_ADDRESS = 'http://app.beida666.com/#/'
+VUE_APP_CLIENT_ADDRESS = 'http://t-app.beida666.com/#/'
+VUE_APP_APP_ADDRESS = 'http://t-app.beida666.com/#/'
 # 打包：
 # npm run build:prod

--- 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: '出库单',
--- 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
+  })
 }

-
--- a/src/api/statistics.js
+++ b/src/api/statistics.js
@ -107,19 +107,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
  })
--- 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: "伞下新增安置业绩",
--- a/src/router/index.js
+++ b/src/router/index.js
@ -2258,16 +2258,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
      },
      {
--- 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')
+}
--- 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"
--- a/src/views/information/realInfo/index.vue
+++ b/src/views/information/realInfo/index.vue
@ -36,7 +36,7 @@
            </el-form-item>
          </el-col>
          <el-col :span="4">
-            <el-form-item :label="'真实奖衔'" prop="pkAwards">
+            <el-form-item :label="'荣誉奖衔'" prop="pkAwards">
              <el-select
                v-model="queryParams.pkAwards"
                clearable
@ -125,121 +125,69 @@
            </el-form-item>
          </el-col>
          <el-col :span="4">
-            <el-form-item :label="'详细地址'" prop="accountStatus">
-              <el-cascader
-                v-model="address"
-                class="area"
-                :options="areaData"
-                :placeholder="'请选择省市区'"
-                :props="regionParams"
-                @change="flChange"
-              />
+            <el-form-item :label="'性别'" prop="isMakerSpace">
+              <el-select
+                v-model="queryParams.sex"
+                clearable
+                placeholder=""
+              >
+                <el-option
+                  v-for="item in sexList"
+                  :key="item.value"
+                  :label="item.label"
+                  :value="item.value"
+                />
+              </el-select>
            </el-form-item>
          </el-col>
          <el-col :span="8">
-            <el-form-item class="lefts" prop="parMemberCode">
-              <el-input
-                v-model="queryParams.address"
-                clearable
-                placeholder=""
+            <el-form-item :label="'认证日期'" prop="code">
+              <el-date-picker
+                v-model="queryParams.rzsj"
+                format="yyyy-MM-dd"
+                type="datetimerange"
+                range-separator="——"
+                :start-placeholder="'开始日期'"
+                :end-placeholder="'结束日期'"
+                value-format="yyyy-MM-dd"
+                :unlink-panels="true"
+                @change="changeTime3"
              />
            </el-form-item>
          </el-col>
        </el-row>
        <el-collapse-transition>
          <div v-show="isActive">
-            <el-row>
-              <el-col :span="4">
-                <el-form-item :label="'性别'" prop="isMakerSpace">
-                  <el-select
-                    v-model="queryParams.sex"
-                    clearable
-                    placeholder=""
-                  >
-                    <el-option
-                      v-for="item in sexList"
-                      :key="item.value"
-                      :label="item.label"
-                      :value="item.value"
-                    />
-                  </el-select>
-                </el-form-item>
-              </el-col>
-              <el-col :span="4">
-                <el-form-item :label="'银行名称'" prop="isMakerSpace">
-                  <el-input
-                    v-model="queryParams.bankName"
-                    clearable
-                    placeholder=""
-                  />
-                </el-form-item>
-              </el-col>
-              <el-col :span="4">
-                <el-form-item :label="'支行名称'" prop="parMemberCode">
-                  <el-input
-                    v-model="queryParams.subBankName"
-                    clearable
-                    placeholder=""
-                  />
-                </el-form-item>
-              </el-col>
-              <el-col :span="4">
-                <el-form-item :label="'银行卡号'" prop="parMemberCode">
-                  <el-input
-                    v-model="queryParams.cardNumber"
-                    clearable
-                    placeholder=""
-                  />
-                </el-form-item>
-              </el-col>
-              <el-col :span="8">
-                <el-form-item :label="'认证日期'" prop="code">
-                  <el-date-picker
-                    v-model="queryParams.rzsj"
-                    format="yyyy-MM-dd"
-                    type="datetimerange"
-                    range-separator="——"
-                    :start-placeholder="'开始日期'"
-                    :end-placeholder="'结束日期'"
-                    value-format="yyyy-MM-dd"
-                    :unlink-panels="true"
-                    @change="changeTime3"
-                  />
-                </el-form-item>
-              </el-col>
-            </el-row>
-            <el-row>
-
-              <el-col :span="8">
-                <el-form-item :label="'创建日期'" prop="code">
-                  <el-date-picker
-                    v-model="queryParams.cjsj"
-                    type="datetimerange"
-                    range-separator="——"
-                    format="yyyy-MM-dd"
-                    :start-placeholder="'开始日期'"
-                    :end-placeholder="'结束日期'"
-                    value-format="yyyy-MM-dd"
-                    :unlink-panels="true"
-                    @change="changeTime1"
-                  />
-                </el-form-item>
-              </el-col>
-              <el-col :span="8">
-                <el-form-item :label="'支付日期'" prop="code">
-                  <el-date-picker
-                    v-model="queryParams.zfsj"
-                    type="datetimerange"
-                    range-separator="——"
-                    format="yyyy-MM-dd"
-                    :start-placeholder="'开始日期'"
-                    :end-placeholder="'结束日期'"
-                    value-format="yyyy-MM-dd"
-                    :unlink-panels="true"
-                    @change="changeTime2"
-                  />
-                </el-form-item>
-              </el-col>
+            <el-col :span="8">
+              <el-form-item :label="'创建日期'" prop="code">
+                <el-date-picker
+                  v-model="queryParams.cjsj"
+                  type="datetimerange"
+                  range-separator="——"
+                  format="yyyy-MM-dd"
+                  :start-placeholder="'开始日期'"
+                  :end-placeholder="'结束日期'"
+                  value-format="yyyy-MM-dd"
+                  :unlink-panels="true"
+                  @change="changeTime1"
+                />
+              </el-form-item>
+            </el-col>
+            <el-col :span="8">
+              <el-form-item :label="'支付日期'" prop="code">
+                <el-date-picker
+                  v-model="queryParams.zfsj"
+                  type="datetimerange"
+                  range-separator="——"
+                  format="yyyy-MM-dd"
+                  :start-placeholder="'开始日期'"
+                  :end-placeholder="'结束日期'"
+                  value-format="yyyy-MM-dd"
+                  :unlink-panels="true"
+                  @change="changeTime2"
+                />
+              </el-form-item>
+            </el-col>
            </el-row>
          </div>
        </el-collapse-transition>
@ -344,16 +292,9 @@
            width="180"
          />
          <el-table-column
-            v-if="menuList[3].checked==true&&allTxt.awardsVal"
+            v-if="allTxt.pkAwardsVal"
            align="center"
-            prop="awardsVal"
-            :label="'真实奖衔'"
-            width="180"
-          />
-          <el-table-column
-            v-if="allTxt.pkMaxAwardsVal"
-            align="center"
-            prop="pkMaxAwardsVal"
+            prop="pkAwardsVal"
            :label="'荣誉奖衔'"
            width="180"
          />
@ -390,7 +331,7 @@
              <img :src="scope.row.idFront" style="width: 44px;height: 44px;border-radius: 4px">
            </template>
          </el-table-column>
-          <el-table-column v-if="menuList[9].checked==true&&allTxt.idBack" align="center" prop="idBack" :label="'证件(反面)'" width="200">
+          <el-table-column v-if="allTxt.idBack" align="center" prop="idBack" :label="'证件(反面)'" width="200">
            <template slot-scope="scope">
              <img :src="scope.row.idBack" style="width: 44px;height: 44px;border-radius: 4px">
            </template>
@ -499,12 +440,6 @@ export default {
          checked: true,
          prop: 'pkSettleGrade'
        },
-        {
-          id: 42,
-          text: '真实奖衔',
-          checked: true,
-          prop: 'pkAwards'
-        },
        {
          id: 33,
          text: '性别',
@ -540,60 +475,6 @@ export default {
          text: '证件(反面)',
          checked: true,
          prop: 'idCardBack'
-        },
-        {
-          id: 9,
-          text: '省',
-          checked: true,
-          prop: 'provinceName'
-        },
-        {
-          id: 10,
-          text: '市',
-          checked: true,
-          prop: 'cityName'
-        },
-        {
-          id: 11,
-          text: '区/县',
-          checked: true,
-          prop: 'countyName'
-        },
-        {
-          id: 12,
-          text: '详细地址',
-          checked: true,
-          prop: 'address'
-        },
-        {
-          id: 13,
-          text: '银行名称',
-          checked: true,
-          prop: 'bankName'
-        },
-        {
-          id: 14,
-          text: '支行名称',
-          checked: true,
-          prop: 'subBankName'
-        },
-        {
-          id: 15,
-          text: '开户姓名',
-          checked: true,
-          prop: 'accountName'
-        },
-        {
-          id: 16,
-          text: '预留电话',
-          checked: true,
-          prop: 'reservedPhone'
-        },
-        {
-          id: 17,
-          text: '银行卡号',
-          checked: true,
-          prop: 'cardNumber'
        }

      ],
@ -704,16 +585,21 @@ export default {
      this.queryParams.pkCounty = value[2]
    },
    changeTime3(val) {
-      this.queryParams.startCertificationTime = val[0]
-      this.queryParams.endCertificationTime = val[1]
+      if (val) {
+        this.queryParams.startCertificationTime = val[0]
+        this.queryParams.endCertificationTime = val[1]
+      } else {
+        this.queryParams.startCertificationTime = null
+        this.queryParams.endCertificationTime = null
+      }
    },
    changeTime1(val) {
-      this.queryParams.startCreationTime = val[0]
-      this.queryParams.endCreationTime = val[1]
+      this.queryParams.startCreationTime = val ? val[0] : null
+      this.queryParams.endCreationTime = val ? val[1] : null
    },
    changeTime2(val) {
-      this.queryParams.startPayTime = val[0]
-      this.queryParams.endPayTime = val[1]
+      this.queryParams.startPayTime = val ? val[0] : null
+      this.queryParams.endPayTime = val ? val[1] : null
    },
    // 性别
    getSexs() {
--- a/src/views/settlementCenter/performanceRatio/performanceList.vue
+++ b/src/views/settlementCenter/performanceRatio/performanceList.vue
@ -249,30 +249,16 @@ export default {
          checked: true,
          prop: 'teamName'
        },
-        {
-          id: 28,
-          text: '首购PV拨比(%)',
-          checked: true,
-          prop: 'mainBonusPvRate',
-          total: 'mainBonusPvRateSum'
-        },
-        {
-          id: 29,
-          text: '复购PV拨比(%)',
-          checked: true,
-          prop: 'repurBonusPvRate',
-          total: 'repurBonusPvRateSum'
-        },
        {
          id: 3,
-          text: `${'注册专区'}`,
+          text: `注册专区`,
          checked: true,
          prop: 'mainRegAmount',
          total: 'mainRegAmountSum'
        },
        {
          id: 4,
-          text: `${'升级专区'}`,
+          text: `升级专区`,
          checked: true,
          prop: 'mainUpAmount',
          total: 'mainUpAmountSum'
--- a/src/views/settlementCenter/topPerformance/index.vue
+++ b/src/views/settlementCenter/topPerformance/index.vue
@ -208,20 +208,6 @@ export default {
          checked: true,
          prop: 'teamName'
        },
-        {
-          id: 28,
-          text: '首购PV拨比(%)',
-          checked: true,
-          prop: 'mainBonusPvRate',
-          total: 'mainBonusPvRateSum'
-        },
-        {
-          id: 29,
-          text: '复购PV拨比(%)',
-          checked: true,
-          prop: 'repurBonusPvRate',
-          total: 'repurBonusPvRateSum'
-        },
        {
          id: 3,
          text: `${'注册专区'}`,
--- a/src/views/settlementCenter/topPerformanceTotal/index.vue
+++ b/src/views/settlementCenter/topPerformanceTotal/index.vue
@ -240,21 +240,17 @@ export default {
          prop: 'memberName'
        },
        {
-          text: `${'首购金额'}(￥)`,
+          text: `${'首购金额'}`,
          prop: 'firstPurchaseAll'
        },
        {
-          text: `首购奖金(￥)`,
+          text: `首购奖金`,
          prop: 'mainBonus'
        },
        {
          text: `首购金额拨比(%)`,
          prop: 'mainBonusRate'
        },
-        {
-          text: '首购PV拨比(%)',
-          prop: 'mainBonusPvRate'
-        },
        {
          text: '直推拨比(%)',
          prop: 'introduceBonusRate'
@ -272,21 +268,18 @@ export default {
          prop: 'serviceBonusRate'
        },
        {
-          text: '复购金额(￥)',
+          text: '复购金额',
          prop: 'repurchaseAllAmount'
        },
        {
-          text: '复购奖金(￥)',
+          text: '复购奖金',
          prop: 'repurBonus'
        },
        {
          text: '复购金额拨比(%)',
          prop: 'repurBonusRate'
        },
-        {
-          text: '复购PV拨比(%)',
-          prop: 'repurBonusPvRate'
-        },
+
        {
          text: '复购级差拨比(%)',
          prop: 'repurRangeBonusRate'
--- a/src/views/statistics/productSaleStatistics.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>
@ -68,8 +60,8 @@
    <div class="main">
      <div class="maintop">
        <div class="mainbtn">
-          <el-button size="small" class="thebtn1" @click="handleExport">
-            {{ '导出' }}</el-button>
+          <el-button v-hasButtons="['ProductSaleStatisticsExport']" size="small" class="thebtn1" @click="handleExport">
+            导出</el-button>
        </div>
      </div>
      <div class="maintable">
@ -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: 'productSaleStatistics',
      topList: [
        {
-          name: '出货明细汇总统计',
-          path: 'shippingSummaryDetail'
+          name: '产品销售统计',
+          path: 'productSaleStatistics'
        }
      ],
      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;
 }
--- a/src/views/statistics/productSaleStatisticsDetail.vue
+++ 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 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>
--- a/src/views/statistics/shippingSummary.vue
+++ b/src/views/statistics/shippingSummary.vue
@ -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>
-      
--- a/vue.config.js
+++ b/vue.config.js
@ -44,9 +44,11 @@ module.exports = {
    },
    proxy: {
      '/prod-api': {
-        target: 'https://t-mana.beida666.com/',
-        changeOrigin: true
-
+        target: 'http://localhost:8080/',
+        changeOrigin: true,
+        pathRewrite: {
+          '^/prod-api': ''
+        }
      }
    }
    // proxy: {