diff --git a/src/components/manger/Auth.vue b/src/components/manger/Auth.vue new file mode 100644 index 0000000..1d59b18 --- /dev/null +++ b/src/components/manger/Auth.vue @@ -0,0 +1,89 @@ + + + + + + 保存 + + + + + {{ decryptedText.fixmedinsCode }} + + + {{ decryptedText.createDate }} + + + {{ decryptedText.expiryDate }} + + + + + + diff --git a/src/components/outpatient/CaseDetail.vue b/src/components/outpatient/CaseDetail.vue index 3cd605d..183cb1c 100644 --- a/src/components/outpatient/CaseDetail.vue +++ b/src/components/outpatient/CaseDetail.vue @@ -17,37 +17,37 @@ :column="1" border > - + {{ formDate.mainAppeal}} - + {{ formDate.diagnosisSummary}} - + {{ formDate.nowMedicalHistory}} - + {{ formDate.beforeMedicalHistory}} - + {{ formDate.allergyHistory}} - + {{ formDate.exam}} - + {{ formDate.chinaAdjunctCheck}} - + {{ formDate.chinaDeal}} - + {{ formDate.mouthCheck}} - + {{ formDate.adjunctCheck}} - + {{ formDate.deal}} diff --git a/src/components/outpatient/Settlement.vue b/src/components/outpatient/Settlement.vue index bfaf3d5..faa8a91 100644 --- a/src/components/outpatient/Settlement.vue +++ b/src/components/outpatient/Settlement.vue @@ -2,7 +2,7 @@ import Panel from '../common/Panel.vue'; import {defineEmits, defineModel,defineProps} from 'vue' const {status}=defineProps(['status']) -const emit = defineEmits(['save','deleteItem']); +const emit = defineEmits(['save','deleteItem','edit']); const save = () => { emit('save'); }; @@ -10,7 +10,9 @@ const deleteItem = () => { emit('deleteItem'); }; const totalAmount = defineModel() - +const editItem= () => { + emit('edit'); +}; @@ -20,7 +22,7 @@ const totalAmount = defineModel() 取消接诊 完成接诊 - 修改 + 修改 diff --git a/src/components/settings/MemberEdit.vue b/src/components/settings/MemberEdit.vue index 9398068..767abcb 100644 --- a/src/components/settings/MemberEdit.vue +++ b/src/components/settings/MemberEdit.vue @@ -1,30 +1,59 @@ - + + + + + + + + + + + + + + + + + + + + - + - + - + + + + + + @@ -39,18 +68,13 @@ - - - - - - + - + - + - {form.electronicSignature=url}"> + {memberInfo.electronicSignature=url}"> @@ -133,7 +157,7 @@ const roleList = [ label: '其他', }, ] -const form = ref({ +const memberInfo = ref({ name: "", // 姓名 gender: "", // 性别 age: "", // 年龄 @@ -144,24 +168,44 @@ const form = ref({ sectionId: "", // 科室id electronicSignature: "", // 电子签名 memo: '',// 备注 + password: "", }) +const userInfo= ref({ + username: "", // 账号 + name: "", + password: "", +}) +const rules= { + username: [ + {required: true, message: '请输入账号', trigger: 'blur'}, + ], + password: [ + {required: true, message: '请输入密码', trigger: 'blur'}, + ], + } const emit = defineEmits(['onSubmit']) const onSubmit = () => { emit('onSubmit') } - +const ruleFormRef= ref('') const save = () => { - if (props.id) { - post("organization/member/edit", {data: form.value}).then((res) => { - onSubmit() - form.value = {} - }) - } else { - post("organization/member/add", {data: form.value}).then((res) => { - onSubmit() - form.value = {} - }) - } + ruleFormRef.value.validate((valid: any) => { + if (valid) { + if (props.id) { + post("organization/member/edit", {data: memberInfo.value}).then((res) => { + onSubmit() + memberInfo.value = {} + userInfo.value = {} + }) + } else { + post("organization/member/add", {data: memberInfo.value}).then((res) => { + onSubmit() + memberInfo.value = {} + }) + } + } + }) + } const options = Object.entries(depts).map(([key, value]) => { if (typeof value === 'string') { @@ -180,9 +224,9 @@ const options = Object.entries(depts).map(([key, value]) => { const uploadRef = ref('') const init = (id: any) => { post("organization/member/getById", {id}).then((res: any) => { - form.value = res - if(form.value.electronicSignature){ - uploadRef.value?.getImageUrl(form.value.electronicSignature) + memberInfo.value = res + if(memberInfo.value.electronicSignature){ + uploadRef.value?.getImageUrl(memberInfo.value.electronicSignature) } }) } diff --git a/src/router/index.ts b/src/router/index.ts index 16e62c5..27e3cf3 100644 --- a/src/router/index.ts +++ b/src/router/index.ts @@ -7,6 +7,10 @@ const router = createRouter({ path: '/', redirect: '/home/index', }, + { + path: '/manager/login', + component: ()=>import('../views/Login.vue'), + }, { path: '/home', component: () => import('../views/Layout.vue'), diff --git a/src/utils/request.ts b/src/utils/request.ts index 9248fd2..04622cd 100644 --- a/src/utils/request.ts +++ b/src/utils/request.ts @@ -11,7 +11,6 @@ export async function initRequest(_router:any) { function post(path: string, data: any = {}, options: any = {}) { let config={catch_error: false,base_url:globalConfig.base_url} config={...config,...options} - let token = localStorage.getItem('token'); let headers: Record = {}; if (token) { diff --git a/src/views/Login.vue b/src/views/Login.vue new file mode 100644 index 0000000..fb3aa3d --- /dev/null +++ b/src/views/Login.vue @@ -0,0 +1,338 @@ + + + + + + + + + + + + + 欢迎使用药慧精灵 + + + + + + + + + + + 登录 + 授权 + + + + + + + + + diff --git a/src/views/outpatient/index.vue b/src/views/outpatient/index.vue index 243a3b4..5a79abf 100644 --- a/src/views/outpatient/index.vue +++ b/src/views/outpatient/index.vue @@ -19,7 +19,7 @@ - + @@ -98,7 +98,6 @@ const getId = (item: any) => { status.value = 2 }) } - if (item.status == 3) { post(apiConfig.DoctorDetail, { regisId: item.id @@ -119,6 +118,11 @@ const deleteItem = () => { const getStatus = (e: any) => { status.value = e } +const edit=()=>{ + post('registration/changeStatus', {id: registerId.value, status: 2}).then((res: any) => { + status.value = 2 + }) +} // 使用 watch 监听 goodsList 和 itemList 的变化 watch([()=>goodsList.value, itemList], ([newGoodsList, newItemList]) => { const pharmaceuticalTotalAmount = newItemList.reduce((pre: any, cur: any) => { diff --git a/src/views/settings/member.vue b/src/views/settings/member.vue index 9aa9eee..aa911e7 100644 --- a/src/views/settings/member.vue +++ b/src/views/settings/member.vue @@ -4,29 +4,29 @@ - {{formatDate(scope.row.createDatetime)}} + {{ formatDate(scope.row.createDatetime) }} - {{roleList.find((item: any) => item.value === scope.row.role)?.label||'-'}} + {{ roleList.find((item: any) => item.value === scope.row.role)?.label || '-' }} - {{sectionList.find((item: any) => item.id === scope.row.sectionId)?.name ||'-'}} + {{ sectionList.find((item: any) => item.id === scope.row.sectionId)?.name || '-' }} - +