From d6dfcd80c49db84237b978a365cacd2207748599 Mon Sep 17 00:00:00 2001
From: java110 <928255095@qq.com>
Date: Thu, 24 Sep 2020 00:39:27 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E4=BB=A3=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../addFeePrintSpec/addFeePrintSpec.html      |  5 ++--
 .../editFeePrintSpec/editFeePrintSpec.html    |  1 +
 .../feePrintSpecManage.html                   |  2 +-
 .../property/printOweFee/printOweFee.html     |  3 ++-
 .../property/printPayFee/printPayFee.html     | 24 +++++++++---------
 .../pages/property/printPayFee/printPayFee.js | 25 +++++++++++--------
 6 files changed, 33 insertions(+), 27 deletions(-)

diff --git a/public/components/property/addFeePrintSpec/addFeePrintSpec.html b/public/components/property/addFeePrintSpec/addFeePrintSpec.html
index f12dfdcc4..59dae6379 100644
--- a/public/components/property/addFeePrintSpec/addFeePrintSpec.html
+++ b/public/components/property/addFeePrintSpec/addFeePrintSpec.html
@@ -13,14 +13,15 @@
                                     <select class="custom-select" v-model="addFeePrintSpecInfo.specCd">
                                         <option selected disabled value="">必填，请选择规格</option>
                                         <option value="1010">催缴打印说明</option>
+                                        <option value="2020">收据打印说明</option>
+                                        
                                     </select> </div>
                             </div>
                             <div class="form-group row">
                                 <label class="col-sm-2 col-form-label">图片</label>
                                 <div class="col-sm-10">
                                     <vc:create path="frame/uploadImage" callBackListener="addFeePrintSpec"
-                                        callBackFunction="notifyUploadImage" imageCount="1"
-                                        namespace="addFeePrintSpec">
+                                        callBackFunction="notifyUploadImage" imageCount="1" namespace="addFeePrintSpec">
                                     </vc:create>
                                 </div>
                             </div>
diff --git a/public/components/property/editFeePrintSpec/editFeePrintSpec.html b/public/components/property/editFeePrintSpec/editFeePrintSpec.html
index e0ae3aec3..80a988740 100644
--- a/public/components/property/editFeePrintSpec/editFeePrintSpec.html
+++ b/public/components/property/editFeePrintSpec/editFeePrintSpec.html
@@ -13,6 +13,7 @@
                                     <select class="custom-select" v-model="editFeePrintSpecInfo.specCd">
                                         <option selected disabled value="">必填，请选择规格</option>
                                         <option value="1010">催缴打印说明</option>
+                                        <option value="2020">收据打印说明</option>
                                     </select> </div>
                             </div>
 
diff --git a/public/pages/property/feePrintSpecManage/feePrintSpecManage.html b/public/pages/property/feePrintSpecManage/feePrintSpecManage.html
index 445f1ecb2..eccc1903f 100644
--- a/public/pages/property/feePrintSpecManage/feePrintSpecManage.html
+++ b/public/pages/property/feePrintSpecManage/feePrintSpecManage.html
@@ -28,7 +28,7 @@
                                 <td class="text-center">
                                     <img :src="feePrintSpec.qrImg" style="border-radius: 5px;" width="100px" height="100px"/>
                                 </td>
-                                <td class="text-center">{{feePrintSpec.specCd == '1010'?'催缴打印说明':'未知'}}</td>
+                                <td class="text-center">{{feePrintSpec.specCd == '1010'?'催缴打印说明':'收据打印说明'}}</td>
                                 <td class="text-center">{{feePrintSpec.printId}}</td>
                                 <td class="text-right">
                                     <div class="btn-group">
diff --git a/public/pages/property/printOweFee/printOweFee.html b/public/pages/property/printOweFee/printOweFee.html
index 82024c345..89f7ca147 100644
--- a/public/pages/property/printOweFee/printOweFee.html
+++ b/public/pages/property/printOweFee/printOweFee.html
@@ -46,7 +46,8 @@
                     <tr height="60px">
                         <td colspan="3">
                             <p style="max-width: 600px;">
-                                {{printPayFeeInfo.content}}
+                                <!-- {{printPayFeeInfo.content}} -->
+                                <div v-html="printPayFeeInfo.content"></div>
                             </p>
                         </td>
                         <td colspan="4">
diff --git a/public/pages/property/printPayFee/printPayFee.html b/public/pages/property/printPayFee/printPayFee.html
index 30e79da19..6744674e4 100644
--- a/public/pages/property/printPayFee/printPayFee.html
+++ b/public/pages/property/printPayFee/printPayFee.html
@@ -3,6 +3,7 @@
         <div>
             <div class=" text-center">
                 <h1>{{printPayFeeInfo.communityName}} 收据单</h1>
+                <span>单号：{{printPayFeeInfo.receiptId}}</span>
             </div>
             <div class="row margin-top">
                 <div class="col-sm-4">
@@ -22,8 +23,7 @@
                         <th scope="col" class="text-center">收费项目</th>
                         <th scope="col" class="text-center">收费范围</th>
                         <th scope="col" class="text-center">周期</th>
-                        <th scope="col" class="text-center">单价</th>
-                        <th scope="col" class="text-center">固定费</th>
+                        <th scope="col" class="text-center">单价/固定费</th>
                         <th scope="col" class="text-center">面积/用量</th>
                         <th scope="col" class="text-center">单位</th>
                         <th scope="col" class="text-center">金额</th>
@@ -37,7 +37,6 @@
                         <td class="text-center">{{vc.dateFormat(item.startTime)}}至{{vc.dateFormat(item.endTime)}}</td>
                         <td class="text-center">{{item.cycle}}</td>
                         <td class="text-center">{{item.squarePrice}}</td>
-                        <td class="text-center">{{item.additionalAmount}}</td>
                         <td class="text-center">{{item.area}}</td>
                         <td class="text-center">元</td>
                         <td class="text-center">{{item.amount}}</td>
@@ -45,20 +44,21 @@
                     </tr>
                     <tr >
                         <td colspan="1" class="text-center ">大写人民币（元）</td>
-                        <td colspan="5" class="text-center ">{{vc.changeNumMoneyToChinese(printPayFeeInfo.amount)}}
+                        <td colspan="4" class="text-center ">{{vc.changeNumMoneyToChinese(printPayFeeInfo.amount)}}
                         </td>
                         <td colspan="4" class="text-center ">{{printPayFeeInfo.amount}}</td>
                     </tr>
-                    <tr height="60px" v-if="printPayFeeInfo.wechatName != ''">
-                        <td colspan="10"  >
-                            <p>
-                                尊敬的业主：
-                            </p>
-                            <p>
-                                您好！感谢您在百忙中来缴费，为了更好的服务您，我们已开通网上缴费，请您关注《{{printPayFeeInfo.wechatName}}》公众号并注册，实现网上缴费。
+                    <tr height="60px">
+                        <td colspan="5">
+                            <p style="max-width: 600px;">
+                                <!-- {{printPayFeeInfo.content}} -->
+                                <div v-html="printPayFeeInfo.content"></div>
                             </p>
                         </td>
-                        
+                        <td colspan="4">
+                            <img :src="printPayFeeInfo.qrImg" width="100px" height="100px">
+                        </td>
+
                     </tr>
                 </tbody>
             </table>
diff --git a/public/pages/property/printPayFee/printPayFee.js b/public/pages/property/printPayFee/printPayFee.js
index 93397302d..6dadbb05e 100644
--- a/public/pages/property/printPayFee/printPayFee.js
+++ b/public/pages/property/printPayFee/printPayFee.js
@@ -9,7 +9,9 @@
                 amount: 0.00,
                 fees: [],
                 feeTime: '',
-                wechatName:''
+                wechatName:'',
+                content:'',
+                qrImg:''
             },
             printFlag: '0'
         },
@@ -17,13 +19,13 @@
             //vc.component._initPrintPurchaseApplyDateInfo();
 
             $that.printPayFeeInfo.receiptId = vc.getParam('receiptId');
-            $that.printPayFeeInfo.feeTime = vc.dateTimeFormat(new Date());
+            //$that.printPayFeeInfo.feeTime = vc.dateTimeFormat(new Date());
 
             $that.printPayFeeInfo.communityName = vc.getCurrentCommunity().name;
 
             $that._loadReceipt();
 
-            $that._loadWechat();
+            $that._loadPrintSpec();
         },
         _initEvent: function () {
 
@@ -53,7 +55,7 @@
 
                         $that.printPayFeeInfo.amount = _feeReceipt.amount;
                         $that.printPayFeeInfo.roomName = _feeReceipt.objName;
-
+                        $that.printPayFeeInfo.feeTime = _feeReceipt.createTime;
                         $that._loadReceiptDetail();
                     
                     }, function (errInfo, error) {
@@ -84,24 +86,25 @@
                     }
                 );
             },
-            _loadWechat: function () {
+            _loadPrintSpec: function () {
                 var param = {
                     params: {
                         page: 1,
                         row: 1,
-                        weChatType: 1100,
+                        specCd: 2020,
                         communityId: vc.getCurrentCommunity().communityId
                     }
                 };
 
                 //发送get请求
-                vc.http.apiGet('smallWeChat.listSmallWeChats',
+                vc.http.apiGet('/feePrintSpec/queryFeePrintSpec',
                     param,
                     function (json, res) {
-                        var _smallWeChatInfo = JSON.parse(json);
-                        var _smallWeChats = _smallWeChatInfo.smallWeChats;
-                        if(_smallWeChats.length > 0){
-                            $that.printPayFeeInfo.wechatName = _smallWeChats[0].name
+                        var _json = JSON.parse(json);
+                        var _data = _json.data;
+                        if (_data.length > 0) {
+                            $that.printPayFeeInfo.content = _data[0].content;
+                            $that.printPayFeeInfo.qrImg = _data[0].qrImg;
                         }
                     }, function (errInfo, error) {
                         console.log('请求失败处理');