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

Release/3.0



See merge request !31

@@ -47,9 +47,9 @@
                 </tbody>
             </table>
         </div>
-        <p class="price">费用小计：{{deduction}}</p>
-        <p class="price">实际应付款(元)：{{deduction}}</p>
-        <p class="price"><b>总计：{{count}}</b></p>
+        <p class="price">费用小计：￥{{deduction}}</p>
+        <p class="price">实际应付款(元)：￥{{count}}</p>
+        <p class="price"><b>总计：￥{{count}}</b></p>
         <p><b>请您按照上述商品款小计金额开具发票。</b></p>
         <div class="seal">盖章确认</div>  	
         <p>请您在SPM系统将结算对账单和库存对账单各打印一份，并盖章确认后与发票一并寄至：</p>
@@ -106,16 +106,18 @@
 
                 this.FinanceService.settlementList(params).then(ret => {
                     let list = _.get(ret, 'data.records', []);
-                    let list1 = []; // 销售出库
+                    let list1 = []; // 商品款
                     let list2 = []; // 代销抵冲
                     let deduction, count;
+                    let type1 = ['销售出库', '换货入库', '换货出库', '退货入库', '促销出库', '盘亏', 'vip折扣', '优惠券分摊'];
+                    let type2 = ['其他抵冲', '折扣抵冲', '经销抵冲'];
 
                     _.each(list, item => {
-                        if (item.agencyTypeDesc === '销售出库') {
+                        if (type1.indexOf(item.agencyTypeDesc) > -1) {
                             list1.push(item);
                         }
 
-                        if(item.agencyTypeDesc === '折扣抵冲') {
+                        if(type2.indexOf(item.agencyTypeDesc) > -1) {
                             list2.push(item);
                         }
                     });