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

src/doctor/Doctor.vue

@@ -66,7 +66,8 @@ export default {
             if (!token) {
                 token = sessionStorage.getItem('token')
                 if (process.env.NODE_ENV !== 'production') {
-                    token = 'b9a25475-8323-4bec-8e52-902237c82711'
+                    // token = '9486b3ed-332d-4a2e-86dc-0502a3e2bd69'
+                    token = '25637a72-13ba-4efb-a892-e443a93113ef'
                 }
             }
             if (token) {

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

@@ -8,7 +8,7 @@
             :disabled="$route.query.id ? true : false"
             placeholder="请选择"
             :rules="rules.diseaseTypeName"
-            @click="showDiseaseType = true"
+            @click="showDiseaseTypeChange"
             class="form-input mb-5"
         />
         <van-popup v-model:show="showDiseaseType" position="bottom">
@@ -145,6 +145,10 @@ export default {
 
             // }
             
+        },
+        showDiseaseTypeChange() {
+            if (this.$route.query.id) return
+            this.showDiseaseType = true
         }
     }
 }

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

@@ -57,7 +57,13 @@ export default {
         onSubmit() {
             this.$refs.formCont.submit().then(() => {
                 this.$message.success('新增成功')
-                this.$router.go(-1)
+                // this.$router.go(-1)
+                this.$router.replace({
+                    path: '/doctor/patient-detail',
+                    query: {
+                        residentInfoId: this.routeQuery.residentInfoId
+                    }
+                })
                 this.store.onRefreshMark()
             })
         }

vue.config.js

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