+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
@@ -97,4 +122,6 @@
+
+
\ No newline at end of file
diff --git a/public/components/admin/viewRentingPoolInfo/viewRentingPoolInfo.js b/public/components/admin/viewRentingPoolInfo/viewRentingPoolInfo.js
index a4149eaab..b9d3478a1 100644
--- a/public/components/admin/viewRentingPoolInfo/viewRentingPoolInfo.js
+++ b/public/components/admin/viewRentingPoolInfo/viewRentingPoolInfo.js
@@ -19,7 +19,8 @@
paymentTypeName: '',
roomName: '',
serviceOwnerFee: 0.0,
- serviceTenantFee: 0.0
+ serviceTenantFee: 0.0,
+ photos:[]
}
},
_initMethod: function () {
@@ -70,6 +71,7 @@
vc.copyObject(_rentingPoolManageInfo.data[0], $that.viewRentingPoolInfo);
let _data = _rentingPoolManageInfo.data[0];
+ $that.viewRentingPoolInfo.photos = _data.photos;
let _rentingFormula = _data.rentingFormula;
//收费计算公式,1001 固定值 ,2002 每月租金比例
@@ -89,7 +91,12 @@
},
_goBack: function () {
vc.goBack();
- }
+ },
+ openFile:function(_photo){
+ vc.emit('viewImage','showImage',{
+ url:_photo
+ });
+ }
}
});
diff --git a/public/pages/admin/rentingDetail/rentingDetail.html b/public/pages/admin/rentingDetail/rentingDetail.html
index 54469d10d..6ecf2e126 100644
--- a/public/pages/admin/rentingDetail/rentingDetail.html
+++ b/public/pages/admin/rentingDetail/rentingDetail.html
@@ -2,6 +2,7 @@
+
diff --git a/public/pages/admin/rentingDetail/rentingDetail.js b/public/pages/admin/rentingDetail/rentingDetail.js
index 9afd322df..c37db07f5 100644
--- a/public/pages/admin/rentingDetail/rentingDetail.js
+++ b/public/pages/admin/rentingDetail/rentingDetail.js
@@ -7,7 +7,7 @@
data: {
rentingDetailInfo: {
rentingFlows:[],
- fees:[]
+ fees:[],
}
},
_initMethod: function () {
diff --git a/public/pages/property/feeManualCollectionManage/feeManualCollectionManage.html b/public/pages/property/feeManualCollectionManage/feeManualCollectionManage.html
index 3d8a9e7ea..185d9528b 100644
--- a/public/pages/property/feeManualCollectionManage/feeManualCollectionManage.html
+++ b/public/pages/property/feeManualCollectionManage/feeManualCollectionManage.html
@@ -68,6 +68,7 @@
业主名称 |
业主电话 |
房屋面积 |
+ 托收金额 |
状态 |
操作 |
@@ -79,6 +80,7 @@
{{feeManualCollection.ownerName}} |
{{feeManualCollection.link}} |
{{feeManualCollection.roomArea}} |
+ {{feeManualCollection.totalFee}} |
{{feeManualCollection.stateName}} |
|