筛查提交接口修改

src/resident/screening/first/detail/Detail.vue

@@ -15,7 +15,8 @@
             <div v-for="item in columnsBase" :key="item.key"
                 class="flex justify-between py-4 border-bottom item">
                 <span class="shrink-0 mr-2 label">{{ item.title }}</span>
-                <span class="text-end">{{ residentInfo[item.key] || '-' }}</span>
+                <span v-if="item.key === 'idCard'">{{ $idCardHide(residentInfo.idCard) || '-' }}</span>
+                <span class="text-end" v-else>{{ residentInfo[item.key] || '-' }}</span>
             </div>
         </div>
 
@@ -82,6 +83,7 @@ export default {
             info: {},
             columnsBase: [
                 { title: '姓名', key: 'residentName' },
+                { title: '证件号码', key: 'idCard'},
                 { title: '性别', key: 'genderName' },
                 { title: '出生日期', key: 'dataBirth' },
                 { title: '年龄', key: 'currentAge' },

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

@@ -26,6 +26,7 @@
 </template>
 
 <script>
+import { computed } from 'vue'
 import { showNotify } from 'vant'
 import { backHome } from '@/utils/common.js'
 import IdCheck from './IdCheck.vue'
@@ -55,8 +56,8 @@ export default {
     },
     provide() {
         return {
-            checkInfo: this.checkInfo,
-            recordForm: this.recordForm
+            checkInfo: computed(() => this.checkInfo),
+            recordForm: computed(() => this.recordForm)
         }
     },
     computed: {
@@ -76,10 +77,6 @@ export default {
     },
     methods: {
         onNext(step) {
-            if (this.step === 1) {
-                this.recordForm = {}
-                this.checkInfo = {}
-            }
             this.step = step ? step : this.step + 1
             this.setpHistory.push(this.step)
             const dom = this.$refs.top
@@ -90,6 +87,10 @@ export default {
             if (this.step === 1) return
             this.setpHistory.pop()
             this.step = this.setpHistory[this.setpHistory.length - 1]
+            if (this.step === 1) {
+                this.recordForm = {}
+                this.checkInfo = {}
+            }
         },
         onClose() {
             backHome()

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

@@ -468,9 +468,11 @@ export default {
                 const query = {
                     ...this.form,
                     screenDoctorId: this.recordForm.doctorId,
-                    residentsRecord: this.recordForm.base,
+                    residentsRecord: {
+                        ...this.recordForm.base,
                         idCard: this.checkInfo.idCard
                     }
+                }
                 // 提交表单
                 savefirstScreen(fetchDataHandle(query, {
                     familyHistory: 'arrToStr',