设置所有费用类型

commandCenter/src/main.js

@@ -17,6 +17,7 @@ import apiService from './api/index';
 import store from './store/store.js';
 import '@utils/utils.js';
 import 'babel-polyfill';
+import publicArray from '@utils/publicArray';
 
 window.onresize = () => {
   let size = document.body.clientWidth / 1920;
@@ -28,6 +29,7 @@ import filter from './utils/filters';
 Object.keys(filter).forEach((key) => Vue.filter(key, filter[key]));
 
 Vue.prototype.$moment = moment;
+Vue.prototype.$publicArray = publicArray;
 Vue.config.productionTip = false;
 Vue.use(Vuex);
 Vue.use(commonComponents);

commandCenter/src/utils/publicArray.js

@@ -0,0 +1,72 @@
+//收费类型
+const chargeType = () => {
+  return [
+    {
+      label: "物业费",
+      value: 1
+    },
+    {
+      label: "水费",
+      value: 2
+    },
+    {
+      label: "电费",
+      value: 3
+    },
+    {
+      label: "车位费",
+      value: 4
+    },
+    {
+      label: "卫生费",
+      value: 6
+    },
+    {
+      label: "其他费用",
+      value: 7
+    },
+    {
+      label: "租赁费",
+      value: 8
+    }
+  ]
+}
+//付款类型
+const paymentType = () => {
+  return [
+    {
+      label: "微信",
+      value: 7
+    },
+    {
+      label: "支付宝",
+      value: 2
+    },
+    {
+      label: "现金",
+      value: 3
+    },
+    {
+      label: "刷卡",
+      value: 6
+    },
+    {
+      label: "其他",
+      value: 5
+    },
+  ]
+}
+export default {
+  chargeType,
+  paymentType,
+  //收费类型名称
+  chargeTypeName: (va) => {
+    let name = ''
+    chargeType().map(item => {
+      if (item.value == va) {
+        name = item.label
+      }
+    })
+    return name
+  }
+}

commandCenter/src/views/financialAnalysis/smallModuleIndex/collectionRate.vue

@@ -13,9 +13,12 @@
                     :clearable="false"
                 >
                 </el-date-picker>
-                <el-select v-model="mixins_query.chargeType" placeholder="所有费用" clearable class="saveColumn-select" @change="getData">
-                    <el-option v-for="(item, index) in amountType" :label="item.name" :value="item.value" :key="index"></el-option>
-                </el-select>
+                <el-option
+                    :label="item.label"
+                    :value="item.value"
+                    v-for="(item, index) in $publicArray.chargeType()"
+                    :key="index"
+                ></el-option>
             </div>
         </div>
         <div class="model-content">
@@ -66,32 +69,6 @@ export default {
                 endTime: ''
             },
             date: '',
-            amountType: [
-                {
-                    value: 1,
-                    name: '物业费'
-                },
-                {
-                    value: 2,
-                    name: '水费'
-                },
-                {
-                    value: 3,
-                    name: '电费'
-                },
-                {
-                    value: 4,
-                    name: '车位费'
-                },
-                {
-                    value: 6,
-                    name: '卫生费'
-                },
-                {
-                    value: 7,
-                    name: '其他费用'
-                }
-            ],
             dataObj: {
                 receivedAmount: 0,
                 receivableAmount: 0,

commandCenter/src/views/financialAnalysis/smallModuleIndex/incomeMode.vue

@@ -4,7 +4,12 @@
             <div class="model-title-text">收入方式</div>
             <div class="model-title-right">
                 <el-select v-model="mixins_query.chargeType" placeholder="所有费用" clearable class="saveColumn-select" @change="getData">
-                    <el-option v-for="(item, index) in amountType" :label="item.name" :value="item.value" :key="index"></el-option>
+                    <el-option
+                        :label="item.label"
+                        :value="item.value"
+                        v-for="(item, index) in $publicArray.chargeType()"
+                        :key="index"
+                    ></el-option>
                 </el-select>
                 <el-date-picker
                     value-format="yyyy-MM"
@@ -56,33 +61,7 @@ export default {
                 {},
                 { type: '%', total: 0 },
                 30
-            ),
-            amountType: [
-                {
-                    value: 1,
-                    name: '物业费'
-                },
-                {
-                    value: 2,
-                    name: '水费'
-                },
-                {
-                    value: 3,
-                    name: '电费'
-                },
-                {
-                    value: 4,
-                    name: '车位费'
-                },
-                {
-                    value: 6,
-                    name: '卫生费'
-                },
-                {
-                    value: 7,
-                    name: '其他费用'
-                }
-            ]
+            )
         };
     },
     methods: {
@@ -140,5 +119,4 @@ export default {
 </script>
 <style lang="scss" scoped>
 @import './style.scss';
-
 </style>

commandCenter/src/views/financialAnalysis/smallModuleIndex/netReceipts.vue

@@ -4,7 +4,12 @@
             <div class="model-title-text">实收分析</div>
             <div class="model-title-right">
                 <el-select v-model="mixins_query.chargeType" placeholder="所有费用" clearable class="saveColumn-select" @change="getData">
-                    <el-option v-for="(item, index) in amountType" :label="item.name" :value="item.value" :key="index"></el-option>
+                    <el-option
+                        :label="item.label"
+                        :value="item.value"
+                        v-for="(item, index) in $publicArray.chargeType()"
+                        :key="index"
+                    ></el-option>
                 </el-select>
                 <el-date-picker
                     value-format="yyyy"
@@ -36,32 +41,6 @@ export default {
                 endTime: '',
                 startTime: ''
             },
-            amountType: [
-                {
-                    value: 1,
-                    name: '物业费'
-                },
-                {
-                    value: 2,
-                    name: '水费'
-                },
-                {
-                    value: 3,
-                    name: '电费'
-                },
-                {
-                    value: 4,
-                    name: '车位费'
-                },
-                {
-                    value: 6,
-                    name: '卫生费'
-                },
-                {
-                    value: 7,
-                    name: '其他费用'
-                }
-            ],
             date: '',
             clientOptions: discountedWave('(元)', [], [])
         };
@@ -98,4 +77,7 @@ export default {
 </script>
 <style scoped lang="scss">
 @import './style.scss';
+.model-title .model-title-right .saveColumn-select:not(:first-child) {
+    margin-left: 10px;
+}
 </style>

operationSupport/src/main.js

@@ -28,6 +28,8 @@ import apiService from './api/index';
 import store from './store/store.js';
 import '@utils/utils.js';
 import 'babel-polyfill';
+import publicArray from '@utils/publicArray';
+
 // 过滤
 import filter from './utils/filters';
 Object.keys(filter).forEach((key) => Vue.filter(key, filter[key]));
@@ -35,13 +37,14 @@ Object.keys(filter).forEach((key) => Vue.filter(key, filter[key]));
 import GeminiScrollbar from 'vue-gemini-scrollbar';
 
 Vue.use(GeminiScrollbar);
-
+Vue.prototype.$publicArray = publicArray;
 Vue.prototype.$moment = moment;
 Vue.config.productionTip = false;
 Vue.use(Vuex);
 Vue.use(commonComponents);
 Vue.use(directiveInit);
 Vue.use(directived);
+
 Vue.use(ElementUI, {
     size: 'small'
 });

operationSupport/src/utils/publicArray.js

@@ -0,0 +1,72 @@
+//收费类型
+const chargeType = () => {
+  return [
+    {
+      label: "物业费",
+      value: 1
+    },
+    {
+      label: "水费",
+      value: 2
+    },
+    {
+      label: "电费",
+      value: 3
+    },
+    {
+      label: "车位费",
+      value: 4
+    },
+    {
+      label: "卫生费",
+      value: 6
+    },
+    {
+      label: "其他费用",
+      value: 7
+    },
+    {
+      label: "租赁费",
+      value: 8
+    }
+  ]
+}
+//付款类型
+const paymentType = () => {
+  return [
+    {
+      label: "微信",
+      value: 7
+    },
+    {
+      label: "支付宝",
+      value: 2
+    },
+    {
+      label: "现金",
+      value: 3
+    },
+    {
+      label: "刷卡",
+      value: 6
+    },
+    {
+      label: "其他",
+      value: 5
+    },
+  ]
+}
+export default {
+  chargeType,
+  paymentType,
+  //收费类型名称
+  chargeTypeName: (va) => {
+    let name = ''
+    chargeType().map(item => {
+      if (item.value == va) {
+        name = item.label
+      }
+    })
+    return name
+  }
+}

operationSupport/src/views/newWorkBench/components/collectionRate.vue

@@ -21,7 +21,12 @@
                         class="saveColumn-select"
                         @change="getData"
                     >
-                        <el-option v-for="(item, index) in amountType" :label="item.name" :value="item.value" :key="index"></el-option>
+                        <el-option
+                            :label="item.label"
+                            :value="item.value"
+                            v-for="(item, index) in $publicArray.chargeType()"
+                            :key="index"
+                        ></el-option>
                     </el-select>
                 </div>
             </div>
@@ -80,32 +85,6 @@ export default {
                 endTime: ''
             },
             date: '',
-            amountType: [
-                {
-                    value: 1,
-                    name: '物业费'
-                },
-                {
-                    value: 2,
-                    name: '水费'
-                },
-                {
-                    value: 3,
-                    name: '电费'
-                },
-                {
-                    value: 4,
-                    name: '车位费'
-                },
-                {
-                    value: 6,
-                    name: '卫生费'
-                },
-                {
-                    value: 7,
-                    name: '其他费用'
-                }
-            ],
             dataObj: {
                 receivedAmount: 0,
                 receivableAmount: 0,

operationSupport/src/views/newWorkBench/components/workbenchMent/paidAnalysis.vue

@@ -1,166 +1,125 @@
 <template>
-  <div class="modelBlock">
-    <template v-if="permissionFiltering">
-      <div class="model-title">
-        <div class="model-title-text">实收分析</div>
-        <div class="model-title-right">
-          <el-date-picker
-            value-format="yyyy"
-            v-model="date"
-            type="year"
-            placeholder="选择年"
-            class="saveColumn-select"
-            @change="changeTime"
-            :clearable="false"
-          >
-          </el-date-picker>
-          <el-select
-            v-model="mixins_query.chargeType"
-            placeholder="所有费用"
-            clearable
-            class="saveColumn-select"
-            @change="getData"
-          >
-            <el-option
-              v-for="(item, index) in amountType"
-              :label="item.name"
-              :value="item.value"
-              :key="index"
-            ></el-option>
-          </el-select>
-        </div>
-      </div>
-      <div class="model-content">
-        <zz-echart
-          :option="clientOptions"
-          class="chart"
-        ></zz-echart>
-      </div>
-    </template>
-    <no-permission
-      v-else
-      tipsText="实收分析"
-    ></no-permission>
-  </div>
+    <div class="modelBlock">
+        <template v-if="permissionFiltering">
+            <div class="model-title">
+                <div class="model-title-text">实收分析</div>
+                <div class="model-title-right">
+                    <el-date-picker
+                        value-format="yyyy"
+                        v-model="date"
+                        type="year"
+                        placeholder="选择年"
+                        class="saveColumn-select"
+                        @change="changeTime"
+                        :clearable="false"
+                    >
+                    </el-date-picker>
+                    <el-select
+                        v-model="mixins_query.chargeType"
+                        placeholder="所有费用"
+                        clearable
+                        class="saveColumn-select"
+                        @change="getData"
+                    >
+                        <el-option
+                            :label="item.label"
+                            :value="item.value"
+                            v-for="(item, index) in $publicArray.chargeType()"
+                            :key="index"
+                        ></el-option>
+                    </el-select>
+                </div>
+            </div>
+            <div class="model-content">
+                <zz-echart :option="clientOptions" class="chart"></zz-echart>
+            </div>
+        </template>
+        <no-permission v-else tipsText="实收分析"></no-permission>
+    </div>
 </template>
 <script>
 import { discountedChart } from '../indexOptionChart';
 import permissionComponent from '../permissionComponent';
 let dataArr = [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0];
-let dataDay = [
-  '1月',
-  '2月',
-  '3月',
-  '4月',
-  '5月',
-  '6月',
-  '7月',
-  '8月',
-  '9月',
-  '10月',
-  '11月',
-  '12月',
-];
+let dataDay = ['1月', '2月', '3月', '4月', '5月', '6月', '7月', '8月', '9月', '10月', '11月', '12月'];
 export default {
-  mixins: [permissionComponent],
-  data () {
-    return {
-      defaultModel: {
-        permissUrl: '16',
-        titleName: '告警管理'
-      },
-      clientOptions: discountedChart('(元)', dataDay, dataArr),
-      mixins_query: {
-        communityId: '',
-        year: '',
-        chargeType: ''
-      },
-      date: '',
-      amountType: [
-        {
-          value: 1,
-          name: '物业费'
-        },
-        {
-          value: 2,
-          name: '水费'
-        },
-        {
-          value: 3,
-          name: '电费'
-        },
-        {
-          value: 4,
-          name: '车位费'
-        },
-        {
-          value: 6,
-          name: '卫生费'
-        },
-        {
-          value: 7,
-          name: '其他费用'
-        }
-      ],
-    };
-  },
-  created () {
-
-    this.mixins_query.year = this.$moment().format('YYYY');
-    this.date = this.$moment().format('YYYY');
-    this.getData();
-  },
-  methods: {
-    getData () {
-      this.$http.get('/sc-charge/charge/report/months/total', this.mixins_query).then(({ status, data, msg }) => {
-        if (status == 0) {
-          if (data != null) {
-            let dateTimes = ['1月', '2月', '3月', '4月', '5月', '6月', '7月', '8月', '9月', '10月', '11月', '12月'];
-            let dateRes = [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]
-            dateRes[0] = data.january == null ? 0 : data.january;
-            dateRes[1] = data.february == null ? 0 : data.february;
-            dateRes[2] = data.march == null ? 0 : data.march;
-            dateRes[3] = data.april == null ? 0 : data.april;
-            dateRes[4] = data.may == null ? 0 : data.may;
-            dateRes[5] = data.june == null ? 0 : data.june;
-            dateRes[6] = data.july == null ? 0 : data.july;
-            dateRes[7] = data.august == null ? 0 : data.august;
-            dateRes[8] = data.september == null ? 0 : data.september;
-            dateRes[9] = data.october == null ? 0 : data.october;
-            dateRes[10] = data.november == null ? 0 : data.november;
-            dateRes[11] = data.december == null ? 0 : data.december;
-            this.clientOptions = discountedChart('(元)', dateTimes, dateRes);
-          } else {
-            let dateTimes = ['1月', '2月', '3月', '4月', '5月', '6月', '7月', '8月', '9月', '10月', '11月', '12月'];
-            let dateRes = [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0];
-            this.clientOptions = discountedChart('(元)', dateTimes, dateRes);
-          }
-
-        }
-        // if (status == 0) {
-        //   let dateTime = [];
-        //   // let dateTimes = ['1月','2月','3月','4月','5月','6月','7月','8月','9月','10月','11月','12月'];
-        //   let dateTimes = [];
-        //   let dateRes = [];
-        //   for (let i = 0; i < data.length; i++) {
-        //     dateTime.push(data[i].months)
-        //     dateRes.push(data[i].totalAmount)
-        //   }
-        //   for (let j = 0; j < dateTime.length; j++) {
-        //     dateTimes.push(dateTime[j] + '月')
-        //   }
-        //   this.clientOptions = discountedChart('(元)', dateTimes, dateRes);
-        // }
-      })
-        .catch((err) => { });
+    mixins: [permissionComponent],
+    data() {
+        return {
+            defaultModel: {
+                permissUrl: '16',
+                titleName: '告警管理'
+            },
+            clientOptions: discountedChart('(元)', dataDay, dataArr),
+            mixins_query: {
+                communityId: '',
+                year: '',
+                chargeType: ''
+            },
+            date: ''
+        };
     },
-    changeTime (v) {
-      this.mixins_query.year = v;
-      this.getData();
+    created() {
+        this.mixins_query.year = this.$moment().format('YYYY');
+        this.date = this.$moment().format('YYYY');
+        this.getData();
     },
-  }
+    methods: {
+        getData() {
+            this.$http
+                .get('/sc-charge/charge/report/months/total', this.mixins_query)
+                .then(({ status, data, msg }) => {
+                    if (status == 0) {
+                        if (data != null) {
+                            let dateTimes = ['1月', '2月', '3月', '4月', '5月', '6月', '7月', '8月', '9月', '10月', '11月', '12月'];
+                            let dateRes = [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0];
+                            dateRes[0] = data.january == null ? 0 : data.january;
+                            dateRes[1] = data.february == null ? 0 : data.february;
+                            dateRes[2] = data.march == null ? 0 : data.march;
+                            dateRes[3] = data.april == null ? 0 : data.april;
+                            dateRes[4] = data.may == null ? 0 : data.may;
+                            dateRes[5] = data.june == null ? 0 : data.june;
+                            dateRes[6] = data.july == null ? 0 : data.july;
+                            dateRes[7] = data.august == null ? 0 : data.august;
+                            dateRes[8] = data.september == null ? 0 : data.september;
+                            dateRes[9] = data.october == null ? 0 : data.october;
+                            dateRes[10] = data.november == null ? 0 : data.november;
+                            dateRes[11] = data.december == null ? 0 : data.december;
+                            this.clientOptions = discountedChart('(元)', dateTimes, dateRes);
+                        } else {
+                            let dateTimes = ['1月', '2月', '3月', '4月', '5月', '6月', '7月', '8月', '9月', '10月', '11月', '12月'];
+                            let dateRes = [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0];
+                            this.clientOptions = discountedChart('(元)', dateTimes, dateRes);
+                        }
+                    }
+                    // if (status == 0) {
+                    //   let dateTime = [];
+                    //   // let dateTimes = ['1月','2月','3月','4月','5月','6月','7月','8月','9月','10月','11月','12月'];
+                    //   let dateTimes = [];
+                    //   let dateRes = [];
+                    //   for (let i = 0; i < data.length; i++) {
+                    //     dateTime.push(data[i].months)
+                    //     dateRes.push(data[i].totalAmount)
+                    //   }
+                    //   for (let j = 0; j < dateTime.length; j++) {
+                    //     dateTimes.push(dateTime[j] + '月')
+                    //   }
+                    //   this.clientOptions = discountedChart('(元)', dateTimes, dateRes);
+                    // }
+                })
+                .catch((err) => {});
+        },
+        changeTime(v) {
+            this.mixins_query.year = v;
+            this.getData();
+        }
+    }
 };
 </script>
 <style scoped lang="scss">
 @import '../style.scss';
+
+.model-title .model-title-right .saveColumn-select:not(:first-child) {
+    margin-left: rem(10);
+}
 </style>

operationSupport/src/views/newWorkBench/components/workbenchMent/proportionIncomeMode.vue

@@ -21,7 +21,12 @@
                         class="saveColumn-select"
                         @change="getData"
                     >
-                        <el-option v-for="(item, index) in amountType" :label="item.name" :value="item.value" :key="index"></el-option>
+                        <el-option
+                            :label="item.label"
+                            :value="item.value"
+                            v-for="(item, index) in $publicArray.chargeType()"
+                            :key="index"
+                        ></el-option>
                     </el-select>
                 </div>
             </div>
@@ -72,33 +77,7 @@ export default {
                 ],
                 {},
                 { type: 'number', total: 0 }
-            ),
-            amountType: [
-                {
-                    value: 1,
-                    name: '物业费'
-                },
-                {
-                    value: 2,
-                    name: '水费'
-                },
-                {
-                    value: 3,
-                    name: '电费'
-                },
-                {
-                    value: 4,
-                    name: '车位费'
-                },
-                {
-                    value: 6,
-                    name: '卫生费'
-                },
-                {
-                    value: 7,
-                    name: '其他费用'
-                }
-            ]
+            )
         };
     },
     methods: {
@@ -182,7 +161,7 @@ export default {
         }
     }
 }
-.modelBlock .model-content .totals{
-  min-width: rem(120);
+.modelBlock .model-content .totals {
+    min-width: rem(120);
 }
 </style>

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

@@ -6,14 +6,12 @@
                 <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-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="6"></el-option>
-                <el-option label="其他费用" :value="7"></el-option>
-                 <el-option label="租赁费" :value="8"></el-option>
-                
+                <el-option
+                    :label="item.label"
+                    :value="item.value"
+                    v-for="(item, index) in $publicArray.chargeType()"
+                    :key="index"
+                ></el-option>
             </el-select>
             <el-button type="primary" class="search-btn" @click="mixins_search" icon="el-icon-search">查询 </el-button>
             <div class="search-icon">
@@ -88,6 +86,7 @@ export default {
     mixins: [list],
     name: 'billingRules',
     data() {
+        var _this = this;
         return {
             cols: [
                 {
@@ -102,21 +101,7 @@ 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 == 6) {
-                            return '卫生费';
-                        } else if (val == 7) {
-                            return '其他费用';
-                        } else if (val == 8) {
-                            return '租赁费';
-                        }
+                        return _this.$publicArray.chargeTypeName(val);
                     }
                 },
                 {

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

@@ -7,13 +7,12 @@
         </el-form-item>
         <el-form-item label="费用类型" prop="chargeType">
             <el-select v-model="formData.chargeType" @change="chargeTypeToggle">
-                <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="6"></el-option>
-                <el-option label="其他费用" :value="7"></el-option>
-                <el-option label="租赁费" :value="8"></el-option>
+                <el-option
+                    :label="item.label"
+                    :value="item.value"
+                    v-for="(item, index) in $publicArray.chargeType()"
+                    :key="index"
+                ></el-option>
             </el-select>
         </el-form-item>
         <el-form-item label="费用名称" prop="chargeName">

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

@@ -26,8 +26,6 @@
                 <div class="blockName">催缴设置（<span class="show-required-icon-star"></span>为必填项）</div>
                 <el-form label-width="120px" :rules="formRules">
                     <el-form-item label="催缴方式" prop="callType">
-                        <!-- <el-checkbox  v-model="callPayment.callType" :label="1">短信</el-checkbox >
-                        <el-checkbox  v-model="callPayment.callType" :label="2">微信</el-checkbox > -->
 
                         <el-radio v-model="callPayment.callType" :label="1">短信</el-radio>
                         <el-radio v-model="callPayment.callType" :label="2">微信</el-radio>

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

@@ -44,7 +44,7 @@
                             </div>
                         </div>
                     </template> -->
-                    <div >{{ scope.row.chargePrice }}</div>
+                    <div>{{ scope.row.chargePrice }}</div>
                 </template>
                 <template slot-scope="scope" slot="opt">
                     <div class="opt">
@@ -65,6 +65,7 @@ export default {
     mixins: [list],
     name: 'chargeSetting',
     data() {
+        var _this = this;
         return {
             currentId: '',
             cols: [
@@ -80,19 +81,7 @@ 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 == '6') {
-                            return '卫生费';
-                        } else if (val == '7') {
-                            return '其他费用';
-                        }
+                        return _this.$publicArray.chargeTypeName(val);
                     }
                 },
                 {
@@ -130,7 +119,7 @@ export default {
                 value: '',
                 address: ''
             },
-            communityId:""
+            communityId: ''
         };
     },
     methods: {
@@ -145,7 +134,7 @@ export default {
                         data: this.chiData,
                         todo,
                         productOptions: this.productOptions,
-                        communityId:this.communityId,
+                        communityId: this.communityId,
                         callback: resolve
                     },
                     title: title

operationSupport/src/views/payService/depositManagement/stepPage/collections.vue

@@ -29,11 +29,12 @@
             <div class="inline">
                 <el-form-item label="支付方式" prop="payType">
                     <el-select v-model="formData.payType">
-                        <el-option label="微信" :value="7"></el-option>
-                        <el-option label="支付宝" :value="2"></el-option>
-                        <el-option label="现金" :value="3"></el-option>
-                        <el-option label="其他" :value="5"></el-option>
-                        <el-option label="刷卡" :value="6"></el-option>
+                        <el-option
+                            :label="item.label"
+                            :value="item.value"
+                            v-for="(item, index) in $publicArray.paymentType()"
+                            :key="index"
+                        ></el-option>
                     </el-select>
                 </el-form-item>
                 <div>

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

@@ -17,11 +17,12 @@
                 <!-- 已交 -->
                 <template v-if="chargeStatus == 2">
                     <el-select v-model="mixins_query.payType" class="width120" placeholder="缴费方式" clearable>
-                        <el-option label="微信" :value="7"></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="5"></el-option>
+                        <el-option
+                            :label="item.label"
+                            :value="item.value"
+                            v-for="(item, index) in $publicArray.paymentType()"
+                            :key="index"
+                        ></el-option>
                     </el-select>
                     <el-date-picker
                         v-model="times"

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

@@ -13,11 +13,12 @@
             <div class="inline">
                 <el-form-item label="支付方式:" prop="payType">
                     <el-select placeholder="选择支付方式" v-model="formData.payType">
-                        <el-option label="微信" :value="7"></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="5"></el-option>
+                        <el-option
+                            :label="item.label"
+                            :value="item.value"
+                            v-for="(item, index) in $publicArray.paymentType()"
+                            :key="index"
+                        ></el-option>
                     </el-select>
                 </el-form-item>
                 <el-form-item label="应收金额(元):"> {{ fiterSum(tabList, 'receivableAmount') }}</el-form-item>

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

@@ -30,11 +30,12 @@
             <div class="inline">
                 <el-form-item label="支付方式" prop="payType">
                     <el-select v-model="formData.payType">
-                        <el-option label="微信" :value="7"></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="5"></el-option>
+                        <el-option
+                            :label="item.label"
+                            :value="item.value"
+                            v-for="(item, index) in $publicArray.paymentType()"
+                            :key="index"
+                        ></el-option>
                     </el-select>
                 </el-form-item>
                 <el-form-item label="应收金额(元)"

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

@@ -15,21 +15,24 @@
                     v-model.trim="mixins_query.chargeName"
                 ></el-input>
                 <el-select v-model="mixins_querys.chargeType" placeholder="费用类型" clearable class="width120">
-                    <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>
+                    <template v-for="(item, index) in $publicArray.chargeType()">
+                        <el-option
+                            :label="item.label"
+                            :value="item.value"
+                            v-if="index < $publicArray.chargeType().length - 1"
+                            :key="index"
+                        ></el-option>
+                    </template>
                 </el-select>
                 <!-- 已交 -->
                 <template v-if="chargeStatus == 2">
                     <el-select v-model="mixins_query.payType" class="width120" placeholder="缴费方式" clearable>
-                        <el-option label="微信" :value="7"></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="5"></el-option>
+                       <el-option
+                            :label="item.label"
+                            :value="item.value"
+                            v-for="(item, index) in $publicArray.paymentType()"
+                            :key="index"
+                        ></el-option>
                     </el-select>
                     <el-date-picker
                         v-model="times"
@@ -64,7 +67,7 @@
                     >
                         <i class="zoniot_font zoniot-icon-linshishoukuan" @click="collections('temporary')"></i>
                     </el-tooltip>
-                    <el-dropdown type="primary" @command="addCommand" >
+                    <el-dropdown type="primary" @command="addCommand">
                         <span class="zoniot_font zoniot-icon-tianjia2"></span>
                         <el-dropdown-menu slot="dropdown" hide-on-click="false" class="device-search-dropdown">
                             <el-dropdown-item command="batchAdd">

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

@@ -11,11 +11,12 @@
             <div class="inline">
                 <el-form-item label="支付方式:" prop="payType">
                     <el-select placeholder="选择支付方式" v-model="formData.payType">
-                        <el-option label="微信" :value="7"></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="5"></el-option>
+                        <el-option
+                            :label="item.label"
+                            :value="item.value"
+                            v-for="(item, index) in $publicArray.paymentType()"
+                            :key="index"
+                        ></el-option>
                     </el-select>
                 </el-form-item>
                 <el-form-item label="应收金额(元):"> {{ fiterSum(tabList, 'receivableAmount') }}</el-form-item>

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

@@ -31,11 +31,12 @@
             <div class="inline">
                 <el-form-item label="支付方式" prop="payType">
                     <el-select v-model="formData.payType">
-                        <el-option label="微信" :value="7"></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="5"></el-option>
+                        <el-option
+                            :label="item.label"
+                            :value="item.value"
+                            v-for="(item, index) in $publicArray.paymentType()"
+                            :key="index"
+                        ></el-option>
                     </el-select>
                 </el-form-item>
                 <el-form-item label="应收金额(元)"

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

@@ -140,6 +140,13 @@ export default {
                 case 7:
                     name = item.chargeName;
                     break;
+                case 8:
+                    if ( item.chargeName == "租赁保证金"){
+                        name = item.chargeName;
+                    } else{
+                        name = "租赁费";
+                    }
+                    break;
             }
             return name;
         },

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

@@ -6,12 +6,12 @@
                 <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-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="6"></el-option>
-                <el-option label="其他费用" :value="7"></el-option>
+                <el-option
+                    :label="item.label"
+                    :value="item.value"
+                    v-for="(item, index) in $publicArray.chargeType()"
+                    :key="index"
+                ></el-option>
             </el-select>
             <el-date-picker
                 v-model="times"