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

src/xt_pages/dialysis/details/assessmentAfter.vue

@@ -711,7 +711,6 @@ export default {
       return dialyzerName;
     },
     isShow(name) {
-      // console.log("name", name);
       var filedList = store.getters.xt_user.fileds;
 
       for (let i = 0; i < filedList.length; i++) {

src/xt_pages/dialysis/details/dialog/dialysisPrescriptionDialog.vue

@@ -1571,9 +1571,9 @@ export default {
         this.dialysisPrescription.anticoagulant = "低分子肝素";
       }
       this.pre = pre;
-      console.log("pre", pre);
+      console.log("pre1", pre);
       this.getPermission();
-
+      
       let last_weight_after = 0;
       let weight_before = 0;
 

src/xt_pages/dialysis/template/DialysisPrintOrderNine.vue

@@ -3097,4 +3097,5 @@ export default {
 .print-template-two tr {
   line-height: 30px;
 }
+/*  */
 </style>

src/xt_pages/dialysis/template/dialysisPrintOrderNine.vue

@@ -3097,4 +3097,5 @@ export default {
 .print-template-two tr {
   line-height: 30px;
 }
+/*  */
 </style>