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

src/api/patient.js

@@ -1282,7 +1282,7 @@ export function modifySickHistoryTemplate(data){
 export function deleteSickHistoryTempalte(id,params){
 
   return request({
-    url:"/api/patient/deletesickhistorytemplate?id="+id,
+    url:"/api/patient/deletesickhistorytemplate?template_id="+id,
     method:"get",
     params:params
   })

src/xt_pages/user/components/PatientSidebar.vue

@@ -167,10 +167,10 @@ export default {
               name: '3-1',
               label: '病史'
             },
-            // {
-            //   name: '3-4',
-            //   label: '病史新'
-            // },
+            {
+              name: '3-4',
+              label: '病史新'
+            },
             {
               name: '3-2',
               label: '体格检查'

src/xt_pages/user/sickHistory_new.vue

@@ -462,6 +462,7 @@ export default {
   },
   methods: {
     template_dele(){
+      console.log("hahhahahah",this.template_id)
      deleteSickHistoryTempalte(this.template_id).then(response=>{
         if(response.data.state == 1){
           var msg =  response.data.data.msg
@@ -977,10 +978,11 @@ export default {
 
     },
     getCurrentChangeOne(val){
-
+      console.log("val-------------------",val.id)
       this.$refs.editorOne.contents = val.content
       this.template_content = ""
       this.template_content = val.content
+      this.template_id = ""
       this.template_id = val.id
     },
     saveTemplate(){

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))