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

operationSupport/src/components/common/buildingTree.vue

@@ -69,12 +69,11 @@ export default {
     methods: {
         dimension(arr) {
             arr.map((item, index) => {
-                if (!!item.children && item.type !== 'unit' && item.type !== 'building') {
+                if (!!item.children) {
                     this.dimension(item.children);
-                } else {
-                    if (item.type === 'unit') {
+                    if (item.type == 'unit') {
                         item.name = this.CheckChinese(item.name, '单元');
-                    } else if (item.type === 'building') {
+                    } else if (item.type == 'building') {
                         item.name = this.CheckChinese(item.name, '楼栋');
                     }
                 }

operationSupport/src/components/common/organTree.vue

@@ -55,12 +55,11 @@ export default {
         },
         dimension(arr) {
             arr.map((item, index) => {
-                if (!!item.children && item.type !== 'unit' && item.type !== 'building') {
+                if (!!item.children) {
                     this.dimension(item.children);
-                } else {
-                    if (item.type === 'unit') {
+                    if (item.type == 'unit') {
                         item.name = this.CheckChinese(item.name, '单元');
-                    } else if (item.type === 'building') {
+                    } else if (item.type == 'building') {
                         item.name = this.CheckChinese(item.name, '楼栋');
                     }
                 }

operationSupport/src/components/common/treeHouse.vue

@@ -275,15 +275,24 @@ export default {
         },
         dimension(arr) {
             arr.map((item, index) => {
-                if (!!item.children & (item.type !== 'unit')) {
+                if (!!item.children) {
                     this.dimension(item.children);
-                } else {
-                    if (item.name.indexOf('单元') === -1 && item.type === 'unit') {
-                        item.name = item.name + '单元';
+                    if (item.type == 'unit') {
+                        item.name = this.CheckChinese(item.name, '单元');
+                    } else if (item.type == 'building') {
+                        item.name = this.CheckChinese(item.name, '楼栋');
                     }
                 }
             });
         },
+        CheckChinese(val, name) {
+            var reg = new RegExp('[\\u4E00-\\u9FFF]+', 'g');
+            let newVal = val;
+            if (!reg.test(val)) {
+                newVal = val + name;
+            }
+            return newVal;
+        },
         getOrgTreeList() {
             this.$http
                 .get('/sc-community/assets/tree/community/find', { buildingType: this.buildingType })

operationSupport/src/store/store.js

@@ -188,8 +188,6 @@ const store = new Vuex.Store({
          * @return {null} null:
          */
         addPopup(ctx, args) {
-            console.log('ctx', ctx);
-            console.log('args', args);
             const params = { ...args };
             const list = ctx.getters.getPopups;
             params.id = 'modal_' + +new Date();

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

@@ -29,7 +29,7 @@ export default {
     mounted() {},
     methods: {
         submit() {
-                        debugger;
+            debugger;
             if (this.unitPa.type === 'room') {
                 this.params.callback && this.params.callback(this.unitPa);
                 this.$emit('close');
@@ -53,14 +53,23 @@ export default {
         },
         dimension(arr) {
             arr.map((item, index) => {
-                if (!!item.children & (item.type !== 'unit')) {
+                if (!!item.children) {
                     this.dimension(item.children);
-                } else {
-                    if (item.name.indexOf('单元') === -1 && item.type === 'unit') {
-                        item.name = item.name + '单元';
+                    if (item.type == 'unit') {
+                        item.name = this.CheckChinese(item.name, '单元');
+                    } else if (item.type == 'building') {
+                        item.name = this.CheckChinese(item.name, '楼栋');
                     }
                 }
             });
+        },
+        CheckChinese(val, name) {
+            var reg = new RegExp('[\\u4E00-\\u9FFF]+', 'g');
+            let newVal = val;
+            if (!reg.test(val)) {
+                newVal = val + name;
+            }
+            return newVal;
         }
     },
     created() {

operationSupport/src/views/flow/index.vue

@@ -89,7 +89,12 @@ export default {
                     label: '任务类型',
                     prop: 'taskType',
                     format(val) {
-                        return taskTypeList.filter((item) => item.dictCode == val)[0].dictValue;
+                        let typeName = '',
+                            isObj = taskTypeList.filter((item) => item.dictCode == val)[0];
+                        if (!!isObj) {
+                            typeName = isObj.dictValue;
+                        }
+                        return typeName;
                     }
                 },
                 {

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

@@ -664,14 +664,23 @@ export default {
         },
         dimension(arr) {
             arr.map((item, index) => {
-                if (!!item.children & (item.type !== 'unit')) {
+                if (!!item.children) {
                     this.dimension(item.children);
-                } else {
-                    if (item.name.indexOf('单元') === -1 && item.type === 'unit') {
-                        item.name = item.name + '单元';
+                    if (item.type == 'unit') {
+                        item.name = this.CheckChinese(item.name, '单元');
+                    } else if (item.type == 'building') {
+                        item.name = this.CheckChinese(item.name, '楼栋');
                     }
                 }
             });
+        },
+        CheckChinese(val, name) {
+            var reg = new RegExp('[\\u4E00-\\u9FFF]+', 'g');
+            let newVal = val;
+            if (!reg.test(val)) {
+                newVal = val + name;
+            }
+            return newVal;
         }
     }
 };

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

@@ -118,11 +118,7 @@
                     <div class="formContent-formList house" v-for="(item, index) in formData.houseList" :key="index">
                         <div class="block-title">
                             <div class="floor list-title">
-                                {{
-                                    `${item.buildingName} ${
-                                        item.unitName.indexOf('单元') !== -1 ? item.unitName : !!item.unitName ? item.unitName + '单元' : ''
-                                    }${item.roomNumber}`
-                                }}
+                                {{ `${item.buildingName} ${!!item.unitName ? CheckChinese(item.unitName, '单元') : ''}${item.roomNumber}` }}
                             </div>
                             <!-- <span class="remove list-title" @click="removeHouse(index)">移除</span> -->
                             <img class="bg-img" src="@/assets/img/ownerManagement/bg_card@2x.png" alt="" />
@@ -156,7 +152,7 @@
 
                         <div class="block-title car" v-for="(items, indexs) in item.parkingList" :key="indexs">
                             <div class="floor list-title">
-                                {{ `${items.garageName}${items.areaName || items.partitionName}-${items.parkingNumber}` }}
+                                {{ `${items.garageName}${items.areaName || items.partitionName || ''}-${items.parkingNumber}` }}
                             </div>
                             <span class="remove list-title" @click="removeCard(indexs, item)">移除</span>
                             <img class="bg-img" src="@/assets/img/ownerManagement/bg_card@2x.png" alt="" />
@@ -626,12 +622,11 @@ export default {
         },
         dimension(arr) {
             arr.map((item, index) => {
-                 if (!!item.children && item.type !== 'unit' && item.type !== 'building') {
+                if (!!item.children) {
                     this.dimension(item.children);
-                } else {
-                    if (item.type === 'unit') {
+                    if (item.type == 'unit') {
                         item.name = this.CheckChinese(item.name, '单元');
-                    } else if (item.type === 'building') {
+                    } else if (item.type == 'building') {
                         item.name = this.CheckChinese(item.name, '楼栋');
                     }
                 }

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

@@ -75,16 +75,6 @@ export default {
                     item.disabled = false;
                 }
             });
-
-            // return trData.filter((item) => {
-            //     if (this.isNotEmpty(item.children)) {
-            //         item.disabled = false;
-            //         item.children = this.filterTreeData(item.children);
-            //         console.log(item.children);
-            //     } else {
-            //         item.disabled = true;
-            //     }
-            // });
         },
         isNotEmpty(arr) {
             return arr && Array.isArray(arr) && arr.length > 0;

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

@@ -11,7 +11,7 @@
                 <el-option v-for="(item, index) in unitArr" :key="index" :label="item.label" :value="item.id"></el-option>
             </el-select>
             <template slot="latitude">
-                <el-input v-model="initDot" @change="initDotTggle" placeholder="请选择经纬坐标">
+                <el-input v-model="initDot" @change="initDotTggle" placeholder="请输入正确坐标或选择坐标">
                     <i slot="suffix" class="zoniot_font zoniot-icon-dizhi" @click="QueryClick"></i>
                 </el-input>
             </template>
@@ -46,8 +46,8 @@ export default {
                 latitude: this.$valid.custome({
                     validator(rule, value, cb) {
                         const rl = rule;
-                        if (!value) {
-                            rl.message = '请输入或选择坐标';
+                        if (!value || !_this.formData.longitude) {
+                            rl.message = '请输入正确坐标或选择坐标';
                             cb(new Error());
                         } else if (_this.initDot.split(',').length > 2) {
                             rl.message = '一个巡更点只能有一个经纬度';
@@ -191,7 +191,9 @@ export default {
             this.nestedLoop(this.buildingArr, 'unit', 'unitArr', e);
         },
         initDotTggle() {
-            // console.log(this.initDot.split(','))
+            let logPoint = this.initDot.split(',');
+            this.formData.latitude = logPoint[0];
+            this.formData.longitude = logPoint[1];
         }
     },
     created() {

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

@@ -33,7 +33,7 @@
                     </template>
                     <div
                         class="pointSet"
-                        v-if="date.getTime() >= new Date(new Date().toLocaleDateString()).getTime() && !trueArr.includes(time)"
+                        v-if="date.getTime() >= new Date(new Date().toLocaleDateString()).getTime() && !trueArr.includes(data.day)"
                         @click="add(data)"
                     >
                         点击设置
@@ -119,8 +119,8 @@ export default {
         getShiftInformation(obj) {
             this.$http.post('/sc-community/patrolRoute/getShiftInformation', obj).then(({ data, status, msg }) => {
                 if (!!data) {
-                    this.calendarData = [];
-                    this.trueArr = [];
+                    let calendarData = [],
+                        trueArr = [];
                     for (let inx in data) {
                         let rosterUserDtos = [];
                         data[inx].map((item) => {
@@ -129,12 +129,14 @@ export default {
                                 partolName: item.partolName
                             });
                         });
-                        this.trueArr.push(this.$moment(inx).format('YYYY-MM-DD'));
-                        this.calendarData.push({
+                        trueArr.push(this.$moment(inx).format('YYYY-MM-DD'));
+                        calendarData.push({
                             partrolDate: this.$moment(inx).format('YYYY-MM-DD'),
                             rosterUserDtos: rosterUserDtos
                         });
                     }
+                    this.calendarData = calendarData;
+                    this.trueArr = trueArr;
                 }
             });
         }
@@ -188,15 +190,15 @@ export default {
             height: 110px;
             overflow: auto;
             &::-webkit-scrollbar {
-                width: 10px;
+                width: 5px;
             }
             &::-webkit-scrollbar-track {
-                border-radius: 10px;
-                background: #c6c4c4a9;
+                border-radius: 5px;
+                background: #f4f7f9a8;
             }
             &::-webkit-scrollbar-thumb {
-                border-radius: 10px;
-                background: #f4f7f9a8;
+                border-radius: 5px;
+                background: #c6c4c4a9;
             }
         }
     }

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

@@ -9,8 +9,9 @@
                 <el-option label="物业费" :value="1"></el-option>
                 <el-option label="水费" :value="2"></el-option>
                 <el-option label="电费" :value="3"></el-option>
-                <!-- <el-option label="车位费" :value="4"></el-option>
-                <el-option label="二次供水费" :value="5"></el-option> -->
+                <el-option label="车位费" :value="4"></el-option>
+                <el-option label="卫生费" :value="6"></el-option>
+                <el-option label="其他费用" :value="7"></el-option>
             </el-select>
             <el-button type="primary" class="search-btn" @click="mixins_search" icon="el-icon-search">查询 </el-button>
             <div class="search-icon">
@@ -107,8 +108,10 @@ export default {
                             return '电费';
                         } else if (val == '4') {
                             return '车位费';
-                        } else if (val == '5') {
-                            return '二次供水费';
+                        } else if (val == '6') {
+                            return '卫生费';
+                        } else if (val == '7') {
+                            return '其他费用';
                         }
                     }
                 },
@@ -214,7 +217,7 @@ export default {
                 }
                 this.$store.dispatch('addPopup', {
                     // url: '/payService/billingRules/stepPage/add.vue',
-                    url: '/payService/billingRules/stepPage/newAdd.vue', 
+                    url: '/payService/billingRules/stepPage/newAdd.vue',
                     width: '524px',
                     height: '600px',
                     props: {

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

@@ -88,8 +88,10 @@ export default {
                             return '电费';
                         } else if (val == '4') {
                             return '车位费';
-                        } else if (val == '5') {
-                            return '二次供水费';
+                        } else if (val == '6') {
+                            return '卫生费';
+                        } else if (val == '7') {
+                            return '其他费用';
                         }
                     }
                 },

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

@@ -81,11 +81,13 @@ export default {
                 },
                 {
                     label: '业主',
-                    prop: 'residentName'
+                    prop: 'residentName',
+                    width: '100'
                 },
                 {
                     label: '费用名称',
-                    prop: 'chargeName'
+                    prop: 'chargeName',
+                    width: '200'
                 },
                 {
                     label: '计费日期',
@@ -131,7 +133,8 @@ export default {
                 },
                 {
                     label: '费用名称',
-                    prop: 'chargeName'
+                    prop: 'chargeName',
+                    width: '200'
                 },
                 {
                     label: '计费日期',

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

@@ -155,7 +155,6 @@ export default {
                         item.sumTotle = '';
                     });
                     this.tabList = res;
-                    console.log(res);
                 })
                 .catch(() => {
                     loading.close();

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

@@ -6,19 +6,22 @@
                 <el-col :span="12" :key="index">
                     <el-form-item :label="labelType(item.label, item.prop)">
                         <template v-if="item.slot">
+                            <template v-if="item.slot === 'assetsArea' && thisItem['chargeType'] == 4">
+                                {{ !!thisItem['parkingDetail'] ? thisItem['parkingDetail'] : '--' }}
+                            </template>
                             <template v-if="item.slot === 'chargeMode'">
                                 {{ !!chargeModeValue[thisItem[item.prop]] ? chargeModeValue[thisItem[item.prop]] : '--' }}
                             </template>
                             <template v-if="item.slot === 'chargeStatus'">
                                 <span class="redText">未缴费</span>
                             </template>
+                            <template v-if="item.slot === 'payEndTime'">
+                                <div style="white-space: nowrap">{{ typeTimeTransition(thisItem.payBeginTime, thisItem.payEndTime) }}</div>
+                            </template>
                         </template>
                         <template v-else>
                             {{ thisItem[item.prop] || '--' }}
                         </template>
-                        <template v-if="item.slot === 'payEndTime'">
-                            <div style="white-space: nowrap">{{ typeTimeTransition(thisItem.payBeginTime, thisItem.payEndTime) }}</div>
-                        </template>
                     </el-form-item>
                 </el-col>
             </template>
@@ -67,7 +70,8 @@ export default {
                 },
                 {
                     label: '面积(㎡):',
-                    prop: 'assetsArea'
+                    prop: 'assetsArea',
+                    slot: 'assetsArea'
                 },
                 {
                     label: '价格(元/月):',
@@ -185,15 +189,17 @@ export default {
             let type = this.thisItem['chargeType'];
             if (val == 'assetsArea') {
                 if (type == 2) {
-                    lab = '用量(吨)';
+                    lab = '用量(吨):';
                 } else if (type == 3) {
-                    lab = '用量(度)';
+                    lab = '用量(度):';
+                } else if (type == 4) {
+                    lab = '车位:';
                 }
             } else if (val == 'chargePrice') {
                 if (type == 2) {
-                    lab = '价格(元/吨)';
+                    lab = '价格(元/吨):';
                 } else if (type == 3) {
-                    lab = '价格(元/度)';
+                    lab = '价格(元/度):';
                 }
             }
             return lab;

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

@@ -25,7 +25,7 @@
         </div>
         <div class="table-top">
             <div class="table-top_block title">
-                <div>{{ thisObjCommunit['communityName'] }}收费统计</div>
+                <div>{{ thisObjCommunit['communityName'] || '' }}收费统计</div>
                 <div>{{ timeFiterType() }}</div>
             </div>
             <div class="table-top_block blockColor" v-for="item in blockArr" :key="item">
@@ -103,12 +103,38 @@ export default {
     watch: {
         mixins_list(val) {
             if (!!val) {
+                this.cols = [
+                    {
+                        label: '社区名称',
+                        prop: 'communityName'
+                    },
+                    {
+                        label: '房间',
+                        prop: 'houseDetail'
+                    },
+                    {
+                        label: '业主',
+                        prop: 'residentName'
+                    },
+                    {
+                        label: '物业费标准(元/月)',
+                        prop: 'chargingStandard'
+                    },
+                    {
+                        label: '月数',
+                        prop: 'months'
+                    },
+                    {
+                        label: '合计',
+                        prop: 'totalAmount'
+                    }
+                ];
                 if (val.length) {
                     let arr = [{ label: '总收费', val: val[0].totalAmount }];
                     val[0].details.map((item, index) => {
-                        arr.push({ label: item.chargeName, val: item.amount });
-                        this.cols.splice(4 + index, 0, {
-                            label: item.chargeName,
+                        arr.push({ label: this.typeName(item), val: item.amount });
+                        this.cols.splice(5 + index, 0, {
+                            label: this.typeName(item),
                             prop: 'type' + index,
                             slot: 'type' + index
                         });
@@ -128,6 +154,30 @@ export default {
                 endTime: time
             };
         },
+        typeName(item) {
+            let name = '';
+            switch (item.chargeType) {
+                case 1:
+                    name = '物业费';
+                    break;
+                case 2:
+                    name = '水费';
+                    break;
+                case 3:
+                    name = '电费';
+                    break;
+                case 4:
+                    name = '车位费';
+                    break;
+                case 6:
+                    name = '卫生费';
+                    break;
+                case 7:
+                    name = item.chargeName;
+                    break;
+            }
+            return name
+        },
         exportExcel() {
             this.__exportExcel('/sc-charge/charge/report/export/excel', this.mixins_query);
         },

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

@@ -15,7 +15,7 @@
                 @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="initPageData" icon="el-icon-search">查询 </el-button>
             <div class="search-icon">
                 <el-tooltip class="item" effect="light" placement="bottom" content="导出">
                     <i class="zoniot_font zoniot-icon-daochu2" @click="exportExcel"></i>
@@ -141,7 +141,7 @@ export default {
             activeIndex: 1,
             mixins_post: 'post',
             times: [],
-            communityArr:[]
+            communityArr: []
         };
     },
     created() {
@@ -150,9 +150,7 @@ export default {
             accountType: 3,
             paymentType: 1
         };
-        this.getSun(1);
-        this.getSun(2);
-        this.mixins_search();
+        this.initPageData();
         this.getorgTree();
     },
     mounted() {},
@@ -162,9 +160,20 @@ export default {
             this.mixins_query.paymentType = index;
             this.mixins_search();
         },
+        initPageData() {
+            this.getSun(1);
+            this.getSun(2);
+            this.mixins_search();
+        },
         getSun(type) {
             this.$http
-                .post('/sc-charge/payment/record/sum/amount', { accountType: 3, paymentType: type })
+                .post('/sc-charge/payment/record/sum/amount', {
+                    accountType: 3,
+                    paymentType: type,
+                    communityId: this.mixins_query.communityId,
+                    endTime: this.mixins_query.endTime,
+                    startTime: this.mixins_query.startTime
+                })
                 .then(({ data, status, msg }) => {
                     if (status == 0) {
                         if (type == 1) {
@@ -186,8 +195,8 @@ export default {
             if (!arr) {
                 arr = ['', ''];
             }
-            this.mixins_query.startTime = arr[0] + ' 00:00:00';
-            this.mixins_query.endTime = arr[1] + ' 23:59:59';
+            this.mixins_query.startTime = !!arr[0] ? arr[0] + ' 00:00:00' : '';
+            this.mixins_query.endTime = !!arr[1] ? arr[1] + ' 23:59:59' : '';
         },
         getorgTree() {
             this.$http

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

@@ -1,7 +1,7 @@
 <template>
     <div class="main">
         <div class="search">
-            <el-select v-model="mixins_query.communityId" placeholder="选择社区"  @change="communityChange">
+            <el-select v-model="mixins_query.communityId" placeholder="选择社区" @change="communityChange">
                 <el-option v-for="(item, index) in communityArr" :key="index" :label="item.communityName" :value="item.id"></el-option>
             </el-select>
             <el-button type="primary" class="search-btn" @click="mixins_search" icon="el-icon-search">查询 </el-button>
@@ -12,7 +12,7 @@
             </div>
         </div>
         <div class="table-top">
-            {{ `${new Date().getFullYear()}年${thisObjCommunit['communityName']}缴纳物业管理费情况表` }}
+            {{ `${new Date().getFullYear()}年${thisObjCommunit['communityName'] || ''}缴纳物业管理费情况表` }}
         </div>
         <zz-table
             :cols="cols"

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

@@ -15,7 +15,7 @@
                 @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="initPageData" icon="el-icon-search">查询 </el-button>
             <div class="search-icon">
                 <el-tooltip class="item" effect="light" placement="bottom" content="导出">
                     <i class="zoniot_font zoniot-icon-daochu2" @click="exportExcel"></i>
@@ -150,9 +150,7 @@ export default {
             accountType: 2,
             paymentType: 1
         };
-        this.getSun(1);
-        this.getSun(2);
-        this.mixins_search();
+        this.initPageData();
         this.getorgTree();
     },
     mounted() {},
@@ -162,9 +160,21 @@ export default {
             this.mixins_query.paymentType = index;
             this.mixins_search();
         },
+        initPageData() {
+            this.getSun(1);
+            this.getSun(2);
+            this.mixins_search();
+        },
         getSun(type) {
+            debugger;
             this.$http
-                .post('/sc-charge/payment/record/sum/amount', { accountType: 2, paymentType: type })
+                .post('/sc-charge/payment/record/sum/amount', {
+                    accountType: 2,
+                    paymentType: type,
+                    communityId: this.mixins_query.communityId,
+                    endTime: this.mixins_query.endTime,
+                    startTime: this.mixins_query.startTime
+                })
                 .then(({ data, status, msg }) => {
                     if (status == 0) {
                         if (type == 1) {
@@ -186,8 +196,8 @@ export default {
             if (!arr) {
                 arr = ['', ''];
             }
-            this.mixins_query.startTime = arr[0] + ' 00:00:00';
-            this.mixins_query.endTime = arr[1] + ' 23:59:59';
+            this.mixins_query.startTime = !!arr[0] ? arr[0] + ' 00:00:00' : '';
+            this.mixins_query.endTime = !!arr[1] ? arr[1] + ' 23:59:59' : '';
         },
         getorgTree() {
             this.$http

operationSupport/src/views/workOrders/records.vue

@@ -85,7 +85,15 @@ export default {
                 },
                 {
                     label: '紧急程度',
-                    prop: 'urgencyDegree'
+                    prop: 'urgencyDegree',
+                    format(val) {
+                        if (val == 1) {
+                            return '普通';
+                        } else if (val == 2) {
+                            return '紧急';
+                        }
+                        return '--';
+                    }
                 },
                 {
                     label: '维修人员',