From 880788b2137c3c517c097b91507bbeb15c0ca246 Mon Sep 17 00:00:00 2001
From: java110 <928255095@qq.com>
Date: Thu, 31 Dec 2020 00:55:17 +0800
Subject: [PATCH] =?UTF-8?q?=E8=B4=B9=E7=94=A8=E5=AF=BC=E5=85=A5=E6=94=AF?=
 =?UTF-8?q?=E6=8C=81=20=E8=BD=A6=E8=BE=86=E8=B4=B9=E7=94=A8=E5=AF=BC?=
 =?UTF-8?q?=E5=85=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../property/importRoomFee/importRoomFee.html      | 14 ++++++++++++--
 .../property/importRoomFee/importRoomFee.js        | 11 +++++++----
 2 files changed, 19 insertions(+), 6 deletions(-)

diff --git a/public/components/property/importRoomFee/importRoomFee.html b/public/components/property/importRoomFee/importRoomFee.html
index 604b53365..2b6d1e3dd 100644
--- a/public/components/property/importRoomFee/importRoomFee.html
+++ b/public/components/property/importRoomFee/importRoomFee.html
@@ -14,11 +14,21 @@
                                         <option selected disabled value="">必填，请选择费用类型</option>
                                         
                                         <option v-for="(item,index) in importRoomFeeInfo.feeTypeCds" :key="index"
-                                            v-bind:value="item.statusCd" v-if="item.statusCd !='888800010008'">
+                                            v-bind:value="item.statusCd" >
                                             {{item.name}}
                                         </option>
                                     </select></div>
                             </div>
+                            <div class="form-group row">
+                                <label class="col-sm-2 col-form-label">费用对象</label>
+                                <div class="col-sm-10">
+                                    <select class="custom-select" v-model="importRoomFeeInfo.objType"
+                                      >
+                                        <option selected disabled value="">必填，请选择费用对象</option>
+                                        <option value="3333" >房屋</option>
+                                        <option value="6666" >车位车辆</option>
+                                    </select></div>
+                            </div>
                             <div class="form-group row">
                                 <label class="col-sm-2 col-form-label">选择文件</label>
                                 <div class="col-sm-10">
@@ -36,7 +46,7 @@
                                 <label class="col-sm-2 col-form-label">下载模板</label>
                                 <div class="col-sm-10">
                                     请先下载
-                                    <a :href="'/callComponent/importRoomFee/exportData?communityId='+importRoomFeeInfo.communityId" target="_blank" >导入模板
+                                    <a :href="'/callComponent/importRoomFee/exportData?communityId='+importRoomFeeInfo.communityId+'&objType='+importRoomFeeInfo.objType" target="_blank" >导入模板
                                     </a>
                                     准备数据后，上传导入
                                 </div>
diff --git a/public/components/property/importRoomFee/importRoomFee.js b/public/components/property/importRoomFee/importRoomFee.js
index 1026b1347..a0354e2b0 100644
--- a/public/components/property/importRoomFee/importRoomFee.js
+++ b/public/components/property/importRoomFee/importRoomFee.js
@@ -6,7 +6,8 @@
                 communityId: vc.getCurrentCommunity().communityId,
                 excelTemplate: '',
                 feeTypeCd: '',
-                feeTypeCds: []
+                feeTypeCds: [],
+                objType:'3333'
             }
         },
         _initMethod: function () {
@@ -69,7 +70,8 @@
                 param.append("uploadFile", vc.component.importRoomFeeInfo.excelTemplate);
                 param.append('communityId', vc.component.importRoomFeeInfo.communityId);
                 param.append('feeTypeCd', vc.component.importRoomFeeInfo.feeTypeCd);
-
+                param.append('objType', $that.importRoomFeeInfo.objType);
+            
 
                 vc.http.upload(
                     'importRoomFee',
@@ -101,7 +103,7 @@
                     });
             },
             _exportRoomFeeTemplate:function(){
-                vc.jumpToPage('/callComponent/importRoomFee/exportData?communityId='+vc.getCurrentCommunity().communityId);
+                vc.jumpToPage('/callComponent/importRoomFee/exportData?communityId='+vc.getCurrentCommunity().communityId+"&objType="+$that.importRoomFeeInfo.objType);
             },
             clearAddFeeConfigInfo: function () {
                 var _feeTypeCds = vc.component.importRoomFeeInfo.feeTypeCds;
@@ -109,7 +111,8 @@
                     communityId: vc.getCurrentCommunity().communityId,
                     excelTemplate: '',
                     feeTypeCd: '',
-                    feeTypeCds: []
+                    feeTypeCds: [],
+                    objType:'3333'
                 };
 
                 vc.component.importRoomFeeInfo.feeTypeCds = _feeTypeCds;