Merge branch 'dev' of ssh://git.omniview.pro:256/fangdi/housemanage/web/majorproject into dev

src/server/api.js

@@ -63,8 +63,8 @@ case 'huangpu-prod':
 default: // 默认环境下（开发环境）
   // BASE_URL = 'http://31.0.161.39/apiv2'
   // BASE_URL = 'http://211.136.105.193/apiv2'
-  // BASE_URL = 'http://yangpu-hm.omniview.pro/api/v2'
-  BASE_URL = 'http://xuhui.hm.omniview.pro/api/v2'
+  BASE_URL = 'http://yangpu-hm.omniview.pro/api/v2'
+  // BASE_URL = 'http://xuhui.hm.omniview.pro/api/v2'
   // BASE_URL = 'http://pudong.hm.omniview.pro/api/v2'
   // BASE_URL = 'http://211.136.105.193/apiv2'
   MOCK_URL = 'https://yapi.omniview.pro/mock/283'

src/views/personal/InternalStaff/edit.vue

@@ -57,9 +57,9 @@
 					<a-row class="formItemLine">
           	<a-col span="8" >
 							<a-form-item label="角色名称" v-bind="colSpe">
-								<a-select placeholder="请选择" @change="roleChange" allowClear mode="multiple" labelInValue v-decorator="['notes']
+								<a-select placeholder="请选择" @change="roleChange" allowClear mode="multiple" show-search labelInValue v-decorator="['notes']
                 ">
-									<a-select-option v-for="(item,index) in roleList" :key="index" :value="item.id">{{item.roleName}}</a-select-option>
+									<a-select-option v-for="(item,index) in roleList" :key="index" :value="item.roleName+'#'+item.id">{{item.roleName}}</a-select-option>
 								</a-select>
 							</a-form-item>
 						</a-col>
@@ -124,6 +124,7 @@ export default {
 
     this.getTree()
     this.getRoleLists()
+    console.log(123)
   },
   methods: {
     // 查询权限树
@@ -234,7 +235,7 @@ export default {
         params: sparams
       }).then(res => {
         this.roleList = this.$com.confirm(res, 'data.content', []) // 得到当前账号可支配全部角色  供多选框选择
-        
+        console.log(this.roleList)
         //如果路由有id则为修改数据-- 去获取对应数据渲染
         if (this.$route.query.id) {
           this.getDetail()