BUG

operationSupport/src/views/buildingManagement/pageJump/addoredit.vue

@@ -341,6 +341,7 @@
                   </div>
                   <div class="title_class border_hr">
                     <span class="title_txt">单元户信息</span>
+
                     <el-tooltip
                       v-if="
                                                 doorData[buildingIndex] &&
@@ -828,6 +829,7 @@ export default {
         if (0 === status) {
           if (data.buildingUnitList.length !== 0) {
             this.formdata = data;
+            debugger
             this.formdata.householdsPerFloor = data.buildingUnitList[0].unitFloorList[0].roomList.length;
             this.initialUnitList = {
               checkedUnit: data.unitNumber !== 0 ? true : false,
@@ -838,7 +840,14 @@ export default {
                 end: data.buildingUnitList[data.buildingUnitList.length - 1]['unitName']
               }
             };
-            this.doorData = data.buildingUnitList;
+            debugger
+            let resDate = [];
+            data.buildingUnitList.map((item, index) => {
+              resDate.push(item.unitFloorList)
+            })
+            // this.doorData = data.buildingUnitList;
+            debugger
+            this.doorData = resDate;
           } else {
             this.formdata = data;
           }

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

@@ -1101,7 +1101,8 @@ export default {
               for (let k = 0; k < data.buildingList[i].houseList.length; k++) {
                 houseId.push(data.buildingList[i].houseList[k].houseId);
                 unitName.push(data.buildingList[i].houseList[k].unitName)
-                if (unitName.length != 0) {
+                if (unitName.length != 0 && unitName[0] != null) {
+                  debugger
                   resDateRegion[k] = [communityId, buildingId, unitName[k], houseId[k]];
                 } else {
                   resDateRegion[k] = [communityId, buildingId, houseId[k]];
@@ -1118,6 +1119,7 @@ export default {
             this.RescommunityRules(i, data.buildingList[i].communityId);
           }
           this.houseInformation = newHouse;
+          console.log('5555', this.houseInformation)
         }
       })
     }

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

@@ -230,6 +230,7 @@
                 src="../../../assets/img/icon_xiugaizhangdanjine.png"
                 alt=""
                 @click="editAmount(scope.row)"
+                style="margin-right: 20px;"
               >
             </el-tooltip>
 
@@ -249,7 +250,7 @@
                 src="../../../assets/img/icon_xiugaiyingshoujine.png"
                 alt=""
                 @click="receivableAmount(scope.row)"
-                style="margin: 0 15px;"
+                style="margin-right: 20px;"
               >
             </el-tooltip>
 
@@ -264,6 +265,7 @@
                 v-if="$editAmount"
                 class="zoniot_font zoniot-icon-shanchu redText"
                 @click="deluserbyidFn(scope.row.id)"
+                style="margin-right: 20px;"
               ></i>
             </el-tooltip>
             <el-tooltip
@@ -276,6 +278,7 @@
               <i
                 class="zoniot_font zoniot-icon-xiangqing"
                 @click="lookDetails(scope.row)"
+                style="margin-right: 20px;"
               ></i>
             </el-tooltip>
           </div>

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

@@ -13,6 +13,7 @@
         placeholder="请选择"
         v-model="formData.residentId"
         clearable
+        filterable
         @change="dateLandladyChange"
       >
         <!-- dateLandlady -->

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

@@ -115,7 +115,7 @@
             effect="light"
             placement="bottom"
             content="临时收款"
-            v-show="chargeStatus == 1"
+            v-show="temporaryCollection == '1' ? true : false"
           >
             <i
               class="zoniot_font zoniot-icon-linshishoukuan"
@@ -543,6 +543,7 @@ export default {
     currentOrganId (data) {
       this.currentId = data || '';
       if (data.type == "room") {
+
         this.temporaryCollection = '1'
       } else {
         this.temporaryCollection = '2'

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

@@ -81,7 +81,8 @@
     <el-form-item
       label="用量"
       v-if="formData.chargeType == 2 || formData.chargeType == 3"
-      prop="quantity"
+      :prop="formData.chargeType == 2 ? quantity : 'quan'"
+      :key="keyChange"
     >
       <el-input v-model="formData.quantity"></el-input>
     </el-form-item>
@@ -92,6 +93,7 @@ export default {
   props: ['params'],
   data () {
     return {
+
       formData: {
         assetsId: '',
         strategyId: '',
@@ -121,7 +123,33 @@ export default {
     submit () {
       this.$refs.form.validate((valid) => {
         if (valid) {
-          if (Number(this.formData.quantity) >= 1) {
+          console.log('formData.chargeType', this.formData.chargeType);
+          if (this.formData.chargeType == 2 || this.formData.chargeType == 3) {
+            if (Number(this.formData.quantity) >= 1) {
+              var loading = this.$loading();
+              this.$http
+                .post('/czc-charge/charge/bill/create', this.formData)
+                .then(({ status, msg }) => {
+                  if (status == 0) {
+                    this.$message.success(msg);
+                    this.params.callback();
+                    this.$emit('close');
+                  } else {
+                    this.$message.error(msg);
+                  }
+                  loading.close();
+                })
+                .catch(() => {
+                  loading.close();
+                });
+            } else {
+              // if (this.formData.chargeType == 2 || this.formData.chargeType == 3) {
+              this.$message.error('请重新输入用量');
+              this.formData.quantity = ''
+              // }
+
+            }
+          } else {
             var loading = this.$loading();
             this.$http
               .post('/czc-charge/charge/bill/create', this.formData)
@@ -138,11 +166,9 @@ export default {
               .catch(() => {
                 loading.close();
               });
-          } else {
-            this.$message.error('请重新输入用量');
-            this.formData.quantity = ''
           }
 
+
         }
       });
     },