BUG

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

@@ -445,9 +445,10 @@ export default {
             .post(url, this.ruleForm)
             .then(({ status, msg }) => {
               if (status == 0) {
+                this.params.callback();
                 this.$emit('close');
                 this.$message.success(msg);
-                this.cancelSaving();
+                // this.cancelSaving();
               } else {
                 this.$message.error(msg);
               }

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

@@ -261,6 +261,7 @@ export default {
             prop: 'householdType',
             const: true,
             format (val) {
+              debugger
               return '业主';
             }
           },
@@ -364,12 +365,17 @@ export default {
       let activeRout = this.$route;
       if (tagsList.length > 1) {
         tagsList.forEach((item, index) => {
-          if (item.title == activeRout.meta.title || item.path == activeRout.path) {
-            tagsList.splice(index, 1);
+          if (item.title == "房屋管理" || item.name == 'assetManagement/housingManagement/index') {
             this.$router.push({
-              path: tagsList[index - 1].path
-            });
+              path: item.path
+            })
           }
+          // if (item.title == activeRout.meta.title || item.path == activeRout.path) {
+          //   tagsList.splice(index, 1);
+          //   this.$router.push({
+          //     path: tagsList[index - 1].path
+          //   });
+          // }
         });
       } else {
         this.$router.push({
@@ -410,6 +416,7 @@ export default {
         .then(({ data, status, msg }) => {
           if (0 === status) {
             if (data !== null) {
+              debugger
               this.houseData = data;
             }
           } else {

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

@@ -442,13 +442,18 @@ export default {
       let tagsList = this.$store.getters['getTagsList'];
       let activeRout = this.$route;
       if (tagsList.length > 1) {
-        tagsList.forEach((item, index) => {
-          if (item.title == activeRout.meta.title || item.path == activeRout.path) {
-            tagsList.splice(index, 1);
+        tagsList.forEach((item) => {
+          if (item.title == "商铺管理" || item.name == 'assetManagement/shopManagement/index') {
             this.$router.push({
-              path: tagsList[index - 1].path
-            });
+              path: item.path
+            })
           }
+          // if (item.title == activeRout.meta.title || item.path == activeRout.path) {
+          //   tagsList.splice(index, 1);
+          //   this.$router.push({
+          //     path: tagsList[index - 1].path
+          //   });
+          // }
         });
       } else {
         this.$router.push({

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

@@ -1,87 +1,109 @@
 <template>
-    <div class="item-table">
-        <div class="table-list" v-for="item in tableNames" :key="item">
-            <div class="lable">{{ item.lable }}</div>
-            <span class="text" v-if="!!item.format && item.const">{{ item.format()}}</span>
-            <span class="text" v-else-if="!!item.format && !!item.const">{{  item.format(params.data[item['prop']]) || '--' }}</span>
-            <div class="text" v-else-if="item.prop === 'nation'">{{ tabDatas['nation'] | matchingVal(nationArray) }}</div>
-            <div class="text" v-else-if="item.prop === 'communityId'">{{ tabDatas['communityId'] | matchingVal(communityArray) }}</div>
-            <div class="text" v-else-if="!!item.typeArray">{{ tabDatas[item.prop] | matchingVal(item.typeArray) }}</div>
-            <div class="text" v-else>{{ tabDatas[item.prop] || ' --' }}</div>
-        </div>
+  <div class="item-table">
+    <div
+      class="table-list"
+      v-for="item in tableNames"
+      :key="item"
+    >
+      <div class="lable">{{ item.lable }}</div>
+      <span
+        class="text"
+        v-if="!!item.format && item.const"
+      >{{ item.format()}}</span>
+      <span
+        class="text"
+        v-else-if="!!item.format && !!item.const"
+      >{{  item.format(params.data[item['prop']]) || '--' }}</span>
+      <div
+        class="text"
+        v-else-if="item.prop === 'nation'"
+      >{{ tabDatas['nation'] | matchingVal(nationArray) }}</div>
+      <div
+        class="text"
+        v-else-if="item.prop === 'communityId'"
+      >{{ tabDatas['communityId'] | matchingVal(communityArray) }}</div>
+      <div
+        class="text"
+        v-else-if="!!item.typeArray"
+      >{{ tabDatas[item.prop] | matchingVal(item.typeArray) }}</div>
+      <div
+        class="text"
+        v-else
+      >{{ tabDatas[item.prop] || ' --' }}</div>
     </div>
+  </div>
 </template>
 <script>
 import Vue from 'vue';
 let _this = this;
 export default {
-    name: 'householdTable',
-    data() {
-        return {};
+  name: 'householdTable',
+  data () {
+    return {};
+  },
+  props: {
+    tableName: {
+      type: Array
     },
-    props: {
-        tableName: {
-            type: Array
-        },
-        tabData: {
-            type: Object
-        }
-    },
-    filters: {
-        matchingVal(val, arr) {
-            // let v = '--';
-            // if (!!val) {
-            //     arr.forEach((item) => {
-            //         if (!!item.code && item.code === val) {
-            //             v = item.name;
-            //         } else if (item.type === val) {
-            //             v = item.lable;
-            //         } else if (!!item.communityName && item.id === val) {
-            //             v = item.communityName;
-            //         }
-            //     });
-            // }
-            // return v;
+    tabData: {
+      type: Object
+    }
+  },
+  filters: {
+    matchingVal (val, arr) {
+      // let v = '--';
+      // if (!!val) {
+      //     arr.forEach((item) => {
+      //         if (!!item.code && item.code === val) {
+      //             v = item.name;
+      //         } else if (item.type === val) {
+      //             v = item.lable;
+      //         } else if (!!item.communityName && item.id === val) {
+      //             v = item.communityName;
+      //         }
+      //     });
+      // }
+      // return v;
 
-            let v = '--';
-            let newDa;
-            if (!!val) {
-                try {
-                    v = '';
-                    newDa = val.split(':');
-                    newDa.forEach((item, index) => {
-                        v += item + arr[index].lable;
-                    });
-                } catch (e) {}
+      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;
-                    } else if (item.type === val) {
-                        v = item.lable;
-                    } else if (!!item.communityName && item.id === val) {
-                        v = item.communityName;
-                    }
-                });
-            }
-            return v;
-        }
+        arr.forEach((item) => {
+          if (!!item.code && item.code === val) {
+            v = item.name;
+          } else if (item.type === val) {
+            v = item.lable;
+          } else if (!!item.communityName && item.id === val) {
+            v = item.communityName;
+          }
+        });
+      }
+      return v;
+    }
+  },
+  computed: {
+    tableNames () {
+      return this.tableName;
+    },
+    tabDatas () {
+      return this.tabData;
     },
-    computed: {
-        tableNames() {
-            return this.tableName;
-        },
-        tabDatas() {
-            return this.tabData;
-        },
-        nationArray() {
-            return this.$store.getters['getNationArray'];
-        },
-        communityArray() {
-            return this.$store.getters['getCommunityArray'];
-        }
+    nationArray () {
+      return this.$store.getters['getNationArray'];
     },
-    created() {}
+    communityArray () {
+      return this.$store.getters['getCommunityArray'];
+    }
+  },
+  created () { }
 };
 </script>
 <style lang='scss' scoped >

operationSupport/src/views/businessManagement/InvestmentResources/stepPage/add.vue

@@ -377,7 +377,7 @@ export default {
     // 获取招租房屋
     getOrgTreeList () {
       // { buildingType: 1 }
-      this.$http.get('/czc-community/assets/tree/community/find').then(({ status, data, msg }) => {
+      this.$http.get('/czc-community/assets/tree/community/find', { rentOut: 1 }).then(({ status, data, msg }) => {
         if (status == 0) {
           this.informTypes = data;
         }

operationSupport/src/views/ownerManagement/details.vue

@@ -360,12 +360,17 @@ export default {
       let activeRout = this.$route;
       if (tagsList.length > 1) {
         tagsList.forEach((item, index) => {
-          if (item.title == activeRout.meta.title || item.path == activeRout.path) {
-            tagsList.splice(index, 1);
+          if (item.title == "住户管理" || item.path == "/ownerManagement/index") {
             this.$router.push({
-              path: tagsList[index - 1].path
-            });
+              path: item.path
+            })
           }
+          // if (item.title == activeRout.meta.title || item.path == activeRout.path) {
+          //   tagsList.splice(index, 1);
+          //   this.$router.push({
+          //     path: tagsList[index - 1].path
+          //   });
+          // }
         });
       } else {
         this.$router.push({

operationSupport/src/views/ownerManagement/landlordManagement/stepPage/add.vue

@@ -699,13 +699,27 @@ export default {
         if (valid) {
           for (let a = 0; a < this.houseInformation.length; a++) {
             if (this.houseInformation[a].region == null) {
-              if (this.houseInformation[a].region == null || this.houseInformation[a].billingRules.length == 0 || this.houseInformation[a].billingArea.length == 0) {
-                this.$message.error('请填写物业信息');
+
+              if (this.houseInformation[a].region == null) {
+                this.$message.error('请选择房屋信息');
+                return;
+              } else if (this.houseInformation[a].billingRules.length == 0) {
+                this.$message.error('请填写计费规则');
+                return;
+              } else if (this.houseInformation[a].billingArea.length == 0) {
+                this.$message.error('请选择计费面积');
                 return;
               }
             } else {
-              if (this.houseInformation[a].region.length == 0 || this.houseInformation[a].billingRules.length == 0 || this.houseInformation[a].billingArea.length == 0) {
-                this.$message.error('请填写物业信息');
+
+              if (this.houseInformation[a].region.length == 0) {
+                this.$message.error('请选择房屋信息');
+                return;
+              } else if (this.houseInformation[a].billingRules.length == 0) {
+                this.$message.error('请填写计费规则');
+                return;
+              } else if (this.houseInformation[a].billingArea.length == 0) {
+                this.$message.error('请选择计费面积');
                 return;
               }
 

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

@@ -381,13 +381,17 @@ export default {
           width: '150'
         },
         {
-          label: '费用金额(元)',
-          prop: 'amount'
-        },
-        {
-          label: '滞纳金(元)',
-          prop: 'lateFee'
+          label: '应收金额(元)',
+          prop: 'discountAmount'
         },
+        // {
+        //   label: '费用金额(元)11',
+        //   prop: 'amount'
+        // },
+        // {
+        //   label: '滞纳金(元)',
+        //   prop: 'lateFee'
+        // },
         {
           label: '实收金额(元)',
           prop: 'discountAmount'

operationSupport/src/views/payService/statisticalReport/paymentDetails.vue

@@ -96,7 +96,7 @@ export default {
   },
   created () {
 
-    this.mixins_query = Object.assign({ platform: 1, buildingId: this.params.row.buildingId, houseId: this.params.row.houseId, residentName: this.params.row.residentName, paymentMethod: -1 }, this.params.mixins_query);
+    this.mixins_query = Object.assign({ customerType: this.params.row.customerType, platform: 1, buildingId: this.params.row.buildingId, houseId: this.params.row.houseId, residentName: this.params.row.residentName, paymentMethod: -1 }, this.params.mixins_query);
     this.mixins_dataUrl = '/czc-charge/charge/bill/page';
     this.mixins_search();
   },