28169 před 6 dny
rodič
revize
74e501554b
2 změnil soubory, kde provedl 25 přidání a 20 odebrání
  1. 12 7
      src/xt_pages/user/courseOfDisease_new.vue
  2. 13 13
      src/xt_permission.js

+ 12 - 7
src/xt_pages/user/courseOfDisease_new.vue Zobrazit soubor

@@ -584,6 +584,7 @@
584 584
               医嘱类型:
585 585
               <el-select v-model="advice_type" @change="type_chang" placeholder="请选择" style="width: 120px;">
586 586
                 <el-option
587
+                
587 588
                   v-for="item in type_option"
588 589
                   :key="item.value"
589 590
                   :label="item.label"
@@ -1409,7 +1410,6 @@
1409 1410
         this.advice_dialog = false
1410 1411
       },
1411 1412
       getCurrentChangeOne(val){
1412
-        console.log("val================",val)
1413 1413
         this.$refs.editor.contents = val.content
1414 1414
         this.record_date = this.getTime(val.record_time)
1415 1415
         this.admin_user_id = val.recorder
@@ -1417,6 +1417,7 @@
1417 1417
            this.admin_user_id = ""
1418 1418
         }
1419 1419
         this.id = val.id
1420
+        this.ids = val.id
1420 1421
       },
1421 1422
       getCurrentChangeTwo(val){
1422 1423
 
@@ -1441,9 +1442,7 @@
1441 1442
      rowclick(){
1442 1443
 
1443 1444
       },
1444
-      prints(){
1445
-
1446
-      },
1445
+     
1447 1446
       saveTemplate(){
1448 1447
 
1449 1448
         var params = {
@@ -2361,6 +2360,9 @@
2361 2360
                 if(this.longAdvice[i].advice_type == 1){
2362 2361
                   this.longAdvice[i].advice_type_name = "长期医嘱"
2363 2362
                 }
2363
+                if(this.longAdvice[i].advice_type == 2){
2364
+                  this.longAdvice[i].advice_type_name = "长期医嘱"
2365
+                }
2364 2366
                 if(this.longAdvice[i].stop_state == 1){
2365 2367
                   this.longAdvice[i].stop_state_name = "停用"
2366 2368
                 }
@@ -2858,7 +2860,7 @@
2858 2860
                 newListItem6.style.cssText= 'width: 10%;display: inline-block;padding: 5px 0;'
2859 2861
                 newListItem1.textContent = this.longAdvice[i].advice_name;
2860 2862
                 newListItem2.textContent = this.longAdvice[i].advice_type_name;
2861
-                newListItem3.textContent = this.getTime(this.longAdvice[i].start_time)
2863
+                newListItem3.textContent = this.getTime(this.longAdvice[i].created_time)
2862 2864
                 newListItem4.textContent = this.longAdvice[i].single_dose +this.longAdvice[i].single_dose_unit ;
2863 2865
                 newListItem5.textContent = this.longAdvice[i].execution_frequency;
2864 2866
                 newListItem6.textContent = this.longAdvice[i].stop_state_name;
@@ -3315,7 +3317,7 @@
3315 3317
       }, onRowClick(row, event, column) {
3316 3318
         this.table_current_index = row.index
3317 3319
       },
3318
-      print(){
3320
+      prints(){
3319 3321
         if(this.ids.length == 0){
3320 3322
           this.$message.error('请选择要打印的病程')
3321 3323
           return
@@ -3425,9 +3427,11 @@
3425 3427
       },
3426 3428
       type_chang(val){
3427 3429
         this.advice_type = val
3430
+        this.getPatientAdviceList()
3428 3431
       },
3429 3432
       status_chang(val){
3430 3433
         this.advice_status = val
3434
+        this.getPatientAdviceList()
3431 3435
       },
3432 3436
       selectionchange(val){
3433 3437
         this.bloodRows = val
@@ -3918,7 +3922,8 @@
3918 3922
        
3919 3923
         this.$refs.editor.contents = this.$refs.editor.contents +this.option_context
3920 3924
         this.option_dialog = false
3921
-      }
3925
+      },
3926
+    
3922 3927
 
3923 3928
     },
3924 3929
     beforeMount(){

+ 13 - 13
src/xt_permission.js Zobrazit soubor

@@ -12,19 +12,19 @@ const permissionWhiteList = loginWhiteList.concat(['/']) // 权限验证白名
12 12
 
13 13
 router.beforeEach((to, from, next) => {
14 14
   // 线上注释
15
-  if (!store.getters.configlist || store.getters.configlist === undefined || store.getters.configlist.length <= 0) {
16
-    store.dispatch('VerifyConfigList', []).then(() => {
17
-      next()
18
-    })
19
-  }
20
-  if (store.getters.permission_routers === undefined) {
21
-    store.dispatch('xt_GenerateRoutes', []).then(() => {
22
-      next()
23
-    })
24
-  } else {
25
-    next()
26
-  }
27
-  return
15
+  // if (!store.getters.configlist || store.getters.configlist === undefined || store.getters.configlist.length <= 0) {
16
+  //   store.dispatch('VerifyConfigList', []).then(() => {
17
+  //     next()
18
+  //   })
19
+  // }
20
+  // if (store.getters.permission_routers === undefined) {
21
+  //   store.dispatch('xt_GenerateRoutes', []).then(() => {
22
+  //     next()
23
+  //   })
24
+  // } else {
25
+  //   next()
26
+  // }
27
+  // return
28 28
  // 线上注释
29 29
   NProgress.start()
30 30
   // console.log(store.getters.current_role_urls.indexOf(to.path))