住户管理修改

operationSupport/src/views/patrolManagement/index.vue

@@ -1,7 +1,7 @@
 <template>
     <div class="main">
         <div class="search">
-            <el-input placeholder="请输入巡更点名称" class="search-input" clearable v-model="mixins_query.name"></el-input>
+            <el-input placeholder="请输入巡更点名称" class="search-input" clearable v-model="mixins_query.pointName"></el-input>
             <el-select v-model="mixins_query.communityId" placeholder="请选择所属社区" clearable>
                 <el-option v-for="(item, index) in communityArr" :key="index" :label="item.communityName" :value="item.id"></el-option>
             </el-select>

operationSupport/src/views/patrolManagement/patrolRoute.vue

@@ -2,7 +2,7 @@
     <div class="main">
         <template v-if="isLook === 'index'">
             <div class="search">
-                <el-input placeholder="请输入巡更点名称" class="search-input" clearable v-model="mixins_query.name"></el-input>
+                <el-input placeholder="请输入巡更点名称" class="search-input" clearable v-model="mixins_query.route_name"></el-input>
                 <el-select v-model="mixins_query.communityId" placeholder="请选择所属社区" clearable>
                     <el-option v-for="(item, index) in communityArr" :key="index" :label="item.communityName" :value="item.id"></el-option>
                 </el-select>

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

@@ -203,7 +203,7 @@ export default {
                 if (todo == 'temporary') {
                     title = '设置收费项目';
                     hideStar = false;
-                    height = '230px';
+                    height = '270px';
                     width = '550px';
                 } else if (todo == 'bulk') {
                     if (!this.selectRow.length) {
@@ -319,7 +319,7 @@ export default {
         this.mixins_dataUrl = '/sc-charge/charge/bill/page'; // 分页查询接口
         this.mixins_query = {
             chargeStatus: this.chargeStatus,
-            chargeType: 1
+            // chargeType: 1
         };
     }
 };

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

@@ -1,7 +1,7 @@
 <template>
     <el-form ref="form" :model="formData" :rules="formRules" label-width="120px">
         <el-form-item label="选择收费项目" prop="chargeType">
-            <el-select placeholder="选择收费项目" v-model="formData.strategyId" clearable>
+            <el-select placeholder="选择收费项目" v-model="formData.strategyId" clearable @change="strategyType">
                 <el-option :label="item.chargeName" :value="item.id" v-for="(item, index) in selectData" :key="index"></el-option>
             </el-select>
         </el-form-item>
@@ -17,6 +17,9 @@
             >
             </el-date-picker>
         </el-form-item>
+        <el-form-item label="用量" v-if="formData.chargeType == 2 || formData.chargeType == 3">
+            <el-input v-model="formData.amount"></el-input>
+        </el-form-item>
     </el-form>
 </template>
 <script >
@@ -28,9 +31,10 @@ export default {
                 assetsId: '',
                 strategyId: '',
                 assetsType: 1,
-                chargeType: 1,
+                chargeType: '',
                 chargeStartTime: '2021-09',
-                chargeEndTime: '2021-09'
+                chargeEndTime: '2021-09',
+                amount:'',
             },
             times: [],
             selectData: [],
@@ -74,11 +78,19 @@ export default {
         },
         getSelect() {
             this.$http
-                .get('/sc-charge/scChargeStrategy/page?pageNum=1&pageSize=100&chargeType=1')
+                // .get('/sc-charge/scChargeStrategy/page?pageNum=1&pageSize=100&chargeType=1')
+                .get('/sc-charge/scChargeStrategy/page?pageNum=1&pageSize=100')
                 .then(({ data, status, msg }) => {
                     this.selectData = data.list;
                 })
                 .catch(() => {});
+        },
+        strategyType(id) {
+            this.selectData.find((item) => {
+                if (item.id === id) {
+                    this.formData.chargeType = item.chargeType;
+                }
+            });
         }
     },
     created() {