diff --git a/src/pages/health/doctorRecord/addEdit.vue b/src/pages/health/doctorRecord/addEdit.vue index 73fbaac..1a9ba41 100644 --- a/src/pages/health/doctorRecord/addEdit.vue +++ b/src/pages/health/doctorRecord/addEdit.vue @@ -25,6 +25,11 @@ + + + + @@ -73,6 +78,8 @@ @confirm="handlePersonConfirm"> + { + typeList.value =[res.data] + }) listPerson(queryPersonParams.value).then((response) => { personList.value = [response.rows] if(response.rows.length>0){ @@ -188,6 +203,10 @@ function getData() { getDoctorRecord(form.value.id).then(res => { form.value = res.data }) + // 就医类型 + getDicts('doctor_type').then(result => { + form.value.typeName=dictStr(form.value.type, result.data) + }) } } @@ -238,6 +257,23 @@ function handHealthRecordCancel() { showHealthRecord.value = false } +function handleType() { + if (typeList.value[0].length === 0) { + proxy.$refs['uToast'].show({ + message: '就医类型为空 ', type: 'warning' + }) + } else { + showType.value = true + } + } + function handleTypeConfirm(e) { + form.value.typeName = e.value[0].dictLabel + form.value.type = e.value[0].dictValue + showType.value = false + } + function handleTypeCancel() { + showType.value = false + } function selectDate() { datePickShow.value = true diff --git a/src/pages/health/doctorRecord/list.vue b/src/pages/health/doctorRecord/list.vue index 8e16896..fbdb435 100644 --- a/src/pages/health/doctorRecord/list.vue +++ b/src/pages/health/doctorRecord/list.vue @@ -74,6 +74,10 @@ + + 就医类型: + {{ dictStr(item.type, typeList) }} + 就诊时间: {{ item.visitingTime }} @@ -147,6 +151,8 @@ const timeShow= ref(false) const showPerson = ref(false) const personList = ref([]) +const typeList = ref([]) + const flag= ref(true) const time =ref( Number(new Date())) const data = reactive({ @@ -185,6 +191,15 @@ onLoad(() => { timeShow.value = !timeShow.value flag.value = data } + function dictStr(val, arr) { + let str = '' + arr.map(item => { + if (item.dictValue === val) { + str = item.dictLabel + } + }) + return str + } function loadmore() { pageNum.value += 1 if (status.value == 'loadmore') { @@ -192,6 +207,10 @@ function loadmore() { } } function getList() { + // 类型 + getDicts('doctor_type').then(res => { + typeList.value = res.data + }) listPerson(queryPersonParams.value).then((response) => { personList.value = [response.rows] }) diff --git a/src/pages/login.vue b/src/pages/login.vue index 2c89791..162f0e3 100644 --- a/src/pages/login.vue +++ b/src/pages/login.vue @@ -93,7 +93,7 @@ async function handleLogin() { } else if (loginForm.value.code === "" && captchaEnabled.value) { modal.msgError("请输入验证码") } else { - modal.loading("登录中,请耐心等待...") + modal.loading("登录中,请等待...") pwdLogin() } };