Merge pull request '欠费查询功能优化' (#14) from feature_approval into develop

Reviewed-on: http://101.201.121.115:3000/leo/LAPP_MY_WEBFRONT/pulls/14
Reviewed-by: Liwei <wei.li@le-it.com.cn>

src/views/reportform/chargeRate.vue

@@ -26,7 +26,7 @@
 		<el-tabs v-model="activeName" type="card">
 			<el-tab-pane label="园区物业费基本信息" name="first">
 				<el-table v-loading="loading" :data="dataList" border max-height="600">
-					<el-table-column prop="cidname" :show-overflow-tooltip="true"></el-table-column>
+					<el-table-column prop="buildingname" :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>

src/views/reportform/expire.vue

@@ -1,18 +1,29 @@
 <template>
   <div class="app-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" style="width:200px;">
+					<el-option
+						v-for="item in cidList"
+						:key="item.cid"
+						:label="item.descr"
+						:value="item.cid"
+						clear="false"
+					/>
+				</el-select>
+			</el-form-item>
       <el-form-item label="缴费类型">
         <el-select
           ref="headerSearchSelect"
           v-model="queryParams.chargetype"
           clearable
-          style="width:100px"
+          style="width:200px"
           size="small"
         >
           <el-option v-for="item in feesType" :key="item.value" :value="item.value" :label="item.label" />
         </el-select>
       </el-form-item>
-      <el-form-item label="开始日期">
+      <el-form-item label="欠费统计日期">
         <el-date-picker
           v-model="queryParams.startDate"
           type="date"
@@ -20,27 +31,7 @@
           value-format="yyyy-MM-dd"
           clearable
           size="small"
-          style="width:140px"
-        />
-      </el-form-item>
-      <el-form-item label="结束日期">
-        <el-date-picker
-          v-model="queryParams.expireDate"
-          type="date"
-          placeholder="选择日期"
-          value-format="yyyy-MM-dd"
-          clearable
-          size="small"
-          style="width:140px"
-        />
-      </el-form-item>
-      <el-form-item label="编号">
-        <el-input
-          v-model.trim="queryParams.number"
-          placeholder="请输入"
-          clearable
-          size="small"
-          style="width:120px"
+          style="width:200px"
         />
       </el-form-item>
       <el-form-item>
@@ -52,18 +43,18 @@
       </el-form-item>
     </el-form>
     <el-table v-loading="loading" :data="dataList" border>
-      <el-table-column v-for="(item, index) in headers" :key="index" align="center" :label="getColumnName(item)" width="120px" :show-overflow-tooltip="true">
+      <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-if=" item === 'chargetype'">{{ scope.row[item] === 2 ? '电梯卡费' : scope.row[item] === 3 ? '车位费' : '物业费' }}</span>
-          <span v-else-if=" item === 'status'">{{ scope.row[item] === 0 ? '已缴费' : '未缴费' }}</span>
-          <span v-else-if=" item === 'lastmodifytime'">{{ parseTime(scope.row.createtime) }}</span>
-          <span v-else-if=" item === 'createtime'">{{ parseTime(scope.row.createtime) }}</span>
+					<span v-else-if=" item === 'chargetype'">{{ feesTypeEcho(scope.row[item]) }}</span>
           <span v-else>{{ scope.row[item] }}</span>
         </template>
       </el-table-column>
     </el-table>
-
+		<div style="text-align:right;margin-right: 20px;">
+			<span>数据统计时间标签：</span>
+			<span>{{ currentDate }}</span>
+		</div>
     <pagination
       v-show="total>0"
       :total="total"
@@ -76,15 +67,27 @@
 
 <script>
 import { getExpireList, exportExpireList } from '@/api/reportform'
-
+import moment from 'moment'
 export default {
   name: 'ExpireReport',
   data() {
     return {
+			cidList:JSON.parse(localStorage.cid) || [], // 园区列表
+			role:localStorage.role, // 角色
       // 数据列表
       dataList: [],
       // 遍历表头
-      headers: [],
+      headers: [
+				'cid',
+				'chargetype',
+				'propertyid',
+				'constructionarea',
+				'unitprice',
+				'owetime',
+				'chargetime',
+				'lengthdate',
+				'chargableexpense'
+			],
       // 遮罩层
       loading: true,
       // 总条数
@@ -94,16 +97,16 @@ export default {
       queryParams: {
         pageIndex: 1,
         pageSize: 10,
-        expireDate: undefined,
+				cid: undefined,
         chargetype: 1,
         startDate: undefined,
-        number: undefined
       },
       feesType: [
         { value: 1, label: '物业费' },
         { value: 2, label: '电梯卡费' },
         { value: 3, label: '车位费' }
-      ]
+      ],
+			currentDate: undefined,
     }
   },
   created() {
@@ -113,12 +116,12 @@ export default {
     /** 查询角色列表 */
     getList() {
       this.loading = true
+			this.currentDate = this.queryParams.startDate || moment().format('YYYY-MM-DD')
       getExpireList(this.queryParams).then(
         response => {
           this.dataList = response.data.data
           this.total = response.data.count
           this.totalFee = response.data.total
-          if (this.dataList.length > 0) this.headers = Object.keys(this.dataList[0])
           this.loading = false
         }
       )
@@ -128,14 +131,19 @@ export default {
       this.queryParams.pageIndex = 1
       this.getList()
     },
-    /** 重置按钮操作 */
+    /** 导出操作 */
     handleExport() {
       delete this.queryParams.pageIndex
       delete this.queryParams.pageSize
       exportExpireList(this.queryParams).then(res => {
         location.href = `${process.env.VUE_APP_BASE_API}/${res.data}`
       })
-    }
+    },
+		// 缴费类型字段映射
+		feesTypeEcho(data) {
+			const item = this.feesType.find(e=> e.value == data)
+			return item ? item.label : data
+		}
   }
 }
 </script>