Merge branch 'new_web' of http://39.108.172.131:3000/Shannon_mu/SmartCommunity into new_web

operationSupport/src/main.js

@@ -71,18 +71,27 @@ Vue.prototype.routerLoad = {
             }
         });
     },
-    findMen(arr, indexPath) {
-        let status = false;
+    findMen(arrList, arr, indexPath) {
         arr.map((v) => {
+            // if ('/' + v.linkPath !== indexPath) {
+            //     if (!!v.children) {
+            //         this.findMen(arrList, item.children, indexPath);
+            //     } else {
+            //         arrList.push(true)
+            //     }
+            // } else {
+
+            // }
+
             if (v.children) {
-                this.findMen(v.children);
+                this.findMen(arrList, v.children, indexPath);
             } else {
-                if ('/' + v.linkPath === indexPath) {
-                    status = true;
+                if ('/' + v.linkPath == indexPath) {
+                    arrList.push(true)
                 }
             }
         });
-        return status;
+
     },
     close() {
         let activeRout = localStorage.getItem('path');
@@ -99,6 +108,16 @@ Vue.prototype.routerLoad = {
         http.get('/sc-user-center/user/findUserMenu', { appId: '1002' }).then(({ status, data, msg }) => {
             if (0 === status) {
                 store.commit('setMenuList', data[0].children);
+                if (data[0].children[0].children == null) {
+                    router.push({
+                        path: '/' + data[0].children[0].linkPath
+                    });
+                } else {
+                    router.push({
+                        path: '/' + data[0].children[0].children[0].linkPath
+                    });
+
+                }
                 store.commit('setThisDetai', data[0]);
             }
         });
@@ -138,12 +157,15 @@ Vue.prototype.routerLoad = {
 router.beforeEach((to, from, next) => {
     if (to.path !== '/404') {
         // console.log()
-        let PermissionsRouter = Vue.prototype.routerLoad.findMen(store.getters.getMenuList, to.fullPath);
-        if (PermissionsRouter) {
+        let newa = [];
+        console.log()
+        Vue.prototype.routerLoad.findMen(newa, store.getters.getMenuList, to.fullPath);
+        if (newa.length) {
             next();
         } else {
-            next({ path: 404 });
+            next({ path: '404' });
         }
+        next();
         // 跳转时存储路由
         localStorage.setItem('path', to.fullPath);
     } else {

operationSupport/src/router/index.js

@@ -140,12 +140,19 @@ const zRoute = [
         meta: { title: '收费统计' },
         name: 'chargeStatistics'
     },
-    
+
     // {
     //     path: '/invoiceManagement/index',
     //     component: () => import(/* webpackChunkName: "404" */ '@views/payService/invoiceManagement/index.vue'),
     //     meta: { title: '发票管理' }
     // },
+    // {
+    //     path: '/shannon-transfer',
+    //     component: () => import(/* webpackChunkName: "404" */ '@views/patrolManagement/components/shannon-transfer.vue'),
+    //     meta: { title: '测试' },
+    //     name: 'shannon-transfer'
+    // },
+
     {
         path: '/propertyFee/index',
         component: () => import(/* webpackChunkName: "404" */ '@views/payService/propertyFee/index.vue'),
@@ -318,7 +325,7 @@ const quietRoute = [
             },
             ...zRoute
         ],
-        redirect: '/workbench/index'
+        // redirect: '/workbench/index'
     },
     {
         path: '*',

operationSupport/src/views/patrolManagement/components/shannon-transfer.vue

@@ -0,0 +1,351 @@
+<template>
+    <div class="shannon-transfer">
+        <div class="shannon-transfer-panel">
+            <div class="shannon-transfer-panel__header">
+                <div class="item-flex justify">
+                    <div class="item-flex justify cursor" @click="leftAllf">
+                        <span class="label-block" :class="leftAll ? 'is-checked' : ''"></span>
+                        <span class="label-name">{{ title[0] }}</span>
+                    </div>
+                    <span class="label-number">{{ leftSelectArr.length }}/{{ leftArr.length }}</span>
+                </div>
+            </div>
+            <div class="shannon-transfer-panel__body">
+                <el-input placeholder="请输入内容" prefix-icon="el-icon-search shannon-transfer-panel__filter"></el-input>
+                <div class="shannon-transfer-panel__list is-filterable">
+                    <div class="shannon-transfer-panel__item" v-for="(item, index) in newArr[0]" :key="item.id">
+                        <div class="item-flex cursor" @click="leftThis(item, index)">
+                            <span class="label-block" :class="item.isChecked ? 'is-checked' : ''"></span>
+                            <span class="label-name">{{ item.label }}</span>
+                        </div>
+                        <!-- <div>{{ newArr }}</div> -->
+                    </div>
+                </div>
+                <p class="shannon-transfer-panel__empty">无匹配数据</p>
+                <p class="shannon-transfer-panel__empty">无数据</p>
+            </div>
+        </div>
+        <div class="shannon-transfer__buttons">
+            <el-button type="primary" class="shannon-transfer__button" @click="moveData('left')">
+                <span><i class="el-icon-arrow-left"></i></span>
+            </el-button>
+            <el-button type="primary" class="shannon-transfer__button" @click="moveData('right')">
+                <span><i class="el-icon-arrow-right"></i></span>
+            </el-button>
+        </div>
+        <div class="shannon-transfer-panel">
+            <div class="shannon-transfer-panel__header">
+                <div class="item-flex justify">
+                    <div class="item-flex justify cursor" @click="rightAllf">
+                        <span class="label-block" :class="rightAll ? 'is-checked' : ''"></span>
+                        <span class="label-name">{{ title[0] }}</span>
+                    </div>
+                    <span class="label-number">{{ rightSelectArr.length }}/{{ rightArr.length }}</span>
+                </div>
+            </div>
+            <div class="shannon-transfer-panel__body">
+                <el-input placeholder="请输入内容" prefix-icon="el-icon-search shannon-transfer-panel__filter"></el-input>
+                <div class="shannon-transfer-panel__list is-filterable">
+                    <div class="shannon-transfer-panel__item" v-for="item in newArr[1]" :key="item.id">
+                        <div class="item-flex cursor" @click="rightThis(item)">
+                            <span class="label-block" :class="item.isChecked ? 'is-checked' : ''"></span>
+                            <span class="label-name">{{ item.label }}</span>
+                        </div>
+                        <div></div>
+                    </div>
+                </div>
+                <p class="shannon-transfer-panel__empty">无匹配数据</p>
+                <p class="shannon-transfer-panel__empty">无数据</p>
+            </div>
+        </div>
+    </div>
+</template>
+<script>
+export default {
+    props: {
+        arr: {
+            type: Array,
+            default: () => [
+                {
+                    id: 1,
+                    label: '测试一号',
+                    isChecked: false
+                },
+                {
+                    id: 2,
+                    label: '测试二号',
+                    isChecked: false
+                }
+            ]
+        },
+        title: {
+            type: Array,
+            default: () => ['待选列表', '已选列表']
+        }
+    },
+    data() {
+        return {
+            //左右数据 左右勾选数据
+            leftArr: [],
+            rightArr: [],
+            leftSelectArr: [],
+            rightSelectArr: [],
+            leftAll: false,
+            rightAll: false
+        };
+    },
+    watch: {
+        rightSelectArr: {
+            deep: true,
+            handler(n) {
+                console.log(n);
+            }
+        }
+    },
+    computed: {
+        newArr() {
+            let newData = [];
+            if (this.rightArr.length == 0) {
+                newData[0] = this.arr;
+                this.leftArr = this.arr;
+            } else {
+                newData[0] = this.leftArr;
+                this.rightArr = this.rightArr;
+            }
+            newData[1] = this.rightArr;
+            return newData;
+        }
+    },
+    methods: {
+        leftAllf() {
+            this.leftArr.map((item) => {
+                if (!item.isChecked) {
+                    item.isChecked = true;
+                } else {
+                    item.isChecked = false;
+                }
+            });
+            this.allTrue(0);
+        },
+        rightAllf() {
+            this.rightArr.map((item) => {
+                if (!item.isChecked) {
+                    item.isChecked = true;
+                } else {
+                    item.isChecked = false;
+                }
+            });
+            this.allTrue(1);
+        },
+        leftThis(item, index) {
+            item.isChecked = !item.isChecked;
+            if (item.isChecked) {
+                this.leftSelectArr.push(item.id);
+            } else {
+                this.leftSelectArr.map((its, inx) => {
+                    if (item.id == its) {
+                        this.leftSelectArr.splice(inx, 1);
+                    }
+                });
+            }
+            this.allTrue(0);
+        },
+        rightThis(item) {
+            item.isChecked = !item.isChecked;
+            if (item.isChecked) {
+                this.rightSelectArr.push(item.id);
+            } else {
+                this.rightSelectArr.map((its, inx) => {
+                    if (item.id == its) {
+                        this.rightSelectArr.splice(inx, 1);
+                    }
+                });
+            }
+            this.allTrue(1);
+        },
+        moveData(direction) {
+            if (direction == 'right' && this.leftSelectArr.length !== 0) {
+                this.rightArr.push(this.leftSelectArr);
+                let thisLeft = this.leftArr.filter((item, index) => {
+                    return this.leftSelectArr[index] !== item.id;
+                });
+                let thisRight = this.leftArr.filter((item, index) => {
+                    item.isChecked = false;
+                    return this.leftSelectArr[index] == item.id;
+                });
+                console.log(thisLeft);
+                console.log(thisRight);
+                this.leftArr = thisLeft;
+                this.rightArr = thisRight;
+                this.leftSelectArr = [];
+            } else if (direction == 'left' && this.rightSelectArr.length !== 0) {
+                this.leftArr.push(this.rightSelectArr);
+                let thisRight = this.rightArr.filter((item, index) => {
+                    return this.rightSelectArr[index] !== item.id;
+                });
+                let thisLeft = this.rightArr.filter((item, index) => {
+                    item.isChecked = false;
+                    return this.rightSelectArr[index] == item.id;
+                });
+                console.log(thisLeft);
+                console.log(thisRight);
+                this.leftArr = thisLeft;
+                this.rightArr = thisRight;
+                this.rightSelectArr = [];
+            }
+        },
+        allTrue(sun) {
+            if (sun == 0) {
+                let leftAll = false;
+                this.newArr[0].map((item) => {
+                    leftAll = item.isChecked;
+                    if (leftAll == false) {
+                        this.leftAll = 'Multiple';
+                    } else {
+                        this.leftAll = 'all';
+                    }
+                });
+                this.leftAll = leftAll;
+            } else {
+                let rightAll = false;
+                this.newArr[1].map((item) => {
+                    rightAll = item.isChecked;
+                });
+                this.rightAll = rightAll;
+            }
+        }
+    }
+};
+</script>
+<style lang="scss" scoped>
+$name: shannon-transfer;
+$panelName: #{$name}-panel;
+$white: white;
+.backWhite {
+    background: $white;
+}
+$eaeff: #0eaeff;
+.color0eaeff {
+    color: $eaeff;
+}
+.cursor {
+    cursor: pointer;
+}
+.#{$name} {
+    &-panel {
+        border: 1px solid #ebeef5;
+        border-radius: 4px;
+        overflow: hidden;
+        @extend .backWhite;
+        display: inline-block;
+        vertical-align: middle;
+        width: 200px;
+        max-height: 100%;
+        -webkit-box-sizing: border-box;
+        box-sizing: border-box;
+        position: relative;
+        .#{$name}-panel__header {
+            height: 40px;
+            line-height: 40px;
+            background: #f5f7fa;
+            margin: 0;
+            padding-left: 15px;
+            border-bottom: 1px solid #ebeef5;
+            -webkit-box-sizing: border-box;
+            box-sizing: border-box;
+            color: #000;
+        }
+        .#{$panelName}__body {
+            height: 246px;
+            .#{$panelName}__filter {
+                text-align: center;
+                margin: 15px;
+                -webkit-box-sizing: border-box;
+                box-sizing: border-box;
+                display: block;
+                width: auto;
+            }
+            .#{$panelName}__list {
+                margin: 0;
+                padding: 6px 0;
+                list-style: none;
+                height: 246px;
+                overflow: auto;
+                -webkit-box-sizing: border-box;
+                box-sizing: border-box;
+            }
+            .#{$panelName}__item {
+                line-height: 30px;
+                margin: 0 15px;
+                .label-block {
+                    margin-top: 8px;
+                }
+            }
+            .el-input--prefix {
+                margin: 15px;
+                width: calc(100% - 30px);
+                .el-input__inner {
+                    border-radius: 30px;
+                }
+            }
+        }
+        .item-flex {
+            display: flex;
+            &.justify {
+                justify-content: space-between;
+            }
+        }
+        .label-block {
+            position: relative;
+            height: 14px;
+            width: 14px;
+            border-radius: 3px;
+            margin-top: 13px;
+            border: 1px solid #dcdfe6;
+            @extend .backWhite;
+            cursor: pointer;
+            &.is-checked {
+                background: $eaeff;
+                border-color: $eaeff;
+            }
+            &.is-checked {
+                background: $eaeff;
+                border-color: $eaeff;
+            }
+            &:hover {
+                border-color: $eaeff;
+            }
+            &::after {
+                content: '';
+                position: absolute;
+                left: 2px;
+                top: 2px;
+                width: 50%;
+                height: 25%;
+                border: 2px solid #fff;
+                border-radius: 1px;
+                border-top: none;
+                border-right: none;
+                background: transparent;
+                transform: rotate(-45deg);
+            }
+        }
+        .label-name {
+            margin-left: 10px;
+        }
+    }
+    &__buttons {
+        display: inline-block;
+        vertical-align: middle;
+        padding: 0 30px;
+        .#{$name}__button {
+            &:first-child {
+                margin-bottom: 10px;
+            }
+            span {
+                font-size: 14px;
+            }
+        }
+    }
+}
+</style>

operationSupport/src/views/patrolManagement/patrolRecords.vue

@@ -2,18 +2,8 @@
     <div class="main">
         <template v-if="!isLook">
             <div class="search">
-                <el-input
-                    placeholder="请输入巡更路线/人员"
-                    class="search-input"
-                    clearable
-                    v-model="mixins_query.partolName"
-                ></el-input>
-                <el-select
-                    class="width90"
-                    placeholder="请选择巡更状态"
-                    v-model="mixins_query.patrolStatus"
-                    clearable
-                >
+                <el-input placeholder="请输入巡更路线/人员" class="search-input" clearable v-model="mixins_query.partolName"></el-input>
+                <el-select class="width90" placeholder="请选择巡更状态" v-model="mixins_query.patrolStatus" clearable>
                     <el-option label="待执行" :value="1"></el-option>
                     <el-option label="执行中" :value="2"></el-option>
                     <el-option label="已完成" :value="3"></el-option>
@@ -29,12 +19,7 @@
                     end-placeholder="结束日期"
                     @change="effectiveDateToggle"
                 ></el-date-picker>
-                <el-button
-                    type="primary"
-                    class="search-btn"
-                    @click="mixins_search"
-                    icon="el-icon-search"
-                >查询</el-button>
+                <el-button type="primary" class="search-btn" @click="mixins_search" icon="el-icon-search">查询</el-button>
             </div>
             <zz-table
                 :cols="cols"
@@ -44,13 +29,11 @@
                 :pageset="mixins_pageset"
                 @page-change="pageChange"
             >
+                <template slot-scope="scope" slot="patrolDate"> {{ checkDateType(scope.row.patrolDate) }}</template>
                 <template slot-scope="scope" slot="opt">
                     <div class="opt">
                         <el-tooltip effect="light" placement="bottom" content="详情">
-                            <i
-                                class="zoniot_font zoniot-icon-xiangqing"
-                                @click="lookDetails(scope.row)"
-                            ></i>
+                            <i class="zoniot_font zoniot-icon-xiangqing" @click="lookDetails(scope.row)"></i>
                         </el-tooltip>
                     </div>
                 </template>
@@ -87,7 +70,8 @@ export default {
                 },
                 {
                     label: '巡更日期',
-                    prop: 'patrolDate'
+                    prop: 'patrolDate',
+                    slot: 'patrolDate'
                 },
                 {
                     label: '巡更时间',
@@ -145,6 +129,9 @@ export default {
         initPage() {
             this.isLook = false;
             this.thisObj = {};
+        },
+        checkDateType(time) {
+            return !!time ? this.$moment(new Date(time)).format('YYYY-MM-DD') : '--';
         }
     }
 };

operationSupport/src/views/patrolManagement/patrolRoute.vue

@@ -22,6 +22,7 @@
                 :pageset="mixins_pageset"
                 @page-change="pageChange"
             >
+                <template slot-scope="scope" slot="startDate"> {{ checkDateType(scope.row.startDate) }}</template>
                 <template slot-scope="scope" slot="periodValue">{{
                     scope.row.periodType == 1 ? `每周${periodValueType(scope.row.periodValue)}` : `每隔${scope.row.periodValue}天`
                 }}</template>
@@ -69,7 +70,8 @@ export default {
                 },
                 {
                     label: '巡更日期',
-                    prop: 'startDate'
+                    prop: 'startDate',
+                    slot: 'startDate'
                 },
                 {
                     label: '巡更时间',
@@ -148,6 +150,9 @@ export default {
                 return value.split(',').sort().toString();
             }
             return '--';
+        },
+        checkDateType(time) {
+            return !!time ? this.$moment(new Date(time)).format('YYYY-MM-DD') : '--';
         }
     }
 };

operationSupport/src/views/patrolManagement/popups/popMap.vue

@@ -34,8 +34,9 @@ export default {
         init() {
             let _this = this;
             this.map = new AMap.Map('container', {
+                city: this.params.data.communityName || '',
                 resizeEnable: true, //是否监控地图容器尺寸变化
-                zoom: 11 //初始化地图层级
+                zoom: 16 //初始化地图层级
             });
             this.map.on('complete', () => {
                 if (!!_this.params.location) {
@@ -46,7 +47,10 @@ export default {
 
             this.map.on('click', this.mapClick);
             this.placeSearch = new AMap.PlaceSearch({
-                map: _this.map
+                map: _this.map,
+                city: '广东', //020
+                citylimit: true, //定点范围
+                autoFitView: true
             });
             AMap.event.addListener(this.placeSearch, 'markerClick', (e) => {
                 this.thisMapPot = e.event.lnglat;
@@ -82,6 +86,7 @@ export default {
         togglePlaceSearch(val, resolve) {
             this.placeSearch.search(val, (status, result) => {
                 if (result.info == 'OK' && status == 'complete') {
+                    console.log(result.poiList);
                     this.poisArray = result.poiList.pois;
                 }
                 resolve && resolve(true);

operationSupport/src/views/patrolManagement/popups/scheduling.vue

@@ -31,9 +31,21 @@
                             </template>
                         </div>
                     </template>
+                    <!-- <div
+                        class="pointSet"
+                        v-if="
+                            date.getTime() <= $moment($parent.thisObj.endDate).valueOf() &&
+                            date.getTime() >= new Date(new Date().toLocaleDateString()).getTime() &&
+                            !trueArr.includes(data.day)
+                        "
+                        @click="add(data)"
+                    > -->
                     <div
                         class="pointSet"
-                        v-if="date.getTime() >= new Date(new Date().toLocaleDateString()).getTime() && !trueArr.includes(data.day)"
+                        v-if="
+                            date.getTime() <= $moment($parent.thisObj.endDate).valueOf() &&
+                            date.getTime() >= new Date(new Date().toLocaleDateString()).getTime()
+                        "
                         @click="add(data)"
                     >
                         点击设置

operationSupport/src/views/patrolManagement/popups/schedulingAdd.vue

@@ -1,11 +1,5 @@
 <template>
-    <el-form
-        class="timeNewStyle"
-        label-width="100px"
-        :model="formData"
-        :rules="formRules"
-        ref="formRu"
-    >
+    <el-form class="timeNewStyle" label-width="100px" :model="formData" :rules="formRules" ref="formRu">
         <el-form-item label="巡更日期" v-if="!params.isSingle" prop="partrolDate">
             <el-date-picker
                 v-model="formData.partrolDate"
@@ -13,10 +7,11 @@
                 type="daterange"
                 start-placeholder="开始日期"
                 end-placeholder="结束日期"
+                :picker-options="pickerOptions"
             ></el-date-picker>
         </el-form-item>
         <el-form-item label="巡更日期" v-else>{{ thisDay.day | dateText }}</el-form-item>
-        <template v-for="(item,index) in timePeriod">
+        <template v-for="(item, index) in timePeriod">
             <el-form-item :label="item.partrolTime" :key="index">
                 <el-cascader
                     :ref="`userName${index}`"
@@ -33,6 +28,7 @@
 export default {
     props: ['params'],
     data() {
+        const _this = this;
         return {
             timePeriod: [],
             findUser: [],
@@ -48,6 +44,13 @@ export default {
             },
             formRules: {
                 partrolDate: [this.$valid.selectRequired('时间段')]
+            },
+            pickerOptions: {
+                disabledDate(time) {
+                    let startDate = _this.$moment(_this.params.thisObj.startDate).valueOf();
+                    let endDate = _this.$moment(_this.params.thisObj.endDate).valueOf();
+                    return time.getTime() > endDate || time.getTime() < startDate;
+                }
             }
         };
     },
@@ -68,7 +71,7 @@ export default {
         },
         submit() {
             if (!this.params.isSingle) {
-                this.$refs['formRu'].validate(valid => {
+                this.$refs['formRu'].validate((valid) => {
                     if (valid) {
                         this.add();
                     }
@@ -85,21 +88,30 @@ export default {
                 periodType: data.periodType,
                 periodValue: data.periodValue,
                 rosterUserDtos: this.timePeriod,
-                partrolDate: this.thisDay.day
+                partrolDate: this.thisDay.day,
+                startDate: data.startDate,
+                endDate: data.endDate
             };
             if (!this.params.isSingle) {
                 initData.partrolDate = this.formData.partrolDate[0];
                 initData.partrolEndDate = this.formData.partrolDate[1];
             }
-            this.$http.post('/sc-community/patrolRoute/roster', initData).then(({ data, status, msg }) => {
-                if (status == 0) {
-                    this.$message.success(msg);
-                    this.params.callback();
-                    this.$emit('close');
-                } else {
-                    this.$message.error(msg);
-                }
-            });
+            var loading = this.$loading();
+            this.$http
+                .post('/sc-community/patrolRoute/roster', initData)
+                .then(({ data, status, msg }) => {
+                    if (status == 0) {
+                        this.$message.success(msg);
+                        this.params.callback();
+                        this.$emit('close');
+                    } else {
+                        this.$message.error(msg);
+                    }
+                    loading.close();
+                })
+                .catch(() => {
+                    loading.close();
+                });
         }
     },
     created() {
@@ -112,7 +124,7 @@ export default {
         }
         if (!!this.params.thisObj) {
             let arrs = this.params.thisObj.timePeriod.split(',');
-            arrs.map(item => {
+            arrs.map((item) => {
                 this.timePeriod.push({
                     partolName: '',
                     partolUserId: '',

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

@@ -133,7 +133,7 @@ export default {
                 remark: ''
             },
             lateFeeMsg: '滞纳金计算规则：</br>月费用*逾期天数*滞纳金标准',
-            rulesFeeMsg: `预计生成账单：下个月1日，按照设置的计</br>费方式、计费周期生成物业费账单</br>后生成账单：从下个月开始计算，到计费周</br>期结束后一个月的1日生成账单`,
+            rulesFeeMsg: `预生成账单：下个月1日，按照设置的计费方式、计费周期，生成后几个月的账单</br>后生成账单：下个月1日，按照设置的计费方式、计费周期，生成前几个月的账单`,
             formRules: {
                 chargeName: [this.$valid.inputRequired('费用名称')],
                 chargePrice: [this.$valid.inputRequired('价格')],

operationSupport/src/views/workOrders/records.vue

@@ -13,7 +13,7 @@
             </el-select>
             <el-date-picker
                 v-model="times"
-                value-format="yyyy-MM-dd"
+                value-format="yyyyMMdd"
                 type="daterange"
                 range-separator="至"
                 start-placeholder="报修开始日期"