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

src/api/doctor/workbench.js

@@ -32,7 +32,7 @@ export function getReceiveByPage(params) {
 
 // 待接诊列表 忽略
 export function ignoreReceive(params) {
-    return fetchBase({ url: `/chronic-admin/v1/chronic-referral-task/update`, body: params })
+    return fetchBase({ url: `/chronic-admin/v1/chronic-referral-task/update`, body: params, loading: true })
 }
 
 // 筛查高危记录表 初筛高危待复筛1 复筛高危待诊断2
@@ -47,5 +47,5 @@ export function getDiagnoseByPage(params) {
 
 // 待复筛和高危待诊断忽略
 export function addIgnoreRecord(params) {
-    return fetchBase({ url: `/chronic-admin/v1/chronic-ignore-record/save`, body: params })
+    return fetchBase({ url: `/chronic-admin/v1/chronic-ignore-record/save`, body: params, loading: true })
 }

src/doctor/screening/detail/FirstDetail.vue

@@ -10,7 +10,7 @@
             <div class="flex w-full">
                 <div class="grow flex flex-col justify-between">
                     <div class="flex justify-between">
-                        <span class="name">{{ userInfo.residentName }}</span>
+                        <span class="name">{{ collapseList[0].info.residentName }}</span>
                     </div>
                     <div class='lh-22'>
                         <div class='mt-3'>筛查日期：<span class='color-26'>{{ info.screenDate || '-' }}</span></div>
@@ -150,10 +150,7 @@ export default {
     computed: {
         id() {
             return this.$route.query.id
-        },
-        userInfo() {
-            return this.store.userInfo
-        },
+        }
     },
     created() {
         document.title = '筛查详情'

src/doctor/workbench/tables/FirstScreen.vue

@@ -239,7 +239,7 @@ export default {
                 ignoreType:2,
             }
             addIgnoreRecord(params).then(() => {
-                this.list = this.list.filter(e => e.id !== record.id)
+                this.list = this.list.filter(e => e.screenId !== record.screenId)
                 setTimeout(() => {
                     showToast('操作成功')
                 }, 800);