Browse Source

Merge branch 'superman' of http://git.shengws.com/zhangbj/xt_vue into superman

XMLWAN 4 years ago
parent
commit
ee299c65ef

+ 113 - 84
src/router/modules/dialysis.js View File

1
-import Layout from '@/views/layout/Layout'
1
+import Layout from "@/views/layout/Layout";
2
 
2
 
3
 export default {
3
 export default {
4
-  path: '/dialysis/',
4
+  path: "/dialysis/",
5
   component: Layout,
5
   component: Layout,
6
-  redirect: 'noredirect',
7
-  name: 'dialysis',
6
+  redirect: "noredirect",
7
+  name: "dialysis",
8
   alwaysShow: true,
8
   alwaysShow: true,
9
   meta: {
9
   meta: {
10
-    title: 'dialysis',
11
-    icon: 'touxi'
10
+    title: "dialysis",
11
+    icon: "touxi"
12
   },
12
   },
13
-  children: [{
14
-      path: '/dialysis/dialysisrecord',
15
-      component: () => import('@/xt_pages/dialysis/schedualPatient'),
16
-      name: '透析记录',
13
+  children: [
14
+    {
15
+      path: "/dialysis/dialysisrecord",
16
+      component: () => import("@/xt_pages/dialysis/schedualPatient"),
17
+      name: "透析记录",
17
       meta: {
18
       meta: {
18
-        title: '透析记录'
19
+        title: "透析记录"
19
       }
20
       }
20
     },
21
     },
21
     {
22
     {
22
-      path: '/dialysis/record/:id',
23
-      component: () => import('@/xt_pages/dialysis/dialysisPage'),
23
+      path: "/dialysis/record/:id",
24
+      component: () => import("@/xt_pages/dialysis/dialysisPage"),
24
       hidden: true,
25
       hidden: true,
25
       is_menu: false,
26
       is_menu: false,
26
-      name: 'paper',
27
+      name: "paper",
27
       meta: {
28
       meta: {
28
-        title: 'paper',
29
+        title: "paper",
29
         noCache: true
30
         noCache: true
30
       }
31
       }
31
     },
32
     },
32
     {
33
     {
33
-      path: '/dialysis/print',
34
-      component: () => import('@/xt_pages/dialysis/dialysisPrintOrder'),
34
+      path: "/dialysis/print",
35
+      component: () => import("@/xt_pages/dialysis/dialysisPrintOrder"),
35
       hidden: true,
36
       hidden: true,
36
       is_menu: false,
37
       is_menu: false,
37
-      name: 'dialysisPrintOrder',
38
+      name: "dialysisPrintOrder",
38
       meta: {
39
       meta: {
39
-        title: 'dialysisPrintOrder',
40
+        title: "dialysisPrintOrder",
40
         noCache: true
41
         noCache: true
41
       }
42
       }
42
     },
43
     },
44
     // { path: 'advice', component: () => import('@/xt_pages/dialysis/doctorAdvice'), name: 'advice', meta: { title: 'advice' }},
45
     // { path: 'advice', component: () => import('@/xt_pages/dialysis/doctorAdvice'), name: 'advice', meta: { title: 'advice' }},
45
     // { path: 'prepare', component: () => import('@/xt_pages/dialysis/dialysisPrepare'), name: 'prepare', meta: { title: 'prepare' }},
46
     // { path: 'prepare', component: () => import('@/xt_pages/dialysis/dialysisPrepare'), name: 'prepare', meta: { title: 'prepare' }},
46
     {
47
     {
47
-      path: '/dialysis/watch',
48
-      component: () => import('@/xt_pages/dialysis/bloodPresssWatch'),
49
-      name: 'watch',
48
+      path: "/dialysis/watch",
49
+      component: () => import("@/xt_pages/dialysis/bloodPresssWatch"),
50
+      name: "watch",
50
       meta: {
51
       meta: {
51
-        title: 'watch'
52
+        title: "watch"
52
       }
53
       }
53
     },
54
     },
54
     {
55
     {
55
-      path: '/dialysis/details',
56
-      component: () => import('@/xt_pages/dialysis/details'),
57
-      name: 'details',
56
+      path: "/dialysis/details",
57
+      component: () => import("@/xt_pages/dialysis/details"),
58
+      name: "details",
58
       meta: {
59
       meta: {
59
-        title: 'details'
60
+        title: "details"
60
       },
61
       },
61
       hidden: true,
62
       hidden: true,
62
       is_menu: false
63
       is_menu: false
63
     },
64
     },
64
     {
65
     {
65
-      path: '/dialysis/print/batch',
66
-      component: () => import('@/xt_pages/dialysis/batch_print/batch_print_order'),
66
+      path: "/dialysis/print/batch",
67
+      component: () =>
68
+        import("@/xt_pages/dialysis/batch_print/batch_print_order"),
69
+      hidden: true,
70
+      is_menu: false,
71
+      name: "dialysis_batch_print",
72
+      meta: {
73
+        title: "批量打印",
74
+        noCache: true
75
+      }
76
+    },
77
+    {
78
+      path: "/dialysis/print/batch/other",
79
+      component: () =>
80
+        import("@/xt_pages/dialysis/batch_print/batch_print_order_other"),
67
       hidden: true,
81
       hidden: true,
68
       is_menu: false,
82
       is_menu: false,
69
-      name: 'dialysis_batch_print',
83
+      name: "dialysis_batch_print_two",
70
       meta: {
84
       meta: {
71
-        title: '批量打印',
85
+        title: "批量打印",
72
         noCache: true
86
         noCache: true
73
       }
87
       }
74
-    }, {
75
-      path: '/dialysis/print/batch/other',
76
-      component: () => import('@/xt_pages/dialysis/batch_print/batch_print_order_other'),
88
+    },
89
+    {
90
+      path: "/dialysis/print/batch/three",
91
+      component: () =>
92
+        import("@/xt_pages/dialysis/batch_print/batch_print_order_three"),
77
       hidden: true,
93
       hidden: true,
78
       is_menu: false,
94
       is_menu: false,
79
-      name: 'dialysis_batch_print_two',
95
+      name: "dialysis_batch_print_two_one",
80
       meta: {
96
       meta: {
81
-        title: '批量打印',
97
+        title: "批量打印",
82
         noCache: true
98
         noCache: true
83
       }
99
       }
84
     },
100
     },
85
     {
101
     {
86
-      path: '/dialysis/print/batch/three',
87
-      component: () => import('@/xt_pages/dialysis/batch_print/batch_print_order_three'),
102
+      path: "/dialysis/print/batch/four",
103
+      component: () =>
104
+        import("@/xt_pages/dialysis/batch_print/batch_print_order_four"),
88
       hidden: true,
105
       hidden: true,
89
       is_menu: false,
106
       is_menu: false,
90
-      name: 'dialysis_batch_print_two_one',
107
+      name: "dialysis_batch_print_two_one",
91
       meta: {
108
       meta: {
92
-        title: '批量打印',
109
+        title: "批量打印",
93
         noCache: true
110
         noCache: true
94
       }
111
       }
95
     },
112
     },
96
     {
113
     {
97
-      path: '/dialysis/print/batch/four',
98
-      component: () => import('@/xt_pages/dialysis/batch_print/batch_print_order_four'),
114
+      path: "/dialysis/print/batch/five",
115
+      component: () =>
116
+        import("@/xt_pages/dialysis/batch_print/batch_print_order_five"),
99
       hidden: true,
117
       hidden: true,
100
       is_menu: false,
118
       is_menu: false,
101
-      name: 'dialysis_batch_print_two_one',
119
+      name: "dialysis_batch_print_two_one",
102
       meta: {
120
       meta: {
103
-        title: '批量打印',
121
+        title: "批量打印",
104
         noCache: true
122
         noCache: true
105
       }
123
       }
106
     },
124
     },
107
     {
125
     {
108
-      path: '/dialysis/print/batch/five',
109
-      component: () => import('@/xt_pages/dialysis/batch_print/batch_print_order_five'),
126
+      path: "/dialysis/print/batch/six",
127
+      component: () =>
128
+        import("@/xt_pages/dialysis/batch_print/batch_print_order_six"),
110
       hidden: true,
129
       hidden: true,
111
       is_menu: false,
130
       is_menu: false,
112
-      name: 'dialysis_batch_print_two_one',
131
+      name: "dialysis_batch_six",
113
       meta: {
132
       meta: {
114
-        title: '批量打印',
133
+        title: "批量打印",
115
         noCache: true
134
         noCache: true
116
       }
135
       }
117
     },
136
     },
118
     {
137
     {
119
-      path: '/dialysis/print/batch/six',
120
-      component: () => import('@/xt_pages/dialysis/batch_print/batch_print_order_six'),
138
+      path: "/dialysis/print/batch/seven",
139
+      component: () =>
140
+        import("@/xt_pages/dialysis/batch_print/batch_print_order_seven"),
121
       hidden: true,
141
       hidden: true,
122
       is_menu: false,
142
       is_menu: false,
123
-      name: 'dialysis_batch_six',
143
+      name: "dialysis_batch_seven",
124
       meta: {
144
       meta: {
125
-        title: '批量打印',
145
+        title: "批量打印",
126
         noCache: true
146
         noCache: true
127
       }
147
       }
128
     },
148
     },
129
     {
149
     {
130
-      path: '/dialysis/print/batch/seven',
131
-      component: () => import('@/xt_pages/dialysis/batch_print/batch_print_order_seven'),
150
+      path: "/dialysis/print/batch/eight",
151
+      component: () =>
152
+        import("@/xt_pages/dialysis/batch_print/batch_print_order_eight"),
132
       hidden: true,
153
       hidden: true,
133
       is_menu: false,
154
       is_menu: false,
134
-      name: 'dialysis_batch_seven',
155
+      name: "dialysis_batch_eight",
135
       meta: {
156
       meta: {
136
-        title: '批量打印',
157
+        title: "批量打印",
137
         noCache: true
158
         noCache: true
138
       }
159
       }
139
     },
160
     },
140
     {
161
     {
141
-      path: '/dialysis/print/batch/eight',
142
-      component: () => import('@/xt_pages/dialysis/batch_print/batch_print_order_eight'),
162
+      path: "/dialysis/print/batch/nine",
163
+      component: () =>
164
+        import("@/xt_pages/dialysis/batch_print/batch_print_order_nine"),
143
       hidden: true,
165
       hidden: true,
144
       is_menu: false,
166
       is_menu: false,
145
-      name: 'dialysis_batch_eight',
167
+      name: "dialysis_batch_nine",
146
       meta: {
168
       meta: {
147
-        title: '批量打印',
169
+        title: "批量打印",
148
         noCache: true
170
         noCache: true
149
       }
171
       }
150
     },
172
     },
151
     {
173
     {
152
-      path: '/dialysis/print/batch/otherone',
153
-      component: () => import('@/xt_pages/dialysis/batch_print/batch_print_order_other_one'),
174
+      path: "/dialysis/print/batch/otherone",
175
+      component: () =>
176
+        import("@/xt_pages/dialysis/batch_print/batch_print_order_other_one"),
154
       hidden: true,
177
       hidden: true,
155
       is_menu: false,
178
       is_menu: false,
156
-      name: 'dialysis_batch_print_two_one',
179
+      name: "dialysis_batch_print_two_one",
157
       meta: {
180
       meta: {
158
-        title: '批量打印',
181
+        title: "批量打印",
159
         noCache: true
182
         noCache: true
160
       }
183
       }
161
-    }, {
162
-      path: '/dialysis/print/batch/othertwo',
163
-      component: () => import('@/xt_pages/dialysis/batch_print/batch_print_order_other_two'),
184
+    },
185
+    {
186
+      path: "/dialysis/print/batch/othertwo",
187
+      component: () =>
188
+        import("@/xt_pages/dialysis/batch_print/batch_print_order_other_two"),
164
       hidden: true,
189
       hidden: true,
165
       is_menu: false,
190
       is_menu: false,
166
-      name: 'dialysis_batch_print_two_two',
191
+      name: "dialysis_batch_print_two_two",
167
       meta: {
192
       meta: {
168
-        title: '批量打印',
193
+        title: "批量打印",
169
         noCache: true
194
         noCache: true
170
       }
195
       }
171
-    }, {
172
-      path: '/dialysis/print/batch/fiveone',
173
-      component: () => import('@/xt_pages/dialysis/batch_print/batch_print_order_five_one'),
196
+    },
197
+    {
198
+      path: "/dialysis/print/batch/fiveone",
199
+      component: () =>
200
+        import("@/xt_pages/dialysis/batch_print/batch_print_order_five_one"),
174
       hidden: true,
201
       hidden: true,
175
       is_menu: false,
202
       is_menu: false,
176
-      name: 'dialysis_batch_print_two_two',
203
+      name: "dialysis_batch_print_two_two",
177
       meta: {
204
       meta: {
178
-        title: '批量打印',
205
+        title: "批量打印",
179
         noCache: true
206
         noCache: true
180
       }
207
       }
181
-    }, {
182
-      path: '/dialysis/print/batch/fivetwo',
183
-      component: () => import('@/xt_pages/dialysis/batch_print/batch_print_order_five_two'),
208
+    },
209
+    {
210
+      path: "/dialysis/print/batch/fivetwo",
211
+      component: () =>
212
+        import("@/xt_pages/dialysis/batch_print/batch_print_order_five_two"),
184
       hidden: true,
213
       hidden: true,
185
       is_menu: false,
214
       is_menu: false,
186
-      name: 'dialysis_batch_print_two_two',
215
+      name: "dialysis_batch_print_two_two",
187
       meta: {
216
       meta: {
188
-        title: '批量打印',
217
+        title: "批量打印",
189
         noCache: true
218
         noCache: true
190
       }
219
       }
191
     },
220
     },
192
     {
221
     {
193
-      path: '/dialysis/board',
194
-      component: () => import('@/xt_pages/dialysis/bulletinBoard'),
195
-      name: '数据看板',
222
+      path: "/dialysis/board",
223
+      component: () => import("@/xt_pages/dialysis/bulletinBoard"),
224
+      name: "数据看板",
196
       meta: {
225
       meta: {
197
-        title: '数据看板'
226
+        title: "数据看板"
198
       }
227
       }
199
     }
228
     }
200
   ]
229
   ]
201
-}
230
+};

+ 1 - 1
src/xt_pages/dialysis/batch_print/batch_print_order_four.vue View File

337
                       目标KT/V:
337
                       目标KT/V:
338
                       <div class="under_line" style="width: 50px;"></div>&nbsp;&nbsp;
338
                       <div class="under_line" style="width: 50px;"></div>&nbsp;&nbsp;
339
                       电导度::
339
                       电导度::
340
-                      <div class="under_line" style="width: 50px;"></div>mS/m&nbsp;&nbsp;
340
+                      <div class="under_line" style="width: 50px;"></div>mS/cm&nbsp;&nbsp;
341
 
341
 
342
                     </div>
342
                     </div>
343
                   </div>
343
                   </div>

File diff suppressed because it is too large
+ 2925 - 0
src/xt_pages/dialysis/batch_print/batch_print_order_nine.vue


+ 12 - 0
src/xt_pages/dialysis/bloodPresssWatch.vue View File

120
           >批量打印</el-button
120
           >批量打印</el-button
121
         >
121
         >
122
       </template>
122
       </template>
123
+      <template v-if="this.template_id == 9">
124
+        <el-button
125
+          size="small"
126
+          icon="el-icon-printer"
127
+          :disabled="selecting_schs.length == 0"
128
+          @click="batchPrintAction"
129
+          type="primary"
130
+          >批量打印</el-button
131
+        >
132
+      </template>
123
     </div>
133
     </div>
124
     <div class="app-container">
134
     <div class="app-container">
125
       <!-- <div class="filter-container">
135
       <!-- <div class="filter-container">
579
         this.$router.push({ path: "/dialysis/print/batch/seven" });
589
         this.$router.push({ path: "/dialysis/print/batch/seven" });
580
       } else if (this.template_id == 8) {
590
       } else if (this.template_id == 8) {
581
         this.$router.push({ path: "/dialysis/print/batch/eight" });
591
         this.$router.push({ path: "/dialysis/print/batch/eight" });
592
+      } else if (this.template_id == 9) {
593
+        this.$router.push({ path: "/dialysis/print/batch/nine" });
582
       }
594
       }
583
     },
595
     },
584
     batchPrintActionOne: function() {
596
     batchPrintActionOne: function() {

File diff suppressed because it is too large
+ 520 - 357
src/xt_pages/dialysis/details/DialysisPrescription.vue


+ 2 - 2
src/xt_pages/dialysis/details/dialog/monitor_dialog.vue View File

267
           <el-table-column
267
           <el-table-column
268
             prop="displacement_flow_quantity"
268
             prop="displacement_flow_quantity"
269
             align="center"
269
             align="center"
270
-            label="电导度(mS/m)"
270
+            label="电导度(mS/cm)"
271
             width="100"
271
             width="100"
272
             v-if="isShow('电导度')"
272
             v-if="isShow('电导度')"
273
           >
273
           >
447
           </el-col>
447
           </el-col>
448
 
448
 
449
           <el-col :span="8" v-if="isShow('电导度')">
449
           <el-col :span="8" v-if="isShow('电导度')">
450
-            <el-form-item label="电导度(mS/m):">
450
+            <el-form-item label="电导度(mS/cm):">
451
               <el-input v-model="form.conductivity"></el-input>
451
               <el-input v-model="form.conductivity"></el-input>
452
             </el-form-item>
452
             </el-form-item>
453
           </el-col>
453
           </el-col>

+ 1 - 1
src/xt_pages/dialysis/details/dialysisMonitoring.vue View File

22
         <th v-if="isShow('置换量')&& template_id == 6" width="92px">置换量(ml)</th>
22
         <th v-if="isShow('置换量')&& template_id == 6" width="92px">置换量(ml)</th>
23
         <th v-if="isShow('置换量')&& template_id != 6" width="92px">置换量(L)</th>
23
         <th v-if="isShow('置换量')&& template_id != 6" width="92px">置换量(L)</th>
24
          <th v-if="isShow('SpO₂')&& template_id != 6" width="92px">SpO₂(%)</th>
24
          <th v-if="isShow('SpO₂')&& template_id != 6" width="92px">SpO₂(%)</th>
25
-        <th v-if="isShow('电导度')" width="92px">电导度(mS/m)</th>
25
+        <th v-if="isShow('电导度')" width="92px">电导度(mS/cm)</th>
26
         <th v-if="isShow('置换液流量')"  width="92px">置换液流量(ml/h)</th>
26
         <th v-if="isShow('置换液流量')"  width="92px">置换液流量(ml/h)</th>
27
         <th v-if="isShow('病情变化')" width="92px">病情变化</th>
27
         <th v-if="isShow('病情变化')" width="92px">病情变化</th>
28
         <th v-if="isShow('处理')"  width="92px">处理</th>
28
         <th v-if="isShow('处理')"  width="92px">处理</th>

+ 27 - 0
src/xt_pages/dialysis/dialysisPrintOrder.vue View File

123
           >打印</el-button
123
           >打印</el-button
124
         >
124
         >
125
       </template>
125
       </template>
126
+      <template v-if="org_template_info.template_id == 9">
127
+        <el-button
128
+          :loading="loading"
129
+          size="small"
130
+          icon="el-icon-printer"
131
+          @click="printThisPage"
132
+          type="primary"
133
+          >打印</el-button
134
+        >
135
+      </template>
126
     </div>
136
     </div>
127
     <div class="app-container ">
137
     <div class="app-container ">
128
       <!--<div class="order-print-btn"-->
138
       <!--<div class="order-print-btn"-->
184
         v-if="org_template_info.template_id == 8"
194
         v-if="org_template_info.template_id == 8"
185
       >
195
       >
186
       </DialysisPrintOrderEight>
196
       </DialysisPrintOrderEight>
197
+      <DialysisPrintOrderNine
198
+        v-bind:childResponse="childResponse"
199
+        v-if="org_template_info.template_id == 9"
200
+      ></DialysisPrintOrderNine>
187
     </div>
201
     </div>
188
   </div>
202
   </div>
189
 </template>
203
 </template>
202
 import DialysisPrintOrderSix from "./template/DialysisPrintOrderSix";
216
 import DialysisPrintOrderSix from "./template/DialysisPrintOrderSix";
203
 import DialysisPrintOrderSeven from "./template/DialysisPrintOrderSeven";
217
 import DialysisPrintOrderSeven from "./template/DialysisPrintOrderSeven";
204
 import DialysisPrintOrderEight from "./template/DialysisPrintOrderEight";
218
 import DialysisPrintOrderEight from "./template/DialysisPrintOrderEight";
219
+import DialysisPrintOrderNine from "./template/DialysisPrintOrderNine";
205
 import print from "print-js";
220
 import print from "print-js";
206
 
221
 
207
 export default {
222
 export default {
215
     DialysisPrintOrderSix,
230
     DialysisPrintOrderSix,
216
     DialysisPrintOrderSeven,
231
     DialysisPrintOrderSeven,
217
     DialysisPrintOrderEight,
232
     DialysisPrintOrderEight,
233
+    DialysisPrintOrderNine,
218
     LabelBox,
234
     LabelBox,
219
     BreadCrumb
235
     BreadCrumb
220
   },
236
   },
412
           style: style3,
428
           style: style3,
413
           scanStyles: false
429
           scanStyles: false
414
         });
430
         });
431
+      } else if (this.org_template_info.template_id == 9) {
432
+        console.log(
433
+          "joasdjjaslkdjlasjdlkasj",
434
+          this.org_template_info.template_id
435
+        );
436
+        printJS({
437
+          printable: "dialysis-print-box",
438
+          type: "html",
439
+          style: style3,
440
+          scanStyles: false
441
+        });
415
       }
442
       }
416
     },
443
     },
417
     printThisOnePage() {
444
     printThisOnePage() {

+ 1 - 1
src/xt_pages/dialysis/template/DialysisPrintOrderFour.vue View File

451
                           <span v-if="prescription.anticoagulant==2">{{prescription.anticoagulant_shouji}}</span>
451
                           <span v-if="prescription.anticoagulant==2">{{prescription.anticoagulant_shouji}}</span>
452
                         </div>
452
                         </div>
453
                       </td>
453
                       </td>
454
-                      <td width="20">mS/m</td>
454
+                      <td width="20">mS/cm</td>
455
                       <td></td>
455
                       <td></td>
456
                     </tr>
456
                     </tr>
457
                   </tbody>
457
                   </tbody>

File diff suppressed because it is too large
+ 2105 - 1264
src/xt_pages/dialysis/template/DialysisPrintOrderThree.vue


File diff suppressed because it is too large
+ 2983 - 0
src/xt_pages/dialysis/template/dialysisPrintOrderNine.vue