diff --git a/src/components/UpLoad.vue b/src/components/UpLoad.vue index 4a7f3e2..f8c6498 100644 --- a/src/components/UpLoad.vue +++ b/src/components/UpLoad.vue @@ -24,6 +24,7 @@ const imageName = defineModel() const imageUrl = ref() const uploadUrl= ref() const getImageUrl = (imageName:any) => { + if (!imageName) return loadConfig().then(res => { imageUrl.value = res.base_url + 'file/getImage/' + imageName }) diff --git a/src/components/settings/MemberEdit.vue b/src/components/settings/MemberEdit.vue index 0644020..5d05e2c 100644 --- a/src/components/settings/MemberEdit.vue +++ b/src/components/settings/MemberEdit.vue @@ -2,7 +2,8 @@
- + - + - + ({ tel: "", // 手机号 socialMemberCode: "", // 医保人员代码 role: "", // 角色 - sectionId: "", // 科室id + sectionIds: [], // 科室id electronicSignature: "", // 电子签名 memo: '',// 备注 password: "", @@ -196,6 +200,14 @@ const userInfo = ref({ name: "", password: "", }) +const rulesBasic = { + username: [ + {required: true, message: '请输入账号', trigger: 'blur'}, + ], + password: [ + {required: true, message: '请输入密码', trigger: 'blur'}, + ] +} const rules = { username: [ {required: true, message: '请输入账号', trigger: 'blur'}, @@ -207,7 +219,7 @@ const rules = { {required: true, message: '请输入姓名', trigger: 'blur'}, ], gender: [ - {required: true, message: '请选择性别', trigger: 'change'}, + {required: true, message: '请选择性别', trigger: 'change'}, ], age: [ {required: true, message: '请输入年龄', trigger: 'blur'}, @@ -215,6 +227,12 @@ const rules = { idCardNumber: [ {required: true, message: '请输入身份证号', trigger: 'blur'}, ], + sectionIds: [ + {required: true, message: '请选择科室', trigger: 'change'}, + ], + role: [ + {required: true, message: '请选择角色', trigger: 'change'}, + ] } const isShow = ref(false) const emit = defineEmits(['close']) @@ -227,24 +245,33 @@ const exit = () => { } const sectionIds = ref([]) const ruleFormRef = ref('') +const ruleBasicFormRef = ref('') const save = () => { let form = { memberInfo: memberInfo.value, userInfo: userInfo.value, - sectionIds: sectionIds.value + sectionIds: memberInfo.value.sectionIds } - ruleFormRef.value.validate((valid: any) => { + ruleBasicFormRef.value.validate((valid: any) => { if (valid) { - post(apiConfig.OrganizationMemberSave, {data: form}).then(() => { - exit() - ElMessage.success('已修改') + ruleFormRef.value.validate((valid: any) => { + if (valid) { + post(apiConfig.OrganizationMemberSave, {data: form}).then(() => { + if(memberInfo.value.id){ + ElMessage.success('修改成功') + }else{ + ElMessage.success('添加成功') + } + exit() + }) + } }) } }) - } + const uploadRef = ref('') -const getById = (id:any) => { +const getById = (id: any) => { memberInfo.value = {} userInfo.value = {} post("organization/member/getById", {id: id}).then((res: any) => { @@ -252,7 +279,7 @@ const getById = (id:any) => { if (res.userInfo) { userInfo.value = res.userInfo } - sectionIds.value = res.sectionIds + memberInfo.value.sectionIds = res.sectionIds if (memberInfo.value.electronicSignature) { uploadRef.value?.getImageUrl(memberInfo.value.electronicSignature) } @@ -274,6 +301,7 @@ const deleteDetail = () => { ElMessage.error('已删除'); }) } +const id = ref('') const init = (id: any) => { isShow.value = true uploadURL.value = '' diff --git a/src/components/settings/SectionEdit.vue b/src/components/settings/SectionEdit.vue index 8cc7f4d..0c64d2f 100644 --- a/src/components/settings/SectionEdit.vue +++ b/src/components/settings/SectionEdit.vue @@ -16,7 +16,7 @@ - + diff --git a/src/views/settings/member.vue b/src/views/settings/member.vue index 8d6b742..f8aaecc 100644 --- a/src/views/settings/member.vue +++ b/src/views/settings/member.vue @@ -30,9 +30,8 @@ 新增
-
- +