用户 增加医生选项 选择完机构后 出来当前选择机构的数据 用户的审核 超声和影像分开权限 超声和影像保存时候修改诊断医生
This commit is contained in:
parent
f42d9fbba2
commit
3ecceabf27
@ -17,6 +17,9 @@ export interface UserVO {
|
||||
createTime: Date
|
||||
orgId:string
|
||||
isexamine:string
|
||||
isimageexamine:string
|
||||
doctorID:string
|
||||
doctorname:string
|
||||
}
|
||||
|
||||
// 查询用户管理列表
|
||||
@ -81,3 +84,7 @@ export const updateUserStatus = (id: number, status: number) => {
|
||||
export const getSimpleUserList = (): Promise<UserVO[]> => {
|
||||
return request.get({ url: '/system/user/simple-list' })
|
||||
}
|
||||
|
||||
export const getDoctorList= (orgid:string) => {
|
||||
return request.get({ url: '/doctor/getdoctorlist?orgId='+orgid })
|
||||
}
|
||||
|
@ -31,6 +31,9 @@ export interface ProfileVO {
|
||||
createTime: Date
|
||||
isexamine:string
|
||||
orgId:string
|
||||
isimageexamine:string
|
||||
doctorID:string
|
||||
doctorname:string
|
||||
}
|
||||
|
||||
export interface UserProfileUpdateReqVO {
|
||||
|
@ -22,6 +22,7 @@ export interface PatientexamlistVO {
|
||||
diagResults: string // 诊断结论
|
||||
diagDate: Date // 下诊断结论的时间:年月日时分秒
|
||||
diagDoctor: string // 诊断医生
|
||||
diagDoctorId:string
|
||||
reviewDoctor: string // 审核医生
|
||||
reviewDate: Date // 审核日期:年月日时分秒
|
||||
thumbnailImgUrl: string // 缩略图oss url, httP:oss url
|
||||
|
@ -239,7 +239,7 @@
|
||||
<el-button
|
||||
type="success"
|
||||
plain
|
||||
style="width: 80px; float: right; margin-right: 15px; margin-top: 13px"
|
||||
style="width: 80px; float: right; margin-right: 15px; margin-top: 30px ;background-color: rgba(56, 119, 246, 1);font-size: 14; color: rgb(255, 255, 255);"
|
||||
@click="save"
|
||||
:disabled="savedisabled"
|
||||
>保存</el-button
|
||||
@ -249,7 +249,7 @@
|
||||
type="primary"
|
||||
plain
|
||||
v-show="examinedisabled"
|
||||
style="width: 80px; float: right; margin-right: 15px; margin-top: 13px"
|
||||
style="width: 80px; float: right; margin-right: 15px; margin-top: 30px ;background-color: rgba(56, 119, 246, 1);font-size: 14; color: rgb(255, 255, 255);"
|
||||
@click="examine"
|
||||
>审核</el-button
|
||||
>
|
||||
@ -342,7 +342,8 @@ const save = async () => {
|
||||
examineFormVO.value.diagResults = zdjl.value
|
||||
examineFormVO.value.notes = notes.value
|
||||
examineFormVO.value.diagFlag = radio1.value
|
||||
examineFormVO.value.diagDoctor = Profilevo.value.username
|
||||
examineFormVO.value.diagDoctor = Profilevo.value.doctorname
|
||||
examineFormVO.value.diagDoctorId = Profilevo.value.doctorID
|
||||
// examineFormVO.value.reviewDoctor = Profilevo.value.username
|
||||
examineFormVO.value.reportstatus = '已分析'
|
||||
// examineFormVO.value.diagDate=localDateTime
|
||||
@ -565,6 +566,7 @@ const iframeData = async () => {
|
||||
} else {
|
||||
// 如果status不是success,可以根据需要处理错误情况
|
||||
console.error('Request did not succeed:', response.data)
|
||||
|
||||
}
|
||||
// dataLoaded.value = true // 请求完成后,无论成功与否,都设置dataLoaded为true
|
||||
} catch (error) {
|
||||
@ -604,8 +606,8 @@ const PrintForm = () => {
|
||||
//获取当前登录人信息
|
||||
const getlogininfo = async () => {
|
||||
Profilevo.value = await getUserProfile()
|
||||
console.log('审核是否可见' + Profilevo.value.isexamine)
|
||||
if (Profilevo.value.isexamine === '1') {
|
||||
console.log('审核是否可见' + Profilevo.value.isimageexamine)
|
||||
if (Profilevo.value.isimageexamine === '1') {
|
||||
examinedisabled.value = true
|
||||
}
|
||||
}
|
||||
|
@ -14,7 +14,17 @@
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
<el-col :span="12">
|
||||
<el-form-item label="归属部门" prop="deptId">
|
||||
<el-form-item label="医生编码" prop="doctorID">
|
||||
<el-select v-model="formData.doctorID" placeholder="医生" clearable>
|
||||
<el-option
|
||||
v-for="item in doctorList"
|
||||
:key="item.doctorID"
|
||||
:label="item.doctorName"
|
||||
:value="item.doctorID"
|
||||
/>
|
||||
</el-select>
|
||||
</el-form-item>
|
||||
<!-- <el-form-item label="归属部门" prop="deptId">
|
||||
<el-tree-select
|
||||
v-model="formData.deptId"
|
||||
:data="deptList"
|
||||
@ -23,7 +33,7 @@
|
||||
node-key="id"
|
||||
placeholder="请选择归属部门"
|
||||
/>
|
||||
</el-form-item>
|
||||
</el-form-item> -->
|
||||
</el-col>
|
||||
</el-row>
|
||||
<el-row>
|
||||
@ -33,8 +43,8 @@
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
<el-col :span="12">
|
||||
<el-form-item label="邮箱" prop="email">
|
||||
<el-input v-model="formData.email" maxlength="50" placeholder="请输入邮箱" />
|
||||
<el-form-item label="医生名称" prop="doctorname">
|
||||
<el-input disabled v-model="formData.doctorname" />
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
</el-row>
|
||||
@ -69,7 +79,7 @@
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
<el-col :span="12">
|
||||
<el-form-item label="岗位">
|
||||
<!-- <el-form-item label="岗位">
|
||||
<el-select v-model="formData.postIds" multiple placeholder="请选择">
|
||||
<el-option
|
||||
v-for="item in postList"
|
||||
@ -78,32 +88,43 @@
|
||||
:value="item.id!"
|
||||
/>
|
||||
</el-select>
|
||||
</el-form-item> -->
|
||||
<el-form-item label="影像审核" prop="isimageexamine">
|
||||
<el-select v-model="formData.isimageexamine" clearable>
|
||||
<el-option label="是" value="1" />
|
||||
<el-option label="否" value="0" />
|
||||
</el-select>
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
</el-row>
|
||||
<el-row>
|
||||
<el-col :span="12">
|
||||
<el-form-item label="机构名称" prop="orgId" >
|
||||
<el-select v-model="formData.orgId" placeholder="请选择机构" clearable>
|
||||
<el-option
|
||||
v-for="item in fororglistData"
|
||||
:key="item.orgID"
|
||||
:label="item.orgName"
|
||||
:value="item.orgID"
|
||||
/>
|
||||
</el-select>
|
||||
</el-form-item>
|
||||
<el-form-item label="机构名称" prop="orgId">
|
||||
<el-select
|
||||
v-model="formData.orgId"
|
||||
placeholder="请选择机构"
|
||||
clearable
|
||||
@change="handleOrgChange"
|
||||
>
|
||||
<el-option
|
||||
v-for="item in fororglistData"
|
||||
:key="item.orgID"
|
||||
:label="item.orgName"
|
||||
:value="item.orgID"
|
||||
/>
|
||||
</el-select>
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
<el-col :span="12">
|
||||
<el-form-item label="是否审核" prop="isexamine" >
|
||||
<el-select v-model="formData.isexamine" clearable>
|
||||
<el-option label="是" value="1" />
|
||||
<el-option label="否" value="0" />
|
||||
</el-select>
|
||||
</el-form-item>
|
||||
<el-form-item label="超声审核" prop="isexamine">
|
||||
<el-select v-model="formData.isexamine" clearable>
|
||||
<el-option label="是" value="1" />
|
||||
<el-option label="否" value="0" />
|
||||
</el-select>
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
</el-row>
|
||||
|
||||
|
||||
<el-row>
|
||||
<el-col :span="24">
|
||||
<el-form-item label="备注">
|
||||
@ -137,6 +158,7 @@ const dialogVisible = ref(false) // 弹窗的是否展示
|
||||
const dialogTitle = ref('') // 弹窗的标题
|
||||
const formLoading = ref(false) // 表单的加载中:1)修改时的数据加载;2)提交的按钮禁用
|
||||
const formType = ref('') // 表单的类型:create - 新增;update - 修改
|
||||
const doctorList = ref<any[]>([]) //医生列表数据
|
||||
const formData = ref({
|
||||
nickname: '',
|
||||
deptId: '',
|
||||
@ -150,8 +172,11 @@ const formData = ref({
|
||||
remark: '',
|
||||
status: CommonStatusEnum.ENABLE,
|
||||
roleIds: [],
|
||||
orgId:'',
|
||||
isexamine:''
|
||||
orgId: '',
|
||||
isexamine: '',
|
||||
isimageexamine: '',
|
||||
doctorID: '',
|
||||
doctorname: ''
|
||||
})
|
||||
const formRules = reactive<FormRules>({
|
||||
username: [{ required: true, message: '用户名称不能为空', trigger: 'blur' }],
|
||||
@ -182,8 +207,8 @@ const open = async (type: string, id?: number) => {
|
||||
dialogVisible.value = true
|
||||
dialogTitle.value = t('action.' + type)
|
||||
formType.value = type
|
||||
// 获取机构字典数据
|
||||
fororglistData.value = await OrgApi.getOrglist()
|
||||
// 获取机构字典数据
|
||||
fororglistData.value = await OrgApi.getOrglist()
|
||||
resetForm()
|
||||
// 修改时,设置数据
|
||||
if (id) {
|
||||
@ -201,6 +226,26 @@ const open = async (type: string, id?: number) => {
|
||||
}
|
||||
defineExpose({ open }) // 提供 open 方法,用于打开弹窗
|
||||
|
||||
// 监听机构选择变化的方法
|
||||
function handleOrgChange(newVal) {
|
||||
// 清空当前的选项数据
|
||||
doctorList.value = []
|
||||
// 根据新的机构ID加载相关选项
|
||||
if (newVal) {
|
||||
loadRelatedOptions(newVal)
|
||||
}
|
||||
}
|
||||
// 计算属性,根据formData.doctorID获取医生名称
|
||||
const selectedDoctorName = computed(() => {
|
||||
const selectedDoctor = doctorList.value.find(doctor => doctor.doctorID === formData.value.doctorID);
|
||||
return selectedDoctor ? selectedDoctor.doctorName : '';
|
||||
});
|
||||
|
||||
// 根据机构ID加载相关选项的方法
|
||||
async function loadRelatedOptions(orgId) {
|
||||
// 加载医生
|
||||
doctorList.value = await UserApi.getDoctorList(orgId)
|
||||
}
|
||||
/** 提交表单 */
|
||||
const emit = defineEmits(['success']) // 定义 success 事件,用于操作成功后的回调
|
||||
const submitForm = async () => {
|
||||
@ -208,6 +253,7 @@ const submitForm = async () => {
|
||||
if (!formRef) return
|
||||
const valid = await formRef.value.validate()
|
||||
if (!valid) return
|
||||
formData.value.doctorname=selectedDoctorName.value
|
||||
// 提交请求
|
||||
formLoading.value = true
|
||||
try {
|
||||
@ -242,8 +288,13 @@ const resetForm = () => {
|
||||
remark: '',
|
||||
status: CommonStatusEnum.ENABLE,
|
||||
roleIds: [],
|
||||
orgId:''
|
||||
orgId: '',
|
||||
doctorID: '',
|
||||
isexamine: '',
|
||||
isimageexamine: '',
|
||||
doctorname: ''
|
||||
}
|
||||
doctorList.value = []
|
||||
formRef.value?.resetFields()
|
||||
}
|
||||
</script>
|
||||
|
@ -5,11 +5,11 @@
|
||||
|
||||
<el-row :gutter="20">
|
||||
<!-- 左侧部门树 -->
|
||||
<el-col :span="4" :xs="24">
|
||||
<!-- <el-col :span="4" :xs="24">
|
||||
<ContentWrap class="h-1/1">
|
||||
<DeptTree @node-click="handleDeptNodeClick" />
|
||||
</ContentWrap>
|
||||
</el-col>
|
||||
</el-col> -->
|
||||
<el-col :span="20" :xs="24">
|
||||
<!-- 搜索 -->
|
||||
<ContentWrap>
|
||||
@ -110,10 +110,9 @@
|
||||
:show-overflow-tooltip="true"
|
||||
/>
|
||||
<el-table-column
|
||||
label="部门"
|
||||
label="关联医生名称"
|
||||
align="center"
|
||||
key="deptName"
|
||||
prop="deptName"
|
||||
prop="doctorname"
|
||||
:show-overflow-tooltip="true"
|
||||
/>
|
||||
<el-table-column label="手机号码" align="center" prop="mobile" width="120" />
|
||||
|
@ -541,7 +541,8 @@ const save = async () => {
|
||||
examineFormVO.value.diagResults = zdjl.value
|
||||
examineFormVO.value.notes = notes.value
|
||||
examineFormVO.value.diagFlag = radio1.value
|
||||
examineFormVO.value.diagDoctor = Profilevo.value.username
|
||||
examineFormVO.value.diagDoctor = Profilevo.value.doctorname
|
||||
examineFormVO.value.diagDoctorId = Profilevo.value.doctorID
|
||||
// examineFormVO.value.reviewDoctor = Profilevo.value.username
|
||||
examineFormVO.value.reportstatus = '已分析'
|
||||
// examineFormVO.value.diagDate=localDateTime
|
||||
|
Loading…
Reference in New Issue
Block a user