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

src/doctor/deathRecord/form/DeathRecordForm.vue

@@ -86,6 +86,7 @@
                 rows='2'
                 autosize
                 type='textarea'
+                :rules='rules.deathReasonOther'
             />
         </van-form>
     </div>
@@ -118,6 +119,7 @@ export default {
                 deathDate: [{ required: true, message: '请选择' }],
                 reasonItem: [{ required: true, message: '请选择' }],
                 diseaseName: [{ required: true, message: '请选择' }],
+                deathReasonOther: [{ required: true, message: '请填写其他意外情况' }],
             }
         }
     },

src/doctor/deathRecord/form/Index.vue

@@ -105,7 +105,12 @@ export default {
                 }
                 saveResidentsDeath(params).then(res => {
                     this.store.onRefreshMark()
-                    this.$router.back()
+                    this.$router.replace({
+                        path: '/doctor/patient-detail',
+                        query: {
+                            residentInfoId: this.routerDetail.residentInfoId
+                        }
+                    })
                 })
 
         },

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

@@ -242,7 +242,12 @@ export default {
             fun(params, true).then(({ code }) => {
                 if (code == 'SUCCESS') {
                     this.store.onRefreshMark()
-                    this.$router.back()
+                    this.$router.replace({
+                        path: '/doctor/patient-detail',
+                        query: {
+                            residentInfoId: this.routerDetail.residentInfoId
+                        }
+                    })
                 }
             })
         },

src/doctor/patientDetail/components/disease/Visit.vue

@@ -148,23 +148,14 @@ export default {
             if (record.id == null) {
                 this.$message.info('暂时无法查看 详情信息')
                 return
-            } else if (record.source == 7) {
-                //数据来源为his时展示 `请在医生PC端查看详情`
+            } else if (record.source == 7 || record.source == 4) {
+                //数据来源为his或者公卫时展示 `请在医生PC端查看详情`
                 showConfirmDialog({
                     message: '请在医生PC端查看详情'
                 }).then(() => {
                 }).catch((err) => {
                 })
 
-            } else if (record.source == 4) {
-                // 判断是否显示公卫随访
-                this.$router.push({
-                    path: `/systemIframe/doctorGWDetail`,
-                    query: {
-                        src: `https://www.baidu.com/`,
-                        pageTitle: `公卫详情`
-                    }
-                })
             } else {
                 //随访详情
                 this.$router.push({
@@ -176,6 +167,18 @@ export default {
                     }
                 })
             }
+
+
+       /* else if (record.source == 4) {
+                // 判断是否显示公卫随访
+                this.$router.push({
+                    path: `/systemIframe/doctorGWDetail`,
+                    query: {
+                        src: `https://www.baidu.com/`,
+                        pageTitle: `公卫详情`
+                    }
+                })
+            }*/
         },
         editBtn(item) {
             if (item.serveType === 3 || item.serveType === 4) {