费用类型

operationSupport/src/views/assetManagement/housingManagement/details.vue

@@ -48,7 +48,7 @@ import householdTable from '../stepPage/householdTable.vue';
 export default {
     components: { householdTable },
     mixins: [list],
-    name:"housingManagementDetails",
+    name: 'housingManagementDetails',
     data() {
         let _this = this;
         return {
@@ -286,7 +286,9 @@ export default {
                 .then(({ data, status, msg }) => {
                     if (0 === status) {
                         this.detailsData = data;
-                        this.getHouse(data.residentId);
+                        if (!!data.residentId) {
+                            this.getHouse(data.residentId);
+                        }
                     } else {
                         this.$message.error(msg);
                     }

operationSupport/src/views/buildingManagement/pageJump/addoredit.vue

@@ -420,7 +420,7 @@ const txtI18n = {
 };
 export default {
     mixins: [initList],
-    name:'editBuilding',
+    name: 'editBuilding',
     data() {
         return {
             unitCols: [[{ label: '单元', slot: 'unitRule', prop: 'unitRule' }]],
@@ -503,7 +503,7 @@ export default {
                 householdsPerFloor: '1' //每层户数
             },
             initialUnitList: {
-                checkedUnit: true,
+                checkedUnit: false,
                 enableUnit: 1, //勾选了复选框
                 unit: {
                     type: 'Number', //  Number letter
@@ -641,6 +641,7 @@ export default {
                 }
 
                 this.doorData = initDoor(this.formdata, this.initialUnitList).generateUnit;
+                console.log(initDoor(this.formdata, this.initialUnitList));
             });
         },
         handleInputConfirm(e, arr) {
@@ -718,7 +719,7 @@ export default {
                         this.formdata = data;
                         this.formdata.householdsPerFloor = data.buildingUnitList[0].unitFloorList[0].roomList.length;
                         this.initialUnitList = {
-                            checkedUnit: true,
+                            checkedUnit: false,
                             enableUnit: 1, //勾选了复选框
                             unit: {
                                 type: 'Number', //  Number letter

operationSupport/src/views/payService/ChargebackRecord.vue

@@ -41,7 +41,8 @@
 import list from '@utils/list.js';
 export default {
     mixins: [list],
-    name:"ChargebackRecord",
+    props: ['params'],
+    name: 'ChargebackRecord',
     data() {
         return {
             cols: [
@@ -78,8 +79,8 @@ export default {
     },
     created() {
         this.mixins_dataUrl = '/sc-charge/payment/record/page';
-        if (this.$route.query) {
-            const { accountType, name, paymentType, id } = this.$route.query;
+        if (this.$route.query || this.params) {
+            const { accountType, name, paymentType, id } = this.params || this.$route.query;
             this.name = name;
             let typeName = '水';
             let Quantity = '用水量(吨)';
@@ -107,15 +108,16 @@ export default {
     mounted() {},
     methods: {
         close() {
-            let activeRout = this.$route;
-            let tagsList = this.$store.getters['getTagsList'];
-            tagsList.forEach((item, index) => {
-                if (item.title == activeRout.meta.title || item.path == activeRout.path) {
-                    tagsList.splice(index, 1);
-                    history.go(-1);
-                    return true;
-                }
-            });
+            this.$parent.viewActive = 'index';
+            // let activeRout = this.$route;
+            // let tagsList = this.$store.getters['getTagsList'];
+            // tagsList.forEach((item, index) => {
+            //     if (item.title == activeRout.meta.title || item.path == activeRout.path) {
+            //         tagsList.splice(index, 1);
+            //         history.go(-1);
+            //         return true;
+            //     }
+            // });
         },
         getSun() {
             this.$http

operationSupport/src/views/payService/RechargeRecord.vue

@@ -55,7 +55,8 @@
 import list from '@utils/list.js';
 export default {
     mixins: [list],
-    name:'RechargeRecord',
+    props: ['params'],
+    name: 'RechargeRecord',
     data() {
         return {
             cols: [
@@ -109,11 +110,9 @@ export default {
         };
     },
     created() {
-        console.log(this.cols);
-
         this.mixins_dataUrl = '/sc-charge/payment/record/page';
-        if (this.$route.query) {
-            const { accountType, name, paymentType, id } = this.$route.query;
+        if (this.$route.query || this.params) {
+            const { accountType, name, paymentType, id } = this.params || this.$route.query;
             let typeName = '水';
             if (accountType == 1) {
                 typeName = '物业';
@@ -138,15 +137,17 @@ export default {
     mounted() {},
     methods: {
         close() {
-            let activeRout = this.$route;
-            let tagsList = this.$store.getters['getTagsList'];
-            tagsList.forEach((item, index) => {
-                if (item.title == activeRout.meta.title || item.path == activeRout.path) {
-                    tagsList.splice(index, 1);
-                    history.go(-1);
-                    return true;
-                }
-            });
+            this.$parent.viewActive = 'index';
+
+            // let activeRout = this.$route;
+            // let tagsList = this.$store.getters['getTagsList'];
+            // tagsList.forEach((item, index) => {
+            //     if (item.title == activeRout.meta.title || item.path == activeRout.path) {
+            //         tagsList.splice(index, 1);
+            //         history.go(-1);
+            //         return true;
+            //     }
+            // });
         },
         getSun() {
             this.$http

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

@@ -22,7 +22,7 @@
                     <el-option label="价格*面积收费" :value="2"></el-option>
                 </template>
                 <template v-else>
-                    <el-option label="单价*用量" :value="2"></el-option>
+                    <el-option label="单价*用量" :value="4"></el-option>
                     <el-option label="阶梯计费" :value="3"></el-option>
                 </template>
             </el-select>
@@ -251,7 +251,7 @@ export default {
                 installData.arrearsDays = this.formData.arrearsDays;
                 installData.generationRules = this.formData.generationRules;
             } else {
-                if (this.formData.chargeMode === 2) {
+                if (this.formData.chargeMode === 2 || this.formData.chargeMode === 4) {
                     installData.chargePrice = this.formData.chargePrice;
                 } else {
                     installData.chargeCycle = this.formData.chargeCycle;

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

@@ -1,6 +1,6 @@
 <template>
     <div class="main">
-        <div class="search">
+        <div class="search" v-if="viewActive == 'index'">
             <el-input
                 clearable
                 placeholder="输入房间号/业主/手机号"
@@ -22,7 +22,7 @@
             <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">
+        <div class="roles-wrap" v-if="viewActive == 'index'">
             <zz-table
                 :cols="cols"
                 :settings="{ showIndex: true, stripe: true }"
@@ -46,16 +46,26 @@
                 </template>
             </zz-table>
         </div>
+
+        <chargeback-record v-if="viewActive == 'chargeback'" :params="thisLookData"></chargeback-record>
+        <recharge-record v-if="viewActive == 'recharge'" :params="thisLookData"></recharge-record>
     </div>
 </template>
 
 <script>
+import ChargebackRecord from '../ChargebackRecord.vue';
+import RechargeRecord from '../RechargeRecord.vue';
 import list from '@utils/list.js';
 export default {
     mixins: [list],
-    name:"electricManagement",
+    components: {
+        ChargebackRecord,
+        RechargeRecord
+    },
+    // name: 'electricManagement',
     data() {
         return {
+            viewActive: 'index',
             cols: [
                 {
                     label: '社区名称',
@@ -88,7 +98,8 @@ export default {
                 }
             ],
             communityArr: [],
-            mixins_post: 'post'
+            mixins_post: 'post',
+            thisLookData: {}
         };
     },
     created() {
@@ -112,26 +123,40 @@ export default {
                 .catch(function () {});
         },
         lookRechargeRecord(row) {
-            this.$router.push({
-                path: '/RechargeRecord',
-                query: {
-                    accountType: 3,
-                    paymentType: 1,
-                    id: row.houseId,
-                    name: row.communityName + row.assets
-                }
-            });
+            this.thisLookData = {
+                accountType: 3,
+                paymentType: 1,
+                id: row.houseId,
+                name: row.communityName + row.assets
+            };
+            this.viewActive = 'recharge';
+            // 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
-                }
-            });
+            this.thisLookData = {
+                accountType: 3,
+                paymentType: 2,
+                id: row.houseId,
+                name: row.communityName + row.assets
+            };
+            this.viewActive = 'chargeback';
+            // this.$router.push({
+            //     path: '/ChargebackRecord',
+            //     query: {
+            //         accountType: 3,
+            //         paymentType: 2,
+            //         id: row.houseId,
+            //         name: row.communityName + row.assets
+            //     }
+            // });
         },
         addOrEdit(row) {
             new Promise((resolve) => {

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

@@ -1,6 +1,6 @@
 <template>
     <div class="main">
-        <div class="search">
+        <div class="search" v-if="viewActive == 'index'">
             <el-input
                 clearable
                 placeholder="输入房间号/业主/手机号"
@@ -22,7 +22,7 @@
             <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">
+        <div class="roles-wrap" v-if="viewActive == 'index'">
             <zz-table
                 :cols="cols"
                 :settings="{ showIndex: true, stripe: true }"
@@ -46,16 +46,26 @@
                 </template>
             </zz-table>
         </div>
+
+        <chargeback-record v-if="viewActive == 'chargeback'" :params="thisLookData"></chargeback-record>
+        <recharge-record v-if="viewActive == 'recharge'" :params="thisLookData"></recharge-record>
     </div>
 </template>
 
 <script>
+import ChargebackRecord from '../ChargebackRecord.vue';
+import RechargeRecord from '../RechargeRecord.vue';
 import list from '@utils/list.js';
 export default {
     mixins: [list],
-    name:"waterManagement",
+    components: {
+        ChargebackRecord,
+        RechargeRecord
+    },
+    // name: 'waterManagement',
     data() {
         return {
+            viewActive: 'index',
             cols: [
                 {
                     label: '社区名称',
@@ -88,7 +98,8 @@ export default {
                 }
             ],
             communityArr: [],
-            mixins_post: 'post'
+            mixins_post: 'post',
+            thisLookData: {}
         };
     },
     created() {
@@ -112,26 +123,41 @@ export default {
                 .catch(function () {});
         },
         lookRechargeRecord(row) {
-            this.$router.push({
-                path: '/RechargeRecord',
-                query: {
-                    accountType: 2,
-                    paymentType: 1,
-                    id: row.houseId,
-                    name: row.communityName + row.assets,
-                }
-            });
+            this.thisLookData = {
+                accountType: 2,
+                paymentType: 1,
+                id: row.houseId,
+                name: row.communityName + row.assets
+            };
+            this.viewActive = 'recharge';
+            // 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,
-                }
-            });
+            this.thisLookData = {
+                accountType: 2,
+                paymentType: 2,
+                id: row.houseId,
+                name: row.communityName + row.assets
+            };
+            this.viewActive = 'chargeback';
+
+            // this.$router.push({
+            //     path: '/ChargebackRecord',
+            //     query: {
+            //         accountType: 2,
+            //         paymentType: 2,
+            //         id: row.houseId,
+            //         name: row.communityName + row.assets
+            //     }
+            // });
         },
         addOrEdit(row) {
             new Promise((resolve) => {