公寓 绑定 水表信息

@@ -5,6 +5,8 @@ let base = 'empt-location/water_meter';
 
 export const getList = params => { return axios.get(`${base}/selectAll`, { params: params }); };
 
+export const waterMeterAll = params => { return axios.get(`${base}/waterMeterAll`, { params: params }); };
+
 
 export const remove = params => { return axios({
     method: 'DELETE',

@@ -5,12 +5,12 @@ export const getUserList = params => { return http.get(`${baseUrl}/list`,  param
 
 export const getUserListPage = params => { return http.get(`/user/list`,params) };
 
-export const removeUser = params => { return http.del(`/user/del`,params)};
+export const removeUser = params => { return http.del(`${baseUrl}/del`,params)};
 
-export const batchRemoveUser = params => { return http.del(`/user/batchremove`, { params: params }); };
+export const batchRemoveUser = params => { return http.del(`${baseUrl}/batchremove`, { params: params }); };
 
-export const editUser = params => { return http.put(`/user/edit`,params)};
+export const editUser = params => { return http.put(`${baseUrl}/edit`,params)};
 
-export const addUser = params => { return http.post(`/user/add`,params)};
+export const addUser = params => { return http.post(`${baseUrl}/add`,params)};
 
-export const setUserRole = params => { return http.put(`/user/roleset`,params)};
\ No newline at end of file
+export const setUserRole = params => { return http.put(`${baseUrl}/roleset`,params)};
\ No newline at end of file

@@ -2,7 +2,7 @@
 	<el-row class="container">
 		<el-col :span="24" class="header">
 			<el-col :span="10" class="logo" :class="collapsed?'logo-collapse-width':'logo-width'">
-				{{collapsed?'':sysName}}
+<!--				{{collapsed?'':sysName}}-->水电费缴费平台
 			</el-col>
 			<el-col :span="10">
 				<div class="tools" @click.prevent="collapse">

@@ -274,6 +274,27 @@
                 <el-form-item label="公寓名称" prop="adrName">
                     <el-input v-model="editLocationForm.adrname" auto-complete="off" placeholder="请输入名称"></el-input>
                 </el-form-item>
+
+
+                <el-form-item label="水表编号" prop="adrName"  >
+<!--                    <el-input v-model="editLocationForm.adrname" auto-complete="off" placeholder=""></el-input>-->
+                    <el-select style="height: 38px; width: 100%"
+                            v-model="editLocationForm.wmid"
+                            filterable
+                            remote
+                            default-first-option
+                            placeholder="请输入关键词"
+                            :remote-method="waterMeterAlls"
+                            :loading="listLoading">
+                        <el-option
+                                v-for="item in waterMeterList"
+                                :key="item.wmId" :label="item.wmId" :value="item.wmId">
+                        </el-option>
+                    </el-select>
+                </el-form-item>
+
+
+
             </el-form>
             <div slot="footer" class="dialog-footer">
                 <el-button @click.native="editFormLocationVisible = false">取消</el-button>
@@ -299,7 +320,7 @@
 <script>
     import { getList,add, remove, edit as editLocation} from '@/api/empt/location_api';
     import {add as electicity, getEEModel, edit} from '@/api/empt/electricityParams';
-    import {findRealTime } from '@/api/empt/waterMeter';
+    import {findRealTime, waterMeterAll } from '@/api/empt/waterMeter';
     import moment from 'moment'
     import parseTime from '@/utils'
     import loginUserInfo from '@/api/base'
@@ -319,6 +340,12 @@
                 pageNum: 1,
                 pageSize: 5,
                 listLoading: false,
+                waterNumber: undefined,
+                waterMeterList:[],
+                restaurants: [],
+                state4: '',
+                timeout:  null,
+
                 sels: [],//列表选中列
                 //编辑界面是否显示
                 editFormVisible: false,
@@ -426,7 +453,8 @@
                 editLocationForm:{
                     adrname: '',
                     parent: '',
-                    type:''
+                    type:'',
+                    wmid:''
                 },
                 centerDialogVisible: false,
                 dialogData:{
@@ -658,6 +686,10 @@
             handleEdit: function (index, row) {
                 this.editFormLocationVisible = true;
                 this.editLocationForm = row;
+                console.log(row)
+                // if (row.type == 3){
+                //     this.waterNumber ='waterNum'
+                // }
             },
 
 
@@ -692,6 +724,24 @@
                 });
             },
 
+            // 远程搜索水表
+            waterMeterAlls(query) {
+                this.waterMeterList = []
+                if (query !== '') {
+                    this.listLoading = true
+                    waterMeterAll({wmId: query}).then(res => {
+                        if (res !== null) {
+                            setTimeout(() => {
+                                this.listLoading = false
+                                this.waterMeterList = res.data.data
+                            }, 200)
+                        }
+                    })
+                } else {
+                    this.waterMeterList = []
+                }
+            },
+
             //电表参数配置新增界面，每次点开初始化数据
             electrixityMeterConfiguration: function (row) {
                 this.electrixityAddFormVisible = true;