lilei 1 年之前
父節點
當前提交
25839b44b1

+ 4 - 4
src/api/reportData.js

@@ -856,7 +856,7 @@ export const sparePartsReturnReportExportDetail = (params) => {
 
 // 返利报表
 export const rebateQueryList = (params) => {
-  const url = `/rebate/queryPage/${params.pageNo}/${params.pageSize}`
+  const url = `/report/productRebate/queryPage/${params.pageNo}/${params.pageSize}`
   delete params.pageNo
   delete params.pageSize
   return axios({
@@ -870,7 +870,7 @@ export const rebateQueryList = (params) => {
 }
 // 合计
 export const rebateQueryCount = (params) => {
-  const url = `/rebate/queryCount`
+  const url = `/report/productRebate/queryCount`
   return axios({
     url: url,
     data: params,
@@ -879,7 +879,7 @@ export const rebateQueryCount = (params) => {
 }
 // 返利明细报表
 export const rebateDetailQueryList = (params) => {
-  const url = `/rebate/detail/queryPage/${params.pageNo}/${params.pageSize}`
+  const url = `/report/productRebateDetail/queryPage/${params.pageNo}/${params.pageSize}`
   delete params.pageNo
   delete params.pageSize
   return axios({
@@ -893,7 +893,7 @@ export const rebateDetailQueryList = (params) => {
 }
 // 返利明细报表统计
 export const rebateDetailQueryCount = (params) => {
-  const url = `/rebate/detail/queryCount`
+  const url = `/report/productRebateDetail/queryCount`
   return axios({
     url: url,
     data: params,

+ 9 - 6
src/views/reportData/hPriceDifferenceDetailReport/list.vue

@@ -139,7 +139,7 @@
               <a-col :md="6" :sm="24" >分公司金额:{{ (totalData && (totalData.wholesalePrice1 || totalData.wholesalePrice1==0)) ? toThousands(totalData.wholesalePrice1) : '--' }}</a-col>
               <a-col :md="6" :sm="24" >加盟商金额:{{ (totalData && (totalData.wholesalePrice2 || totalData.wholesalePrice2==0)) ? toThousands(totalData.wholesalePrice2) : '--' }}</a-col>
               <a-col :md="6" :sm="24" >特约加盟店金额:{{ (totalData && (totalData.wholesalePrice3 || totalData.wholesalePrice3==0)) ? toThousands(totalData.wholesalePrice3) : '--' }}</a-col>
-              <a-col :md="6" :sm="24" >差价金额:{{ (totalData && (totalData.directRebateAmount || totalData.directRebateAmount==0)) ? toThousands(totalData.directRebateAmount) : '--' }}</a-col>
+              <a-col :md="6" :sm="24" >差价金额:{{ (totalData && (totalData.rebateAmount || totalData.rebateAmount==0)) ? toThousands(totalData.rebateAmount) : '--' }}</a-col>
             </a-row>
           </template>
         </s-table>
@@ -227,6 +227,9 @@ export default {
               if (data.list[i].bizType) {
                 data.list[i].bizTypeValue = data.list[i].bizType == 'SALES' ? '采购差价' : data.list[i].bizType == 'SALES_RETURN' ? '退货差价' : ''
               }
+              if (data.list[i].parentDealerName) {
+                data.list[i].parentDealerName += '(' + data.list[i].rebateRate * 100 + '%)'
+              }
             }
             this.disabled = false
           }
@@ -251,10 +254,10 @@ export default {
         { title: '分区', dataIndex: 'subareaArea.subareaAreaName', width: 100, align: 'center', customRender: function (text) { return text || '--' } },
         { title: '区域负责人', dataIndex: 'subareaArea.bizUserName', width: 100, align: 'center', customRender: function (text) { return text || '--' }, ellipsis: true },
         { title: '订单号', dataIndex: 'bizNo', width: 160, align: 'center', customRender: function (text) { return text || '--' } },
-        { title: '日期', dataIndex: 'bizCreateDate', width: 90, align: 'center', customRender: function (text) { return text || '--' } },
+        { title: '日期', dataIndex: 'bizDate', width: 90, align: 'center', customRender: function (text) { return text || '--' } },
         { title: '省份', dataIndex: 'provinceName', width: 90, align: 'center', customRender: function (text) { return text || '--' } },
-        { title: '差价归属方', dataIndex: 'directDealerName', width: 120, align: 'center', customRender: function (text) { return text || '--' }, ellipsis: true },
-        { title: '差价归属类型', dataIndex: 'indirectDealerName', width: 100, align: 'center', customRender: function (text) { return text || '--' } },
+        { title: '差价归属方', dataIndex: 'parentDealerName', width: 120, align: 'center', customRender: function (text) { return text || '--' } },
+        { title: '差价归属类型', dataIndex: 'rebateParentTypeDictValue', width: 100, align: 'center', customRender: function (text) { return text || '--' } },
         { title: '客户名称', dataIndex: 'buyerName', width: 120, align: 'center', customRender: function (text) { return text || '--' }, ellipsis: true },
         { title: '客户级别', dataIndex: 'buyerLevelDictValue', width: 120, align: 'center', customRender: function (text) { return text || '--' } },
         { title: '品牌', dataIndex: 'productBrandName', width: 130, align: 'center', customRender: function (text) { return text || '--' }, ellipsis: true },
@@ -263,13 +266,13 @@ export default {
         // { title: '分公司金额', dataIndex: 'wholesalePrice1', width: 90, align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
         // { title: '加盟商金额', dataIndex: 'wholesalePrice2', width: 90, align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
         // { title: '特约加盟店金额', dataIndex: 'wholesalePrice3', width: 100, align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
-        // { title: '差价金额', dataIndex: 'directRebateAmount', width: 80, align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
+        // { title: '差价金额', dataIndex: 'rebateAmount', width: 80, align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
         { title: '类型', dataIndex: 'bizTypeValue', width: 100, align: 'center', customRender: function (text) { return text || '--' } }
       ]
       arr.splice(11, 0, { title: '分公司金额', dataIndex: 'wholesalePrice1', width: 90, align: 'right', customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text) : '--') } })
       arr.splice(12, 0, { title: '加盟商金额', dataIndex: 'wholesalePrice2', width: 90, align: 'right', customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text) : '--') } })
       arr.splice(13, 0, { title: '特约加盟店金额', dataIndex: 'wholesalePrice3', width: 100, align: 'right', customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text) : '--') } })
-      arr.splice(14, 0, { title: '差价金额', dataIndex: 'directRebateAmount', width: 80, align: 'right', customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text) : '--') } })
+      arr.splice(14, 0, { title: '差价金额', dataIndex: 'rebateAmount', width: 80, align: 'right', customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text) : '--') } })
       return arr
     }
   },

+ 15 - 11
src/views/reportData/productRebateReport/detailList.vue

@@ -70,7 +70,7 @@
             <a-col :md="6" :sm="24" style="margin-bottom: 10px;">
               <a-button type="primary" @click="handleSearch" :disabled="disabled" id="rebateDetailReport-refresh">查询</a-button>
               <a-button style="margin-left: 5px" @click="resetSearchForm" :disabled="disabled" id="rebateDetailReport-reset">重置</a-button>
-              <a-button
+              <!-- <a-button
                 type="primary"
                 style="margin-left: 5px"
                 @click="handleExport"
@@ -78,7 +78,7 @@
                 :loading="exportLoading"
                 v-if="$hasPermissions('M_salesReturnReportExport')"
                 class="button-warning"
-                id="rebateDetailReport-export-btn">导出</a-button>
+                id="rebateDetailReport-export-btn">导出</a-button> -->
               <a @click="advanced=!advanced" style="margin-left: 5px">
                 {{ advanced ? '收起' : '展开' }}
                 <a-icon :type="advanced ? 'up' : 'down'"/>
@@ -95,7 +95,8 @@
           class="sTable fixPagination"
           ref="table"
           size="small"
-          :rowKey="(record) => record.id"
+          :rowKey="(record) => record.no"
+          rowKeyName="no"
           :columns="columns"
           :data="loadData"
           :pageSize="30"
@@ -107,7 +108,7 @@
             <a-row type="flex" justify="end" :gutter="10">
               <a-col flex="10%" >总开单金额:{{ (totalData && (totalData.totalAmount || totalData.totalAmount==0)) ? toThousands(totalData.totalAmount) : '--' }}</a-col>
               <a-col flex="10%" >总实售金额:{{ (totalData && (totalData.totalRealAmount || totalData.totalRealAmount==0)) ? toThousands(totalData.totalRealAmount) : '--' }}</a-col>
-              <a-col flex="10%" >差价金额:{{ (totalData && (totalData.directRebateAmount || totalData.directRebateAmount==0)) ? toThousands(totalData.directRebateAmount) : '--' }}</a-col>
+              <a-col flex="10%" >差价金额:{{ (totalData && (totalData.rebateAmount || totalData.rebateAmount==0)) ? toThousands(totalData.rebateAmount) : '--' }}</a-col>
             </a-row>
           </template>
         </s-table>
@@ -174,6 +175,9 @@ export default {
             for (var i = 0; i < data.list.length; i++) {
               data.list[i].no = no + i + 1
               data.list[i].inStockQty = data.list[i].qty
+              if (data.list[i].parentDealerName) {
+                data.list[i].parentDealerName += '(' + data.list[i].rebateRate * 100 + '%)'
+              }
             }
             this.disabled = false
           }
@@ -190,11 +194,11 @@ export default {
       const arr = [
         { title: '序号', dataIndex: 'no', width: '60px', align: 'center' },
         { title: '订单号', dataIndex: 'bizNo', width: '100px', align: 'center', customRender: function (text) { return text || '--' } },
-        { title: '类型', dataIndex: 'rebateBill.bizTypeDictValue', width: '80px', align: 'center', customRender: function (text) { return text || '--' } },
-        { title: '客户级别', dataIndex: 'rebateBill.buyerLevelDictValue', width: '90px', align: 'center', customRender: function (text) { return text || '--' } },
-        { title: '客户名称', dataIndex: 'rebateBill.buyerName', width: '150px', align: 'left', customRender: function (text) { return text || '--' }, ellipsis: true },
-        { title: '差价归属方', dataIndex: 'rebateBill.directDealerName', width: '130px', align: 'left', customRender: function (text) { return text || '--' }, ellipsis: true },
-        { title: '差价归属类型', dataIndex: 'rebateBill.indirectDealerName', width: '120px', align: 'left', customRender: function (text) { return text || '--' } },
+        { title: '类型', dataIndex: 'bizTypeDictValue', width: '80px', align: 'center', customRender: function (text) { return text || '--' } },
+        { title: '客户级别', dataIndex: 'buyerLevelDictValue', width: '90px', align: 'center', customRender: function (text) { return text || '--' } },
+        { title: '客户名称', dataIndex: 'buyerName', width: '150px', align: 'left', customRender: function (text) { return text || '--' }, ellipsis: true },
+        { title: '差价归属方', dataIndex: 'parentDealerName', width: '130px', align: 'left', customRender: function (text) { return text || '--' }, ellipsis: true },
+        { title: '差价归属类型', dataIndex: 'rebateParentTypeDictValue', width: '120px', align: 'center', customRender: function (text) { return text || '--' } },
         { title: '品牌', dataIndex: 'productEntity.productBrandName', width: '100px', align: 'center', customRender: function (text) { return text || '--' } },
         { title: '产品分类', width: '160px', align: 'center', customRender: function (text, record) { return record.productEntity.productTypeName1 + (record.productEntity.productTypeName2 ? '>' : '') + (record.productEntity.productTypeName2 || '') } },
         { title: '产品编码', dataIndex: 'productEntity.code', width: '100px', align: 'center', customRender: function (text) { return text || '--' } },
@@ -205,8 +209,8 @@ export default {
         { title: '特约价', dataIndex: 'specialPrice', width: '80px', align: 'right', customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text) : '--') } },
         { title: '总开单金额', dataIndex: 'totalAmount', width: '80px', align: 'right', customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text) : '--') } },
         { title: '总实售金额', dataIndex: 'totalRealAmount', width: '80px', align: 'right', customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text) : '--') } },
-        { title: '差价', dataIndex: 'directRebatePrice', width: '80px', align: 'right', customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text) : '--') } },
-        { title: '差价金额', dataIndex: 'directRebateAmount', width: '80px', align: 'right', customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text) : '--') } }
+        { title: '差价', dataIndex: 'rebatePrice', width: '80px', align: 'right', customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text) : '--') } },
+        { title: '差价金额', dataIndex: 'rebateAmount', width: '80px', align: 'right', customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text) : '--') } }
       ]
       return arr
     }

+ 8 - 8
src/views/reportData/productRebateReport/list.vue

@@ -53,7 +53,7 @@
             <a-col :md="6" :sm="24" style="margin-bottom: 10px;">
               <a-button type="primary" @click="handleSearch" :disabled="disabled" id="srebateReport-refresh">查询</a-button>
               <a-button style="margin-left: 5px" @click="resetSearchForm" :disabled="disabled" id="srebateReport-reset">重置</a-button>
-              <a-button
+              <!-- <a-button
                 type="primary"
                 style="margin-left: 5px"
                 @click="handleExport"
@@ -61,7 +61,7 @@
                 :loading="exportLoading"
                 v-if="$hasPermissions('M_salesReturnReportExport')"
                 class="button-warning"
-                id="srebateReport-export-btn">导出</a-button>
+                id="srebateReport-export-btn">导出</a-button> -->
             </a-col>
           </a-row>
         </a-form-model>
@@ -196,15 +196,15 @@ export default {
         { title: '总实售价金额', dataIndex: 'totalRealAmount', width: '8%', align: 'right', customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text) : '--') } }
       ]
       if (this.showCols.includes('directRebateAmountInfo')) {
-        arr.splice(6, 0, { title: '直接上级差价', dataIndex: 'indirectRebateAmount1', width: 90, align: 'right', customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text) : '--') } })
-        arr.splice(7, 0, { title: '直接指定差价', dataIndex: 'indirectRebateAmount2', width: 90, align: 'right', customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text) : '--') } })
-        arr.splice(8, 0, { title: '直接总部差价', dataIndex: 'indirectRebateAmount3', width: 90, align: 'right', customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text) : '--') } })
+        arr.splice(6, 0, { title: '直接上级差价', dataIndex: 'directSuperiorsAmount', width: 90, align: 'right', customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text) : '--') } })
+        arr.splice(7, 0, { title: '直接指定差价', dataIndex: 'directAssignAmount', width: 90, align: 'right', customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text) : '--') } })
+        arr.splice(8, 0, { title: '直接总部差价', dataIndex: 'directHeadAmount', width: 90, align: 'right', customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text) : '--') } })
       }
       if (this.showCols.includes('indirectRebateAmountInfo')) {
         const pos = this.showCols.includes('directRebateAmountInfo') ? 10 : 7
-        arr.splice(pos, 0, { title: '间接上级差价', dataIndex: 'indirectRebateAmount4', width: 90, align: 'right', customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text) : '--') } })
-        arr.splice(pos + 1, 0, { title: '间接指定差价', dataIndex: 'indirectRebateAmount5', width: 90, align: 'right', customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text) : '--') } })
-        arr.splice(pos + 2, 0, { title: '间接总部差价', dataIndex: 'indirectRebateAmount6', width: 90, align: 'right', customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text) : '--') } })
+        arr.splice(pos, 0, { title: '间接上级差价', dataIndex: 'indirectSuperiorsAmount', width: 90, align: 'right', customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text) : '--') } })
+        arr.splice(pos + 1, 0, { title: '间接指定差价', dataIndex: 'indirectAssignAmount', width: 90, align: 'right', customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text) : '--') } })
+        arr.splice(pos + 2, 0, { title: '间接总部差价', dataIndex: 'indirectHeadAmount', width: 90, align: 'right', customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text) : '--') } })
       }
       return arr
     }

+ 2 - 2
vue.config.js

@@ -108,9 +108,9 @@ const vueConfig = {
     // If you want to turn on the proxy, please remosve the mockjs /src/main.jsL11
     proxy: {
       '/api': {
-        // target: 'http://192.168.2.111/ocs-admin',
+        target: 'http://192.168.2.117/ocs-admin',
         // target: 'https://t.ocs.360arrow.com/ocs-admin', //  练习
-        target: 'https://p.ocs.360arrow.com/ocs-admin', //  预发布
+        // target: 'https://p.ocs.360arrow.com/ocs-admin', //  预发布
         ws: false,
         changeOrigin: true,
         pathRewrite: {