计费bug

operationSupport/src/views/alarmManagement/popups/addoreditalarm.vue

@@ -837,6 +837,7 @@ export default {
         // this.deviceOptions=this.params.deviceOptions;
         this.productOptions = this.params.productOptions;
         if (this.alarmCategory == '2') {
+            console.log(addCols[0])
             let newaddCols = addCols[0].slice(0, 5);
             this.cols = [newaddCols];
         } else {

operationSupport/src/views/ownerManagement/details.vue

@@ -1,7 +1,8 @@
 <template>
     <div class="main">
         <div class="top-title">
-            <h1>{{ detailsData.name }} <span class="titleType">业主</span></h1>
+            <h1>{{ detailsData.name }}</h1>
+            <!-- <h1>{{ detailsData.name }} <span class="titleType">业主</span></h1> -->
             <el-button class="right" type="primary" @click="close()">返回</el-button>
             <div class="text">
                 <span>手机号：{{ detailsData.phone }}</span> <span>身份证号：{{ detailsData.idNumber }}</span>
@@ -58,7 +59,7 @@
 import householdTable from './stepPage/householdTable.vue';
 export default {
     components: { householdTable },
-    name:'ownerManagementDetails',
+    name: 'ownerManagementDetails',
     data() {
         let _this = this;
         return {
@@ -115,9 +116,13 @@ export default {
                     // }
                 ],
                 right: [
+                    // {
+                    //     lable: '类型',
+                    //     prop: 'householdType'
+                    // },
                     {
-                        lable: '类型',
-                        prop: 'householdType'
+                        lable: '',
+                        prop: ''
                     },
                     {
                         lable: '人员编号',
@@ -226,8 +231,8 @@ export default {
                         ]
                     },
                     {
-                        lable: '',
-                        prop: ''
+                        lable: '住户类型',
+                        prop: 'householdTypeDict'
                     }
                 ]
             },

operationSupport/src/views/ownerManagement/stepPage/householdTable.vue

@@ -27,7 +27,16 @@ export default {
     filters: {
         matchingVal(val, arr) {
             let v = '--';
+            let newDa;
             if (!!val) {
+                try {
+                    v = '';
+                    newDa = val.split(':');
+                    newDa.forEach((item, index) => {
+                        v += item + arr[index].lable;
+                    });
+                } catch (e) {}
+
                 arr.forEach((item) => {
                     if (!!item.code && item.code === val) {
                         v = item.name;

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

@@ -30,8 +30,9 @@
             >
                 <template slot-scope="scope" slot="chargeMode">
                     <span v-if="scope.row.chargeMode === 1">固定收费 </span>
-                    <span v-if="scope.row.chargeMode === 2">{{ scope.row.chargeType === 1 ? '价格*面积收费 ' : '单价*用量' }}</span>
+                    <span v-if="scope.row.chargeMode === 2">价格*面积收费</span>
                     <span v-if="scope.row.chargeMode === 3">阶梯计费 </span>
+                    <span v-if="scope.row.chargeMode === 4">单价*用量</span>
                 </template>
                 <template slot-scope="scope" slot="chargePrice">
                     <div v-if="!!scope.row.chargePrice">{{ scope.row.chargePrice }}</div>
@@ -82,7 +83,7 @@ import list from '@utils/list.js';
 const sunm = ['一', '二', '三', '四', '五'];
 export default {
     mixins: [list],
-    name:'billingRules',
+    name: 'billingRules',
     data() {
         return {
             cols: [