From be2bcdc648884df74c459888e8fff612e429178a Mon Sep 17 00:00:00 2001
From: java110 <928255095@qq.com>
Date: Wed, 25 Nov 2020 18:45:30 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96diamante?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../property/chooseUnit/chooseUnit.html       | 39 +++++++++--------
 .../deletePayFeeConfigDiscount.js             | 42 +++++++++----------
 .../property/viewUnitInfo/viewUnitInfo.html   |  2 +-
 .../payFeeConfigDiscountManage.html           | 10 ++++-
 .../payFeeConfigDiscountManage.js             | 17 +++++---
 5 files changed, 63 insertions(+), 47 deletions(-)

diff --git a/public/components/property/chooseUnit/chooseUnit.html b/public/components/property/chooseUnit/chooseUnit.html
index 5da6db027..cde8079f2 100644
--- a/public/components/property/chooseUnit/chooseUnit.html
+++ b/public/components/property/chooseUnit/chooseUnit.html
@@ -1,4 +1,5 @@
-<div id = "chooseUnitModel" class="modal fade" tabindex="-1" role="dialog" aria-labelledby="chooseUnitModelLabel" aria-hidden="true" >
+<div id="chooseUnitModel" class="modal fade" tabindex="-1" role="dialog" aria-labelledby="chooseUnitModelLabel"
+    aria-hidden="true">
     <div class="modal-dialog modal-lg">
         <div class="modal-content">
             <div class="modal-header">
@@ -17,10 +18,13 @@
                                 </div>
                                 <div class="col-sm-5">
                                     <div class="input-group">
-                                        <input placeholder="输入单元名称" type="text" v-model="chooseUnitInfo._currentUnitName" class="form-control form-control-sm">
+                                        <input placeholder="输入单元名称" type="text"
+                                            v-model="chooseUnitInfo._currentUnitName"
+                                            class="form-control form-control-sm">
                                         <span class="input-group-append">
-                                                <button type="button" class="btn btn-sm btn-primary" v-on:click="queryUnits()">查询</button>
-                                            </span>
+                                            <button type="button" class="btn btn-sm btn-primary"
+                                                v-on:click="queryUnits()">查询</button>
+                                        </span>
                                     </div>
                                 </div>
                             </div>
@@ -28,25 +32,26 @@
                                 <table class="table table-striped">
                                     <thead>
                                         <tr>
-                                                                        <th class="text-center">单元ID</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">单元ID</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="unit in chooseUnitInfo.units">
-                                                                        <td class="text-center">{{unit.unitId}}</td>
-                            <td class="text-center">{{unit.unitNum}}</td>
-                            <td class="text-center">{{unit.layerCount}}</td>
-                            <td class="text-center">{{unit.lift}}</td>
-                            <td class="text-center">{{unit.remark}}</td>
+                                            <td class="text-center">{{unit.unitId}}</td>
+                                            <td class="text-center">{{unit.unitNum}}</td>
+                                            <td class="text-center">{{unit.layerCount}}</td>
+                                            <td class="text-center">{{unit.lift == '1010'?'有':'无'}}</td>
+                                            <td class="text-center">{{unit.remark}}</td>
 
                                             <td>
-                                                <button class="btn btn-primary btn-xs" v-on:click="chooseUnit(unit)">选择</button>
+                                                <button class="btn btn-primary btn-xs"
+                                                    v-on:click="chooseUnit(unit)">选择</button>
                                             </td>
                                         </tr>
                                     </tbody>
@@ -59,4 +64,4 @@
             </div>
         </div>
     </div>
-</div>
+</div>
\ No newline at end of file
diff --git a/public/components/property/deletePayFeeConfigDiscount/deletePayFeeConfigDiscount.js b/public/components/property/deletePayFeeConfigDiscount/deletePayFeeConfigDiscount.js
index f59ffcf28..2a8523b42 100644
--- a/public/components/property/deletePayFeeConfigDiscount/deletePayFeeConfigDiscount.js
+++ b/public/components/property/deletePayFeeConfigDiscount/deletePayFeeConfigDiscount.js
@@ -1,52 +1,52 @@
-(function(vc,vm){
+(function (vc, vm) {
 
     vc.extends({
-        data:{
-            deletePayFeeConfigDiscountInfo:{
+        data: {
+            deletePayFeeConfigDiscountInfo: {
 
             }
         },
-         _initMethod:function(){
+        _initMethod: function () {
 
-         },
-         _initEvent:function(){
-             vc.on('deletePayFeeConfigDiscount','openDeletePayFeeConfigDiscountModal',function(_params){
+        },
+        _initEvent: function () {
+            vc.on('deletePayFeeConfigDiscount', 'openDeletePayFeeConfigDiscountModal', function (_params) {
 
                 vc.component.deletePayFeeConfigDiscountInfo = _params;
                 $('#deletePayFeeConfigDiscountModel').modal('show');
 
             });
         },
-        methods:{
-            deletePayFeeConfigDiscount:function(){
-                vc.component.deletePayFeeConfigDiscountInfo.communityId=vc.getCurrentCommunity().communityId;
+        methods: {
+            deletePayFeeConfigDiscount: function () {
+                vc.component.deletePayFeeConfigDiscountInfo.communityId = vc.getCurrentCommunity().communityId;
                 vc.http.apiPost(
-                    'payFeeConfigDiscount.deletePayFeeConfigDiscount',
+                    '/payFeeConfigDiscount/deletePayFeeConfigDiscount',
                     JSON.stringify(vc.component.deletePayFeeConfigDiscountInfo),
                     {
-                        emulateJSON:true
-                     },
-                     function(json,res){
+                        emulateJSON: true
+                    },
+                    function (json, res) {
                         //vm.menus = vm.refreshMenuActive(JSON.parse(json),0);
                         let _json = JSON.parse(json);
                         if (_json.code == 0) {
                             //关闭model
                             $('#deletePayFeeConfigDiscountModel').modal('hide');
-                            vc.emit('payFeeConfigDiscountManage','listPayFeeConfigDiscount',{});
-                            return ;
+                            vc.emit('payFeeConfigDiscountManage', 'listPayFeeConfigDiscount', {});
+                            return;
                         }
                         vc.message(_json.msg);
-                     },
-                     function(errInfo,error){
+                    },
+                    function (errInfo, error) {
                         console.log('请求失败处理');
                         vc.message(json);
 
-                     });
+                    });
             },
-            closeDeletePayFeeConfigDiscountModel:function(){
+            closeDeletePayFeeConfigDiscountModel: function () {
                 $('#deletePayFeeConfigDiscountModel').modal('hide');
             }
         }
     });
 
-})(window.vc,window.vc.component);
+})(window.vc, window.vc.component);
diff --git a/public/components/property/viewUnitInfo/viewUnitInfo.html b/public/components/property/viewUnitInfo/viewUnitInfo.html
index 513df6033..810cbb0f2 100644
--- a/public/components/property/viewUnitInfo/viewUnitInfo.html
+++ b/public/components/property/viewUnitInfo/viewUnitInfo.html
@@ -42,7 +42,7 @@
                     <div class="col-sm-4">
                         <div class="form-group">
                             <label class="col-form-label">电梯：</label>
-                            <label class="">{{viewUnitInfo.lift}}</label>
+                            <label class="">{{viewUnitInfo.lift == '1010'?'有':'无'}}</label>
                         </div>
                     </div>
                     <div class="col-sm-4">
diff --git a/public/pages/property/payFeeConfigDiscountManage/payFeeConfigDiscountManage.html b/public/pages/property/payFeeConfigDiscountManage/payFeeConfigDiscountManage.html
index bca30b0f9..cd5f9508a 100644
--- a/public/pages/property/payFeeConfigDiscountManage/payFeeConfigDiscountManage.html
+++ b/public/pages/property/payFeeConfigDiscountManage/payFeeConfigDiscountManage.html
@@ -23,6 +23,7 @@
                                 <th class="text-center">费用折扣ID</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>
@@ -31,8 +32,13 @@
                             <tr v-for="payFeeConfigDiscount in payFeeConfigDiscountManageInfo.payFeeConfigDiscounts">
                                 <td class="text-center">{{payFeeConfigDiscount.configDiscountId}}</td>
                                 <td class="text-center">{{payFeeConfigDiscountManageInfo.feeName}}</td>
-                                <td class="text-center">{{payFeeConfigDiscount.discountId}}</td>
-                                <td class="text-center">{{payFeeConfigDiscount.discountType}}</td>
+                                <td class="text-center">{{payFeeConfigDiscount.discountName}}</td>
+                                <td class="text-center">
+                                    <div v-for="(item,index) in payFeeConfigDiscount.feeDiscountSpecs">
+                                        {{item.specName}}：{{item.specValue}}
+                                    </div>
+                                </td>
+                                <td class="text-center">{{payFeeConfigDiscount.discountType == '1001'?'优惠':'违约'}}</td>
                                 <td class="text-center">
                                     <div class="btn-group">
                                         <button class="btn-white btn btn-xs"
diff --git a/public/pages/property/payFeeConfigDiscountManage/payFeeConfigDiscountManage.js b/public/pages/property/payFeeConfigDiscountManage/payFeeConfigDiscountManage.js
index cf0bdd979..ceb30b9a9 100644
--- a/public/pages/property/payFeeConfigDiscountManage/payFeeConfigDiscountManage.js
+++ b/public/pages/property/payFeeConfigDiscountManage/payFeeConfigDiscountManage.js
@@ -36,14 +36,17 @@
         methods: {
             _listPayFeeConfigDiscounts: function (_page, _rows) {
 
-                vc.component.payFeeConfigDiscountManageInfo.conditions.page = _page;
-                vc.component.payFeeConfigDiscountManageInfo.conditions.row = _rows;
-                var param = {
-                    params: vc.component.payFeeConfigDiscountManageInfo.conditions
+                let param = {
+                    params: {
+                        page:_page,
+                        row:_rows,
+                        configId:$that.payFeeConfigDiscountManageInfo.configId,
+                        communityId:vc.getCurrentCommunity().communityId
+                    }
                 };
 
                 //发送get请求
-                vc.http.apiGet('payFeeConfigDiscount.listPayFeeConfigDiscounts',
+                vc.http.apiGet('/payFeeConfigDiscount/queryPayFeeConfigDiscount',
                     param,
                     function (json, res) {
                         var _payFeeConfigDiscountManageInfo = JSON.parse(json);
@@ -60,7 +63,9 @@
                 );
             },
             _openAddPayFeeConfigDiscountModal: function () {
-                vc.emit('addPayFeeConfigDiscount', 'openAddPayFeeConfigDiscountModal', {});
+                vc.emit('addPayFeeConfigDiscount', 'openAddPayFeeConfigDiscountModal', {
+                    configId: $that.payFeeConfigDiscountManageInfo.configId
+                });
             },
             _openDeletePayFeeConfigDiscountModel: function (_payFeeConfigDiscount) {
                 vc.emit('deletePayFeeConfigDiscount', 'openDeletePayFeeConfigDiscountModal', _payFeeConfigDiscount);