From 17dd10066c270e784e21c7dbccfc510c062f423f Mon Sep 17 00:00:00 2001
From: java110 <928255095@qq.com>
Date: Thu, 19 Nov 2020 18:28:20 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B8=B8=E6=B9=96=E9=98=BF=E4=BB=A3=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../simplifyRoomFee/simplifyRoomFee.html      |  97 +++++++++++++
 .../simplifyRoomFee/simplifyRoomFee.js        |   0
 .../simplifyAcceptance.html                   | 135 +++++-------------
 .../simplifyAcceptance/simplifyAcceptance.js  |  13 +-
 4 files changed, 139 insertions(+), 106 deletions(-)
 create mode 100644 public/components/property/simplifyRoomFee/simplifyRoomFee.html
 create mode 100644 public/components/property/simplifyRoomFee/simplifyRoomFee.js

diff --git a/public/components/property/simplifyRoomFee/simplifyRoomFee.html b/public/components/property/simplifyRoomFee/simplifyRoomFee.html
new file mode 100644
index 000000000..eaecd6be5
--- /dev/null
+++ b/public/components/property/simplifyRoomFee/simplifyRoomFee.html
@@ -0,0 +1,97 @@
+<div>
+    <div class="row margin-top">
+        <div class="col-lg-11 text-right">
+            <button type="button" class="btn btn-primary btn-sm" style="margin-left:10px"
+                v-on:click="_openProxyFeeModal()">
+                代收费用
+            </button>
+            <button type="button" class="btn btn-primary btn-sm" style="margin-left:10px"
+                v-on:click="_openAddMeterWaterModal()">
+                水电抄表
+            </button>
+            <button type="button" class="btn btn-primary btn-sm" style="margin-left:10px"
+                v-on:click="_openRoomCreateFeeAddModal()">
+                创建费用
+            </button>
+            <button type="button" class="btn btn-primary btn-sm" style="margin-left:10px" v-on:click="_toOwnerPayFee()">
+                欠费缴费
+            </button>
+        </div>
+    </div>
+    <div>
+        <table class="footable table table-stripped toggle-arrow-tiny" style="margin-top:10px" data-page-size="10">
+            <thead>
+                <tr>
+                    <th class="text-center">费用项目</th>
+                    <th class="text-center">费用标识</th>
+                    <th class="text-center">费用类型</th>
+                    <th class="text-center">应收金额</th>
+                    <th class="text-center">建账时间</th>
+                    <th class="text-center">计费起始时间</th>
+                    <th class="text-center">计费结束时间</th>
+                    <th class="text-center">说明</th>
+                    <th class="text-center">状态</th>
+                    <th class="text-right">操作</th>
+                </tr>
+            </thead>
+            <tbody>
+                <tr v-for="fee in simplifyAcceptanceInfo.fees">
+                    <!-- <td class="text-center">{{fee.feeId}}</td> -->
+                    <td class="text-center">{{fee.feeName}}</td>
+                    <td class="text-center">{{fee.feeFlagName}}</td>
+                    <td class="text-center">{{fee.feeTypeCdName}}</td>
+                    <td class="text-center">{{fee.amountOwed}}</td>
+                    <td class="text-center">{{fee.startTime}}</td>
+                    <td class="text-center">{{_getEndTime(fee)}}</td>
+                    <td class="text-center">{{_getDeadlineTime(fee)}}</td>
+                    <td class="text-center" v-if="fee.computingFormula == '5005'">
+                        <div>上期度数：{{fee.preDegrees}}</div>
+                        <div>本期度数：{{fee.curDegrees}} </div>
+                        <div>单价：{{fee.squarePrice}} </div>
+                        <div>附加费：{{fee.additionalAmount}}</div>
+                    </td>
+                    <td class="text-center" v-else-if="fee.computingFormula == '6006'">
+                        <div>用量：{{_getAttrValue(fee.feeAttrs,'390006')}}</div>
+                        <div>单价：{{fee.squarePrice}} </div>
+                        <div>附加费：{{fee.additionalAmount}}</div>
+                    </td>
+                    <td class="text-center" width="150" v-else-if="fee.feeTypeCd == '888800010017'">
+                        <div>算法：{{_getAttrValue(fee.feeAttrs,'390005')}}</div>
+                        <div>用量：{{_getAttrValue(fee.feeAttrs,'390003')}}</div>
+                    </td>
+                    <td class="text-center" v-else>
+                        <div>面积：{{listRoomCreateFeeInfo.builtUpArea}}</div>
+                        <div>单价：{{fee.squarePrice}}</div>
+                        <div v-if="fee.feeFlag == '1003006'">附加费：{{fee.additionalAmount}}</div>
+                        <div v-else>固定费：{{fee.additionalAmount}}</div>
+                    </td>
+                    <td class="text-center">{{fee.stateName}}</td>
+                    <td class="text-right">
+
+                        <button class="btn btn-link btn-xs"
+                            v-if="fee.state != '2009001' && vc.hasPrivilege('502020082314267912')"
+                            v-on:click="_payFee(fee)">缴费
+                        </button>
+                        <button class="btn btn-link btn-xs" v-on:click="_payFeeHis(fee)">缴费历史
+                        </button>
+                        <button class="btn btn-link btn-xs" v-if="vc.hasPrivilege('502020090604200029')"
+                            v-on:click="_deleteFee(fee)">取消费用
+                        </button>
+                        <button class="btn btn-link btn-xs"
+                            v-if="fee.state != '2009001' && vc.hasPrivilege('502020090427190001')"
+                            v-on:click="_editFee(fee)">费用变更
+                        </button>
+                    </td>
+                </tr>
+            </tbody>
+        </table>
+        <div class="row">
+            <div class="col-sm-5">
+                <span> 注意： 计费结束时间 “-” 表示未到计费时间 或 收费已结束</span>
+            </div>
+            <div class="col-sm-7 float-right">
+                <vc:create path="frame/pagination"></vc:create>
+            </div>
+        </div>
+    </div>
+</div>
\ No newline at end of file
diff --git a/public/components/property/simplifyRoomFee/simplifyRoomFee.js b/public/components/property/simplifyRoomFee/simplifyRoomFee.js
new file mode 100644
index 000000000..e69de29bb
diff --git a/public/pages/property/simplifyAcceptance/simplifyAcceptance.html b/public/pages/property/simplifyAcceptance/simplifyAcceptance.html
index ecf08c2a9..8b33c4b14 100644
--- a/public/pages/property/simplifyAcceptance/simplifyAcceptance.html
+++ b/public/pages/property/simplifyAcceptance/simplifyAcceptance.html
@@ -122,107 +122,42 @@
                 </div>
             </div>
         </div>
-
-
-        <div class="row margin-top">
-            <div class="col-lg-1 ibox-title">
-                <h5>房屋费用</h5>
-            </div>
-            <div class="col-lg-11 text-right">
-                <button type="button" class="btn btn-primary btn-sm" style="margin-left:10px"
-                    v-on:click="_openProxyFeeModal()">
-                    代收费用
-                </button>
-                <button type="button" class="btn btn-primary btn-sm" style="margin-left:10px"
-                    v-on:click="_openAddMeterWaterModal()">
-                    水电抄表
-                </button>
-                <button type="button" class="btn btn-primary btn-sm" style="margin-left:10px"
-                    v-on:click="_openRoomCreateFeeAddModal()">
-                    创建费用
-                </button>
-                <button type="button" class="btn btn-primary btn-sm" style="margin-left:10px"
-                    v-on:click="_toOwnerPayFee()">
-                    欠费缴费
-                </button>
-            </div>
-        </div>
         <div class="vc-line margin-top-xs"></div>
-        <div>
-            <table class="footable table table-stripped toggle-arrow-tiny" style="margin-top:10px" data-page-size="10">
-                <thead>
-                    <tr>
-                        <th class="text-center">费用项目</th>
-                        <th class="text-center">费用标识</th>
-                        <th class="text-center">费用类型</th>
-                        <th class="text-center">应收金额</th>
-                        <th class="text-center">建账时间</th>
-                        <th class="text-center">计费起始时间</th>
-                        <th class="text-center">计费结束时间</th>
-                        <th class="text-center">说明</th>
-                        <th class="text-center">状态</th>
-                        <th class="text-right">操作</th>
-                    </tr>
-                </thead>
-                <tbody>
-                    <tr v-for="fee in simplifyAcceptanceInfo.fees">
-                        <!-- <td class="text-center">{{fee.feeId}}</td> -->
-                        <td class="text-center">{{fee.feeName}}</td>
-                        <td class="text-center">{{fee.feeFlagName}}</td>
-                        <td class="text-center">{{fee.feeTypeCdName}}</td>
-                        <td class="text-center">{{fee.amountOwed}}</td>
-                        <td class="text-center">{{fee.startTime}}</td>
-                        <td class="text-center">{{_getEndTime(fee)}}</td>
-                        <td class="text-center">{{_getDeadlineTime(fee)}}</td>
-                        <td class="text-center" v-if="fee.computingFormula == '5005'">
-                            <div>上期度数：{{fee.preDegrees}}</div>
-                            <div>本期度数：{{fee.curDegrees}} </div>
-                            <div>单价：{{fee.squarePrice}} </div>
-                            <div>附加费：{{fee.additionalAmount}}</div>
-                        </td>
-                        <td class="text-center" v-else-if="fee.computingFormula == '6006'">
-                            <div>用量：{{_getAttrValue(fee.feeAttrs,'390006')}}</div>
-                            <div>单价：{{fee.squarePrice}} </div>
-                            <div>附加费：{{fee.additionalAmount}}</div>
-                        </td>
-                        <td class="text-center" width="150" v-else-if="fee.feeTypeCd == '888800010017'">
-                            <div>算法：{{_getAttrValue(fee.feeAttrs,'390005')}}</div>
-                            <div>用量：{{_getAttrValue(fee.feeAttrs,'390003')}}</div>
-                        </td>
-                        <td class="text-center" v-else>
-                            <div>面积：{{listRoomCreateFeeInfo.builtUpArea}}</div>
-                            <div>单价：{{fee.squarePrice}}</div>
-                            <div v-if="fee.feeFlag == '1003006'">附加费：{{fee.additionalAmount}}</div>
-                            <div v-else>固定费：{{fee.additionalAmount}}</div>
-                        </td>
-                        <td class="text-center">{{fee.stateName}}</td>
-                        <td class="text-right">
-
-                            <button class="btn btn-link btn-xs"
-                                v-if="fee.state != '2009001' && vc.hasPrivilege('502020082314267912')"
-                                v-on:click="_payFee(fee)">缴费
-                            </button>
-                            <button class="btn btn-link btn-xs" v-on:click="_payFeeHis(fee)">缴费历史
-                            </button>
-                            <button class="btn btn-link btn-xs" v-if="vc.hasPrivilege('502020090604200029')"
-                                v-on:click="_deleteFee(fee)">取消费用
-                            </button>
-                            <button class="btn btn-link btn-xs"
-                                v-if="fee.state != '2009001' && vc.hasPrivilege('502020090427190001')"
-                                v-on:click="_editFee(fee)">费用变更
-                            </button>
-                        </td>
-                    </tr>
-                </tbody>
-            </table>
-            <div class="row">
-                <div class="col-sm-5">
-                    <span> 注意： 计费结束时间 “-” 表示未到计费时间 或 收费已结束</span>
-                </div>
-                <div class="col-sm-7 float-right">
-                    <vc:create path="frame/pagination"></vc:create>
-                </div>
-            </div>
+        <div class="margin-top">
+            <ul class="nav nav-tabs">
+                <li class="nav-item">
+                    <a class="nav-link" v-bind:class="{active:simplifyAcceptanceInfo._currentTab == 1}"
+                        v-on:click="changeTab(1)">房屋费用</a>
+                </li>
+                <li class="nav-item">
+                    <a class="nav-link" v-bind:class="{active:simplifyAcceptanceInfo._currentTab == 2}"
+                        v-on:click="changeTab(2)">停车费用</a>
+                </li>
+                <li class="nav-item">
+                    <a class="nav-link" v-bind:class="{active:simplifyAcceptanceInfo._currentTab == 3}"
+                        v-on:click="changeTab(3)">家庭成员</a>
+                </li>
+                <li class="nav-item">
+                    <a class="nav-link" v-bind:class="{active:simplifyAcceptanceInfo._currentTab == 3}"
+                        v-on:click="changeTab(3)">车辆信息</a>
+                </li>
+                <li class="nav-item">
+                    <a class="nav-link" v-bind:class="{active:simplifyAcceptanceInfo._currentTab == 4}"
+                        v-on:click="changeTab(4)">报修单</a>
+                </li>
+                <li class="nav-item">
+                    <a class="nav-link" v-bind:class="{active:simplifyAcceptanceInfo._currentTab == 4}"
+                        v-on:click="changeTab(4)">投诉单</a>
+                </li>
+                <li class="nav-item">
+                    <a class="nav-link" v-bind:class="{active:simplifyAcceptanceInfo._currentTab == 4}"
+                        v-on:click="changeTab(4)">门禁同步</a>
+                </li>
+                <li class="nav-item">
+                    <a class="nav-link" v-bind:class="{active:simplifyAcceptanceInfo._currentTab == 4}"
+                        v-on:click="changeTab(4)">道闸同步</a>
+                </li>
+            </ul>
         </div>
     </div>
 
diff --git a/public/pages/property/simplifyAcceptance/simplifyAcceptance.js b/public/pages/property/simplifyAcceptance/simplifyAcceptance.js
index d3d87301e..c440d49d1 100644
--- a/public/pages/property/simplifyAcceptance/simplifyAcceptance.js
+++ b/public/pages/property/simplifyAcceptance/simplifyAcceptance.js
@@ -10,7 +10,8 @@
                 searchType: '1',
                 searchValue: '',
                 searchPlaceholder: '请输入房屋编号 楼栋-单元-房屋 如1-1-1',
-                ownerPhoto:'',
+                ownerPhoto: '',
+                _currentTab: 1
             }
         },
         _initMethod: function () {
@@ -42,15 +43,15 @@
                         $that.simplifyAcceptanceInfo.searchPlaceholder = '请输入房屋编号 楼栋-单元-房屋 如1-1-1';
                 }
             },
-            _doSearch:function(){
-                if(!vc.isNotEmpty($that.simplifyAcceptanceInfo.searchValue)){
+            _doSearch: function () {
+                if (!vc.isNotEmpty($that.simplifyAcceptanceInfo.searchValue)) {
                     vc.toast('请输入查询条件');
-                    return ;
+                    return;
                 }
 
             },
-            errorLoadImg:function(){
-                vc.component.simplifyAcceptanceInfo.ownerPhoto="/img/noPhoto.jpg";
+            errorLoadImg: function () {
+                vc.component.simplifyAcceptanceInfo.ownerPhoto = "/img/noPhoto.jpg";
             },
 
         }