Merge branch 'release/3.0' into 'release/3.1'

Release/3.0



See merge request !34

@@ -69,10 +69,26 @@ export default {
             return _.pickBy(params, val => val);
             return _.pickBy(params, val => val);
         },
         },
         search() {
         search() {
+            let sumParams = {
+                balanceId: +this.filters.balanceId.model,
+                brandId: +this.filters.brandId.model,
+                orderCode: +this.filters.orderCode.model,
+                status: +this.filters.status.model,
+                productSku: +this.filters.sku.model
+            };
+
             this.FinanceService.balanceDetail(this.filterValues()).then(ret => {
             this.FinanceService.balanceDetail(this.filterValues()).then(ret => {
                 this.tableData = _.get(ret, 'data.records', []);
                 this.tableData = _.get(ret, 'data.records', []);
                 this.pageData.total = _.get(ret, 'data.totalCount', 0);
                 this.pageData.total = _.get(ret, 'data.totalCount', 0);
                 this.pageData.pageNo = _.get(ret, 'data.pageNo', 1);
                 this.pageData.pageNo = _.get(ret, 'data.pageNo', 1);
+
+                this.FinanceService.balanceDetailSum(_.pickBy(sumParams, val => val)).then(result => {
+                    this.tableData.push({
+                        sellTypeDesc: '总计',
+                        salesNums: result.data.sumNums,
+                        clearingPrice: result.data.sumAmount
+                    });
+                });
             });
             });
         },
         },
         reset() {
         reset() {

@@ -54,10 +54,24 @@ export default {
             return _.pickBy(params, val => val);
             return _.pickBy(params, val => val);
         },
         },
         search() {
         search() {
+            let sumParams = {
+                balanceId: +this.filters.balanceId.model,
+                brandId: +this.filters.brandId.model,
+                productSku: +this.filters.sku.model
+            };
+
             this.FinanceService.settlementList(this.filterValues()).then(ret => {
             this.FinanceService.settlementList(this.filterValues()).then(ret => {
                 this.tableData = _.get(ret, 'data.records', []);
                 this.tableData = _.get(ret, 'data.records', []);
                 this.pageData.total = _.get(ret, 'data.totalCount', 0);
                 this.pageData.total = _.get(ret, 'data.totalCount', 0);
                 this.pageData.pageNo = _.get(ret, 'data.pageNo', 1);
                 this.pageData.pageNo = _.get(ret, 'data.pageNo', 1);
+
+                this.FinanceService.settlementListSum(_.pickBy(sumParams, val => val)).then(result => {
+                    this.tableData.push({
+                        agencyTypeDesc: '总计',
+                        salesNums: result.data.sumNums,
+                        salesAmount: result.data.sumAmount
+                    });
+                });
             });
             });
         },
         },
         reset() {
         reset() {

@@ -5,7 +5,9 @@ let apiUrl = {
     balanceDetail: '/erp/balanceDetail',
     balanceDetail: '/erp/balanceDetail',
     settlementList: '/erp/settlementList',
     settlementList: '/erp/settlementList',
     inventoryLedgerList: '/erp/inventoryLedgerList',
     inventoryLedgerList: '/erp/inventoryLedgerList',
-    exportBalanceList: '/erp/exportBalanceList'
+    exportBalanceList: '/erp/exportBalanceList',
+    balanceDetailSum: '/erp/balanceDetailSum',
+    settlementListSum: '/erp/settlementListSum'
 };
 };
 
 
 class FinanceService extends Service {
 class FinanceService extends Service {
@@ -29,5 +31,11 @@ class FinanceService extends Service {
     inventoryLedgerList(params) {
     inventoryLedgerList(params) {
         return this.post(apiUrl.inventoryLedgerList, params);
         return this.post(apiUrl.inventoryLedgerList, params);
     }
     }
+    balanceDetailSum(params) {
+        return this.post(apiUrl.balanceDetailSum, params);
+    }
+    settlementListSum(params) {
+        return this.post(apiUrl.settlementListSum, params);
+    }
 }
 }
 export default FinanceService;
 export default FinanceService;

@@ -47,7 +47,9 @@ let domainApis = {
         inventoryLedgerList: '/erp-shop-web/inventoryLedger/list',
         inventoryLedgerList: '/erp-shop-web/inventoryLedger/list',
         exportBalanceList: '/erp-shop-web/export/exportBalanceList',
         exportBalanceList: '/erp-shop-web/export/exportBalanceList',
         exportSettlementDetail: '/erp-shop-web/export/exportSettlementDetail',
         exportSettlementDetail: '/erp-shop-web/export/exportSettlementDetail',
-        exportBalanceDetail: '/erp-shop-web/export/exportBalanceDetail'
+        exportBalanceDetail: '/erp-shop-web/export/exportBalanceDetail',
+        balanceDetailSum: '/erp-shop-web/financeBill/balanceDetailSum',
+        settlementListSum: '/erp-shop-web/financeBill/settlementListSum'
     },
     },
     platform: {
     platform: {
         queryShopsByAdminPid: '/SellerShopController/queryShopsByAdminPid',
         queryShopsByAdminPid: '/SellerShopController/queryShopsByAdminPid',