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

 Conflicts:
	src/doctor/Doctor.vue

src/doctor/components/docImageUpload/DocImageUpload.vue

@@ -15,11 +15,11 @@
                 <DocImage isPdf :src='item.trueDownloadUrl' name='pdf文件名称' remove @onRemove='removeImage(item)' />
             </div>
         </div>
+        <!-- accept='.jpg,.jpeg,.png,.pdf' -->
         <input type='file'
-               accept='.jpg,.jpeg,.png,.pdf'
+               accept="image/*"
                ref='fileElem'
                style='display: none;'
-               capture='environment'
                @change='handleFiles'
                :key='inputKey'>
 

src/doctor/components/docNavBar/DocNavBar.vue

@@ -43,7 +43,7 @@ export default {
 <style lang="less" scoped>
 .doc-nav-bar {
     background: transparent;
-    border-bottom: 1px solid #c0ccdf;
+    border-bottom: 1px solid #00000019;
     .left {
         min-width: 24px;
     }

src/doctor/patientDetail/PatientDetail.vue

@@ -21,7 +21,7 @@
                     </div>
                     <div class="flex">
                         <span class="label shrink-0">人群标签</span>
-                        <span class="grow">{{ residentInfo.groupsArraysName || '-' }}</span>
+                        <span class="grow text-wrap">{{ residentInfo.groupsArraysName || '-' }}</span>
                     </div>
                     <div>
                         <span class="label">联系电话</span>
@@ -71,10 +71,11 @@
             <van-popup
                 v-model:show="addVisible"
                 position="bottom"
+                :style="{ height: '30%' }"
             >
                 <div class="popup-bottom-panel">
                     <div class="p-4 text-16 flex items-center justify-between"
-                        style="border-bottom: 1px solid #c0ccdf;">
+                        style="border-bottom: 1px solid #00000019;">
                         <span class="left" @click="addVisible = false">取消</span>
                         <span class="font-semibold">请选择</span>
                         <span class="right" style="width: .32rem;"></span>
@@ -222,7 +223,7 @@ export default {
     bottom: 0;
     left: 16px;
     right: 16px;
-    border-bottom: 1px solid #c0ccdf;
+    border-bottom: 1px solid #00000019;
     .svg-icon {
         transform: rotate(90deg);
     }

src/doctor/patientDetail/components/generalFU/List.vue

@@ -10,7 +10,7 @@
                 @load='onMore'
             >
                 <div class="flex flex-col">
-                    <div v-for='item in list' :key="item.id"
+                    <div v-for='item in list' :key="item.id" @click="toDetail(item)"
                         class="flex flex-col gap-y-2.5 py-3 px-4 mb-3 doc-list-card">
                         <div>
                             <span class="label">随访日期</span>

src/doctor/search/Search.vue

@@ -61,9 +61,9 @@
                         <span>{{ result.highTagsArrayName || '-' }}</span>
                     </div> -->
                     <div class="flex mb-2">
-                        <span class="shrink-0 label">慢病标签</span>
-                        <ChronicTag :list="result.chronicTagsArray"/>
-                        <!-- <span>{{ result.chronicTagsArrayName }}</span> -->
+                        <span class="shrink-0 label">人群标签</span>
+                        <!-- <chronic-tag :list="result.chronicTagsArray" /> -->
+                        <span class="grow text-wrap">{{ result.groupsArraysName }}</span>
                     </div>
                     <div class="text-12 tip">
                         <div style="color: #A5AEBE;" >提示：</div>
@@ -105,12 +105,11 @@ import { getResidentByPage } from '@/api/doctor/resident.js'
 import { validateIdCard } from '@/utils/commonReg.js'
 import { setLocalStorage, getLocalStorage } from '@/utils/common.js'
 import { showFailToast } from 'vant'
-import ChronicTag from '@/doctor/components/chronicTag/ChronicTag.vue'
+// import ChronicTag from '@/doctor/components/chronicTag/ChronicTag.vue'
 import IdCardScan from '@/doctor/components/idCardScan/IdCardScan.vue'
 
 export default {
     components: {
-        ChronicTag,
         IdCardScan
     },
     data() {

src/doctor/workbench/tables/FirstScreen.vue

@@ -19,12 +19,12 @@
                 >
                     <div class="flex flex-col gap-y-2.5">
                         <div class="py-3 px-4 doc-list-card" v-for='item in list' :key="item.id">
-                            <div class="mb-4">
+                            <div class="mb-4" @click="toDetail(item)">
                                 <span class="name mr-2">{{ item.residentName }}</span>
                                 <span class="tag mr-2">{{ item.currentAge }}岁</span>
                                 <span class="tag mr-2">{{ item.genderName }}</span>
                             </div>
-                            <div class="flex flex-col gap-y-2.5">
+                            <div class="flex flex-col gap-y-2.5" @click="toDetail(item)">
                                 <div>
                                     <span class="label">身份证号</span>
                                     <span>{{ item.idCard }}</span>

src/doctor/workbench/tables/HighRisk.vue

@@ -23,12 +23,12 @@
                 >
                     <div class="flex flex-col gap-y-2.5">
                         <div class="py-3 px-4 doc-list-card" v-for='item in list' :key="item.id">
-                            <div class="mb-4">
+                            <div class="mb-4" @click="toDetail(item)">
                                 <span class="name mr-2">{{ item.residentName }}</span>
                                 <span class="tag mr-2">{{ item.currentAge }}岁</span>
                                 <span class="tag mr-2">{{ item.genderName || '-' }}</span>
                             </div>
-                            <div class="flex flex-col gap-y-2.5">
+                            <div class="flex flex-col gap-y-2.5" @click="toDetail(item)">
                                 <div>
                                     <span class="label">身份证号</span>
                                     <span>{{ item.idCard }}</span>

src/doctor/workbench/tables/Receive.vue

@@ -19,12 +19,12 @@
                 >
                     <div class="flex flex-col gap-y-2.5">
                         <div class="py-3 px-4 doc-list-card" v-for='item in list' :key="item.id">
-                            <div class="mb-4">
+                            <div class="mb-4" @click="toDetail(item)">
                                 <span class="name mr-2">{{ item.residentName }}</span>
                                 <span class="tag mr-2">{{ item.age }}岁</span>
                                 <span class="tag mr-2">{{ item.genderName }}</span>
                             </div>
-                            <div class="flex flex-col gap-y-2.5">
+                            <div class="flex flex-col gap-y-2.5" @click="toDetail(item)">
                                 <div>
                                     <span class="label">转出单位</span>
                                     <span>{{ item.outUnitName }}</span>

src/doctor/workbench/tables/Visit.vue

@@ -23,12 +23,12 @@
                 >
                     <div class="flex flex-col gap-y-2.5">
                         <div class="py-3 px-4 doc-list-card" v-for='item in list' :key="item.id">
-                            <div class="mb-4">
+                            <div class="mb-4" @click="toDetail(item)">
                                 <span class="name mr-2">{{ item.residentName }}</span>
                                 <span class="tag mr-2">{{ item.age }}岁</span>
                                 <span class="tag mr-2">{{ item.genderName || '-' }}</span>
                             </div>
-                            <div class="flex flex-col gap-y-2.5">
+                            <div class="flex flex-col gap-y-2.5" @click="toDetail(item)">
                                 <div>
                                     <span class="label">身份证号</span>
                                     <span>{{ $idCardHide(item.idCard) }}</span>

src/doctor/workbench/tables/Work.vue

@@ -19,12 +19,12 @@
                 >
                     <div class="flex flex-col gap-y-2.5">
                         <div class="py-3 px-4 doc-list-card" v-for='item in list' :key="item.id">
-                            <div class="mb-4">
+                            <div class="mb-4" @click="toDetail(item)">
                                 <span class="name mr-2">{{ item.residentName }}</span>
                                 <span class="tag mr-2">{{ item.currentAge }}岁</span>
                                 <span class="tag mr-2">{{ item.genderName }}</span>
                             </div>
-                            <div class="flex flex-col gap-y-2.5">
+                            <div class="flex flex-col gap-y-2.5" @click="toDetail(item)">
                                 <div>
                                     <span class="label">身份证号</span>
                                     <span>{{ $idCardHide(item.idCard) || '-' }}</span>