运营支撑bug修复

operationSupport/src/components/common/organTree.vue

@@ -66,50 +66,31 @@ export default {
             return data.name.indexOf(value) !== -1;
         },
         treeClick(e) {
-            // let unitPa = {};
-            // if (e.value == 0) return;
-            // debugger;
-            // if (e.type == 'unit') {
-            //     let parentV = this.$refs.tree.getNode(e).parent.data;
-            //     unitPa = {
-            //         parentValue: parentV.value,
-            //         type: e.type,
-            //         value: e.value
-            //     };
-            //     this.$emit('organId', unitPa);
-            // } else {
-            //     this.$emit('organId', e);
-            // }
             let unitPa = {
-                communityId: '',
-                buildingId: '',
-                unitId: '',
-                roomId: '',
-                type: '',
-                name: ''
+                id: e.id,
+                communityName: '',
+                buildingName: '',
+                unitName: '',
+                houseName: '',
+                type: e.type
             };
+            let thisObj = this.$refs.tree.getNode(e);
             if (e.type == 'building') {
-                unitPa.communityId = this.$refs.tree.getNode(e).parent.data.value;
-                unitPa.buildingId = e.value;
-                unitPa.type = e.type;
-                unitPa.name = e.name;
+                unitPa.communityName = thisObj.parent.data.name;
+                unitPa.buildingName = e.name;
             } else if (e.type == 'unit') {
-                unitPa.communityId = this.$refs.tree.getNode(e).parent.parent.data.value;
-                unitPa.buildingId = this.$refs.tree.getNode(e).parent.data.value;
-                unitPa.unitId = e.value;
-                unitPa.type = e.type;
-                unitPa.name = this.$refs.tree.getNode(e).parent.data.name + ' ' + e.name;
+                unitPa.communityName = thisObj.parent.parent.data.name;
+                unitPa.buildingName = thisObj.parent.data.name;
+                unitPa.unitName = e.name;
             } else if (e.type == 'room') {
-                unitPa.communityId = this.$refs.tree.getNode(e).parent.parent.parent.data.value;
-                unitPa.buildingId = this.$refs.tree.getNode(e).parent.parent.data.value;
-                unitPa.unitId = this.$refs.tree.getNode(e).parent.data.value;
-                unitPa.roomId = e.value;
-                unitPa.type = e.type;
-                unitPa.name =
-                    this.$refs.tree.getNode(e).parent.parent.data.name + ' ' + this.$refs.tree.getNode(e).parent.data.name + ' ' + e.name;
+                unitPa.communityName = thisObj.parent.parent.parent.data.name;
+                unitPa.buildingName = thisObj.parent.parent.data.name;
+                unitPa.unitName = thisObj.parent.data.name;
+                unitPa.houseName = e.name;
             } else {
-                unitPa = e;
+                unitPa.communityName = e.name;
             }
+
             this.$emit('organId', unitPa);
         }
     },

operationSupport/src/components/common/table.vue

@@ -72,7 +72,7 @@
                 </template>
                 <template slot-scope="scope">
                     <!-- 插槽 -->
-                    <slotItem v-if="item.slot" :row="scope.row" :index="scope.$index" :slots="$scopedSlots[item.slot]"></slotItem>
+                    <slotItem v-if="item.slot"  :row="scope.row" :index="scope.$index" :slots="$scopedSlots[item.slot]"></slotItem>
                     <!-- 过滤方法 -->
                     <el-tooltip
                         v-else-if="item.format && isIE"
@@ -426,11 +426,11 @@ export default {
             display: flex;
             align-items: center;
             cursor: pointer;
-            i,
-            img {
+            i {
                 margin-right: 20px;
                 width: 14px;
                 height: 14px;
+                line-height: 14px;
                 &:last-child {
                     margin-right: 0;
                 }

operationSupport/src/main.js

@@ -127,11 +127,19 @@ Vue.prototype.routerLoad = {
 //     }
 // });
 router.beforeEach((to, from, next) => {
-    if (to.path != '/404') {
+    if (to.path !== '/404') {
+        // console.log()
+        let PermissionsRouter = Vue.prototype.routerLoad.findMen(store.getters.getMenuList, to.fullPath)
+        if (PermissionsRouter) {
+            next();
+        } else {
+            next({ path: 404 })
+        }
         // 跳转时存储路由
         localStorage.setItem('path', to.fullPath)
+    } else {
+        next();
     }
-    next();
 });
 new Vue({
     router,

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

@@ -3,7 +3,7 @@
         <building-tree @buildingInformation="buildingInformation" :buildingType="2"></building-tree>
         <div class="content-right">
             <div class="search">
-                <el-input clearable placeholder="房屋号" class="search-input" v-trim v-model="mixins_query.roomNumber"></el-input>
+                <el-input clearable placeholder="商铺号" class="search-input" v-trim v-model="mixins_query.roomNumber"></el-input>
                 <el-select v-model="mixins_query.useStatus" clearable placeholder="请选择社区名称">
                     <el-option v-for="item in statusOptions" :label="item.label" :value="item.val" :key="item">{{ item.label }}</el-option>
                 </el-select>

operationSupport/src/views/deviceManagement/popups/poptreeSelect.vue

@@ -47,9 +47,21 @@ export default {
                 this.unitPa.houseId = e.value;
                 this.unitPa.houseName = e.name;
             }
+        },
+        dimension(arr) {
+            arr.map((item, index) => {
+                if (!!item.children & (item.type !== 'unit')) {
+                    this.dimension(item.children);
+                } else {
+                    if (item.name.indexOf('单元') === -1) {
+                        item.name = item.name + '单元';
+                    }
+                }
+            });
         }
     },
     created() {
+        this.dimension(this.params.tenantsTree);
         this.tenantsTree = this.params.tenantsTree;
     }
 };

operationSupport/src/views/ownerManagement/index.vue

@@ -349,15 +349,16 @@ export default {
             this.mixins_query.unitName = '';
             this.mixins_query.roomNumber = '';
             if (newValue.type) {
+                let newValueIds = newValue.id.split('-');
                 if (newValue.type === 'community') {
-                    this.mixins_query.communityId = newValue.value;
+                    this.mixins_query.communityId = newValueIds[0];
                 } else if (newValue.type === 'building') {
-                    this.mixins_query.buildingId = newValue.buildingId;
+                    this.mixins_query.buildingId = newValueIds[1];
                 } else if (newValue.type === 'unit') {
-                    this.mixins_query.buildingId = newValue.buildingId;
-                    this.mixins_query.unitName = newValue.unitId;
+                    this.mixins_query.buildingId = newValueIds[1];
+                    this.mixins_query.unitName = newValueIds[2];
                 } else if (newValue.type === 'room') {
-                    this.mixins_query.roomNumber = newValue.roomId;
+                    this.mixins_query.roomNumber = newValueIds[3];
                 }
             }
 

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

@@ -137,7 +137,11 @@
                 <div class="formContent-formList" v-for="(item, index) in formData.houseList" :key="index">
                     <div class="block-title">
                         <div class="floor list-title">
-                            {{ `${item.buildingName} ${item.unitName}${item.roomNumber}` }}
+                            {{
+                                `${item.buildingName} ${item.unitName.indexOf('单元') !== -1 ? item.unitName : item.unitName + '单元'}${
+                                    item.roomNumber
+                                }`
+                            }}
                         </div>
                         <span class="remove list-title" v-if="!islooks" @click="removeHouse(index, 'houseList')">移除</span>
                         <img class="bg-img" src="@/assets/img/ownerManagement/bg_card@2x.png" alt="" />
@@ -181,7 +185,7 @@
                 <div class="formContent-item_title">绑定车位</div>
                 <div class="addCat">
                     <div class="block-title" v-for="(item, index) in formData.parkingList" :key="index">
-                        <div class="floor list-title" >{{ item.parkingNumber }}</div>
+                        <div class="floor list-title">{{ item.parkingNumber }}</div>
                         <span class="remove list-title" v-if="!islooks" @click="removeHouse(index, 'parkingList')">移除</span>
                         <img class="bg-img" src="@/assets/img/ownerManagement/bg_card@2x.png" alt="" />
                         <img class="bg-imgIoc" src="@/assets/img/ownerManagement/icon_car@2x.png" alt="" />
@@ -430,11 +434,15 @@ export default {
         };
     },
     created() {
+        this.$store.dispatch('collapse', true);
         if (!!this.params.id) {
             this.getDetails(this.params.id);
         }
         this.getTenantsTree();
     },
+    beforeDestroy() {
+        this.$store.dispatch('collapse', false);
+    },
     computed: {
         nationArray() {
             return this.$store.getters['getNationArray'];
@@ -613,6 +621,7 @@ export default {
         getTenantsTree() {
             this.$http.get('/sc-community/assets/tree/community/find').then(({ status, data, msg }) => {
                 if (status === 0 && data) {
+                    this.dimension(data);
                     this.communityArr = data;
                 }
             });
@@ -621,6 +630,17 @@ export default {
                     this.garageArr = data;
                 }
             });
+        },
+        dimension(arr) {
+            arr.map((item, index) => {
+                if (!!item.children & (item.type !== 'unit')) {
+                    this.dimension(item.children);
+                } else {
+                    if (item.name.indexOf('单元') === -1) {
+                        item.name = item.name + '单元';
+                    }
+                }
+            });
         }
     }
 };

operationSupport/src/views/ownerManagement/style.scss

@@ -19,6 +19,7 @@
       position: relative;
       .floor {
         margin: 16px 0 9px 0;
+        // text-align: center;
         font-weight: 600;
         font-size: 16px;
       }
@@ -31,7 +32,9 @@
         margin-left: 20px;
         position: relative;
         z-index: 2;
+        white-space: nowrap;
       }
+
       img {
         &.bg-img {
           position: absolute;

operationSupport/src/views/parkingLotAdministration/pageJump/garageSaveEdits.vue

@@ -17,7 +17,7 @@
                         <el-form-item label="车库名称" prop="garageName">
                             <el-input v-model="ruleForm.garageName" placeholder="请输入车库名称"></el-input>
                         </el-form-item>
-                        <el-form-item label="车位数量">
+                        <el-form-item label="车位数量" prop="parkingNumber">
                             <el-input v-model="ruleForm.parkingNumber" placeholder="请输入车库数量"></el-input>
                         </el-form-item>
                         <el-form-item label="备注信息">
@@ -45,7 +45,8 @@ export default {
             },
             rules: {
                 communityId: [{ required: true, message: '请输入社区名称', trigger: 'change' }],
-                garageName: [{ required: true, message: '请输入车库名称', trigger: 'change' }]
+                garageName: [{ required: true, message: '请输入车库名称', trigger: 'change' }],
+                parkingNumber:[{ required: true, message: '请输入车位数量', trigger: 'change' }]
             }
         };
     },

operationSupport/src/views/parkingLotAdministration/pageJump/zoneAddEdit.vue

@@ -17,7 +17,7 @@
                         <el-form-item label="分区名称" prop="areaName">
                             <el-input v-model="ruleForm.areaName"></el-input>
                         </el-form-item>
-                        <el-form-item label="车位数量">
+                        <el-form-item label="车位数量" prop="parkingNumber">
                             <el-input v-model="ruleForm.parkingNumber"></el-input>
                         </el-form-item>
                         <el-form-item label="备注信息">
@@ -45,7 +45,8 @@ export default {
             },
             rules: {
                 garageId: [{ required: true, message: '请输入车库名称', trigger: 'change' }],
-                areaName: [{ required: true, message: '请输入分区名称', trigger: 'change' }]
+                areaName: [{ required: true, message: '请输入分区名称', trigger: 'change' }],
+                parkingNumber: [{ required: true, message: '请输入车位数量', trigger: 'change' }]
             },
             radio: '1'
         };
@@ -90,10 +91,7 @@ export default {
                         .catch(() => {
                             loading.close();
                         });
-                } else {
-                    this.$message.error('验证失败');
-                    return false;
-                }
+                } 
             });
         }
     },

operationSupport/src/views/payService/ChargebackRecord.vue

@@ -116,8 +116,8 @@ export default {
             if (!arr) {
                 arr = ['', ''];
             }
-            this.mixins_query.startTime = arr[0];
-            this.mixins_query.endTime = arr[1];
+            this.mixins_query.startTime = arr[0] + " 00:00:00";
+            this.mixins_query.endTime = arr[1]+ " 23:59:59";;
         }
     }
 };

operationSupport/src/views/payService/RechargeRecord.vue

@@ -147,8 +147,8 @@ export default {
             if (!arr) {
                 arr = ['', ''];
             }
-            this.mixins_query.startTime = arr[0];
-            this.mixins_query.endTime = arr[1];
+            this.mixins_query.startTime = arr[0] + ' 00:00:00';
+            this.mixins_query.endTime = arr[1] + ' 23:59:59';
         }
     }
 };

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

@@ -1,11 +1,11 @@
 <template>
     <div class="main">
         <div class="search">
-            <el-input placeholder="收费名称" class="search-input" clearable v-model="mixins_query.chargeName"></el-input>
-            <el-select v-model="mixins_query.communityId" placeholder="选择社区" clearable>
+            <el-input placeholder="输入费用名称" class="search-input" clearable v-model="mixins_query.chargeName"></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 v-model="mixins_query.chargeType" placeholder="选择收费类型" clearable>
+            <el-select v-model="mixins_query.chargeType" placeholder="费用类型" clearable>
                 <el-option label="物业费" :value="1"></el-option>
                 <el-option label="水费" :value="2"></el-option>
                 <el-option label="电费" :value="3"></el-option>
@@ -14,7 +14,9 @@
             </el-select>
             <el-button type="primary" class="search-btn" @click="mixins_search" icon="el-icon-search">查询 </el-button>
             <div class="search-icon">
-                <i class="iconfont" @click="addOrEdit('add')" v-left-txt-tip data-txt="新增">&#xe641;</i>
+                <el-tooltip class="item" effect="light" placement="bottom" content="新增">
+                    <i class="iconfont" @click="addOrEdit('add')">&#xe641;</i>
+                </el-tooltip>
             </div>
         </div>
         <div class="roles-wrap">
@@ -120,7 +122,12 @@ export default {
                 },
                 {
                     label: '计费周期',
-                    prop: 'chargeCycle'
+                    prop: 'chargeCycle',
+                    format(val) {
+                        if (val) {
+                            return val + '个月';
+                        }
+                    }
                 },
                 {
                     label: '状态',

operationSupport/src/views/payService/call/callSet.vue

@@ -209,7 +209,7 @@ export default {
                         if (!!callPayment) {
                             this.callPayment = callPayment;
                             let hfm = callPayment.callTime.split(':');
-                            this.callTime = new Date(time.getFullYear(), time.getMonth() + 1, hfm[0], hfm[1], hfm[2]);
+                            this.callTime = new Date(time.getFullYear(), time.getMonth(), time.getDate(), hfm[0], hfm[1], hfm[2]);
                         }
                     });
                 }
@@ -217,6 +217,7 @@ export default {
             this.activeIndex = index;
         },
         toggleTime(e) {
+            debugger;
             this.callPayment.callTime = this.timeFi(e.getHours()) + ':' + this.timeFi(e.getMinutes()) + ':' + this.timeFi(e.getSeconds());
         },
         timeFi(val) {

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

@@ -112,7 +112,12 @@ export default {
                 },
                 {
                     label: '计费周期',
-                    prop: 'chargeCycle'
+                    prop: 'chargeCycle',
+                    format(val) {
+                        if (val) {
+                            return val + '个月';
+                        }
+                    }
                 },
 
                 {
@@ -177,38 +182,27 @@ export default {
     },
     watch: {
         currentId(newValue, oldValue) {
-            this.mixins_query.communityId = '';
-            this.mixins_query.buildingId = '';
-            this.mixins_query.unitName = '';
-            this.mixins_query.houseId = '';
-
             if (newValue.type) {
+                let newValueIds = newValue.id.split('-');
+                this.chiData.type = newValueIds.length;
+                this.mixins_query.type = newValueIds.length;
                 if (newValue.type === 'community') {
-                    this.mixins_query.communityId = newValue.value;
-                    this.chiData.type = 1;
-                    this.chiData.value = newValue.value;
-                    this.chiData.address = newValue.name;
+                    this.mixins_query.value = newValueIds[0];
+                    this.chiData.value = newValueIds[0];
+                    this.chiData.address = newValue.communityName;
                 } else if (newValue.type === 'building') {
-                    this.mixins_query.communityId = newValue.communityId;
-                    this.mixins_query.buildingId = newValue.buildingId;
-                    this.chiData.type = 2;
-                    this.chiData.value = newValue.buildingId;
-                    this.chiData.address = newValue.name;
+                    this.mixins_query.value = newValueIds[1];
+                    this.chiData.value = newValueIds[1];
+                    this.chiData.address = newValue.communityName + ' ' + newValue.buildingName;
                 } else if (newValue.type === 'unit') {
-                    this.mixins_query.communityId = newValue.communityId;
-                    this.mixins_query.buildingId = newValue.buildingId;
-                    this.mixins_query.unitName = newValue.unitId;
-                    this.chiData.type = 3;
-                    this.chiData.value = newValue.buildingId + ':' + newValue.unitId;
-                    this.chiData.address = newValue.name;
+                    this.mixins_query.value = newValueIds[1] + ':' + newValueIds[2];
+                    this.chiData.value = newValueIds[1] + ':' + newValueIds[2];
+                    this.chiData.address = newValue.communityName + ' ' + newValue.buildingName + ' ' + newValue.unitName;
                 } else if (newValue.type === 'room') {
-                    this.mixins_query.communityId = newValue.communityId;
-                    this.mixins_query.buildingId = newValue.buildingId;
-                    this.mixins_query.unitName = newValue.unitId;
-                    this.mixins_query.houseId = newValue.roomId;
-                    this.chiData.type = 4;
-                    this.chiData.value = newValue.roomId;
-                    this.chiData.address = newValue.name;
+                    this.mixins_query.value = newValueIds[3];
+                    this.chiData.value = newValueIds[3];
+                    this.chiData.address =
+                        newValue.communityName + ' ' + newValue.buildingName + ' ' + newValue.unitName + ' ' + newValue.houseName;
                 }
             }
 

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

@@ -36,7 +36,7 @@ export default {
                 },
                 {
                     label: '房间',
-                    prop: 'houseId'
+                    prop: 'assets'
                 },
                 {
                     label: '充值时间',
@@ -83,7 +83,7 @@ export default {
                 },
                 {
                     label: '房间',
-                    prop: 'houseId'
+                    prop: 'assets'
                 },
                 {
                     label: '扣费时间',

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

@@ -36,7 +36,7 @@ export default {
                 },
                 {
                     label: '房间',
-                    prop: 'houseId'
+                    prop: 'assets'
                 },
                 {
                     label: '充值时间',
@@ -83,7 +83,7 @@ export default {
                 },
                 {
                     label: '房间',
-                    prop: 'houseId'
+                    prop: 'assets'
                 },
                 {
                     label: '扣费时间',

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

@@ -92,20 +92,21 @@ export default {
                 },
                 {
                     label: '费用名称',
-                    prop: 'chargeType',
-                    format(val) {
-                        if (val == '1') {
-                            return '物业费';
-                        } else if (val == '2') {
-                            return '水费';
-                        } else if (val == '3') {
-                            return '电费';
-                        } else if (val == '4') {
-                            return '车位费';
-                        } else if (val == '5') {
-                            return '二次供水费';
-                        }
-                    }
+                    prop: 'chargeName'
+                    // prop: 'chargeType',
+                    // format(val) {
+                    //     if (val == '1') {
+                    //         return '物业费';
+                    //     } else if (val == '2') {
+                    //         return '水费';
+                    //     } else if (val == '3') {
+                    //         return '电费';
+                    //     } else if (val == '4') {
+                    //         return '车位费';
+                    //     } else if (val == '5') {
+                    //         return '二次供水费';
+                    //     }
+                    // }
                 },
                 {
                     label: '账期',
@@ -149,20 +150,21 @@ export default {
                 },
                 {
                     label: '费用名称',
-                    prop: 'chargeType',
-                    format(val) {
-                        if (val == '1') {
-                            return '物业费';
-                        } else if (val == '2') {
-                            return '水费';
-                        } else if (val == '3') {
-                            return '电费';
-                        } else if (val == '4') {
-                            return '车位费';
-                        } else if (val == '5') {
-                            return '二次供水费';
-                        }
-                    }
+                    prop:'chargeName',
+                    // prop: 'chargeType',
+                    // format(val) {
+                    //     if (val == '1') {
+                    //         return '物业费';
+                    //     } else if (val == '2') {
+                    //         return '水费';
+                    //     } else if (val == '3') {
+                    //         return '电费';
+                    //     } else if (val == '4') {
+                    //         return '车位费';
+                    //     } else if (val == '5') {
+                    //         return '二次供水费';
+                    //     }
+                    // }
                 },
                 {
                     label: '账期',
@@ -300,32 +302,33 @@ export default {
             this.mixins_query.unitName = '';
             this.mixins_query.houseId = '';
             if (newValue.type) {
+                let newValueIds = newValue.id.split('-');
                 this.chiData.type = newValue.type;
                 if (newValue.type === 'community') {
-                    this.mixins_query.communityId = newValue.value;
-                    this.chiData.value = newValue.value;
-                    this.chiData.address = newValue.name;
+                    this.mixins_query.communityId = newValueIds[0];
+                    this.chiData.value = newValueIds[0];
+                    this.chiData.address = newValue.communityName;
                 } else if (newValue.type === 'building') {
-                    this.mixins_query.communityId = newValue.communityId;
-                    this.mixins_query.buildingId = newValue.buildingId;
-
-                    this.chiData.value = newValue.buildingId;
-                    this.chiData.address = newValue.name;
+                    this.mixins_query.communityId = newValueIds[0];
+                    this.mixins_query.buildingId = newValueIds[1];
+                    this.chiData.value = newValueIds[1];
+                    this.chiData.address = newValue.communityName + ' ' + newValue.buildingName;
                 } else if (newValue.type === 'unit') {
-                    this.mixins_query.communityId = newValue.communityId;
-                    this.mixins_query.buildingId = newValue.buildingId;
-                    this.mixins_query.unitName = newValue.unitId;
+                    this.mixins_query.communityId = newValueIds[0];
+                    this.mixins_query.buildingId = newValueIds[1];
+                    this.mixins_query.unitName = newValueIds[2];
 
-                    this.chiData.value = newValue.unitId;
-                    this.chiData.address = newValue.name;
+                    this.chiData.value = newValueIds[1] + ':' + newValueIds[2];
+                    this.chiData.address = newValue.communityName + ' ' + newValue.buildingName + ' ' + newValue.unitName;
                 } else if (newValue.type === 'room') {
-                    this.mixins_query.communityId = newValue.communityId;
-                    this.mixins_query.buildingId = newValue.buildingId;
-                    this.mixins_query.unitName = newValue.unitId;
-                    this.mixins_query.houseId = newValue.roomId;
+                    this.mixins_query.communityId = newValueIds[0];
+                    this.mixins_query.buildingId = newValueIds[1];
+                    this.mixins_query.unitName = newValueIds[2];
+                    this.mixins_query.houseId = newValueIds[3];
 
-                    this.chiData.value = newValue.roomId;
-                    this.chiData.address = newValue.name;
+                    this.chiData.value = newValueIds[3];
+                    this.chiData.address =
+                        newValue.communityName + ' ' + newValue.buildingName + ' ' + newValue.unitName + ' ' + newValue.houseName;
                 }
             }
             this.mixins_search();
@@ -335,7 +338,7 @@ export default {
         this.mixins_dataUrl = '/sc-charge/charge/bill/page'; // 分页查询接口
         this.mixins_query = {
             chargeStatus: this.chargeStatus,
-            chargeType:1,
+            chargeType: 1
         };
     }
 };

operationSupport/vue.config.js

@@ -32,6 +32,9 @@ module.exports = {
             .options({
                 viewportWidth: 1920,//传参
             })
+        // 配置每次打包浏览器缓存文件名的随机性
+        const filename = path.posix.join('js', `${new Date().getTime()}_[name].js`);
+        config.mode('production').devtool(false).output.filename(filename).chunkFilename(filename)
     },
     // 配置全局样式变量
     css: {