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

 Conflicts:
	src/doctor/Doctor.vue

src/doctor/Doctor.vue

@@ -152,6 +152,7 @@ export default {
     .bt-group {
         display: flex;
         justify-content: flex-end;
+        column-gap: 10px;
     }
 }
 

src/doctor/components/docNavBar/DocNavBar.vue

@@ -7,7 +7,7 @@
                 </span>
             </slot>
         </div>
-        <div class="grow text-center title">
+        <div class="grow text-center font-semibold title">
             <slot>
                 {{title}}
             </slot>

src/doctor/patientDetail/PatientDetail.vue

@@ -2,7 +2,7 @@
     <div class="h-full flex flex-col patient-detail">
         <DocNavBar title="居民详情" class="shrink-0">
             <template #right>
-                <span class="text-primary">新增</span>
+                <span class="text-primary" @click="() => addVisible = true">新增</span>
             </template>
         </DocNavBar>
         <div class="grow flex flex-col" style="background: #f5f5f5;min-height: 0px;">
@@ -12,7 +12,7 @@
                     <span class="name mr-2">{{ residentInfo.residentName || '-' }}</span>
                     <span class="tag mr-2">{{ residentInfo.currentAge || '-' }}岁</span>
                     <span class="tag mr-2">{{ residentInfo.genderName || '-' }}</span>
-                    <doc-icon type="doc-edit" class="text-primary" />
+                    <doc-icon type="doc-edit" class="text-primary" @click="toArchivesEdit"/>
                 </div>
                 <div class="flex flex-col gap-y-2.5">
                     <div>
@@ -60,6 +60,24 @@
             <div class="grow py-3 px-2" style="min-height: 0px;" v-if="residentInfo.id">
                 <ScreeningList v-if="activeTabItem.id === 'SCREENING'"/>
             </div>
+            <van-popup
+                v-model:show="addVisible"
+                position="bottom"
+            >
+                <div class="popup-bottom-panel">
+                    <div class="p-4 text-16 flex items-center justify-between"
+                        style="border-bottom: 1px solid #c0ccdf;">
+                        <span class="left" @click="addVisible = false">取消</span>
+                        <span class="font-semibold">请选择</span>
+                        <span class="right" style="width: .32rem;"></span>
+                    </div>
+                    <div class="p-4">
+                        <CheckBtn :options="addOptions"
+                            @change="onAddChange" column-1 />
+                        <div class="pb-4"></div>
+                    </div>
+                </div>
+            </van-popup>
         </div>
     </div>
 </template>
@@ -70,12 +88,14 @@ import ChronicTag from '@/doctor/components/chronicTag/ChronicTag.vue'
 import { queryResidentInfo } from '@/api/doctor/resident.js'
 import { showNotify } from 'vant'
 import ScreeningList from './components/screening/Index.vue'
+import CheckBtn from '@/doctor/components/checkBtn/CheckBtn.vue'
 
 export default {
     components: {
         DocNavBar,
         ChronicTag,
-        ScreeningList
+        ScreeningList,
+        CheckBtn
     },
     data() {
         return {
@@ -83,7 +103,12 @@ export default {
             // 折叠
             collapsed: true,
             // 标签页index
-            activeTab: 0
+            activeTab: 0,
+            // 新增弹窗
+            addVisible: false,
+            addOptions: [
+                { name: '新增通用随访', value: 1, path: '/doctor/followUp/generalFU/add' }
+            ]
         }
     },
     provide() {
@@ -134,6 +159,20 @@ export default {
             queryResidentInfo({ residentInfoId: this.residentInfoId }).then(res => {
                 this.residentInfo = res.data || {}
             })
+        },
+        onAddChange(val, option) {
+            console.log(val, option)
+            this.addVisible = false
+            this.$router.push({
+                path: option.path,
+                query: { residentInfoId: this.residentInfoId }
+            })
+        },
+        toArchivesEdit() {
+            this.$router.push({
+                path: '/doctor/archives-form',
+                query: { residentInfoId: this.residentInfoId }
+            })
         }
     }
 }

src/doctor/patientDetail/components/screening/Record.vue

@@ -32,6 +32,14 @@
                     <span class="label">创建时间</span>
                     <span>{{ item.created }}</span>
                 </div>
+                <div class="divider"></div>
+                <div class="bt-group">
+                    <van-button round size="small" class="doc-btn-primary" @click="toDetail(item)">详情</van-button>
+                    <van-button round size="small" class="doc-btn-primary" @click='editBtn(item)'
+                        v-if="record.allowUpdate == 1">修改</van-button>
+                    <van-button round size="small" class="doc-btn-red" @click="delBtn(item)"
+                        v-if="record.allowDelete ==1">删除</van-button>
+                </div>
             </div>
         </div>
         <div v-for="item in secondScreenList" :key="item.id"
@@ -66,6 +74,14 @@
                     <span class="label">创建时间</span>
                     <span>{{ item.created }}</span>
                 </div>
+                <div class="divider"></div>
+                <div class="bt-group">
+                    <van-button round size="small" class="doc-btn-primary" @click="toDetail(item)">详情</van-button>
+                    <van-button round size="small" class="doc-btn-primary" @click='editBtn(item)'
+                        v-if="record.allowUpdate == 1">修改</van-button>
+                    <van-button round size="small" class="doc-btn-red" @click="delBtn(item)"
+                        v-if="record.allowUpdate == 1">删除</van-button>
+                </div>
             </div>
         </div>
         <div class='text-center shrink-0 empty' v-if='!firstScreenList.length && !secondScreenList.length'>
@@ -101,7 +117,17 @@ export default {
                 this.firstScreenList = result.firstScreenList || []
                 this.secondScreenList = result.secondScreenList || []
             })
+        },
+        toDetail() {
+
+        },
+        editBtn() {
+
+        },
+        delBtn() {
+
         }
+        
     }
 }
 </script>

src/doctor/patientDetail/components/screening/Visit.vue

@@ -36,10 +36,14 @@
                                 <span class="label">随访机构</span>
                                 <span>{{ item.visitUnitName || '-' }}</span>
                             </div>
-                            <!-- <div class="divider"></div>
+                            <div class="divider"></div>
                             <div class="bt-group">
                                 <van-button round size="small" class="doc-btn-primary" @click="toDetail(item)">详情</van-button>
-                            </div> -->
+                                <van-button round size="small" class="doc-btn-primary" @click='editBtn(item)'
+                                    v-if="!(item.allowUpdate !==1 || item.serveType == 3)">修改</van-button>
+                                <van-button round size="small" class="doc-btn-red" @click="delBtn(item)"
+                                    v-if="!(item.allowUpdate !==1 || item.serveType == 3)">删除</van-button>
+                            </div>
                         </div>
                     </div>
                 </div>
@@ -128,6 +132,12 @@ export default {
             //         residentInfoId: record.residentInfoId
             //     }
             // })
+        },
+        editBtn() {
+
+        },
+        delBtn() {
+
         }
     }
 }

src/doctor/workbench/tables/Visit.vue

@@ -58,9 +58,7 @@
                             <div class="divider my-3"></div>
                             <div class="bt-group">
                                 <van-button round size="small" class="doc-btn-primary" @click="toDetail(item)">详情</van-button>
-                                <span class="mr-3"></span>
                                 <van-button round size="small" class="doc-btn-primary" @click='toAddGeneral(item)'>通用随访</van-button>
-                                <span class="mr-3"></span>
                                 <van-button round size="small" class="doc-btn-primary" @click="onIgnore(item)">忽略</van-button>
                             </div>
                         </div>

src/router/index.js

@@ -55,6 +55,11 @@ const routes = [
                 name: 'doctor-patient-detail',
                 component: () => import(/* webpackChunkName: "doctor" */ '@/doctor/patientDetail/PatientDetail.vue')
             },
+            {
+                path: 'archives-form',
+                name: 'doctor-archives-form',
+                component: () => import(/* webpackChunkName: "doctor" */ '@/doctor/archives/form/BaseInfo.vue')
+            },
 
             
             {