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

src/doctor/followUp/generalFU/form/BaseInfo.vue

@@ -199,9 +199,10 @@
             </van-field>
             <van-popup v-model:show='showGroupsArrays' position='bottom'>
                 <div class='p-4'>
-                    <div class='flex justify-between mb-4'>
-                        <div class='greyColor' @click='showGroupsArrays = false'>取消</div>
-                        <div class='blueColor' @click='groupsArraysConfirm'>确认</div>
+                    <div class='flex justify-between items-center mb-4 pop-title'>
+                        <div class='greyColor' @click='showGroupsArrays = false' style='font-weight: 400'>取消</div>
+                        <div>随访人群（可多选）</div>
+                        <div class='blueColor' @click='groupsArraysConfirm'>确定</div>
                     </div>
                     <CheckBtn multiple :options='groupArrList' v-model:value='checkGroupsArrays' :fieldNames="{text: 'name', value: 'value'}"/>
                 </div>
@@ -228,9 +229,10 @@
             </div>
             <van-popup v-model:show='showVisitWay' position='bottom'>
                 <div class='p-4'>
-                    <div class='flex justify-between mb-4'>
-                        <div class='greyColor' @click='showVisitWay = false'>取消</div>
-                        <div class='blueColor' @click='visitWayConfirm'>确认</div>
+                    <div class='flex justify-between mb-4 items-center pop-title'>
+                        <div class='greyColor' @click='showVisitWay = false' style='font-weight: 400'>取消</div>
+                        <div>随访方式（仅单选）</div>
+                        <div class='blueColor' @click='visitWayConfirm'>确定</div>
                     </div>
                     <CheckBtn column-2 :options="store.getDict('CP00179')" v-model:value='checkVisitWay' :fieldNames="{text: 'name', value: 'value'}"/>
                 </div>
@@ -248,9 +250,10 @@
             />
             <van-popup v-model:show='showVisitWayRules' position='bottom'>
                 <div class='p-4'>
-                    <div class='flex justify-between mb-4'>
-                        <div class='greyColor' @click='showVisitWayRules = false'>取消</div>
-                        <div class='blueColor' @click='visitWayRulesConfirm'>确认</div>
+                    <div class='flex justify-between mb-4 items-center pop-title'>
+                        <div class='greyColor' @click='showVisitWayRules = false' style='font-weight: 400'>取消</div>
+                        <div>随访类型（可多选）</div>
+                        <div class='blueColor' @click='visitWayRulesConfirm'>确定</div>
                     </div>
                     <CheckBtn multiple column-2 :options='visitWayRulesList' v-model:value='checkVisitWayRules' :fieldNames="{text: 'name', value: 'value'}"/>
                 </div>
@@ -630,10 +633,17 @@ export default {
     color: var(--van-text-color-2);
 }
 
-//确认按钮颜色
+//确定按钮颜色
 .blueColor {
     color: var(--van-primary-color)
 }
+
+.pop-title {
+    color: #262626;
+    font-size: 16px;
+    line-height: 24px;
+    font-weight: bold;
+}
 :deep(.van-cell-group--inset) {
     overflow: visible;
 }

src/doctor/followUp/generalFU/form/GeneralFUForm.vue

@@ -63,9 +63,10 @@
                         </van-field>
                         <van-popup v-model:show='showPublicizeType' position='bottom'>
                             <div class='p-4'>
-                                <div class='flex justify-between mb-4'>
-                                    <div class='greyColor' @click='showPublicizeType = false'>取消</div>
-                                    <div class='blueColor' @click='publicizeTypeConfirm'>确认</div>
+                                <div class='flex justify-between mb-4 items-center pop-title'>
+                                    <div class='greyColor' @click='showPublicizeType = false' style='font-weight: 400'>取消</div>
+                                    <div>健康宣教（可多选）</div>
+                                    <div class='blueColor' @click='publicizeTypeConfirm'>确定</div>
                                 </div>
                                 <CheckBtn multiple column-3 :options="store.getDict('DC00091')"
                                           v-model:value='checkPublicizeType'
@@ -853,6 +854,22 @@ export default {
     text-align: left;
 }
 
+//灰色
+.greyColor {
+    color: var(--van-text-color-2);
+}
+
+//确定按钮颜色
+.blueColor {
+    color: var(--van-primary-color)
+}
+
+.pop-title {
+    color: #262626;
+    font-size: 16px;
+    line-height: 24px;
+    font-weight: bold;
+}
 :deep(.van-popup) {
     min-height: 30% !important;
 }

src/doctor/followUp/generalFU/form/GuideTextVideo.vue

@@ -34,9 +34,10 @@
                     </van-field>
                     <van-popup v-model:show='showContentSelect' position='bottom'>
                         <div class='p-4'>
-                            <div class='flex justify-between mb-4'>
-                                <div class='greyColor' @click='showContentSelect = false'>取消</div>
-                                <div class='blueColor' @click='contentSelectConfirm'>确认</div>
+                            <div class='flex justify-between mb-4 items-center pop-title'>
+                                <div class='greyColor' @click='showContentSelect = false' style='font-weight: 400'>取消</div>
+                                <div>{{contentTitle}}（可多选）</div>
+                                <div class='blueColor' @click='contentSelectConfirm'>确定</div>
                             </div>
                             <CheckBtn multiple column-2 :options='contentArray' v-model:value='checkContentSelect'
                                       :fieldNames="{text: 'name', value: 'value'}" />
@@ -606,8 +607,15 @@ export default {
     color: var(--van-text-color-2);
 }
 
-//确认按钮颜色
+//确定按钮颜色
 .blueColor {
     color: var(--van-primary-color)
 }
+
+.pop-title {
+    color: #262626;
+    font-size: 16px;
+    line-height: 24px;
+    font-weight: bold;
+}
 </style>
\ No newline at end of file

src/doctor/screening/detail/SecondDetail.vue

@@ -345,7 +345,7 @@
                                         <span>{{ info.giveDrinkName || '-'}}</span>
                                     </span>
                                 </div>
-                                <div class='flex justify-between py-1 border-bottom item'>
+                                <div class='flex justify-between py-1 border-bottom item' v-if="info.giveDrink == 1">
                                     <span class='shrink-0 mr-2 label'>戒酒年龄</span>
                                     <span class='text-end'>
                                         <span>{{ info.giveDrinkStart || '-'}} 岁</span>

src/residentWX/screening/detail/SecondDetail.vue

@@ -345,7 +345,7 @@
                                         <span>{{ info.giveDrinkName || '-'}}</span>
                                     </span>
                                 </div>
-                                <div class='flex justify-between py-1 border-bottom item'>
+                                <div class='flex justify-between py-1 border-bottom item' v-if="info.giveDrink == 1">
                                     <span class='shrink-0 mr-2 label'>戒酒年龄</span>
                                     <span class='text-end'>
                                         <span>{{ info.giveDrinkStart || '-'}} 岁</span>