筛查 表单修改

src/assets/css/base.less

@@ -36,6 +36,7 @@ body {
 .screen-form {
     input::placeholder {
         color: #999999;
+        opacity: 1;
     }
     .van-cell:after {
         transform: scaleY(1);

src/doctor/Doctor.vue

@@ -52,7 +52,7 @@ export default {
             if (!token) {
                 token = sessionStorage.getItem('token')
                 if (process.env.NODE_ENV !== 'production') {
-                    token = '0e5b7b8b-f6b0-4232-90ff-a674159c4fff'
+                    token = '42a5a452-5b42-478f-93f8-0b5198686791'
                 }
             }
             if (token) {

src/doctor/components/chronicTag/ChronicTag.vue

@@ -24,8 +24,9 @@ export default {
                 '32': '肾',
                 '64': '脂'
             }
+            // const colors = ['red', 'orange', 'paleYellow', 'blue', 'cyan', 'pink', 'paleGreen']
             typeof list === 'string' && (list = list.split(','))
-            return list.map(e => {
+            return list.map((e, i) => {
                 if (!map[e]) return
                 return {
                     name: map[e],
@@ -86,4 +87,40 @@ export default {
     background-color: #E6F9FF;
     color: #4D86DA;
 }
+
+.tag-red {
+    .common-tag();
+    background-color: #FFF1F0;
+    color: #F5222D;
+}
+.tag-orange {
+    .common-tag();
+    background-color: #FFFBE6;
+    color: #FA8C16;
+}
+.tag-cyan {
+    .common-tag();
+    color: #13C2C2;
+    background-color: #E6FFFB;
+}
+.tag-blue {
+    .common-tag();
+    color: #2F54EB;
+    background-color: #F0F5FF;
+}
+.tag-pink {
+    .common-tag();
+    color: #F61E54;
+    background-color: #FFE5F1;
+}
+.tag-paleGreen {
+    .common-tag();
+    color: #A0D911;
+    background-color: #FCFFE6;
+}
+.tag-paleYellow {
+    .common-tag();
+    background-color: #FEFFE6;
+    color: #D4B106;
+}
 </style>

src/doctor/resident/Base.vue

@@ -108,6 +108,7 @@ export default {
     .detail-left {
         width: 8em;
         color: #8C8C8C;
+        flex-shrink: 0;
     }
     .detail-bt {
         color: #607FF0;

src/doctor/resident/Visit.vue

@@ -234,6 +234,7 @@ export default {
     .detail-left {
         width: 8em;
         color: #8C8C8C;
+        flex-shrink: 0;
     }
     .card-bt {
         font-size: 14px;

src/resident/screening/first/form/BaseInfo.vue

@@ -18,13 +18,11 @@
             </van-field>
             <van-field required
                 v-model="form.genderName"
-                is-link
                 readonly
                 name="gender"
                 label="性别"
                 placeholder="请选择"
-                :rules="rules.gender"
-                @click="showGender = true"/>
+                :rules="rules.gender"/>
             <van-popup v-model:show="showGender" position="bottom">
                 <van-picker
                     :columns-field-names="{ text: 'name', value: 'value' }"
@@ -43,7 +41,10 @@
                 @click="showBirth = true"
             />
             <van-popup v-model:show="showBirth" position="bottom">
-                <van-date-picker @confirm="dataBirthConfirm" @cancel="showBirth = false" />
+                <van-date-picker v-model="form._dataBirth" 
+                    :min-date="birthRange.min"
+                    :max-date="birthRange.max"
+                    @confirm="dataBirthConfirm" @cancel="showBirth = false" />
             </van-popup>
 
             <van-field v-model="form.currentAge"
@@ -98,7 +99,8 @@
                 @click="showPresent = true"
             >
                 <template #input>
-                    <span class="text-end">{{ form.presentCodeName }}</span>
+                    <span class="text-end" v-if="form.presentCodeName">{{ form.presentCodeName }}</span>
+                    <span class="text-end" style="color: #999999" v-else>请选择</span>
                 </template>
             </van-field>
             <van-popup v-model:show="showPresent" :close-on-click-overlay="false" position="bottom"
@@ -132,7 +134,8 @@
                 @click="showRegistered = true"
             >
                 <template #input>
-                    <span class="text-end">{{ form.registeredCodeName }}</span>
+                    <span class="text-end" v-if="form.registeredCodeName">{{ form.registeredCodeName }}</span>
+                    <span class="text-end" style="color: #999999" v-else>请选择</span>
                 </template>
             </van-field>
             <van-popup v-model:show="showRegistered" :close-on-click-overlay="false" position="bottom"
@@ -164,6 +167,7 @@ import { useStore } from '@/resident/store/index.js'
 import { getInfoByIdCard, fetchDataHandle, addToArr } from '@/utils/common.js'
 import { mobileValidator, addressValidator } from '@/utils/commonReg.js'
 import DocAddress from '@/components/docAddress/DocAddress.vue'
+import dayjs from 'dayjs'
 
 const defaultForm = (info = {}) => {
     const form = {
@@ -191,6 +195,7 @@ const defaultForm = (info = {}) => {
         createdUserName: undefined,
         // 出生日期
         dataBirth: undefined,
+        _dataBirth: undefined,
         // 职业,[DC00010]
         duty: undefined,
         // 文化程度(学历),[DC00007]
@@ -273,7 +278,11 @@ export default {
             showPresent: false,
             // 户籍地址
             showRegistered: false,
-            store: useStore()
+            store: useStore(),
+            birthRange: {
+                start: undefined,
+                end: undefined
+            }
         }
     },
     computed: {
@@ -282,10 +291,14 @@ export default {
         }
     },
     created() {
+        console.log('checkInfo', this.checkInfo)
         this.init()
     },
     methods: {
         init() {
+            const date = dayjs()
+            this.birthRange.max = new Date(date.year(), date.month(), date.date())
+            this.birthRange.min = new Date(date.year() - 120, date.month(), date.date())
             if (this.recordForm.base) {
                 this.form = defaultForm(this.recordForm.base)
                 return
@@ -301,6 +314,7 @@ export default {
             this.form.genderName = this.store.getDictValue('DC00005', this.form.gender)
             this.form.currentAge = info.age
             this.form.dataBirth = info.dataBirth
+            this.form._dataBirth = info.dataBirth.split('-')
         },
         submit() {
             // this.recordForm.base = {...this.form}

src/resident/screening/first/form/Index.vue

@@ -78,6 +78,7 @@ export default {
         onNext(step) {
             if (this.step === 1) {
                 this.recordForm = {}
+                this.checkInfo = {}
             }
             this.step = step ? step : this.step + 1
             this.setpHistory.push(this.step)

src/resident/screening/first/form/ScreenInfo.vue

@@ -128,7 +128,20 @@
                 label="家族史"
                 placeholder="请选择"
                 :rules="rules.familyHistory"
-                @click="showFamily = true"/>
+                @click="showFamily = true">
+                <template #input>
+                    <div class="pb-3">
+                        <!-- <span class="text-end" v-if="form.familyHistoryName">{{ form.familyHistoryName }}</span>
+                        <span class="text-end" style="color: #999999" v-else>请选择</span> -->
+                        <van-field v-model="form.familyHistoryName"
+                            placeholder="请选择"
+                            readonly
+                            style="padding: 0;background: transparent;"
+                        />
+                    </div>
+                    <div class="tip">若一级家属(如父母)有家族病史，则请选择</div>
+                </template>
+            </van-field>
             <van-popup v-model:show="showFamily" position="bottom">
                 <div class="pt-4 popup-checkbox">
                     <div class="flex justify-between">