BUG

operationSupport/src/store/store.js

@@ -104,10 +104,9 @@ const store = new Vuex.Store({
                 for (let i = 0; i < state.permissionList.length; i++) {
                     if (state.permissionList[i].linkPath == role) {
                         return true;
-                    } else {
-                        return false;
                     }
                 }
+                return false;
             }
         },
         hasPermission3: (state) => (role) => {
@@ -115,10 +114,9 @@ const store = new Vuex.Store({
                 for (let i = 0; i < state.permissionList.length; i++) {
                     if (state.permissionList[i].linkPath == role) {
                         return true;
-                    } else {
-                        return false;
                     }
                 }
+                return false;
             }
         },
         hasPermission4: (state) => (role) => {
@@ -126,14 +124,12 @@ const store = new Vuex.Store({
                 for (let i = 0; i < state.permissionList.length; i++) {
                     if (state.permissionList[i].linkPath == role) {
                         return true;
-                    } else {
-                        return false;
                     }
                 }
+                return false;
             }
         },
         hasPermission5: (state) => (role) => {
-            debugger;
             if (state.permissionList) {
                 for (let i = 0; i < state.permissionList.length; i++) {
                     if (state.permissionList[i].linkPath == role) {
@@ -144,7 +140,6 @@ const store = new Vuex.Store({
             }
         },
         hasPermission6: (state) => (role) => {
-            debugger;
             if (state.permissionList) {
                 for (let i = 0; i < state.permissionList.length; i++) {
                     if (state.permissionList[i].linkPath == role) {
@@ -155,7 +150,6 @@ const store = new Vuex.Store({
             }
         },
         hasPermission7: (state) => (role) => {
-            debugger;
             if (state.permissionList) {
                 for (let i = 0; i < state.permissionList.length; i++) {
                     if (state.permissionList[i].linkPath == role) {
@@ -166,7 +160,6 @@ const store = new Vuex.Store({
             }
         },
         hasPermission8: (state) => (role) => {
-            debugger;
             if (state.permissionList) {
                 for (let i = 0; i < state.permissionList.length; i++) {
                     if (state.permissionList[i].linkPath == role) {

operationSupport/src/utils/utils.js

@@ -56,7 +56,6 @@ Vue.mixin({
             return this.$store.getters['hasPermission7'](this.mix_path + ':receivableAmounttenant');
         },
         $editAmounttenant() {
-            debugger;
             return this.$store.getters['hasPermission8'](this.mix_path + ':editAmounttenant');
         }
     }

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

@@ -115,6 +115,11 @@
           @click="mixins_search()"
           icon="el-icon-search"
         >搜索</el-button>
+
+        {{this.$collection}}
+        {{this.$billAmount}}
+        {{this.$receivableAmount}}
+        {{this.$editAmount}}
         <div class="search-icon">
           <el-tooltip
             class="item"

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

@@ -361,12 +361,12 @@ export default {
           width: '150'
         },
         {
-          label: '应收金额(元)',
-          prop: 'receivableAmount'
+          label: '账单金额(元)',
+          prop: 'amount'
         },
         {
-          label: '实收金额(元)',
-          prop: 'receivedAmount'
+          label: '应收金额(元)',
+          prop: 'discountAmount'
         },
         {
           label: '付款方式',

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

@@ -116,12 +116,12 @@ export default {
           prop: 'chargeDate'
         },
         {
-          label: '应收金额(元):',
-          prop: 'receivableAmount'
+          label: '账单金额(元):',
+          prop: 'amount'
         },
         {
-          label: '实收金额(元):',
-          prop: 'receivedAmount'
+          label: '应收金额(元):',
+          prop: 'discountAmount'
         },
         {
           label: '备注:',

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

@@ -68,7 +68,7 @@
           <div style="white-space: nowrap">{{ thisItem.receivableAmount }}</div>
         </el-form-item>
         <el-form-item
-          label="实收金额(元)"
+          label="应收金额(元)"
           required
         >
           <el-input
@@ -213,7 +213,9 @@ export default {
         .get('/czc-charge/charge/bill/findUserBillDetail', { id: id })
         .then(({ data, msg, status }) => {
           if (status == 0) {
+
             this.thisItem = data;
+            this.thisItem.amount = data.discountAmount;
           }
         })
         .catch(() => { });
@@ -253,8 +255,12 @@ export default {
     }
   },
   created () {
+
+
     this.getDatali(this.params.data.id);
     this.chiData = this.params.data;
+
+    this.thisItem.amount = this.params.data.discountAmount;
   }
 };
 </script>