diff --git a/src/pages/health/doctorRecord/list.vue b/src/pages/health/doctorRecord/list.vue index 38bc12e..5d25d47 100644 --- a/src/pages/health/doctorRecord/list.vue +++ b/src/pages/health/doctorRecord/list.vue @@ -316,6 +316,10 @@ function settingCancel() { function handlePersonCancel() { queryParams.value.personName = '' queryParams.value.personId = '' + queryHealthRecordParams.value.personId=null + listHealthRecord(queryHealthRecordParams.value).then((response) => { + healthRecordList.value = [response.rows] + }) showPerson.value = false pageNum.value = 1 listData.value = [] @@ -356,6 +360,10 @@ function settingCancel() { queryParams.value.healthRecordId = '' queryParams.value.endTime = '' queryParams.value.personId = '' + queryHealthRecordParams.value.personId=null + listHealthRecord(queryHealthRecordParams.value).then((response) => { + healthRecordList.value = [response.rows] + }) } function handleEdit(item) { uni.navigateTo({ url: `/pages/health/doctorRecord/addEdit?id=${item.id}` }) diff --git a/src/pages/health/healthRecord/addEdit.vue b/src/pages/health/healthRecord/addEdit.vue index ef2e706..cbd96ad 100644 --- a/src/pages/health/healthRecord/addEdit.vue +++ b/src/pages/health/healthRecord/addEdit.vue @@ -298,8 +298,8 @@ function handleState() { } function handleEtiologyConfirm(e) { form.value.etiologyName = e.value[0].dictLabel - form.value.place = e.value[0].dictValue - showEtiology.etiology = false + form.value.etiology = e.value[0].dictValue + showEtiology.value = false } function handleEtiologyCancel() { showEtiology.value = false diff --git a/src/pages/health/healthRecord/list.vue b/src/pages/health/healthRecord/list.vue index fd7e29a..89100af 100644 --- a/src/pages/health/healthRecord/list.vue +++ b/src/pages/health/healthRecord/list.vue @@ -20,7 +20,7 @@ - 档案状态 + 档案类型 {{ item.dictLabel }} @@ -305,7 +305,12 @@ function settingCancel() { getList() } function handlePersonCancel() { - showPerson.value = false + queryParams.value.personName = '' + queryParams.value.personId= null + showPerson.value = false + pageNum.value = 1 + listData.value = [] + getList() } function searchBlur() { pageNum.value = 1 diff --git a/src/pages/health/heightWeightRecord/list.vue b/src/pages/health/heightWeightRecord/list.vue index 82e2b1c..c0b5c5b 100644 --- a/src/pages/health/heightWeightRecord/list.vue +++ b/src/pages/health/heightWeightRecord/list.vue @@ -222,7 +222,12 @@ function settingCancel() { getList() } function handlePersonCancel() { + queryParams.value.personName = '' + queryParams.value.personId = '' showPerson.value = false + pageNum.value = 1 + listData.value = [] + getList() } function searchBlur() { pageNum.value = 1 diff --git a/src/pages/health/marRecord/list.vue b/src/pages/health/marRecord/list.vue index 748ae6c..16c9b1a 100644 --- a/src/pages/health/marRecord/list.vue +++ b/src/pages/health/marRecord/list.vue @@ -189,7 +189,7 @@ const windowHeight = computed(() => { uni.getSystemInfoSync().windowHeight - 50 }) onLoad(() => { - getList() + getData() }); onShow(() => { @@ -232,12 +232,9 @@ function loadmore() { getList() } } - function getList() { - listPerson(queryPersonParams.value).then((response) => { - personList.value = [response.rows] - }) - // 用药类型 - getDicts('mar_type').then(res => { + function getData() { + // 用药类型 + getDicts('mar_type').then(res => { typeList.value = res.data }) // 用药地点 @@ -253,6 +250,25 @@ function loadmore() { getDicts('mar_resource').then(res => { resourceList.value = res.data }) + listPerson(queryPersonParams.value).then((response) => { + personList.value = [response.rows] + listHealthRecord(queryHealthRecordParams.value).then((response) => { + healthRecordList.value = [response.rows] + }) + status.value = 'loading' + listMarRecord({ pageSize: 10, pageNum: pageNum.value, ...queryParams.value }).then(res => { + listData.value = listData.value.concat(res.rows) + if (listData.value.length < res.total) { + status.value = 'loadmore' + } else { + status.value = 'nomore' + } + }).catch(() => { + status.value = 'nomore' + }) + }) + } + function getList() { status.value = 'loading' listMarRecord({ pageSize: 10, pageNum: pageNum.value, ...queryParams.value }).then(res => { listData.value = listData.value.concat(res.rows) @@ -317,7 +333,16 @@ function settingCancel() { }) } function handlePersonCancel() { + queryParams.value.personName = '' + queryParams.value.personId = '' + queryHealthRecordParams.value.personId=null + listHealthRecord(queryHealthRecordParams.value).then((response) => { + healthRecordList.value = [response.rows] + }) showPerson.value = false + pageNum.value = 1 + listData.value = [] + getList() } function handleHealthRecord() { @@ -338,7 +363,12 @@ function settingCancel() { getList() } function handleHealthRecordCancel() { + queryParams.value.healthRecordName= '' + queryParams.value.healthRecordId = '' showHealthRecord.value = false + pageNum.value = 1 + listData.value = [] + getList() } function searchBlur() { @@ -354,6 +384,10 @@ function settingCancel() { queryParams.value.healthRecordId = '' queryParams.value.endTime = '' queryParams.value.personId = '' + queryHealthRecordParams.value.personId=null + listHealthRecord(queryHealthRecordParams.value).then((response) => { + healthRecordList.value = [response.rows] + }) } function enterDetails(item) { uni.navigateTo({ url: `/pages/health/marRecord/details?id=${item.id}` }) diff --git a/src/pages/health/processRecord/list.vue b/src/pages/health/processRecord/list.vue index 4fa0d84..bb59ff2 100644 --- a/src/pages/health/processRecord/list.vue +++ b/src/pages/health/processRecord/list.vue @@ -256,6 +256,10 @@ function settingCancel() { function handlePersonCancel() { queryParams.value.personName = '' queryParams.value.personId = '' + queryHealthRecordParams.value.personId=null + listHealthRecord(queryHealthRecordParams.value).then((response) => { + healthRecordList.value = [response.rows] + }) showPerson.value = false pageNum.value = 1 listData.value = [] @@ -300,6 +304,10 @@ function settingCancel() { queryParams.value.endTime = '' queryParams.value.personName = '' queryParams.value.personId = '' + queryHealthRecordParams.value.personId=null + listHealthRecord(queryHealthRecordParams.value).then((response) => { + healthRecordList.value = [response.rows] + }) } function enterDetails(item) { uni.navigateTo({ url: `/pages/health/processRecord/details?id=${item.id}` }) diff --git a/src/pages/health/statistic/doctorStatistic/index.vue b/src/pages/health/statistic/doctorStatistic/index.vue index 758c467..ceddaeb 100644 --- a/src/pages/health/statistic/doctorStatistic/index.vue +++ b/src/pages/health/statistic/doctorStatistic/index.vue @@ -306,6 +306,8 @@ function searchSubmit() { queryParams.value.startTime = '' queryParams.value.endTime = '' queryParams.value.time = '' + + } function getList() { // 使用状态 diff --git a/src/pages/health/statistic/healthStatistic/index.vue b/src/pages/health/statistic/healthStatistic/index.vue index 8fb0087..2e164fc 100644 --- a/src/pages/health/statistic/healthStatistic/index.vue +++ b/src/pages/health/statistic/healthStatistic/index.vue @@ -307,7 +307,6 @@ function searchSubmit() { filterPanel.value = false } function resetQuery() { - queryParams.value.id = '' queryParams.value.type = '1' queryParams.value.startTime = '' queryParams.value.endTime = '' diff --git a/src/pages/health/statistic/marStatistic/index.vue b/src/pages/health/statistic/marStatistic/index.vue index ac870ae..3a41624 100644 --- a/src/pages/health/statistic/marStatistic/index.vue +++ b/src/pages/health/statistic/marStatistic/index.vue @@ -362,7 +362,6 @@ function searchSubmit() { filterPanel.value = false } function resetQuery() { - queryParams.value.type = '1' queryParams.value.startTime = '' queryParams.value.endTime = '' diff --git a/src/pages/health/temperatureRecord/list.vue b/src/pages/health/temperatureRecord/list.vue index fb4a07a..24c6b63 100644 --- a/src/pages/health/temperatureRecord/list.vue +++ b/src/pages/health/temperatureRecord/list.vue @@ -287,6 +287,10 @@ function settingCancel() { queryParams.value.healthRecordId = '' queryParams.value.endTime = '' queryParams.value.personId = '' + queryHealthRecordParams.value.personId=null + listHealthRecord(queryHealthRecordParams.value).then((response) => { + healthRecordList.value = [response.rows] + }) } function enterDetails(item) { uni.navigateTo({ url: `/pages/health/temperatureRecord/details?id=${item.id}` })