BUG

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

@@ -516,9 +516,21 @@ export default {
             return;
           }
           let tag = false;
-          this.selectRow.map((item) => {
+          this.selectRow.map((item, index) => {
             if (this.selectRow[0].residentId == item.residentId) {
-              tag = true;
+              debugger
+              if (this.selectRow.length == 1) {
+                if (this.selectRow[0].residentId == this.selectRow[index].residentId) {
+                  debugger
+                  tag = true;
+                }
+              } else {
+                if (this.selectRow[0].residentId == this.selectRow[index].residentId && this.selectRow[1].residentId == this.selectRow[this.selectRow.length - 1].residentId) {
+                  tag = true;
+                }
+              }
+
+
             } else {
               tag = false;
             }

operationSupport/src/views/payService/landlordBill/stePage/editAmount.vue

@@ -3,15 +3,15 @@
     ref="form"
     :model="formData"
     :rules="formRules"
-    label-width="100px"
+    label-width="120px"
   >
     <el-form-item
-      label="应收金额"
+      label="修改账单金额"
       prop="receivableAmount"
     >
       <el-input
         v-model="formData.receivableAmount"
-        placeholder="请输入应收金额"
+        placeholder="请输入账单金额金额"
         type="number"
         class="Number"
       ></el-input>
@@ -28,7 +28,7 @@ export default {
         id: ''
       },
       formRules: {
-        receivableAmount: [this.$valid.inputRequired('应收金额')]
+        receivableAmount: [this.$valid.inputRequired('账单金额')]
       }
     };
   },

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

@@ -125,6 +125,7 @@
           <el-dropdown
             type="primary"
             @command="addCommand"
+            v-show="chargeStatus == 1"
           >
             <span class="zoniot_font zoniot-icon-tianjia2"></span>
             <el-dropdown-menu
@@ -302,8 +303,27 @@ export default {
         // },
         {
           label: '费用类型',
-          prop: 'chargeName',
-          width: '150'
+          prop: 'chargeType',
+          width: '150',
+          format (val) {
+            if (val == 1) {
+              return '物业费'
+            } else if (val == '2') {
+              return '水费'
+            } else if (val == '3') {
+              return '电费'
+            } else if (val == '4') {
+              return '车位费'
+            } else if (val == '5') {
+              return '二次供水费'
+            } else if (val == '6') {
+              return '卫生费'
+            } else if (val == '7') {
+              return '其他费用'
+            } else if (val == '8') {
+              return '租赁费'
+            }
+          }
         },
         {
           label: '计费周期',

operationSupport/src/views/payService/receivableExamine/detali.vue

@@ -8,7 +8,7 @@
       class="demo-ruleForm"
     >
       <el-form-item
-        label="月卡审核"
+        label="审核"
         prop="resource"
       >
         <el-radio-group