慢综 医生端 fetch修改

src/doctor/followUp/List.vue

@@ -156,9 +156,10 @@ export default {
             })
         },
         toAddGeneral(val) {
+            const {id, ...others} = val
             this.$router.push({
                 path: `/doctor/followUp/generalFU/add`,
-                query: val
+                query: {...others}
             })
         },
         toSearch() {

src/doctor/followUp/generalFU/form/BaseInfo.vue

@@ -213,8 +213,8 @@
                     </template>
                 </van-field>
 
-                <div class='label-title mt-5'>随访方式</div>
-                <van-field name='radio' :rules='rules.visitWay' class='p-12-0'>
+                <div class='label-title mt-5' v-if='form.visitSituation == 1'>随访方式</div>
+                <van-field name='radio' :rules='rules.visitWay' class='p-12-0' v-if='form.visitSituation == 1'>
                     <template #input>
                         <van-radio-group v-model='form.visitWay' class='w-full' shape='dot'>
                             <van-cell-group>
@@ -473,8 +473,10 @@ const defaultForm = (info = {}) => {
         permanentAddress: undefined,
         // 现住址编码
         presentCode: undefined,
+        presentCodeName: undefined,
         // 户籍地编码
         registeredCode: undefined,
+        registeredCodeName: undefined,
         // 居民档案id
         residentId: undefined,
         // 姓名
@@ -497,7 +499,7 @@ const defaultForm = (info = {}) => {
         // createUnitId: undefined,
         // createUnitName: undefined
         //本次随访情况
-        visitSituation: undefined,
+        visitSituation: '1',
         lossReason: undefined,
         deathReason: undefined,
         lossReasonOther: undefined,

src/doctor/followUp/generalFU/form/CommonBottom.vue

@@ -9,19 +9,10 @@
                     readonly
                     placeholder='随访单位'
                     class='input-back mt-2 form-input'
-                    @click="showPopup = true"
+                    @click="show1 = true"
                 />
-                <van-popup v-model:show="showPopup" position="bottom" :style="{ height: '40%' }">
-                    <van-search
-                        v-model="searchText"
-                        :show-action="false"
-                        placeholder="搜索"
-                        @search="onSearch"
-                    />
-                    <van-cell-group>
-                        <van-cell v-for="item in searchResults" :key="item" :title="item" />
-                    </van-cell-group>
-                </van-popup>
+                 <DocUnit v-model:show="show1" v-model:value="value1" @change="(option) => value1 = option"/>
+
                 <div class='no-req-label mt-5'>随访科室</div>
                 <van-field
                     v-model='form.visitOfficeName'
@@ -30,6 +21,7 @@
                     placeholder='随访科室'
                     class='input-back mt-2 form-input'
                 />
+                 <DocOffice v-model:show="show2" v-model:value="value2" @change="(option) => value2 = option" unitId="21649"/>
                 <div class='no-req-label mt-5'>随访医生</div>
                 <van-field
                     v-model='form.visitDoctorName'
@@ -38,6 +30,8 @@
                     placeholder='随访医生'
                     class='input-back mt-2 form-input'
                 />
+                <DocOfficeDoctor v-model:show="show3" v-model:value="value3" @change="(option) => value3 = option" unitId="21649" officeId="36234"/>
+
             </van-cell-group>
         </van-form>
     </div>

src/doctor/followUp/generalFU/form/Index.vue

@@ -44,7 +44,7 @@ export default {
         }
     },
     created() {
-        // this.init()
+        this.init()
     },
     computed: {
         routerDetail() {
@@ -53,16 +53,12 @@ export default {
     },
     methods: {
         async init() {
-            const res = await getChronicResidentsId(this.routerDetail.residentId)
-            this.resident = {
-                ...res.data,
-                residentInfoId: this.routerDetail.residentId
-            }
             this.info = {}
-            this.info.residentInfoId = this.routerDetail.residentId
-            this.info.gender = this.resident.gender;
-            this.info.currentAge = this.resident.currentAge;
-            this.info.genderName = this.resident.genderName;
+            const res = await getChronicResidentsId(this.routerDetail.residentInfoId)
+            const { id, ...others} = res.data
+            this.info = {
+               ...others
+            }
             this.info.diseaseType = this.routerDetail.diseaseType
             if (this.routerDetail.id) {
                 const res = await fetchCurrencyById({ id: this.routerDetail.id })

vue.config.js

@@ -30,19 +30,19 @@ module.exports = defineConfig({
                 }
             },
             '/chronic-admin': {
-                // target: 'https://beta-tumour.zmnyjk.com',
-                target: 'http://192.168.1.26:8900',
+                target: 'https://beta-tumour.zmnyjk.com',
+                // target: 'http://192.168.1.26:8900',
                 changOrigin: true,
                 pathRewrite: {
-                    '^/chronic-admin': '/'
+                    '^/chronic-admin': '/chronic-admin'
                 }
             },
             '/chronic-resident': {
-                target: 'http://192.168.1.43:8903',
-                // target: 'https://beta-tumour.zmnyjk.com',
+                // target: 'http://192.168.1.43:8903',
+                target: 'https://beta-tumour.zmnyjk.com',
                 changOrigin: true,
                 pathRewrite: {
-                    '^/chronic-resident': '/'
+                    '^/chronic-resident': '/chronic-resident'
                 }
             }
         },