|
|
@@ -79,21 +79,7 @@
|
|
|
</el-form-item>
|
|
|
</div>
|
|
|
<div>
|
|
|
- <el-form-item label="单位" prop="companyCode">
|
|
|
- <!-- <el-select
|
|
|
- v-model="queryModel.companyCode"
|
|
|
- size="mini"
|
|
|
- filterable
|
|
|
- placeholder="请选择"
|
|
|
- style="width:220px"
|
|
|
- >
|
|
|
- <el-option
|
|
|
- v-for="company in companyResult"
|
|
|
- :key="company.id"
|
|
|
- :label="company.name"
|
|
|
- :value="company.code"
|
|
|
- ></el-option>
|
|
|
- </el-select>-->
|
|
|
+ <el-form-item label="单位" prop="parentId">
|
|
|
<el-select-tree
|
|
|
size="mini"
|
|
|
:props="props"
|
|
|
@@ -106,6 +92,22 @@
|
|
|
>是否包含下级单位</el-checkbox
|
|
|
>
|
|
|
</el-form-item>
|
|
|
+ <el-form-item label="角色" prop="roleId">
|
|
|
+ <el-select
|
|
|
+ v-model="queryModel.roleId"
|
|
|
+ filterable
|
|
|
+ size="mini"
|
|
|
+ placeholder="请选择"
|
|
|
+ style="width: 120px"
|
|
|
+ >
|
|
|
+ <el-option
|
|
|
+ v-for="role in roleResult"
|
|
|
+ :key="role.id"
|
|
|
+ :label="role.personRoleName"
|
|
|
+ :value="role.id"
|
|
|
+ ></el-option>
|
|
|
+ </el-select>
|
|
|
+ </el-form-item>
|
|
|
<el-form-item label="是否上传照片" prop="isUploadPhoto">
|
|
|
<el-select
|
|
|
v-model="queryModel.isUploadPhoto"
|
|
|
@@ -754,6 +756,7 @@ export default {
|
|
|
position5: "",
|
|
|
derviceName: "",
|
|
|
parkId: "",
|
|
|
+ roleId:""
|
|
|
},
|
|
|
loading: false,
|
|
|
tableData: [],
|
|
|
@@ -816,6 +819,7 @@ export default {
|
|
|
bindWechatLoading: false,
|
|
|
parkList: [],
|
|
|
showRoleModal: false,
|
|
|
+ roleResult:[],
|
|
|
};
|
|
|
},
|
|
|
watch: {
|
|
|
@@ -836,6 +840,21 @@ export default {
|
|
|
}
|
|
|
})
|
|
|
}
|
|
|
+ },
|
|
|
+ "queryModel.parentId": function (val, oldval) {
|
|
|
+ if (val != null && val != "") {
|
|
|
+ var self = this;
|
|
|
+ var formData = new FormData();
|
|
|
+ formData.append("companyId", val);
|
|
|
+ personRoleInfoApi.listByCompanyId(formData).then(function (response) {
|
|
|
+ var jsonData = response.data;
|
|
|
+ if (jsonData.result) {
|
|
|
+ if (jsonData.data != null && jsonData.data != "") {
|
|
|
+ self.roleResult = jsonData.data;
|
|
|
+ }
|
|
|
+ }
|
|
|
+ });
|
|
|
+ }
|
|
|
}
|
|
|
},
|
|
|
created() {
|
|
|
@@ -957,6 +976,8 @@ export default {
|
|
|
|
|
|
formData.append("derviceName", self.queryModel.derviceName);
|
|
|
|
|
|
+ formData.append("roleId", self.queryModel.roleId);
|
|
|
+
|
|
|
if (self.queryModel.parkId == null) {
|
|
|
self.queryModel.parkId = "";
|
|
|
}
|