优化打印收据问题

public/pages/property/feeReceipt/feeReceipt.html

@@ -133,6 +133,10 @@
                                         <button class="btn-white btn btn-xs" v-on:click="_printFeeReceipt(feeReceipt)"><span><vc:i18n name="补打收据" namespace="feeReceipt"></vc:i18n></span>
                                     </button>
                                     </div>
+                                    <div class="btn-group">
+                                        <button class="btn-white btn btn-xs" v-on:click="_printFeeSmallReceipt(feeReceipt)"><span><vc:i18n name="补打小票" namespace="feeReceipt"></vc:i18n></span>
+                                    </button>
+                                    </div>
                                     <!-- <div v-if="feeReceipt.objType == '6666'" class="btn-group">
                                 <button class="btn-white btn btn-xs"
                                     v-on:click="_printFeeReceipt(feeReceipt)"><span><vc:i18n name="补打收据" namespace="feeReceipt"></vc:i18n></span>(车)</button>

public/pages/property/feeReceipt/feeReceipt.js

@@ -135,7 +135,8 @@
                             total: vc.component.feeReceiptManageInfo.records,
                             currentPage: _page
                         });
-                    }, function (errInfo, error) {
+                    },
+                    function(errInfo, error) {
                         console.log('请求失败处理');
                     }
                 );
@@ -156,6 +157,9 @@
             _printFeeReceipt: function(_receipt) {
                 window.open($that.feeReceiptManageInfo.printUrl + "?receiptId=" + _receipt.receiptId);
             },
+            _printFeeSmallReceipt: function(_receipt) {
+                window.open('/smallPrint.html#/pages/property/printSmallPayFee?receiptIds=' + _receipt.receiptId);
+            },
             _printFeeReceipts: function(_conditions) {
                 // console.log(_conditions)
                 if (_conditions.roomId == null || _conditions.roomId == "") {
@@ -208,7 +212,8 @@
                         if (feePrintPages && feePrintPages.length > 0) {
                             $that.feeReceiptManageInfo.printUrl = feePrintPages[0].url;
                         }
-                    }, function (errInfo, error) {
+                    },
+                    function(errInfo, error) {
                         console.log('请求失败处理');
                     }
                 );

public/pages/property/payFeeOrder/payFeeOrder.js

@@ -328,13 +328,12 @@
                                 fees: _printFees
                             }
                             let _data = JSON.parse(json).data;
-                            $that.payFeeOrderInfo.receiptId = _data.receiptId;
+                            // $that.payFeeOrderInfo.receiptId = _data.receiptId;
                             //vc.saveData('_feeInfo', _feeInfo);
-                            //关闭model
+                            //查询收据
-                            $("#payFeeResult").modal({
+                            setTimeout(function() {
-                                backdrop: "static", //点击空白处不关闭对话框
+                                $that._queryPayFeeReceiptId(_data);
-                                show: true
+                            }, 1000);
-                            });
                             return;
                         }
                         vc.toast(json);
@@ -345,6 +344,37 @@
                     }
                 );
             },
+            //查询收据
+            _queryPayFeeReceiptId: function(_data) {
+                let _param = {
+                    params: {
+                        detailIds: _data.detailId,
+                        communityId: vc.getCurrentCommunity().communityId,
+                        page: 1,
+                        row: 1
+                    }
+                }
+                vc.http.apiGet(
+                    '/feeReceipt/queryFeeReceipt',
+                    _param,
+                    function(json, res) {
+                        //vm.menus = vm.refreshMenuActive(JSON.parse(json),0);
+                        let _json = JSON.parse(json)
+                        if (_json.code == 0 && _json.data && _json.data.length > 0) {
+                            $that.payFeeOrderInfo.receiptId = _json.data[0].receiptId;
+                        }
+                        $("#payFeeResult").modal({
+                            backdrop: "static", //点击空白处不关闭对话框
+                            show: true
+                        });
+                    },
+                    function(errInfo, error) {
+                        console.log('请求失败处理');
+                        vc.toast(errInfo);
+                    }
+                );
+
+            },
 
             /**
              * 下拉 change 事件