收费问题

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/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/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: '价格(元/月):',
@@ -188,6 +192,8 @@ export default {
                     lab = '用量(吨)';
                 } else if (type == 3) {
                     lab = '用量(度)';
+                } else if (type == 4) {
+                    lab = '车位';
                 }
             } else if (val == 'chargePrice') {
                 if (type == 2) {

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

@@ -133,7 +133,7 @@ export default {
                     let arr = [{ label: '总收费', val: val[0].totalAmount }];
                     val[0].details.map((item, index) => {
                         arr.push({ label: this.typeName(item), val: item.amount });
-                        this.cols.splice(4 + index, 0, {
+                        this.cols.splice(5 + index, 0, {
                             label: this.typeName(item),
                             prop: 'type' + index,
                             slot: 'type' + index

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: '维修人员',