|
@@ -21,46 +21,17 @@
|
|
|
<el-input v-model="formModel.realName" placeholder="请输入真实名称" style="width:300px"></el-input>
|
|
|
</el-form-item>
|
|
|
<el-form-item v-show="ruleValidate.password[0].required" label="密码" prop="password">
|
|
|
- <el-input
|
|
|
- type="password"
|
|
|
- v-model="formModel.password"
|
|
|
- placeholder="请输入密码"
|
|
|
- style="width:300px"
|
|
|
- ></el-input>
|
|
|
- </el-form-item>
|
|
|
- <el-form-item label="企业" prop="companyId">
|
|
|
- <!-- <el-select
|
|
|
- v-model="formModel.companyId"
|
|
|
- filterable
|
|
|
- placeholder="请选择"
|
|
|
- style="width: 250px"
|
|
|
- :filter-method="filterMethod"
|
|
|
- >
|
|
|
- <el-option
|
|
|
- v-for="result in companyInfoResult"
|
|
|
- :key="result.id"
|
|
|
- :label="result.companyName"
|
|
|
- :value="result.id"
|
|
|
- ></el-option>
|
|
|
- </el-select> -->
|
|
|
+ <el-input type="password" v-model="formModel.password" placeholder="请输入密码" style="width:300px"></el-input>
|
|
|
</el-form-item>
|
|
|
+ <!-- <el-form-item label="机构" prop="orgId">
|
|
|
+ <el-select v-model="formModel.orgId" filterable placeholder="请选择" style="width: 250px" :filter-method="filterMethod">
|
|
|
+ <el-option v-for="result in companyInfoResult" :key="result.id" :label="result.companyName" :value="result.id"></el-option>
|
|
|
+ </el-select>
|
|
|
+ </el-form-item> -->
|
|
|
<el-form-item label="分配角色" prop="roles">
|
|
|
- <el-select
|
|
|
- v-model="formModel.roles"
|
|
|
- filterable
|
|
|
- multiple
|
|
|
- placeholder="请选择"
|
|
|
- style="width:300px"
|
|
|
- >
|
|
|
- <el-option
|
|
|
- v-for="role in roleList"
|
|
|
- :key="role.id"
|
|
|
- :label="role.description"
|
|
|
- :value="role.id"
|
|
|
- ></el-option>
|
|
|
+ <el-select v-model="formModel.roles" filterable multiple placeholder="请选择" style="width:300px">
|
|
|
+ <el-option v-for="role in roleList" :key="role.id" :label="role.description" :value="role.id"></el-option>
|
|
|
</el-select>
|
|
|
- <!-- <el-transfer v-model="formModel.roles" :data="roleList"
|
|
|
- :props="{key: 'id',label: 'description'}" :titles="['所有角色','已分配角色']"></el-transfer>-->
|
|
|
</el-form-item>
|
|
|
</el-form>
|
|
|
</div>
|
|
@@ -89,8 +60,8 @@ export default {
|
|
|
realName: [
|
|
|
{ required: true, message: "真实名称不能为空", trigger: "blur" }
|
|
|
],
|
|
|
- companyId: [
|
|
|
- { required: true, message: "单位不能为空", trigger: "blur" }
|
|
|
+ orgId: [
|
|
|
+ { required: true, message: "机构不能为空", trigger: "blur" }
|
|
|
],
|
|
|
password: [
|
|
|
{ required: true, message: "密码不能为空", trigger: "blur" }
|
|
@@ -185,19 +156,19 @@ export default {
|
|
|
self.formModel = jsonData.data;
|
|
|
self.showModal = true;
|
|
|
|
|
|
- let companyId = self.formModel.companyId;
|
|
|
- if (companyId != null) {
|
|
|
- // var formData = new FormData();
|
|
|
- // formData.append("pageSize", 5);
|
|
|
- // formData.append("companyId", companyId);
|
|
|
+ // let orgId = self.formModel.orgId;
|
|
|
+ // if (orgId != null) {
|
|
|
+ // var formData = new FormData();
|
|
|
+ // formData.append("pageSize", 5);
|
|
|
+ // formData.append("orgId", orgId);
|
|
|
|
|
|
- // companyInfoApi.list(formData).then(function (response) {
|
|
|
- // var jsonData = response.data;
|
|
|
- // if (jsonData.result) {
|
|
|
- // self.companyInfoResult = jsonData.data;
|
|
|
- // }
|
|
|
- // });
|
|
|
- }
|
|
|
+ // companyInfoApi.list(formData).then(function (response) {
|
|
|
+ // var jsonData = response.data;
|
|
|
+ // if (jsonData.result) {
|
|
|
+ // self.companyInfoResult = jsonData.data;
|
|
|
+ // }
|
|
|
+ // });
|
|
|
+ // }
|
|
|
} else {
|
|
|
self.$message.error(jsonData.message + "");
|
|
|
}
|