财务管理

@@ -116,6 +116,8 @@ export default {
                 name: 'finance.stock',
                 params: {},
                 query: {
+                    brandId: params.row.brandId,
+                    shopId
                 }
             });
         }

 import clearing from './clearing';
 import payment from './payment';
 import print from './print';
+import stock from './stock';
 export default {
     clearing,
     payment,
-    print
+    print,
+    stock
 };

@@ -102,7 +102,14 @@ export default {
                 }
             });
         },
-        onClickStock() {}
+        onClickStock(params) {
+            this.$router.push({
+                name: 'finance.stock',
+                params: {},
+                query: {
+                }
+            });
+        }
     }
 };
 </script>

@@ -5,4 +5,11 @@ export default [{
     meta: {
         pageName: '结算单详情打印'
     }
+}, {
+    path: '/stock/printDetail.html',
+    name: 'printdetail',
+    component: () => import(/* webpackChunkName: "trade.printDetail" */'./stock-print-detail'),
+    meta: {
+        pageName: '库存打印'
+    }
 }];

 <template>
     <layout-print>
+        <h2>结算单详情</h2>
         <Table border :columns="tableCols" :data="tableData"></Table>
     </layout-print>
 </template>
@@ -40,6 +41,11 @@
 </script>
 
 <style lang="scss" scoped>
+h2 {
+    line-height: 50px;
+    border-bottom: 1px solid #f2f2f2;
+    margin-bottom: 10px;
+}
 .print-detail {
     margin-bottom: 20px;
     color: #333;

+<template>
+    <layout-print>
+        <h2>库存</h2>
+        <Table border :columns="tableCols" :data="tableData"></Table>
+    </layout-print>
+</template>
+
+<script>
+    import _ from 'lodash';
+    import stock from '../stock/store/stock';
+    import FinanceService from 'services/finance/finance-service';
+
+
+    export default {
+        data() {
+            return stock.call(this);
+        },
+        created() {
+            this.FinanceService = new FinanceService();
+            this.search();
+        },
+        methods: {
+            search() {
+                // let params = {
+                //     supplierId: 128,
+                //     balanceId: +this.filters.balanceId.model,
+                //     brandId: +this.filters.brandId.model,
+                //     productSku: +this.filters.sku.model,
+                //     pageSize: 20,
+                //     pageNo: this.$route.query.page
+                // };
+
+                // params = _.pickBy(params, val => val);
+
+                // this.FinanceService.settlementList(params).then(ret => {
+                //     this.tableData = _.get(ret, 'data.records', []);
+                // });
+            }
+        }
+    };
+</script>
+
+<style lang="scss" scoped>
+h2 {
+    line-height: 50px;
+    border-bottom: 1px solid #f2f2f2;
+    margin-bottom: 10px;
+}
+.print-detail {
+    margin-bottom: 20px;
+    color: #333;
+}
+</style>
+

@@ -58,25 +58,25 @@ export default {
     methods: {
         search() {
             // 在这里实现异步查询的方法，建议在service中做
-            // let params = {
-            //     type: 1,
-            //     supplierId: 128,
-            //     balanceId: +this.filters.balanceId.model,
-            //     brandId: this.filters.brandId.model,
-            //     status: this.filters.status.model,
-            //     beginTime: this.startTime,
-            //     endTime: this.endTime,
-            //     pageSize: this.pageData.pageSize,
-            //     pageNo: this.pageData.pageNo
-            // };
+            let params = {
+                shopId: 1,
+                supplierId: 128,
+                brandId: this.filters.brandId.model,
+                productSkn: '',
+                productSku: '',
+                beginTime: this.startTime,
+                endTime: this.endTime,
+                pageSize: this.pageData.pageSize,
+                pageNo: this.pageData.pageNo
+            };
 
-            // params = _.pickBy(params, val => val);
+            params = _.pickBy(params, val => val);
 
-            // this.FinanceService.balanceList(params).then(ret => {
-            //     this.tableData = _.get(ret, 'data.records', []);
-            //     this.pageData.total = ret.data.pageNo;
-            //     this.pageData.pageNo = ret.data.pageNo;
-            // });
+            this.FinanceService.inventoryLedgerList(params).then(ret => {
+                this.tableData = _.get(ret, 'data.records', []);
+                this.pageData.total = ret.data.pageNo;
+                this.pageData.pageNo = ret.data.pageNo;
+            });
         },
         reset() {
             this.filters.brandId.model = null;
@@ -89,7 +89,9 @@ export default {
             this.search();
         },
         print() {
+            const href = `/finance/print/stock/printDetail.html`;
 
+            window.open(href, '_blank');
         }
     }
 };

@@ -9,74 +9,74 @@ export default function() {
         tableCols: [
             {
                 title: '商品编号',
-                key: 'balanceId',
+                key: '',
                 align: 'center'
             },
             {
                 title: '产品名称',
-                key: 'createTimeString',
+                key: 'productName',
                 align: 'center'
             },
             {
                 title: '厂家编号',
-                key: 'clearingCycle',
+                key: '',
                 align: 'center',
             },
             {
                 title: '请购类型',
-                key: 'brandName',
+                key: '',
                 align: 'center',
             },
             {
                 title: '初期数量',
-                key: 'supplierName',
+                key: 'supplier90Sell',
                 align: 'center'
             },
             {
                 title: '进货数量',
-                key: 'clearingAmount',
+                key: 'supplier11Sell',
                 align: 'center'
             },
             {
                 title: '销售数量',
-                key: 'statusDesc',
+                key: 'supplier30Sell',
                 align: 'center'
             },
             {
                 title: '销退数量',
-                key: 'action',
+                key: 'supplier33Sell',
                 align: 'center'
             },
             {
                 title: '退供应商数量',
-                key: 'action',
+                key: 'supplier10Sell',
                 align: 'center'
             },
             {
                 title: '其他出库数量',
-                key: 'action',
+                key: 'supplier60Sell',
                 align: 'center'
             },
             {
                 title: '地面店出库数量',
-                key: 'action',
+                key: 'supplier70Sell',
                 align: 'center',
                 width: 150
             },
             {
                 title: '地面店入库数量',
-                key: 'action',
+                key: 'supplier71Sell',
                 align: 'center',
                 width: 150
             },
             {
                 title: '期末库存数量',
-                key: 'action',
+                key: 'supplier100Sell',
                 align: 'center'
             },
             {
                 title: '库房',
-                key: 'action',
+                key: '',
                 align: 'center'
             }
         ],

@@ -4,7 +4,7 @@ let apiUrl = {
     balanceList: '/erp/balanceList',
     balanceDetail: '/erp/balanceDetail',
     settlementList: '/erp/settlementList',
-    settlementDetail: '/erp/settlementDetail'
+    inventoryLedgerList: '/erp/inventoryLedgerList'
 };
 
 class FinanceService extends Service {
@@ -25,8 +25,8 @@ class FinanceService extends Service {
     settlementList(params) {
         return this.post(apiUrl.settlementList, params);
     }
-    settlementDetail(params) {
-        return this.post(apiUrl.settlementDetail, params);
+    inventoryLedgerList(params) {
+        return this.post(apiUrl.inventoryLedgerList, params);
     }
 }
 export default FinanceService;

@@ -44,7 +44,7 @@ let domainApis = {
         balanceList: '/erp-shop-web/financeBill/balanceList',
         balanceDetail: '/erp-shop-web/financeBill/balanceDetail',
         settlementList: '/erp-shop-web/financeBill/settlementList',
-        settlementDetail: '/erp-shop-web/financeBill/settlementDetail'
+        inventoryLedgerList: '/erp-shop-web/inventoryLedger/list'
     },
     platform: {
         queryShopsByAdminPid: '/SellerShopController/queryShopsByAdminPid',