Merge remote-tracking branch 'origin/20230223_pc_vue_new_branch' into 20230223_pc_vue_new_branch

src/api/patient.js

@@ -1315,3 +1315,21 @@ export function deleteNewCouseOfDisease(id,params){
   })
 }
 
+
+export function savePatientDeathRecord(data){
+   
+  return request({
+    url:"/api/patient/savepatientdeathrecord",
+    method:"post",
+    data:data,
+  })
+}
+
+export function getPatientDeathRecord(params){
+
+  return request({
+    url:"/api/patient/getpatientdeathrecord",
+    method:"Get",
+    params:params
+  })
+}

src/xt_pages/user/Informed/Informedconsent.vue

@@ -128,7 +128,7 @@
                   <Medicalhistory :patient_id ="this.patientID" :medicalList="medicalList" ref="childThrity" @getPatientMeDicalList="getPatientMeDicalList"></Medicalhistory>
                 </div>
                 <div v-if="show14">
-                  <heal_informed :patient_id ="this.patientID" ref="childSeventy" ::patientTreamentPlan="patientTreamentPlan" @getTreamentPlan="getTreamentPlan"></heal_informed>
+                  <heal_informed :patient_id ="this.patientID" ref="childSeventy" :patientTreamentPlan="patientTreamentPlan" @getTreamentPlan="getTreamentPlan"></heal_informed>
                 </div>
                 <div v-if="show16">
                   <criticalpatient_informed2 :patient_id ="this.patientID" ref="childSixty" :patientCritaicalInformedOnePrint="patientCritaicalInformedOnePrint" @getPatientCriticalOneList="getPatientCriticalOneList"></criticalpatient_informed2>
@@ -149,7 +149,7 @@
                   <hemodialysis :patient_id ="this.patientID" ref="childrtwotyone"></hemodialysis>
                 </div>
                 <div v-if="show22">
-                  <Death_informed :patient_id ="this.patientID" ref="childrtwotytwo"></Death_informed>
+                  <Death_informed :patient_id ="this.patientID" ref="childrtwotytwo" :patientDeathPlan="patientDeathPlan" @getPatientDeathRecord="getPatientDeathRecord"></Death_informed>
                 </div>
               </div>
             </div>
@@ -187,7 +187,7 @@ import hemodialysis from './components/hemodialysis'
 import { getPatientDetailInformedconsent,getFallOutBedPrintList,getFilterInformed,getProfundaInformed,
   getArterOvernous,getHighRiskInformed,getPatientMeDicalList,getAnticoagulationInformed,getCriticalInformed,
   getHemoperfusionInformed,getInformedConsent,getCatheterization,getDialyzerInformed, getTherapyInformed,
-  getPatientCriticalList,getPatientCriticalOneList,getTreamentPlan } from '@/api/patient'
+  getPatientCriticalList,getPatientCriticalOneList,getTreamentPlan,getPatientDeathRecord } from '@/api/patient'
 export default {
   components: {
     PatientSidebar,
@@ -270,6 +270,7 @@ export default {
       patientCritaicalInformedPrint:{},
       patientCritaicalInformedOnePrint:{},
       patientTreamentPlan:{},
+      patientDeathPlan:{}
     }
 
   },
@@ -443,6 +444,17 @@ export default {
         }
       })
     },
+    getPatientDeathRecord(){
+       getPatientDeathRecord().then(response=>{
+         if(response.data.state == 1){
+            var list = response.data.data.record
+          
+            this.patientDeathPlan = list
+            console.log("list=================",this.patientDeathPlan)
+            this.$refs.childrtwotytwo.show(list)
+         }
+       })
+    },
 
     rowClick(row, column, event){
      console.log('1111',row);
@@ -941,6 +953,7 @@ export default {
           this.show20 = false,
           this.show21 = false,
           this.show22 = true
+          this.getPatientDeathRecord()
         }
     },
 

src/xt_pages/user/Informed/components/Death_informed.vue

@@ -95,7 +95,7 @@
 import print from "print-js";
 // import Editor from '@/components/Editor'
 import Editor from '@/components/Uedtior'
-import { getPatientDetailInformedconsent,savePatientCritaicalInformed  } from '@/api/patient'
+import { getPatientDetailInformedconsent,savePatientDeathRecord  } from '@/api/patient'
 import { jsGetAge, uParseTime } from "@/utils/tools";
 const content=`<p style="display: flex;margin-bottom: 5px;">
                   <span style="flex:1">讨论目期:</span>
@@ -123,8 +123,8 @@ export default{
   props: {
     patient_id: {
         type: Number,
-      },
-    patientCritaicalInformedPrint:{
+    },
+    patientDeathPlan:{
       type:Object,
     }
   },
@@ -138,6 +138,7 @@ export default{
     dialogVisible:false,
     content:content,
     orgname:'',
+
   }
   },
   methods:{
@@ -183,6 +184,7 @@ export default{
         return age
     },
     show(val){
+      console.log("val--------------",val)
       if(val!=null){
         if(val.content!=""){
           this.content = ""
@@ -192,28 +194,28 @@ export default{
     },
     bianji(){
       this.dialogVisible=true
-      this.$refs.editor.content = this.content
     },
     savePatientCritaicalInformed(){
-      console.log('1111',this.$refs.editor.content);
-      // var params = {
-      //   content:this.$refs.editor.content
-      // }
-      // savePatientCritaicalInformed(params).then(response=>{
-      //   if(response.data.state ==1){
-      //     var patientCritical = response.data.data.patientCritical
-      //     this.$message.success("保存成功!")
-      //     this.dialogVisible = false
-      //     this.$emit("getPatientCriticalList","");
-      //   }
-      // })
+      console.log('1111',this.$refs);
+      var params = {
+        content:this.$refs.editor.contents,
+      }
+      savePatientDeathRecord(params).then(response=>{
+        if(response.data.state ==1){
+          var list = response.data.data.list
+          this.$message.success("保存成功!")
+          this.dialogVisible = false
+          this.$emit("getPatientDeathRecord","");
+        }
+      })
     }
   },
   created(){
     this.orgname = this.$store.getters.xt_user.org.org_name;
-    if(this.patientCritaicalInformedPrint!=null && this.patientCritaicalInformedPrint.id >0){
+    console.log("patientDeathPlan-------------",this.patientDeathPlan)
+    if(this.patientDeathPlan!=null && this.patientDeathPlan.id >0){
        this.content = ""
-       this.content = this.patientCritaicalInformedPrint.content
+       this.content = this.patientDeathPlan.content
     }
     this.getlist()
   }

src/xt_permission.js

@@ -12,19 +12,19 @@ const permissionWhiteList = loginWhiteList.concat(['/']) // 权限验证白名
 
 router.beforeEach((to, from, next) => {
   // 线上注释
-  // if (!store.getters.configlist || store.getters.configlist === undefined || store.getters.configlist.length <= 0) {
-  //   store.dispatch('VerifyConfigList', []).then(() => {
-  //     next()
-  //   })
-  // }
-  // if (store.getters.permission_routers === undefined) {
-  //   store.dispatch('xt_GenerateRoutes', []).then(() => {
-  //     next()
-  //   })
-  // } else {
-  //   next()
-  // }
-  // return
+  if (!store.getters.configlist || store.getters.configlist === undefined || store.getters.configlist.length <= 0) {
+    store.dispatch('VerifyConfigList', []).then(() => {
+      next()
+    })
+  }
+  if (store.getters.permission_routers === undefined) {
+    store.dispatch('xt_GenerateRoutes', []).then(() => {
+      next()
+    })
+  } else {
+    next()
+  }
+  return
   // 线上注释
   NProgress.start()
   // console.log(store.getters.current_role_urls.indexOf(to.path))