From 406c75df914746c21b57d0b696bb25dc307125e9 Mon Sep 17 00:00:00 2001
From: java110 <928255095@qq.com>
Date: Fri, 19 Mar 2021 23:18:30 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E6=8A=A5=E8=A1=A8=E4=B8=93?=
 =?UTF-8?q?=E5=AE=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../property/printPayFee/printPayFee.html     | 28 +++++++++++++------
 .../reportProficient/reportProficient.html    |  4 +--
 .../reportProficient/reportProficient.js      |  2 +-
 3 files changed, 23 insertions(+), 11 deletions(-)

diff --git a/public/pages/property/printPayFee/printPayFee.html b/public/pages/property/printPayFee/printPayFee.html
index d29c0473b..b1c75f9b4 100644
--- a/public/pages/property/printPayFee/printPayFee.html
+++ b/public/pages/property/printPayFee/printPayFee.html
@@ -31,7 +31,9 @@
                     <tr v-for="(item,index) in printPayFeeInfo.fees" class="vc-table-border">
                         <th scope="row" class="text-center">{{index +1}}</th>
                         <td class="text-center">{{item.feeName}}</td>
-                        <td class="text-center">{{vc.dateFormat(item.startTime)}}至{{vc.dateSubOneDay(vc.dateFormat(item.startTime),vc.dateFormat(item.endTime),item.feeFlag)}}</td>
+                        <td class="text-center">
+                            {{vc.dateFormat(item.startTime)}}至{{vc.dateSubOneDay(vc.dateFormat(item.startTime),vc.dateFormat(item.endTime),item.feeFlag)}}
+                        </td>
                         <!--<td class="text-center">{{item.startTime}}至{{item.endTime}}</td>-->
                         <td class="text-center">{{item.cycle}}</td>
                         <td class="text-center">{{item.squarePrice}}</td>
@@ -61,13 +63,23 @@
                 </tbody>
             </table>
         </div>
-        <div id="print-btn">
-            <button class="btn btn-primary float-right" type="button" v-on:click="_printPurchaseApplyDiv()">
-                <i class="fa fa-check"></i>&nbsp;打印
-            </button>
-            <button type="button" class="btn btn-warning float-right" style="margin-right:20px;"
-                v-on:click="_closePage()">取消
-            </button>
+        <div class="row">
+            <div class="col-md-8">
+                <div class="row">
+                    <div class="col-md-3">部门负责人：</div>
+                    <div class="col-md-3">经办人：</div>
+                    <div class="col-md-3">财务收款：</div>
+                    <div class="col-md-3">客户确认：</div>
+                </div>
+            </div>
+            <div class="col-md-4" id="print-btn">
+                <button class="btn btn-primary float-right" type="button" v-on:click="_printPurchaseApplyDiv()">
+                    <i class="fa fa-check"></i>&nbsp;打印
+                </button>
+                <button type="button" class="btn btn-warning float-right" style="margin-right:20px;"
+                    v-on:click="_closePage()">取消
+                </button>
+            </div>
         </div>
     </div>
 </div>
\ No newline at end of file
diff --git a/public/pages/property/reportProficient/reportProficient.html b/public/pages/property/reportProficient/reportProficient.html
index c0d3a78fd..0732b50e7 100644
--- a/public/pages/property/reportProficient/reportProficient.html
+++ b/public/pages/property/reportProficient/reportProficient.html
@@ -68,9 +68,9 @@
                         </div>
                         <div class="col-sm-3">
                             <div class="form-group">
+                                <!-- @click="_changeReporficientConfigId()"-->
                                 <select class="form-control-md form-control input-s-sm inline"
-                                    v-model="reportProficientInfo.conditions.configId"
-                                    @click="_changeReporficientConfigId()">
+                                    v-model="reportProficientInfo.conditions.configId">
                                     <option selected value="">请选择收费项</option>
                                     <option v-for="(item,index) in reportProficientInfo.feeConfigDtos" :key="index"
                                         :value="item.configId">
diff --git a/public/pages/property/reportProficient/reportProficient.js b/public/pages/property/reportProficient/reportProficient.js
index d1e7a86ee..3c6bada6b 100644
--- a/public/pages/property/reportProficient/reportProficient.js
+++ b/public/pages/property/reportProficient/reportProficient.js
@@ -223,7 +223,7 @@
                         vc.component.reportProficientInfo.feeConfigDtos = _feeConfigs;
                         if (_feeConfigs.length > 0) {
                             $that.reportProficientInfo.conditions.configId = _feeConfigs[0].configId;
-                            $that.changeTab($that.reportProficientInfo._currentTab)
+                            //$that.changeTab($that.reportProficientInfo._currentTab)
                         }
                     },
                     function (errInfo, error) {