合并备注

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

@@ -20,7 +20,7 @@
         </el-form-item>
         <el-form-item label="计费方式" prop="chargeMode">
             <el-select v-model="formData.chargeMode">
-                <template v-if="formData.chargeType == 1 || formData.chargeType == 8">
+                <template v-if="formData.chargeType == 1 || formData.chargeType == 7 || formData.chargeType == 8">
                     <el-option label="固定收费" :value="1"></el-option>
                     <el-option label="价格*面积收费" :value="2"></el-option>
                 </template>

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

@@ -219,7 +219,7 @@ export default {
             this.mixins_query.printStatus = this.$parent.nullifyObj.printStatus;
             this.mixins_query.startTime = this.$parent.mixins_query.startTime;
             this.mixins_query.endTime = this.$parent.mixins_query.endTime;
-            this.mixins_query.payType = this.$parent.mixins_query.payType;
+            this.mixins_query.payType = this.$parent.nullifyObj.payType;
 
             this.mixins_query.chargeType = this.$parent.mixins_querys.chargeType;
 

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

@@ -168,7 +168,7 @@ export default {
     },
     data() {
         return {
-            nullifyObj: { printStatus: '' },
+            nullifyObj: { printStatus: '', payType: '' },
             mixins_querys: {
                 chargeType: ''
             },
@@ -452,6 +452,7 @@ export default {
                 });
                 this.times = [];
                 this.nullifyObj.printStatus = '';
+                this.nullifyObj.payType = '';
                 this.Object_Set(['startTime', 'endTime', 'chargeStatus'], ['', '', this.chargeStatus]);
                 this.mixins_search();
             }

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

@@ -132,6 +132,16 @@ export default {
                 .post('/sc-charge/charge/bill/findUserBillDetailList', ids)
                 .then((res) => {
                     this.tabList = res;
+                    let htmls = [];
+
+                    if (!!res) {
+                        res.map((item) => {
+                            if (!!item.remark) {
+                                htmls.push(item.remark);
+                            }
+                        });
+                    }
+                    this.formData.remark = htmls.join(',');
                 })
                 .catch(() => {
                     loading.close();