Skip to content

F
frontend-h5
Commit 3c913b28 authored by 芮自成's avatar 芮自成
Browse files
Options

Merge branch 'chronic-dev' of http://gitlab.yiboshi.com/nightkis1995/frontend-h5 into chronic-dev

parents 0e094af9 39e1d62e
Hide whitespace changes
Inline Side-by-side
Showing with 26 additions and 12 deletions
public/index.html
View file @ 3c913b28
...@@ -7,7 +7,7 @@ ...@@ -7,7 +7,7 @@
<link rel='icon' href='<%= BASE_URL %>favicon.ico'> <link rel='icon' href='<%= BASE_URL %>favicon.ico'>
<title><%= htmlWebpackPlugin.options.title %></title> <title><%= htmlWebpackPlugin.options.title %></title>
<!-- 3.3.4/vconsole.min.js --> <!-- 3.3.4/vconsole.min.js -->
<script src='https://beta-copd-img.yiboshi.com/20241106/1730860078278931285.js'></script> <!-- <script src='https://beta-copd-img.yiboshi.com/20241106/1730860078278931285.js'></script>-->
</head> </head>
<body> <body>
<noscript> <noscript>
...@@ -79,6 +79,6 @@ ...@@ -79,6 +79,6 @@
<!-- built files will be auto injected --> <!-- built files will be auto injected -->
</body> </body>
<script> <script>
var vConsole =new VConsole(); // var vConsole =new VConsole();
</script> </script>
</html> </html>
src/doctor/followUp/detail/FollowUpDetail.vue
View file @ 3c913b28
...@@ -4,8 +4,7 @@ ...@@ -4,8 +4,7 @@
<!-- <GwDetail :info="detailInfo" v-if="showGw"/>--> <!-- <GwDetail :info="detailInfo" v-if="showGw"/>-->
<!-- 通用随访详情 --> <!-- 通用随访详情 -->
<CurrencyFUDetail :id="detailInfo.relationId" :resident-id="residentId" v-if="showCommon"></CurrencyFUDetail> <CurrencyFUDetail :id="detailInfo.relationId" :resident-id="residentId" v-if="showCommon"></CurrencyFUDetail>
<!-- 专病随访详情 -->
<!-- <VisitDetail :id="detailInfo.relationId" :resident-id="residentId" :disease-type="diseaseType" v-else-if="showFU"></VisitDetail>-->
<!-- his --> <!-- his -->
<!-- <HisDetail :info="detailInfo" v-else-if="showHis"></HisDetail>--> <!-- <HisDetail :info="detailInfo" v-else-if="showHis"></HisDetail>-->
<!-- 报卡随访详情 --> <!-- 报卡随访详情 -->
......
src/doctor/patientDetail/components/generalFU/List.vue
View file @ 3c913b28
...@@ -123,14 +123,15 @@ export default { ...@@ -123,14 +123,15 @@ export default {
}, },
toDetail(record) { toDetail(record) {
if (!record) return if (!record) return
if (record.id == null) { if (record.relationUuid == null) {
this.$message.info('暂时无法查看 详情信息') this.$message.info('暂时无法查看 详情信息')
return return
} }
this.$router.push({ this.$router.push({
path: '/doctor/followUp/generalFU/detail', path: '/doctor/followUp/detail',
query: { query: {
relationId: record.id relationUuid: record.relationUuid,
residentInfoId: this.residentInfoId,
} }
}) })
}, },
......
src/doctor/screening/second/FormCont.vue
View file @ 3c913b28
...@@ -176,6 +176,7 @@ ...@@ -176,6 +176,7 @@
placeholder='请选择' placeholder='请选择'
class='input-back mt-2 form-input' class='input-back mt-2 form-input'
@click='showExerciseFrequency = true' @click='showExerciseFrequency = true'
:rules='rules.exerciseFrequencyName'
> >
<template #input> <template #input>
<span class='text-end' v-if='form.exerciseFrequencyName'>{{ form.exerciseFrequencyName }}</span> <span class='text-end' v-if='form.exerciseFrequencyName'>{{ form.exerciseFrequencyName }}</span>
...@@ -478,6 +479,7 @@ ...@@ -478,6 +479,7 @@
placeholder='请选择' placeholder='请选择'
class='input-back mt-2 form-input' class='input-back mt-2 form-input'
@click='showDietaryHabit= true' @click='showDietaryHabit= true'
:rules='rules.dietaryHabitName'
> >
<template #input> <template #input>
<span class='text-end' v-if='form.dietaryHabitName'>{{ form.dietaryHabitName }}</span> <span class='text-end' v-if='form.dietaryHabitName'>{{ form.dietaryHabitName }}</span>
...@@ -509,7 +511,8 @@ ...@@ -509,7 +511,8 @@
<div class='label-title lh-24'>饮酒频率</div> <div class='label-title lh-24'>饮酒频率</div>
<van-field <van-field
class='form-input mt-2' class='form-input mt-2'
style='padding: 0' style='padding: 0;background: #FAFAFA'
:rules='rules.drinkFrequency'
> >
<template #input> <template #input>
<van-radio-group v-model='form.drinkFrequency' <van-radio-group v-model='form.drinkFrequency'
...@@ -531,7 +534,8 @@ ...@@ -531,7 +534,8 @@
<div class='label-title lh-24'>饮酒种类</div> <div class='label-title lh-24'>饮酒种类</div>
<van-field <van-field
class='form-input mt-2' class='form-input mt-2'
style='padding: 0' style='padding: 0;background: #F5F5F5'
:rules='rules.drinkKind'
> >
<template #input> <template #input>
<div class='flex justify-between gap-x-2.5 w-full' style='background: #F5F5F5'> <div class='flex justify-between gap-x-2.5 w-full' style='background: #F5F5F5'>
...@@ -604,6 +608,7 @@ ...@@ -604,6 +608,7 @@
placeholder='请输入' placeholder='请输入'
class='mt-2' class='mt-2'
style='padding: 8px;border-radius: 4px' style='padding: 8px;border-radius: 4px'
:rules='rules.startDrinkAge'
> >
<template #extra> <template #extra>
<span class='mr-2'>岁</span> <span class='mr-2'>岁</span>
...@@ -615,7 +620,8 @@ ...@@ -615,7 +620,8 @@
<div class='label-title lh-24'>是否戒酒</div> <div class='label-title lh-24'>是否戒酒</div>
<van-field <van-field
class='form-input mt-2' class='form-input mt-2'
style='padding: 0' style='padding: 0;background: #F5F5F5'
:rules='rules.giveDrink'
> >
<template #input> <template #input>
<van-radio-group v-model='form.giveDrink' <van-radio-group v-model='form.giveDrink'
...@@ -641,6 +647,7 @@ ...@@ -641,6 +647,7 @@
placeholder='请输入' placeholder='请输入'
class='mt-2' class='mt-2'
style='padding: 8px;border-radius: 4px' style='padding: 8px;border-radius: 4px'
:rules='rules.giveDrinkStart'
> >
<template #extra> <template #extra>
<span class='mr-2'>岁</span> <span class='mr-2'>岁</span>
...@@ -656,7 +663,8 @@ ...@@ -656,7 +663,8 @@
<div class='label-title lh-24'>吸烟情况</div> <div class='label-title lh-24'>吸烟情况</div>
<van-field <van-field
class='form-input mt-2' class='form-input mt-2'
style='padding: 0' style='padding: 0;background: #FAFAFA'
:rules='rules.isSmoking'
> >
<template #input> <template #input>
<van-radio-group v-model='form.isSmoking' <van-radio-group v-model='form.isSmoking'
...@@ -680,6 +688,7 @@ ...@@ -680,6 +688,7 @@
placeholder='请输入' placeholder='请输入'
class='mt-2' class='mt-2'
style='padding: 8px;border-radius: 4px' style='padding: 8px;border-radius: 4px'
:rules='rules.daySmoking'
> >
</van-field> </van-field>
</div> </div>
...@@ -691,6 +700,7 @@ ...@@ -691,6 +700,7 @@
placeholder='请输入' placeholder='请输入'
class='mt-2' class='mt-2'
style='padding: 8px;border-radius: 4px' style='padding: 8px;border-radius: 4px'
:rules='rules.startSmoking'
> >
<template #extra> <template #extra>
<span class='mr-2'>岁</span> <span class='mr-2'>岁</span>
...@@ -706,6 +716,7 @@ ...@@ -706,6 +716,7 @@
placeholder='请输入' placeholder='请输入'
class='mt-2' class='mt-2'
style='padding: 8px;border-radius: 4px' style='padding: 8px;border-radius: 4px'
:rules='rules.giveSmokingAge'
> >
<template #extra> <template #extra>
<span class='mr-2'>岁</span> <span class='mr-2'>岁</span>
...@@ -717,7 +728,8 @@ ...@@ -717,7 +728,8 @@
<div class='label-title lh-24'>经常吸入二手烟（家中有吸烟者，且经常吸入二手烟）</div> <div class='label-title lh-24'>经常吸入二手烟（家中有吸烟者，且经常吸入二手烟）</div>
<van-field <van-field
class='form-input mt-2' class='form-input mt-2'
style='padding: 0' style='padding: 0;background: #F5F5F5'
:rules='rules.secondSmoking'
> >
<template #input> <template #input>
<van-radio-group v-model='form.secondSmoking' <van-radio-group v-model='form.secondSmoking'
...@@ -1677,6 +1689,7 @@ export default { ...@@ -1677,6 +1689,7 @@ export default {
} }
list = Array.from(new Set(list)) list = Array.from(new Set(list))
this.specialScreenResultSelect = list this.specialScreenResultSelect = list
// this.form.specialScreenResult = this.specialScreenResultSelect
}, },
//清洗右侧高危选项表单 //清洗右侧高危选项表单
cleanFormRight() { cleanFormRight() {
...@@ -2462,6 +2475,7 @@ export default { ...@@ -2462,6 +2475,7 @@ export default {
this.specialScreenResultSelect.push(val.value) this.specialScreenResultSelect.push(val.value)
} }
this.specialScreenResultSelect = this.checkboxReject(this.specialScreenResultSelect, [9]) this.specialScreenResultSelect = this.checkboxReject(this.specialScreenResultSelect, [9])
// this.form.specialScreenResult = this.specialScreenResultSelect
}, },
//提交 //提交
onSubmit() { onSubmit() {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment