version6

resources/Web/MicroCommunityWeb/html/components/fee/batchPayConfirm/batchPayConfirm.html

@@ -87,7 +87,7 @@
                                 class="col-sm-8"
                                 :src="ABAQRCode "
                                 alt="ABA QR Code"
-                                style="max-width: 200px; max-height: 200px;"
+                                style="max-width: 200px; "
                         >
                     </div>
 

resources/Web/MicroCommunityWeb/html/components/property/payFeeOrderConfirm/payFeeOrderConfirm.html

@@ -120,7 +120,7 @@
                         class="col-sm-8"
                         :src="payFeeOrderConfirmInfo.ABAQRCode "
                         alt="ABA QR Code"
-                        style="max-width: 210px;"
+                        style="max-width: 200px;"
                 >
                 </div>
 

resources/Web/MicroCommunityWeb/html/pages/property/feeReceipt/feeReceipt.html

@@ -144,21 +144,24 @@
                             <td class="text-center">{{feeReceipt.createTime}}</td>
                             <td class="text-center">
                                 <div 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>
+                                    <div class="dropdown">
+                                        <button class="btn-white btn btn-xs dropdown-toggle" type="button"
+                                                data-toggle="dropdown" aria-haspopup="true" aria-expanded="false"
+                                                title="补打收据 / 补打小票">
+                                            <span><vc:i18n name="打印" namespace="feeReceipt"></vc:i18n></span>
+                                        </button>
+                                        <div class="dropdown-menu" style="min-width: 120px;">
+                                            <a class="dropdown-item" href="javascript:void(0);"
+                                               v-on:click="_printFeeReceipt(feeReceipt)">
+                                                <vc:i18n name="补打收据" namespace="feeReceipt"></vc:i18n>
+                                            </a>
+                                            <a class="dropdown-item" href="javascript:void(0);"
+                                               v-on:click="_printFeeSmallReceipt(feeReceipt)">
+                                                <vc:i18n name="补打小票" namespace="feeReceipt"></vc:i18n>
+                                            </a>
+                                        </div>
+                                    </div>
                                 </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>
-                                 </div> -->
                             </td>
                         </tr>
                         </tbody>

resources/Web/MicroCommunityWeb/html/pages/property/feeReceipt/feeReceipt.js

@@ -169,10 +169,10 @@
                 vc.component._listFeeReceipts(DEFAULT_PAGE, DEFAULT_ROWS);
             },
             _printFeeReceipt: function (_receipt) {
-                window.open($that.feeReceiptManageInfo.printUrl + "?receiptId=" + _receipt.receiptId);
+                window.open('http://localhost:8085/jmreport/view/1157941533747441664?receiptId=' + _receipt.receiptId);
             },
             _printFeeSmallReceipt: function (_receipt) {
-                window.open('/smallPrint.html#/pages/property/printSmallPayFee?receiptIds=' + _receipt.receiptId);
+                window.open('http://localhost:8085/jmreport/view/1158273349834502144?receiptId=' + _receipt.receiptId);
             },
             _printFeeReceipts: function (_conditions) {
                 // console.log(_conditions)