居民端小程序筛查、随访、指导样式重新优化

1e9dc508 · gengchunlei · eef79a76 · 1e9dc508 · 1e9dc508 · 1e9dc508
Commit 1e9dc508 authored Nov 07, 2024 by gengchunlei
14 changed files
--- a/src/residentWX/ResidentWX.vue
+++ b/src/residentWX/ResidentWX.vue
@@ -78,7 +78,7 @@ export default {
                window.sessionStorage.setItem('userInfo', JSON.stringify(user.data))
            } else {
                let user = JSON.parse(window.sessionStorage.getItem('userInfo'))
-                this.store.$patch({ userInfo: user.data || {} })
+                this.store.$patch({ userInfo: user || {} })
            }
            this.visible = true
        }

--- a/src/residentWX/guide/Detail.vue
+++ b/src/residentWX/guide/Detail.vue
@@ -26,7 +26,7 @@
        <div class="p-3 grow cont-box">
            <div class="p-3 h-full cont-inner">
                <div class="flex justify-between collapse-head">
-                    <span class="text-16">全部内容</span>
+                    <span class="text-16 font-semibold">全部内容</span>
                    <!-- <span @click="toggleAll">
                        <span v-if="!collapseAll">展开全部</span>
                        <span v-else>展开收起</span>

--- a/src/residentWX/screening/detail/FirstDetail.vue
+++ b/src/residentWX/screening/detail/FirstDetail.vue
@@ -23,7 +23,7 @@
        <div class="p-3 grow cont-box">
            <div class="p-3 h-full cont-inner">
                <div class="flex justify-between collapse-head">
-                    <span class="text-16">全部内容</span>
+                    <span class="text-16 font-semibold">全部内容</span>
                    <span @click="toggleAll">
                        <span v-if="!collapseAll">展开全部</span>
                        <span v-else>展开收起</span>

--- a/src/residentWX/screening/detail/SecondDetail.vue
+++ b/src/residentWX/screening/detail/SecondDetail.vue
@@ -36,7 +36,7 @@
        <div class='p-3 grow cont-box'>
            <div class='p-3 h-full cont-inner'>
                <div class='flex justify-between collapse-head'>
-                    <span class='text-16'>全部内容</span>
+                    <span class='text-16 font-semibold'>全部内容</span>
                    <span @click='toggleAll'>
                        <span v-if='!collapseAll'>展开全部</span>
                        <span v-else>展开收起</span>

--- a/src/residentWX/utils/common.less
+++ b/src/residentWX/utils/common.less
@@ -34,6 +34,7 @@
    .van-cell {
        padding: .1rem 0;
        color: #8C8C8C;
+        font-weight: 600;
        background: transparent;
        &::after {
            display: none;

--- a/src/residentWX/visit/detail/GeneralFUDetail.vue
+++ b/src/residentWX/visit/detail/GeneralFUDetail.vue
@@ -26,7 +26,7 @@
        <div class='p-3 grow cont-box'>
            <div class='p-3 h-full cont-inner'>
                <div class='flex justify-between collapse-head'>
-                    <span class='text-16'>全部内容</span>
+                    <span class='text-16 font-semibold'>全部内容</span>
                    <span @click='toggleAll'>
                        <span v-if='!collapseAll'>展开全部</span>
                        <span v-else>收起全部</span>
@@ -56,67 +56,46 @@
                            </div>
                        </div>
                    </van-collapse-item>
-                    <van-collapse-item key='2' title='本次随访情况' name='2'>
+                    <van-collapse-item key='2' title='随访人群' name='2'>
                        <template #right-icon>
                            <doc-icon type='doc-down' />
                        </template>
                        <div class='list'>
                            <div class='flex justify-between py-1 border-bottom item'>
-                                <span class='shrink-0 mr-2 label'>本次随访情况</span>
+                                <span class='shrink-0 mr-2 label'>随访人群</span>
                                <span class='text-end'>
-                                        <span>{{ info.visitSituationName || '-' }}</span>
+                                        <span>{{ info.groupsArraysName || '-' }}</span>
                                    </span>
                            </div>
                        </div>
                    </van-collapse-item>
-                    <van-collapse-item key='3' title='失访原因' name='3' v-if='info.visitSituation == 2'>
+                    <van-collapse-item key='5' title='随访方式' name='3'>
                        <template #right-icon>
                            <doc-icon type='doc-down' />
                        </template>
                        <div class='list'>
                            <div class='flex justify-between py-1 border-bottom item' >
-                                <span class='shrink-0 mr-2 label'>失访原因</span>
+                                <span class='shrink-0 mr-2 label'>随访方式</span>
-                                <span class='text-end'>
-                                        <span v-if='info.lossReason != 9'>{{ info.lossReasonName || '-' }}</span>
-                                        <span v-if='info.lossReason == 9'>{{ info.lossReasonOther || '-' }}</span>
-                                    </span>
-                            </div>
-                        </div>
-                    </van-collapse-item>
-                    <van-collapse-item key='4' title='死亡原因' name='4' v-if="info.lossReason == 3">
-                        <template #right-icon>
-                            <doc-icon type='doc-down' />
-                        </template>
-                        <div class='list'>
-                            <div class='flex justify-between py-1 border-bottom item' >
-                                <span class='shrink-0 mr-2 label'>死亡原因</span>
                                <span class='text-end'>
-                                        <span>{{ info.deathReason || '-' }}</span>
+                                        <span>{{ info.visitWayName || '-' }}</span>
                                    </span>
                            </div>
                        </div>
                    </van-collapse-item>
-                    <van-collapse-item key='5' title='随访方式' name='5' v-if="info.visitSituation == 1">
+                    <van-collapse-item key='2' title='随访类型' name='4'>
                        <template #right-icon>
                            <doc-icon type='doc-down' />
                        </template>
                        <div class='list'>
-                            <div class='flex justify-between py-1 border-bottom item' >
+                            <div class='flex justify-between py-1 border-bottom item'>
-                                <span class='shrink-0 mr-2 label'>随访方式</span>
+                                <span class='shrink-0 mr-2 label'>随访类型</span>
-                                <span class='text-end'>
-                                        <span>{{ detailInfo.followUpWayName || '-' }}</span>
-                                    </span>
-                            </div>
-                            <div class='flex justify-between py-1 border-bottom item'  v-if="info.visitSituation == 1 && (info.visitWay == 3 || info.visitWay == 4)">
-                                <span class='shrink-0 mr-2 label'>是否发送</span>
                                <span class='text-end'>
-                                      <span v-if="info.isSms">{{ info.isSmsName || '-'}}</span>
+                                        <span>{{ info.visitWayRulesName || '-' }}</span>
-                                      <span v-if="info.isWx">{{info.isWxName || '-'}}</span>
                                    </span>
                            </div>
                        </div>
                    </van-collapse-item>
-                    <van-collapse-item key='6' title='随访内容' name='6' v-if="showOne && info.visitSituation == 1">
+                    <van-collapse-item key='6' title='随访内容' name='6' v-if="showOne">
                        <template #right-icon>
                            <doc-icon type='doc-down' />
                        </template>
@@ -129,7 +108,7 @@
                            </div>
                        </div>
                    </van-collapse-item>
-                    <van-collapse-item key='7' title='处置意见' name='7' v-if="showOne && info.visitSituation == 1">
+                    <van-collapse-item key='7' title='处置意见' name='7' v-if="showOne">
                        <template #right-icon>
                            <doc-icon type='doc-down' />
                        </template>
@@ -142,7 +121,7 @@
                            </div>
                        </div>
                    </van-collapse-item>
-                    <van-collapse-item key="8" title='健康指导' name="8" v-if="(showOne || showTwo) && info.visitSituation == 1">
+                    <van-collapse-item key="8" title='健康指导' name="8" v-if="showOne || showTwo">
                        <template #right-icon>
                            <doc-icon type="doc-down" />
                        </template>
@@ -158,7 +137,7 @@
                            </div>
                        </div>
                    </van-collapse-item>
-                    <van-collapse-item key="9" title='宣教内容' name="9" v-if="showThree && info.visitSituation == 1">
+                    <van-collapse-item key="9" title='宣教内容' name="9" v-if="showThree">
                        <template #right-icon>
                            <doc-icon type="doc-down" />
                        </template>
@@ -180,7 +159,7 @@
                            </div>
                        </div>
                    </van-collapse-item>
-                    <van-collapse-item key='10' title='催检内容' name='10' v-if="showFour && info.visitSituation == 1">
+                    <van-collapse-item key='10' title='催检内容' name='10' v-if="showFour">
                        <template #right-icon>
                            <doc-icon type='doc-down' />
                        </template>
@@ -193,7 +172,7 @@
                            </div>
                        </div>
                    </van-collapse-item>
-                    <van-collapse-item key='11' title='上传随访记录' name='11' v-if="showOne && info.visitSituation == 1">
+                    <van-collapse-item key='11' title='上传随访记录' name='11' v-if="showOne">
                        <template #right-icon>
                            <doc-icon type='doc-down' />
                        </template>
@@ -203,7 +182,7 @@
                            </div>
                        </div>
                    </van-collapse-item>
-                    <van-collapse-item key='12' title='现场随访照片' name='12' v-if="showOne && info.visitSituation == 1">
+                    <van-collapse-item key='12' title='现场随访照片' name='12' v-if="showOne">
                        <template #right-icon>
                            <doc-icon type='doc-down' />
                        </template>
@@ -248,16 +227,13 @@ export default {
        return {
            activeCollapse: [],
            detailInfo: {
-                visitWayRulesT: [],
                publicizeType: [],
-                followUpWayName: ''
            },
            collapseList: [
                { title: '居民信息', name: '1'},
-                { title: '本次随访情况', name: '2'},
+                { title: '随访人群', name: '2'},
-                { title: '失访原因', name: '3'},
+                { title: '随访方式', name: '3'},
-                { title: '死亡原因', name: '4'},
+                { title: '随访类型', name: '4'},
-                { title: '随访方式', name: '5'},
                { title: '随访内容', name: '6'},
                { title: '处置意见', name: '7'},
                { title: '健康指导', name: '8'},
@@ -299,40 +275,36 @@ export default {
        },
        //复检
        showOne() {
-            const {visitWayRulesT = []} = this.detailInfo
+            const {visitWayRules = []} = this.info
            let res = false
-            if (visitWayRulesT.includes('1-1') || visitWayRulesT.includes('1-2') || visitWayRulesT.includes('1-3') ||
+            if (visitWayRules.includes(1)) {
-                visitWayRulesT.includes('1-4') || visitWayRulesT.includes('1-5') || visitWayRulesT.includes('1-6')) {
                res = true
            }
            return res
        },
        //指导
        showTwo() {
-            const {visitWayRulesT = []} = this.detailInfo
+            const {visitWayRules = []} = this.info
            let res = false
-            if (visitWayRulesT.includes('2-1') || visitWayRulesT.includes('2-2') || visitWayRulesT.includes('2-3') ||
+            if (visitWayRules.includes(2)) {
-                visitWayRulesT.includes('2-4') || visitWayRulesT.includes('2-5') || visitWayRulesT.includes('2-6')) {
                res = true
            }
            return res
        },
        //宣教
        showThree() {
-            const {visitWayRulesT = []} = this.detailInfo
+            const {visitWayRules = []} = this.info
            let res = false
-            if (visitWayRulesT.includes('3-1') || visitWayRulesT.includes('3-2') || visitWayRulesT.includes('3-3') ||
+            if (visitWayRules.includes(3)) {
-                visitWayRulesT.includes('3-4') || visitWayRulesT.includes('3-5') || visitWayRulesT.includes('3-6')) {
                res = true
            }
            return res
        },
        //催检
        showFour() {
-            const {visitWayRulesT = []} = this.detailInfo
+            const {visitWayRules = []} = this.info
            let res = false
-            if (visitWayRulesT.includes('4-1') || visitWayRulesT.includes('4-2') || visitWayRulesT.includes('4-3') ||
+            if (visitWayRules.includes(4)) {
-                visitWayRulesT.includes('4-4') || visitWayRulesT.includes('4-5') || visitWayRulesT.includes('4-6')) {
                res = true
            }
            return res
@@ -378,21 +350,10 @@ export default {
        },
        //数据处理
        dataHandle() {
-            const {visitWay, visitWayRules, publicizeType, visitWayName, visitWayRulesName} = this.info
+            const {publicizeType, visitWayName, visitWayRulesName} = this.info
-            let visitWayRulesT = []
-            if (visitWay && visitWayRules) {
-                let resList = []
-                let list = visitWayRules.split(',')
-                list.forEach(item => {
-                    resList.push(`${item}-${visitWay}`)
-                })
-                visitWayRulesT = resList
-                this.detailInfo.visitWayRulesT = visitWayRulesT
                if (publicizeType) {
                    this.detailInfo.publicizeType = publicizeType.split(',').map(item => Number(item))
                }
-                this.detailInfo.followUpWayName = visitWayName+ '-'+visitWayRulesName.replace(",","/")
-            }
        },
        // 折叠面板切换
        collapseChange(val) {

--- a/src/residentWX/visit/detail/components/AbnormalBloodLipidsDetail.vue
+++ b/src/residentWX/visit/detail/components/AbnormalBloodLipidsDetail.vue
@@ -2,7 +2,7 @@
    <div class="p-3 grow cont-box">
        <div class="p-3 h-full cont-inner">
            <div class="flex justify-between collapse-head">
-                <span class="text-16">全部内容</span>
+                <span class="text-16 font-semibold">全部内容</span>
                <span @click="toggleAll">
                    <span v-if="!collapseAll">展开全部</span>
                    <span v-else>收起全部</span>

--- a/src/residentWX/visit/detail/components/CerebralApoplexyDetail.vue
+++ b/src/residentWX/visit/detail/components/CerebralApoplexyDetail.vue
@@ -2,7 +2,7 @@
    <div class="p-3 grow cont-box">
        <div class="p-3 h-full cont-inner">
            <div class="flex justify-between collapse-head">
-                <span class="text-16">全部内容</span>
+                <span class="text-16 font-semibold">全部内容</span>
                <span @click="toggleAll">
                    <span v-if="!collapseAll">展开全部</span>
                    <span v-else>收起全部</span>

--- a/src/residentWX/visit/detail/components/ChronicKidneyDiseaseDetail.vue
+++ b/src/residentWX/visit/detail/components/ChronicKidneyDiseaseDetail.vue
@@ -2,7 +2,7 @@
    <div class="p-3 grow cont-box">
        <div class="p-3 h-full cont-inner">
            <div class="flex justify-between collapse-head">
-                <span class="text-16">全部内容</span>
+                <span class="text-16 font-semibold">全部内容</span>
                <span @click="toggleAll">
                    <span v-if="!collapseAll">展开全部</span>
                    <span v-else>收起全部</span>

--- a/src/residentWX/visit/detail/components/CopdDetail.vue
+++ b/src/residentWX/visit/detail/components/CopdDetail.vue
@@ -2,7 +2,7 @@
    <div class="p-3 grow cont-box">
        <div class="p-3 h-full cont-inner">
            <div class="flex justify-between collapse-head">
-                <span class="text-16">全部内容</span>
+                <span class="text-16 font-semibold">全部内容</span>
                <span @click="toggleAll">
                    <span v-if="!collapseAll">展开全部</span>
                    <span v-else>收起全部</span>

--- a/src/residentWX/visit/detail/components/CoronaryHeartDiseaseDetail.vue
+++ b/src/residentWX/visit/detail/components/CoronaryHeartDiseaseDetail.vue
@@ -2,7 +2,7 @@
    <div class="p-3 grow cont-box">
        <div class="p-3 h-full cont-inner">
            <div class="flex justify-between collapse-head">
-                <span class="text-16">全部内容</span>
+                <span class="text-16 font-semibold">全部内容</span>
                <span @click="toggleAll">
                    <span v-if="!collapseAll">展开全部</span>
                    <span v-else>收起全部</span>

--- a/src/residentWX/visit/detail/components/DiabetesDetail.vue
+++ b/src/residentWX/visit/detail/components/DiabetesDetail.vue
@@ -2,7 +2,7 @@
    <div class="p-3 grow cont-box">
        <div class="p-3 h-full cont-inner">
            <div class="flex justify-between collapse-head">
-                <span class="text-16">全部内容</span>
+                <span class="text-16 font-semibold">全部内容</span>
                <span @click="toggleAll">
                    <span v-if="!collapseAll">展开全部</span>
                    <span v-else>收起全部</span>

--- a/src/residentWX/visit/detail/components/HypertensionDetail.vue
+++ b/src/residentWX/visit/detail/components/HypertensionDetail.vue
@@ -2,7 +2,7 @@
    <div class="p-3 grow cont-box">
        <div class="p-3 h-full cont-inner">
            <div class="flex justify-between collapse-head">
-                <span class="text-16">全部内容</span>
+                <span class="text-16 font-semibold">全部内容</span>
                <span @click="toggleAll">
                    <span v-if="!collapseAll">展开全部</span>
                    <span v-else>收起全部</span>

--- a/src/residentWX/visit/detail/components/HypertensionDetailV2.vue
+++ b/src/residentWX/visit/detail/components/HypertensionDetailV2.vue
@@ -39,7 +39,7 @@
        <div class="p-3 grow cont-box">
            <div class="p-3 h-full cont-inner">
                <div class="flex justify-between collapse-head">
-                    <span class="text-16">全部内容</span>
+                    <span class="text-16 font-semibold">全部内容</span>
                    <span @click="toggleAll">
                        <span v-if="!collapseAll">展开全部</span>
                        <span v-else>收起全部</span>