修复bug

operationSupport/src/views/ownerManagement/index.vue

@@ -79,7 +79,9 @@
                     <div class="table-list" v-for="(item, index) in scope.row.houseList" :key="index">{{ item.communityName }}</div>
                 </template>
                 <template slot-scope="scope" slot="checkInDate">
-                    <div class="table-list" v-for="(item, index) in scope.row.houseList" :key="index">{{ item.checkInDate || '--' }}</div>
+                    <div class="table-list" v-for="(item, index) in scope.row.houseList" :key="index">
+                        {{ checkDateType(item.checkInDate) }}
+                    </div>
                 </template>
                 <template slot-scope="scope" slot="residentStatus">
                     <div class="table-list" v-for="(item, index) in scope.row.houseList" :key="index">
@@ -150,6 +152,7 @@ export default {
                     label: '住户类型',
                     prop: 'householdType',
                     slot: 'householdType',
+                    width: '100',
                     format(val) {
                         if (val == 1) {
                             return '业主';
@@ -185,13 +188,13 @@ export default {
                 {
                     label: '入住时间',
                     prop: 'checkInDate',
-                    slot: 'checkInDate'
+                    slot: 'checkInDate',
+                    width: '100'
                 },
                 {
                     label: '操作',
                     prop: 'id',
                     slot: 'opt',
-                    width: '200'
                 }
             ],
             householdType: [
@@ -354,6 +357,9 @@ export default {
                 newVal = val + name;
             }
             return newVal;
+        },
+        checkDateType(time) {
+            return !!time ? this.$moment(new Date(time)).format('YYYY-MM-DD') : '--';
         }
     },
     watch: {

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

@@ -87,10 +87,18 @@
         </el-form-item>
         <!-- 生成规则除水电费 -->
         <el-form-item label="生成规则" v-if="formData.chargeType !== 2 && formData.chargeType !== 3">
-            <el-select v-model="formData.generationRules">
-                <el-option label="预生成账单" :value="1"></el-option>
-                <el-option label="后生成账单" :value="2"></el-option>
-            </el-select>
+            <div class="form-item-flex">
+                <el-select v-model="formData.generationRules">
+                    <el-option label="预生成账单" :value="1"></el-option>
+                    <el-option label="后生成账单" :value="2"></el-option>
+                </el-select>
+                <div class="widthFlex">
+                    <el-tooltip class="item" effect="light" placement="left">
+                        <div slot="content" v-html="rulesFeeMsg"></div>
+                        <img src="@/assets/img/menuicon/icon_tishi_zhengchang.png" alt="" />
+                    </el-tooltip>
+                </div>
+            </div>
         </el-form-item>
 
         <el-form-item label="备注" prop="desc">
@@ -125,6 +133,7 @@ export default {
                 remark: ''
             },
             lateFeeMsg: '滞纳金计算规则：</br>月费用*逾期天数*滞纳金标准',
+            rulesFeeMsg: `预计生成账单：下个月1日，按照设置的计</br>费方式、计费周期生成物业费账单</br>后生成账单：从下个月开始计算，到计费周</br>期结束后一个月的1日生成账单`,
             formRules: {
                 chargeName: [this.$valid.inputRequired('费用名称')],
                 chargePrice: [this.$valid.inputRequired('价格')],
@@ -244,7 +253,7 @@ export default {
     .input-number {
         width: 110px;
         /deep/ .el-input__suffix {
-            height: 33px ;
+            height: 33px;
         }
         /deep/ .el-input--suffix .el-input__inner {
             padding-right: 50px;

operationSupport/src/views/payService/collection/stepPage/add.vue

@@ -157,7 +157,7 @@ export default {
         },
         uploadsuccess(response, file, fileList) {
             this.$refs.uploaduserlogo.clearFiles();
-            if (0 === response.status) {
+            if (response.status == 0) {
                 this.formData.authFile = response.data;
             }
         },
@@ -172,7 +172,7 @@ export default {
     },
     created() {
         if (this.params.todo == 'edit') {
-            this.formData = JSON.parse(JSON.stringify(this.params.data));
+            Object.assign(this.formData, this.params.data);
         }
     }
 };

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

@@ -204,7 +204,7 @@ export default {
                     }
                     let tag = false;
                     this.selectRow.map((item) => {
-                        if (this.selectRow[0].assetsId == item.assetsId) {
+                        if (this.selectRow[0].houseId == item.houseId) {
                             tag = true;
                         } else {
                             tag = false;