物业费账单

operationSupport/src/views/payService/expenseReport/Electricity.vue

@@ -1,51 +1,14 @@
 <template>
     <div class="main">
-        <div class="search">
-            <el-input
-                clearable
-                placeholder="输入房间号/业主/手机号"
-                class="search-input"
-                v-trim
-                v-model.trim="mixins_query.queryValue"
-            ></el-input>
-            <el-select v-model="mixins_query.communityId" placeholder="选择社区" clearable>
-                <el-option v-for="(item, index) in communityArr" :key="index" :label="item.communityName" :value="item.id"></el-option>
-            </el-select>
-            电费余额
-            <el-select class="width90" v-model="mixins_query.symbol" clearable>
-                <el-option label="=" :value="1"></el-option>
-                <el-option label=">" :value="2"></el-option>
-                <el-option label=">=" :value="3"></el-option>
-                <el-option label="<" :value="4"></el-option>
-                <el-option label="<=" :value="5"></el-option>
-            </el-select>
-            <el-input class="search-input" v-trim v-model.trim="mixins_query.balance" clearable placeholder="请输入数值" />
-            <el-button type="primary" class="search-btn" @click="mixins_search" icon="el-icon-search">查询 </el-button>
-        </div>
-        <div class="roles-wrap">
-            <zz-table
-                :cols="cols"
-                :settings="{ showIndex: true, stripe: true }"
-                :loading="mixins_onQuery"
-                :data="mixins_list"
-                :pageset="mixins_pageset"
-                @page-change="pageChange"
-            >
-                <template slot-scope="scope" slot="opt">
-                    <div class="opt">
-                        <el-tooltip effect="light" placement="bottom" content="充值">
-                            <i class="zoniot_font zoniot-icon-chongzhi" @click="addOrEdit(scope.row)"></i>
-                        </el-tooltip>
-                        <el-tooltip effect="light" placement="bottom" content="充值记录">
-                            <i class="zoniot_font zoniot-icon-chongzhijilu" @click="lookRechargeRecord(scope.row)"></i>
-                        </el-tooltip>
-                        <el-tooltip effect="light" placement="bottom" content="扣费记录">
-                            <i class="zoniot_font zoniot-icon-koufeijilu" @click="lookChargebackRecord(scope.row)"></i>
-                        </el-tooltip>
-                    </div>
-                </template>
-            </zz-table>
-        </div>
+        <zz-table
+            :cols="cols"
+            :settings="{ showIndex: true, stripe: true }"
+            :loading="mixins_onQuery"
+            :data="mixins_list"
+            :pageset="mixins_pageset"
+            @page-change="pageChange"
+        >
+        </zz-table>
     </div>
 </template>
 
@@ -79,84 +42,26 @@ export default {
                 {
                     label: '最后扣费时间',
                     prop: 'lastPayTime'
-                },
-                {
-                    label: '操作',
-                    prop: 'id',
-                    slot: 'opt'
                 }
             ],
-            communityArr: [],
             mixins_post: 'post'
         };
     },
     created() {
-        this.getorgTree();
         this.mixins_dataUrl = '/sc-charge/house/account/page';
         this.mixins_query = {
             accountType: 3
         };
-        this.mixins_search();
+        // this.mixins_search();
     },
     mounted() {},
     methods: {
-        getorgTree() {
-            this.$http
-                .get('/sc-community/assets/community/list')
-                .then((data) => {
-                    this.communityArr = data.data;
-                    this.$store.commit('setAreaSelect', data.data);
-                })
-
-                .catch(function () {});
-        },
-        lookRechargeRecord(row) {
-            this.$router.push({
-                path: '/RechargeRecord',
-                query: {
-                    accountType: 3,
-                    paymentType: 1,
-                    id: row.houseId,
-                    name: row.communityName + row.assets
-                }
-            });
-        },
-        lookChargebackRecord(row) {
-            this.$router.push({
-                path: '/ChargebackRecord',
-                query: {
-                    accountType: 3,
-                    paymentType: 2,
-                    id: row.houseId,
-                    name: row.communityName + row.assets
-                }
-            });
-        },
-        addOrEdit(row) {
-            new Promise((resolve) => {
-                this.$store.dispatch('addPopup', {
-                    url: '/payService/electricManagement/stepPage/add.vue',
-                    width: '524px',
-                    height: '424px',
-                    props: {
-                        data: row,
-                        callback: resolve
-                    },
-                    title: '电费充值'
-                });
-            }).then(() => {
-                this.mixins_search();
-            });
+        getParent(query) {
+            Object.assign(this.mixins_query, query);
+            this.mixins_search();
         }
     }
 };
 </script>
 <style scoped lang='scss'>
-.search {
-    font-size: 12px;
-    color: #424656;
-}
-.width90 {
-    width: 90px;
-}
 </style>

operationSupport/src/views/payService/expenseReport/Water.vue

@@ -1,51 +1,21 @@
 <template>
     <div class="main">
-        <div class="search">
-            <el-input
-                clearable
-                placeholder="输入房间号/业主/手机号"
-                class="search-input"
-                v-trim
-                v-model.trim="mixins_query.queryValue"
-            ></el-input>
-            <el-select v-model="mixins_query.communityId" placeholder="选择社区" clearable>
-                <el-option v-for="(item, index) in communityArr" :key="index" :label="item.communityName" :value="item.id"></el-option>
-            </el-select>
-            水费余额
-            <el-select class="width90" v-model="mixins_query.symbol" clearable>
-                <el-option label="=" :value="1"></el-option>
-                <el-option label=">" :value="2"></el-option>
-                <el-option label=">=" :value="3"></el-option>
-                <el-option label="<" :value="4"></el-option>
-                <el-option label="<=" :value="5"></el-option>
-            </el-select>
-            <el-input class="search-input" v-trim v-model.trim="mixins_query.balance" clearable placeholder="请输入数值" />
-            <el-button type="primary" class="search-btn" @click="mixins_search" icon="el-icon-search">查询 </el-button>
-        </div>
-        <div class="roles-wrap">
-            <zz-table
-                :cols="cols"
-                :settings="{ showIndex: true, stripe: true }"
-                :loading="mixins_onQuery"
-                :data="mixins_list"
-                :pageset="mixins_pageset"
-                @page-change="pageChange"
-            >
-                <template slot-scope="scope" slot="opt">
-                    <div class="opt">
-                        <el-tooltip effect="light" placement="bottom" content="充值">
-                            <i class="zoniot_font zoniot-icon-chongzhi" @click="addOrEdit(scope.row)"></i>
-                        </el-tooltip>
-                        <el-tooltip effect="light" placement="bottom" content="充值记录">
-                            <i class="zoniot_font zoniot-icon-chongzhijilu" @click="lookRechargeRecord(scope.row)"></i>
-                        </el-tooltip>
-                        <el-tooltip effect="light" placement="bottom" content="扣费记录">
-                            <i class="zoniot_font zoniot-icon-koufeijilu" @click="lookChargebackRecord(scope.row)"></i>
-                        </el-tooltip>
-                    </div>
-                </template>
-            </zz-table>
+        <div class="search_bottom_tab">
+            <div class="tab_list" v-for="(item, index) in tabs" :class="activeIndex == index ? 'active' : ''" :key="index">
+                充值金额：50000元
+                {{ item.label }}{{ item.value }}
+            </div>
+            <!-- <div class="tab_list">充值金额：50000元</div> -->
         </div>
+        <zz-table
+            :cols="cols"
+            :settings="{ showIndex: true, stripe: true }"
+            :loading="mixins_onQuery"
+            :data="mixins_list"
+            :pageset="mixins_pageset"
+            @page-change="pageChange"
+        >
+        </zz-table>
     </div>
 </template>
 
@@ -79,84 +49,59 @@ export default {
                 {
                     label: '最后扣费时间',
                     prop: 'lastPayTime'
+                }
+            ],
+            tabs: [
+                {
+                    label: '充值金额',
+                    value: '0'
                 },
                 {
-                    label: '操作',
-                    prop: 'id',
-                    slot: 'opt'
+                    label: '扣费金额',
+                    value: '0'
                 }
             ],
-            communityArr: [],
+            activeIndex: 1,
             mixins_post: 'post'
         };
     },
     created() {
-        this.getorgTree();
         this.mixins_dataUrl = '/sc-charge/house/account/page';
         this.mixins_query = {
             accountType: 2
         };
-        this.mixins_search();
+        // this.mixins_search();
     },
     mounted() {},
     methods: {
-        getorgTree() {
-            this.$http
-                .get('/sc-community/assets/community/list')
-                .then((data) => {
-                    this.communityArr = data.data;
-                    this.$store.commit('setAreaSelect', data.data);
-                })
-
-                .catch(function () {});
-        },
-        lookRechargeRecord(row) {
-            this.$router.push({
-                path: '/RechargeRecord',
-                query: {
-                    accountType: 2,
-                    paymentType: 1,
-                    id: row.houseId,
-                    name: row.communityName + row.assets,
-                }
-            });
-        },
-        lookChargebackRecord(row) {
-            this.$router.push({
-                path: '/ChargebackRecord',
-                query: {
-                    accountType: 2,
-                    paymentType: 2,
-                    id: row.houseId,
-                    name: row.communityName + row.assets,
-                }
-            });
-        },
-        addOrEdit(row) {
-            new Promise((resolve) => {
-                this.$store.dispatch('addPopup', {
-                    url: '/payService/waterManagement/stepPage/add.vue',
-                    width: '524px',
-                    height: '424px',
-                    props: {
-                        data: row,
-                        callback: resolve
-                    },
-                    title: '水费充值'
-                });
-            }).then(() => {
-                this.mixins_search();
-            });
+        getParent(query) {
+            Object.assign(this.mixins_query, query);
+            this.mixins_search();
         }
     }
 };
 </script>
 <style scoped lang='scss'>
-.search {
-    font-size: 12px;
-    color: #424656;
-}
-.width90 {
-    width: 90px;
+@import '@assets/css/public-style.scss';
+.search_bottom_tab {
+    height: 60px;
+    line-height: 60px;
+    background: #ffffff;
+    border-radius: 4px;
+    margin-bottom: 20px;
+    padding: 0 20px;
+    box-sizing: border-box;
+    .tab_list {
+        display: inline-block;
+        border-bottom: 1px solid transparent;
+        cursor: pointer;
+        &:not(:last-child) {
+            margin-right: 40px;
+        }
+        &.active {
+            color: $mainTextColor;
+            border-color: $mainTextColor;
+        }
+    }
 }
 </style>

operationSupport/src/views/payService/expenseReport/index.vue

@@ -19,7 +19,7 @@
                     end-placeholder="选择结束日期"
                     @change="effectiveDateToggle"
                 ></el-date-picker>
-                <el-button type="primary" class="search-btn" @click="mixins_search" icon="el-icon-search">查询 </el-button>
+                <el-button type="primary" class="search-btn" @click="changeRadio" icon="el-icon-search">查询 </el-button>
                 <div class="search-icon">
                     <el-tooltip class="item" effect="light" placement="bottom" content="导出">
                         <i class="zoniot_font zoniot-icon-daochu2" @click="exportExcel"></i>
@@ -27,6 +27,7 @@
                 </div>
             </div>
             <zz-table
+                v-if="accountType == 1"
                 :cols="cols"
                 :settings="{ showIndex: true, stripe: true }"
                 :loading="mixins_onQuery"
@@ -45,8 +46,8 @@
         </template>
         <property v-else :params="thisItem" @back="back" />
 
-        <electricity v-if="accountType == 3" @back="back" />
-        <water v-if="accountType == 2" @back="back" />
+        <electricity ref="electricity" v-if="accountType == 3" @back="back" />
+        <water ref="water" v-if="accountType == 2" @back="back" />
     </div>
 </template>
 
@@ -114,7 +115,13 @@ export default {
     mounted() {},
     methods: {
         changeRadio() {
-            console.log(this.accountType);
+            if (this.accountType == 1) {
+                this.mixins_search();
+            } else if (this.accountType == 2) {
+                this.$refs.water.getParent(this.mixins_query);
+            } else if (this.accountType == 3) {
+                this.$refs.electricity.getParent(this.mixins_query);
+            }
         },
         back() {
             this.looks = false;

operationSupport/src/views/payService/propertyFee/index.vue

@@ -44,7 +44,7 @@
             <zz-table
                 v-if="statusTable"
                 :settings="{ showCheckbox: chargeStatus == 1, showIndex: chargeStatus == 2, stripe: true }"
-                :cols="cols"
+                :cols="chargeStatus == 1 ? cols : statusCols"
                 :loading="mixins_onQuery"
                 :data="mixins_list"
                 :pageset="mixins_pageset"
@@ -82,6 +82,10 @@ export default {
                     label: '订单号',
                     prop: 'billNumber'
                 },
+                {
+                    label: '地址',
+                    prop: 'assets'
+                },
                 {
                     label: '住户',
                     prop: 'residentName'
@@ -122,15 +126,73 @@ export default {
                 },
                 {
                     label: '缴费状态',
-                    prop: 'chargeStatus',
+                    prop: 'chargeStatusDict'
+                },
+                {
+                    label: '操作',
+                    prop: 'id',
+                    slot: 'opt'
+                }
+            ],
+            statusCols: [
+                {
+                    label: '订单号',
+                    prop: 'billNumber'
+                },
+                {
+                    label: '地址',
+                    prop: 'assets'
+                },
+                {
+                    label: '住户',
+                    prop: 'residentName'
+                },
+                {
+                    label: '费用名称',
+                    prop: 'chargeType',
                     format(val) {
                         if (val == '1') {
-                            return '未缴费';
+                            return '物业费';
                         } else if (val == '2') {
-                            return '已缴费';
+                            return '水费';
+                        } else if (val == '3') {
+                            return '电费';
+                        } else if (val == '4') {
+                            return '车位费';
+                        } else if (val == '5') {
+                            return '二次供水费';
                         }
                     }
                 },
+                {
+                    label: '账期',
+                    prop: 'paymentDays'
+                },
+                {
+                    label: '费用金额(元)',
+                    prop: 'amount'
+                },
+                {
+                    label: '滞纳金(元)',
+                    prop: 'lateFee'
+                },
+
+                {
+                    label: '应收金额(元)',
+                    prop: 'receivableAmount'
+                },
+                {
+                    label: '实收金额(元)',
+                    prop: 'receivedAmount'
+                },
+                {
+                    label: '付款方式',
+                    prop: 'payTypeDict'
+                },
+                {
+                    label: '缴费状态',
+                    prop: 'chargeStatusDict'
+                },
                 {
                     label: '操作',
                     prop: 'id',

operationSupport/src/views/payService/propertyFee/stepPage/details.vue

@@ -89,7 +89,7 @@ export default {
                 },
                 {
                     label: '实收金额(元):',
-                    prop: 'amount'
+                    prop: 'receivedAmount'
                 }
             ],
             thisItem: {}