物业费账单下拉

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

@@ -125,6 +125,12 @@
                         <el-option label="否" :value="0"></el-option>
                     </el-select>
                 </el-form-item>
+                <el-form-item label="按巡更点顺序签到" label-width="130">
+                    <el-radio-group v-model="ruleForm.signFlag">
+                        <el-radio :label="1">是</el-radio>
+                        <el-radio :label="0">否</el-radio>
+                    </el-radio-group>
+                </el-form-item>
                 <el-form-item label="备注信息">
                     <el-input
                         type="textarea"
@@ -161,6 +167,7 @@ export default {
                 periodValue: '',
                 positioningDistance: '',
                 cameraSettings: '',
+                signFlag: '',
                 remark: ''
             },
             periodValue: [],
@@ -220,6 +227,7 @@ export default {
                         periodValue: this.ruleForm.periodValue,
                         positioningDistance: this.ruleForm.positioningDistance,
                         cameraSettings: this.ruleForm.cameraSettings,
+                        signFlag: this.ruleForm.signFlag,
                         remark: this.ruleForm.remark
                     };
                     this.$http

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

@@ -14,6 +14,23 @@
                     v-trim
                     v-model.trim="mixins_query.chargeName"
                 ></el-input>
+                <el-select v-model="mixins_querys.chargeType" placeholder="费用类型" clearable>
+                    <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="6"></el-option>
+                    <el-option label="车位管理费" :value="4"></el-option>
+                    <el-option label="其他费用" :value="7"></el-option>
+                </el-select>
+                <el-date-picker
+                    v-model="times"
+                    value-format="yyyy-MM"
+                    type="monthrange"
+                    range-separator="至"
+                    start-placeholder="选择开始日期"
+                    end-placeholder="选择结束日期"
+                    @change="effectiveDateToggle"
+                ></el-date-picker>
                 <el-button class="search-btn" type="primary" @click="mixins_search()" icon="el-icon-search">搜索</el-button>
                 <div class="search-icon">
                     <el-tooltip
@@ -70,6 +87,9 @@ export default {
     name: 'propertyFee',
     data() {
         return {
+            mixins_querys: {
+                chargeType: ''
+            },
             currentId: '',
             cols: [
                 {
@@ -182,10 +202,20 @@ export default {
             },
             mixins_post: 'post',
             selectRow: [],
-            statusTable: true
+            statusTable: true,
+            times: []
         };
     },
     methods: {
+        mixins_search() {
+            this.mixins_pageset.pageNum = 1;
+            if (!!this.mixins_querys.chargeType) {
+                this.mixins_query.chargeType = this.mixins_querys.chargeType;
+            } else {
+                this.mixins_query.chargeType = '1,2,3,4,5,6,7';
+            }
+            this.getList();
+        },
         collections(todo, row) {
             new Promise((resolve) => {
                 let title = '',
@@ -245,6 +275,14 @@ export default {
                 this.mixins_search();
             });
         },
+        effectiveDateToggle(va) {
+            let arr = va;
+            if (!arr) {
+                arr = ['', ''];
+            }
+            this.mixins_query.startTime = arr[0];
+            this.mixins_query.endTime = arr[1];
+        },
         lookDetails(row) {
             new Promise((resolve) => {
                 this.$store.dispatch('addPopup', {

operationSupport/src/views/payService/systemSetup/stepPage/paymentSetup.vue

@@ -100,6 +100,21 @@
                         >个月
                     </div>
                 </el-form-item>
+
+                <el-form-item>
+                    <div class="item-title">费用账单是否取整</div>
+                    <el-radio-group v-model="formData[10].enable">
+                        <el-radio :label="0">是</el-radio>
+                        <el-radio :label="1">否</el-radio>
+                    </el-radio-group>
+                    <span style="margin-left: 20px" v-if="formData[10].enable == 0">
+                        取整规则
+                        <el-select v-model="formData[10].amount" >
+                            <el-option label="小数点后四舍五入" :value="0"></el-option>
+                        </el-select>
+                    </span>
+                </el-form-item>
+
                 <el-form-item style="text-align: right">
                     <el-button type="primary" @click="submit">保存</el-button>
                 </el-form-item>
@@ -155,7 +170,7 @@ export default {
                     type: 11,
                     category: 1,
                     enable: null,
-                    amount: 1
+                    amount: null
                 },
                 {
                     type: 12,
@@ -174,6 +189,12 @@ export default {
                     category: 1,
                     enable: null,
                     amount: 1
+                },
+                {
+                    type: 15,
+                    category: 1,
+                    enable: null,
+                    amount: 1
                 }
             ],
             initFormData: [
@@ -232,6 +253,12 @@ export default {
                     category: 1,
                     enable: null,
                     amount: 1
+                },
+                {
+                    type: 15,
+                    category: 1,
+                    enable: null,
+                    amount: 1
                 }
             ]
         };
@@ -303,10 +330,12 @@ export default {
                                 Object.assign(this.formData[6], item);
                             } else if (item.type == '12') {
                                 Object.assign(this.formData[7], item);
-                            }else if (item.type == '13') {
+                            } else if (item.type == '13') {
                                 Object.assign(this.formData[8], item);
-                            }else if (item.type == '14') {
+                            } else if (item.type == '14') {
                                 Object.assign(this.formData[9], item);
+                            } else if (item.type == '15') {
+                                Object.assign(this.formData[10], item);
                             }
                         });
                     }