Browse Source

hah阿凡达

28169 2 weeks ago
parent
commit
332b69c21a

+ 6 - 9
src/xt_pages/dialysis/batch_print/batch_print_order_eightythree.vue View File

@@ -56,19 +56,16 @@
56 56
                       </div>
57 57
                     </td>
58 58
                   </tr>
59
-
60 59
                   <tr>
61 60
                     <td colspan="3">
62 61
                       <div style="line-height:30px;display: inline-block;">
63
-                        上机前病情:
64
-                        <label-box
65
-                          :isChecked="record.assessment_before_dislysis.symptom_before_dialysis == '' ? true : false"
66
-                          showValue="无特殊"></label-box>&nbsp;
67
-                        <label-box
68
-                          :isChecked="record.assessment_before_dislysis.symptom_before_dialysis != '' ? true : false"
69
-                          showValue="其他:"></label-box>
70
-                        <span>{{ record.assessment_before_dislysis.symptom_before_dialysis }}</span>
62
+                        上机前病情: <span>{{ record.assessment_before_dislysis.befor_symptoms }}</span>
71 63
                       </div>
64
+                    </td>
65
+                  </tr>
66
+                  <tr>
67
+                    <td colspan="3">
68
+                    
72 69
                       <div class="row" style="padding: 2px 0; line-height: 23px;display: inline-block;" >
73 70
                         <div class="inline_block" style="flex: 0.8;">
74 71
                           T:

+ 17 - 3
src/xt_pages/dialysis/template/DialysisPrintOrdereightythree.vue View File

@@ -41,16 +41,30 @@
41 41
                 </div>
42 42
               </td>
43 43
             </tr>
44
-
45 44
             <tr>
46 45
               <td colspan="3">
47 46
                 <div style="line-height:30px;display: inline-block;">
48 47
                   上机前病情:
49
-                  <label-box :isChecked="predialysis.symptom_before_dialysis == '' ? true : false"
48
+                  <!-- <label-box :isChecked="predialysis.symptom_before_dialysis == '' ? true : false"
50 49
                     showValue="无特殊"></label-box>&nbsp;
51 50
                   <label-box :isChecked="predialysis.symptom_before_dialysis != '' ? true : false"
52
-                  showValue="其他:"></label-box>
51
+                  showValue="其他:"></label-box> -->
52
+                  <div class="inline_block" style="flex: 0.8;">
53
+                    <div class="under_line" style="width: 50px; text-align: center">
54
+                      {{
55
+                        predialysis.befor_symptoms
56
+                          ? predialysis.befor_symptoms
57
+                          : "/"
58
+                      }}
59
+                    </div>
60
+                  </div>
53 61
                 </div>
62
+              </td>
63
+            </tr>
64
+
65
+            <tr>
66
+              <td colspan="3">
67
+            
54 68
                 <div class="row" style="padding: 2px 0; line-height: 23px;display: inline-block;" >
55 69
                   <div class="inline_block" style="flex: 0.8;">
56 70
                     T:

+ 13 - 13
src/xt_permission.js View File

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