收费设置

operationSupport/src/assets/css/public-style.scss

@@ -33,3 +33,6 @@ $ashColor: #dcdcdc;
     content: " ";
   }
 }
+/deep/ label[for="companyOrgId"] + .el-form-item__content {
+  line-height: 0;
+}

operationSupport/src/components/common/SelectTree.vue

@@ -166,6 +166,7 @@ export default {
         onHidePopover() {
             this.showStatus = false;
             this.$emit('selected', this.valueModel);
+            this.$emit('selectedLable', this.labelModel);
         },
         // 树节点过滤方法
         filterNode(query, data) {

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

@@ -183,6 +183,7 @@ export default {
             this.mixins_query.houseId = '';
 
             if (newValue.type) {
+                debugger;
                 if (newValue.type === 'community') {
                     this.mixins_query.communityId = newValue.value;
                     this.chiData.type = 1;
@@ -199,7 +200,7 @@ export default {
                     this.mixins_query.buildingId = newValue.buildingId;
                     this.mixins_query.unitName = newValue.unitId;
                     this.chiData.type = 3;
-                    this.chiData.value = newValue.buildingId + ':' + newValue.name;
+                    this.chiData.value = newValue.buildingId + ':' + newValue.unitId;
                     this.chiData.address = newValue.name;
                 } else if (newValue.type === 'room') {
                     this.mixins_query.communityId = newValue.communityId;
@@ -207,7 +208,7 @@ export default {
                     this.mixins_query.unitName = newValue.unitId;
                     this.mixins_query.houseId = newValue.roomId;
                     this.chiData.type = 4;
-                    this.chiData.value = newValue.buildingId + ':' + newValue.name;
+                    this.chiData.value = newValue.roomId;
                     this.chiData.address = newValue.name;
                 }
             }

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

@@ -98,8 +98,7 @@ export default {
                     slot: 'companyOrgId'
                 }
             ],
-            productOptions: [],
-            mixins_post: 'post'
+            mixins_post: 'get'
         };
     },
     computed: {
@@ -118,9 +117,7 @@ export default {
         this.mixins_query = {};
         this.mixins_search();
     },
-    mounted() {
-        this.getProductOptions();
-    },
+    mounted() {},
     methods: {
         queryList(type = 'search') {
             this.mixins_search(type);
@@ -139,7 +136,7 @@ export default {
         deluserbyidFn(id) {
             this.$msgBox(`删除`, '删除后将无法恢复，请问是否继续?')
                 .then(() => {
-                    this.$http.postForm('/sc-charge/scChargeStrategy/delete', { id: id }).then(({ status, data, msg }) => {
+                    this.$http.get('/sc-charge/payee/account/delete?id=' + id).then(({ status, data, msg }) => {
                         if (0 === status) {
                             this.$message({
                                 type: 'success',
@@ -175,11 +172,6 @@ export default {
             }).then(() => {
                 this.mixins_search();
             });
-        },
-        getProductOptions() {
-            this.$http.postForm('/sc-community/devicetype/selectList', { name: '' }).then((data) => {
-                this.productOptions = data;
-            });
         }
     }
 };

operationSupport/src/views/payService/collection/stepPage/add.vue

@@ -8,6 +8,7 @@
                 :options="params.companyArray"
                 :props="defaultProps"
                 v-model="formData.companyOrgId"
+                @selectedLable="selectedLable"
             />
         </template>
         <template slot="payeeType">
@@ -41,6 +42,7 @@ export default {
     data() {
         return {
             formData: {
+                companyName: '',
                 companyOrgId: '',
                 payeeType: '',
                 merchantNumber: '',
@@ -121,6 +123,9 @@ export default {
     },
 
     methods: {
+        selectedLable(e) {
+            this.formData.companyName = e;
+        },
         QueryClick() {
             this.$refs['uploaduserlogo'].$refs['upload-inner'].handleClick();
         },
@@ -171,35 +176,4 @@ export default {
         }
     }
 };
-</script>
-<style lang="scss" scoped>
-@import '@assets/css/public-style.scss';
-.contentScorll {
-    border-radius: 2px;
-    border: 1px solid #e0e1e3;
-}
-.all {
-    background: #f8fcff;
-    padding: 0 15px;
-    display: flex;
-    justify-content: space-between;
-}
-.item-list {
-    padding: 0 15px;
-    height: 200px;
-    overflow: auto;
-    &::-webkit-scrollbar {
-        display: none;
-    }
-    /deep/ .el-checkbox-group .el-checkbox {
-        display: flex;
-        .el-checkbox__label,
-        .el-checkbox__input {
-            line-height: 30px;
-        }
-    }
-}
-.title {
-    font-size: 12px;
-}
-</style>
+</script>

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

@@ -0,0 +1,162 @@
+<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>
+    </div>
+</template>
+
+<script>
+import list from '@utils/list.js';
+export default {
+    mixins: [list],
+    data() {
+        return {
+            cols: [
+                {
+                    label: '社区名称',
+                    prop: 'communityName'
+                },
+                {
+                    label: '房间',
+                    prop: 'assets'
+                },
+                {
+                    label: '业主',
+                    prop: 'residentName'
+                },
+                {
+                    label: '业主手机号',
+                    prop: 'residentPhone'
+                },
+                {
+                    label: '电费余额(元)',
+                    prop: 'balance'
+                },
+                {
+                    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();
+    },
+    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();
+            });
+        }
+    }
+};
+</script>
+<style scoped lang='scss'>
+.search {
+    font-size: 12px;
+    color: #424656;
+}
+.width90 {
+    width: 90px;
+}
+</style>

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

@@ -0,0 +1,162 @@
+<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>
+    </div>
+</template>
+
+<script>
+import list from '@utils/list.js';
+export default {
+    mixins: [list],
+    data() {
+        return {
+            cols: [
+                {
+                    label: '社区名称',
+                    prop: 'communityName'
+                },
+                {
+                    label: '房间',
+                    prop: 'assets'
+                },
+                {
+                    label: '业主',
+                    prop: 'residentName'
+                },
+                {
+                    label: '业主手机号',
+                    prop: 'residentPhone'
+                },
+                {
+                    label: '水费余额(元)',
+                    prop: 'balance'
+                },
+                {
+                    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: 2
+        };
+        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();
+            });
+        }
+    }
+};
+</script>
+<style scoped lang='scss'>
+.search {
+    font-size: 12px;
+    color: #424656;
+}
+.width90 {
+    width: 90px;
+}
+</style>

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

@@ -44,15 +44,22 @@
             </zz-table>
         </template>
         <property v-else :params="thisItem" @back="back" />
+
+        <electricity v-if="accountType == 3" @back="back" />
+        <water v-if="accountType == 2" @back="back" />
     </div>
 </template>
 
 <script>
 import list from '@utils/list.js';
 import property from './property.vue';
+import electricity from './Electricity.vue';
+import water from './Water.vue';
 export default {
     components: {
-        property
+        property,
+        water,
+        electricity
     },
     mixins: [list],
     data() {
@@ -79,7 +86,7 @@ export default {
                     label: '收款率(%)',
                     prop: 'collectionRateDict',
                     format(val) {
-                        if (val ) {
+                        if (val) {
                             return val;
                         } else {
                             return 0;