Browse Source

Merge branch 'master' of http://git.shengws.com/csx/Vue_New

csx 5 years ago
parent
commit
9ca66d0c58

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

179
         v-if="org_template_info.template_id == 8"
179
         v-if="org_template_info.template_id == 8"
180
       >
180
       >
181
       </DialysisPrintOrderEight>
181
       </DialysisPrintOrderEight>
182
+
183
+      <!--<DialysisPrintOrderTen></DialysisPrintOrderTen>-->
184
+      <DialysisPrintOrderTen
185
+        v-bind:childResponse="childResponse"
186
+        v-if="org_template_info.template_id == 10"
187
+      ></DialysisPrintOrderTen>
188
+
189
+
182
     </div>
190
     </div>
183
   </div>
191
   </div>
184
 </template>
192
 </template>
198
 import DialysisPrintOrderSeven from "./template/DialysisPrintOrderSeven";
206
 import DialysisPrintOrderSeven from "./template/DialysisPrintOrderSeven";
199
 import DialysisPrintOrderEight from "./template/DialysisPrintOrderEight";
207
 import DialysisPrintOrderEight from "./template/DialysisPrintOrderEight";
200
 import print from "print-js";
208
 import print from "print-js";
209
+import DialysisPrintOrderTen from './template/DialysisPrintOrderTen'
201
 
210
 
202
 export default {
211
 export default {
203
   name: "dialysisPrintOrder",
212
   name: "dialysisPrintOrder",
204
   components: {
213
   components: {
214
+    DialysisPrintOrderTen,
205
     DialysisPrintOrderOne,
215
     DialysisPrintOrderOne,
206
     DialysisPrintOrderTwo,
216
     DialysisPrintOrderTwo,
207
     DialysisPrintOrderThree,
217
     DialysisPrintOrderThree,
210
     DialysisPrintOrderSix,
220
     DialysisPrintOrderSix,
211
     DialysisPrintOrderSeven,
221
     DialysisPrintOrderSeven,
212
     DialysisPrintOrderEight,
222
     DialysisPrintOrderEight,
223
+
213
     LabelBox,
224
     LabelBox,
214
     BreadCrumb
225
     BreadCrumb
215
   },
226
   },
399
           style: style,
410
           style: style,
400
           scanStyles: false
411
           scanStyles: false
401
         });
412
         });
413
+      } else if (this.org_template_info.template_id == 10) {
414
+        printJS({
415
+          printable: "dialysis-print-box",
416
+          type: "html",
417
+          style: style,
418
+          scanStyles: false
419
+        });
402
       }
420
       }
403
     },
421
     },
404
     printThisOnePage() {
422
     printThisOnePage() {

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