Merge pull request '单园区物业收费率统计优化' (#9) from feature_approval into develop

Reviewed-on: #9
Reviewed-by: Liwei <wei.li@le-it.com.cn>

src/views/reportform/chargeRate.vue

@@ -1,5 +1,5 @@
 <template>
-  <div class="app-container">
+  <div class="app-container charge-rate-container">
     <el-form ref="queryForm" :model="queryParams" :inline="true">
 			<el-form-item v-if="role=='admin' || role=='group'" label="园区：">
 				<el-select v-model="queryParams.cid" placeholder="请选择" size="small">
@@ -37,35 +37,50 @@
 			<span class="fr">数据统计时间：{{currentDate}}</span>
 		</div>
     <el-table v-loading="loading" :data="dataList" border>
-      <el-table-column v-for="(item, index) in headers" :key="index" align="center" :label="getColumnName(item)" :show-overflow-tooltip="true">
-        <template slot-scope="scope">
-          <span v-if=" item === 'cid'">{{ getValue(scope.row[item]) }}</span>
-          <span v-else>{{ scope.row[item] }}</span>
+			<el-table-column prop="cidname" :show-overflow-tooltip="true"></el-table-column>
+			<el-table-column prop="totalhouseholds" label="总户数(个)" :show-overflow-tooltip="true"></el-table-column>
+			<el-table-column prop="constructionarea" label="建筑面积(㎡)" :show-overflow-tooltip="true"></el-table-column>
+			<el-table-column prop="unitprice" label="单价(元/㎡·月)" :show-overflow-tooltip="true"></el-table-column>
+			<el-table-column prop="start_date" label="起始日期" :show-overflow-tooltip="true"></el-table-column>
+			<el-table-column prop="end_date" label="结束日期" :show-overflow-tooltip="true"></el-table-column>
+			<el-table-column prop="length_date" label="收费周期" :show-overflow-tooltip="true"></el-table-column>
+			<el-table-column prop="expect_money" label="预计物业费金额(万元)" :show-overflow-tooltip="true"></el-table-column>
+			<el-table-column prop="receivable_money" label="实际缴费金额(万元)" :show-overflow-tooltip="true"></el-table-column>
+			<el-table-column prop="percent" label="收费率(%)" :show-overflow-tooltip="true">
+				<template slot-scope="scope">
+          <span>{{ scope.row.percent*10000/100 }}%</span>
         </template>
-      </el-table-column>
+			</el-table-column>
     </el-table>
 		<div style="margin-top:50px;" class="clearfix">
 			<span>楼栋物业费收费率</span>
 			<span class="fr">数据统计时间：{{currentDate}}</span>
 		</div>
-		<el-table 
-			v-loading="loading" 
-			:data="dataBuildList" 
-			show-summary
+		<el-table
+			v-loading="loading"
+			:data="dataBuildList"
 			border
 			max-height="300"
 			ref="table">
 			<el-table-column prop="buildingname" label="楼号" :show-overflow-tooltip="true"></el-table-column>
-			<el-table-column prop="totalhouseholds" label="总户数" :show-overflow-tooltip="true"></el-table-column>
-			<el-table-column prop="constructionarea" label="建筑面积" :show-overflow-tooltip="true"></el-table-column>
-      <el-table-column v-for="(item, index) in headersBuild" :key="index" align="center" :label="getColumnName(item)" :show-overflow-tooltip="true">
-        <template slot-scope="scope">
-          <span>{{ scope.row[item] }}</span>
+			<el-table-column prop="totalhouseholds" label="总户数(个)" :show-overflow-tooltip="true"></el-table-column>
+			<el-table-column prop="constructionarea" label="建筑面积(㎡)" :show-overflow-tooltip="true"></el-table-column>
+			<el-table-column prop="unitprice" label="单价(元/㎡·月)" :show-overflow-tooltip="true"></el-table-column>
+			<el-table-column prop="start_date" label="起始日期" :show-overflow-tooltip="true"></el-table-column>
+			<el-table-column prop="end_date" label="结束日期" :show-overflow-tooltip="true"></el-table-column>
+			<el-table-column prop="length_date" label="收费周期" :show-overflow-tooltip="true"></el-table-column>
+			<el-table-column prop="expect_money" label="预计缴费金额(万元)" :show-overflow-tooltip="true"></el-table-column>
+			<el-table-column prop="receivable_money" label="实际缴费金额(万元)" :show-overflow-tooltip="true"></el-table-column>
+			<el-table-column prop="percent" label="收费率(%)" :show-overflow-tooltip="true">
+				<template slot-scope="scope">
+          <span>{{ scope.row.percent*10000/100 }}%</span>
         </template>
-      </el-table-column>
-			<el-table-column prop="expect_money" label="预计缴费金额" :show-overflow-tooltip="true"></el-table-column>
-			<el-table-column prop="receivable_money" label="实际缴费金额" :show-overflow-tooltip="true"></el-table-column>
-			<el-table-column prop="percent" label="收费率" :show-overflow-tooltip="true"></el-table-column>
+			</el-table-column>
+			<el-table-column prop="difference_value" label="差值(%)" :show-overflow-tooltip="true">
+				<template slot-scope="scope">
+          <span>{{ scope.row.difference_value*10000/100 }}%</span>
+        </template>
+			</el-table-column>
     </el-table>
   </div>
 </template>
@@ -83,8 +98,8 @@ export default {
       dataList: [],
 			dataBuildList: [],
       // 遍历表头
-      headers: [],
-			headersBuild: [],
+      // headers: [],
+			// headersBuild: [],
       // 遮罩层
       loading: true,
       // 总条数
@@ -109,31 +124,31 @@ export default {
         response => {
           this.dataList = response.data.cat_arr
 					this.dataBuildList = response.data.build_arr
-          this.headers = [
-						'cidname',
-						'totalhouseholds',
-						'constructionarea',
-						'unitprice',
-						'start_date',
-						'end_date',
-						'length_date',
-						'expect_money',
-						'receivable_money',
-						'percent'
-					]
-					this.headersBuild = [
+          // this.headers = [
+					// 	'cidname',
+					// 	'totalhouseholds',
+					// 	'constructionarea',
+					// 	'unitprice',
+					// 	'start_date',
+					// 	'end_date',
+					// 	'length_date',
+					// 	'expect_money',
+					// 	'receivable_money',
+					// 	'percent'
+					// ]
+					// this.headersBuild = [
 						// 'buildingname',
 						// 'totalhouseholds',
 						// 'constructionarea',
-						'unitprice',
-						'start_date',
-						'end_date',
-						'length_date',
+						// 'unitprice',
+						// 'start_date',
+						// 'end_date',
+						// 'length_date',
 						// 'expect_money',
 						// 'receivable_money',
 						// 'percent',
-						'difference_value'
-					]
+					// 	'difference_value'
+					// ]
           this.loading = false
         }
       )
@@ -149,17 +164,15 @@ export default {
       }
       this.getList()
     },
-		getSummaries(param) {
-			const { columns, data } = param
-			const sums = []
-			columns.forEach((column, index) => {
-				if (index === 0) {
-					sums[index] = '总计'
-					return
-				}
-			})
-			return sums
-		},
   }
 }
 </script>
+<style lang="scss" scoped>
+.charge-rate-container {
+	/deep/ .el-table__body-wrapper {
+		&::-webkit-scrollbar {
+			width: 6px !important;
+		}
+	}
+}
+</style>