diff --git a/.env.production b/.env.production index 39f37af..46bb6f4 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://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 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 4f4bd54..ecb4419 100644 --- 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 }) 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 87f0f97..fe20997 100644 --- 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 }, { 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 @@ + + + + + @@ -271,6 +276,12 @@ width="120" :label="'产品编号'" /> + - + - - + + + + - - +
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + +
@@ -344,16 +292,9 @@ width="180" /> - @@ -390,7 +331,7 @@ - + @@ -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() { diff --git a/src/views/settlementCenter/performanceRatio/performanceList.vue b/src/views/settlementCenter/performanceRatio/performanceList.vue index 8ad2ea2..1d0b485 100644 --- 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' diff --git a/src/views/settlementCenter/topPerformance/index.vue b/src/views/settlementCenter/topPerformance/index.vue index 489abcc..3cb48f3 100644 --- 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: `${'注册专区'}`, diff --git a/src/views/settlementCenter/topPerformanceTotal/index.vue b/src/views/settlementCenter/topPerformanceTotal/index.vue index b17e439..f58f5d2 100644 --- 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' diff --git a/src/views/statistics/shippingSummaryDetail.vue b/src/views/statistics/productSaleStatistics.vue similarity index 58% rename from src/views/statistics/shippingSummaryDetail.vue rename to src/views/statistics/productSaleStatistics.vue index 60eceb7..54be745 100644 --- a/src/views/statistics/shippingSummaryDetail.vue +++ b/src/views/statistics/productSaleStatistics.vue @@ -9,41 +9,33 @@ - - + + + + + + + + + + + + - - - - - - - - - - - - + + + @@ -58,7 +50,7 @@ " > {{ '搜索' }} - + {{ '重置' }} @@ -68,8 +60,8 @@
- - {{ '导出' }} + + 导出
@@ -82,58 +74,40 @@ @selection-change="handleSelectionChange" > + - - - - - - - - - @@ -152,11 +126,16 @@ - 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 @@ - - - - - - \ No newline at end of file diff --git a/vue.config.js b/vue.config.js index 71371bd..788cbd7 100644 --- 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: {