From 210804522eec54fcfa5a857d5f687152c5afde19 Mon Sep 17 00:00:00 2001
From: java110 <928255095@qq.com>
Date: Fri, 3 Dec 2021 12:45:07 +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

---
 .../newOaWorkflowForm/newOaWorkflowForm.js    |   4 +-
 .../property/listRoomFee/listRoomFee.html     | 128 ++++++++----------
 2 files changed, 60 insertions(+), 72 deletions(-)

diff --git a/public/components/property/newOaWorkflowForm/newOaWorkflowForm.js b/public/components/property/newOaWorkflowForm/newOaWorkflowForm.js
index 95369c96b..70ad0caab 100644
--- a/public/components/property/newOaWorkflowForm/newOaWorkflowForm.js
+++ b/public/components/property/newOaWorkflowForm/newOaWorkflowForm.js
@@ -10,8 +10,8 @@
                 formJson: {},
                 conditions: {},
                 flowId: '',
-                file: '',
-                realFile: ''
+                fileName: '',
+                realFileName: ''
             }
         },
         _initMethod: function() {},
diff --git a/public/pages/property/listRoomFee/listRoomFee.html b/public/pages/property/listRoomFee/listRoomFee.html
index 49709e442..91e452254 100755
--- a/public/pages/property/listRoomFee/listRoomFee.html
+++ b/public/pages/property/listRoomFee/listRoomFee.html
@@ -5,95 +5,83 @@
                 <div class="ibox-title">
                     <h5>{{listRoomCreateFeeInfo.roomName}}费用</h5>
                     <div class="ibox-tools" style="top:10px;">
-                        <button type="button" class="btn btn-primary btn-sm" style="margin-left:10px"
-                                v-on:click="_openProxyFeeModal()" v-if="listRoomCreateFeeInfo.hireOwnerFee == '0'">
+                        <button type="button" class="btn btn-primary btn-sm" style="margin-left:10px" v-on:click="_openProxyFeeModal()" v-if="listRoomCreateFeeInfo.hireOwnerFee == '0'">
                             代收费用
                         </button>
-                        <button type="button" class="btn btn-primary btn-sm" style="margin-left:10px"
-                                v-on:click="_openAddMeterWaterModal()" v-if="listRoomCreateFeeInfo.hireOwnerFee == '0'">
+                        <button type="button" class="btn btn-primary btn-sm" style="margin-left:10px" v-on:click="_openAddMeterWaterModal()" v-if="listRoomCreateFeeInfo.hireOwnerFee == '0'">
                             水电抄表
                         </button>
-                        <button type="button" class="btn btn-primary btn-sm" style="margin-left:10px"
-                                v-on:click="_openRoomCreateFeeAddModal()"
-                                v-if="listRoomCreateFeeInfo.hireOwnerFee == '0'">
+                        <button type="button" class="btn btn-primary btn-sm" style="margin-left:10px" v-on:click="_openRoomCreateFeeAddModal()" v-if="listRoomCreateFeeInfo.hireOwnerFee == '0'">
                             创建费用
                         </button>
-                        <button type="button" class="btn btn-primary btn-sm" style="margin-left:10px"
-                                v-on:click="_toOwnerPayFee()" v-if="listRoomCreateFeeInfo.hireOwnerFee == '0'">
+                        <button type="button" class="btn btn-primary btn-sm" style="margin-left:10px" v-on:click="_toOwnerPayFee()" v-if="listRoomCreateFeeInfo.hireOwnerFee == '0'">
                             欠费缴费
                         </button>
-                        <button type="button" class="btn btn-primary btn-sm" style="margin-left:10px"
-                                v-on:click="_goBack()">
+                        <button type="button" class="btn btn-primary btn-sm" style="margin-left:10px" v-on:click="_goBack()">
                             返回
                         </button>
                     </div>
                 </div>
                 <div class="ibox-content">
-                    <table class="footable table table-stripped toggle-arrow-tiny" style="margin-top:10px"
-                           data-page-size="10">
+                    <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-center">操作</th>
-                        </tr>
+                            <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-center">操作</th>
+                            </tr>
                         </thead>
                         <tbody>
-                        <tr v-for="fee in listRoomCreateFeeInfo.fees">
-                            <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' || fee.computingFormula == '9009'">
-                                <div>上期度数：{{fee.preDegrees}}</div>
-                                <div>本期度数：{{fee.curDegrees}}</div>
-                                <div>单价：{{getOnePrice1(fee)}}</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" width="150" v-else-if="fee.computingFormula == '4004'">
-                                <div>费用根据实际情况而定</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-center">
-                                <button class="btn btn-link btn-xs"
-                                        v-if="fee.state != '2009001' && vc.hasPrivilege('502020082314267912')"
-                                        v-on:click="_payFee(fee)">缴费
+                            <tr v-for="fee in listRoomCreateFeeInfo.fees">
+                                <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' || fee.computingFormula == '9009'">
+                                    <div>上期度数：{{fee.preDegrees}}</div>
+                                    <div>本期度数：{{fee.curDegrees}}</div>
+                                    <div>单价：{{getOnePrice1(fee)}}</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" width="150" v-else-if="fee.computingFormula == '4004'">
+                                    <div>费用根据实际情况而定</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-center">
+                                    <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 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 class="btn btn-link btn-xs" v-if="fee.state != '2009001' && vc.hasPrivilege('502020090427190001')" v-on:click="_editFee(fee)">费用变更
                                 </button>
-                            </td>
-                        </tr>
+                                </td>
+                            </tr>
                         </tbody>
                     </table>
                     <!-- 分页 -->