4月18日杨青

src/xt_pages/dialysis/dialysisPrintOrder.vue

@@ -111,7 +111,8 @@
           org_template_info.template_id == 50 ||
           org_template_info.template_id == 52 ||
           org_template_info.template_id == 53  ||
-          $store.getters.xt_user.org.id == 0
+          org_template_info.template_id == 64  ||
+          $store.getters.xt_user.org.id == 0 
         "
       >
       <div>
@@ -796,7 +797,17 @@
           >
         </div>
       </template>
-      
+
+      <!-- <template v-if="org_template_info.template_id == 64">
+        <el-button
+          :loading="loading"
+          size="small"
+          icon="el-icon-printer"
+          @click="printThisPage"
+          type="primary"
+          >打印</el-button
+        >
+      </template> -->
     </div>
     <div class="app-container" style="min-height: 0">
       <!--<div class="order-print-btn"-->
@@ -1239,6 +1250,11 @@
           v-bind:childResponse="childResponse"
             v-if="org_template_info.template_id == 63">
           </DialysisPrintOrderSixtyThree> -->
+          <DialysisPrintOrderSixtyfour
+          v-bind:childResponse="childResponse"
+            v-if="org_template_info.template_id == 64">
+
+          </DialysisPrintOrderSixtyfour>
         </div>
       </el-container>
     </div>
@@ -1320,6 +1336,7 @@ import DialysisPrintOrderSixty from "./template/DialysisPrintOrderSixty";
 import DialysisPrintOrderSixtyOne from "./template/DialysisPrintOrderSixtyOne"
 import DialysisPrintOrderSixtyTwo from "./template/DialysisPrintOrderSixtyTwo"
 // import DialysisPrintOrderSixtyThree from "./template/DialysisPrintOrderSixtyThree"
+import DialysisPrintOrderSixtyfour from './template/DialysisPrintOrderSixtyfour'
 export default {
   name: "dialysisPrintOrder",
   components: {
@@ -1386,7 +1403,7 @@ export default {
     DialysisPrintOrderSeven,
     DialysisPrintOrderEight,
     DialysisPrintOrderNine,
-
+    DialysisPrintOrderSixtyfour,
     LabelBox,
     BreadCrumb,
   },
@@ -1937,6 +1954,16 @@ export default {
           style: style2,
           scanStyles: false,
         });
+      }else if (
+        this.org_template_info.template_id == 64
+      ) {
+        printJS({
+          printable: "dialysis-print-box-64",
+          type: "html",
+          style: style12,
+          scanStyles: false,
+        });
+        
       }else if (
         this.org_template_info.template_id == 53
       ) {
@@ -1947,7 +1974,8 @@ export default {
           scanStyles: false,
         });
         
-      }else if (
+      }
+      else if (
         this.org_template_info.template_id == 54 || this.org_template_info.template_id == 57
       ) {
         printJS({
@@ -2032,7 +2060,7 @@ export default {
           style: style,
           scanStyles: false,
         });
-      }
+      } 
     },
     printThisTwoPage() {
       var ptime = Math.round(new Date().getTime() / 1000);
@@ -2160,6 +2188,7 @@ export default {
       getDialysisRecord(this.queryParams).then((response) => {
         if (response.data.state == 1) {
           this.childResponse = response;
+          console.log('this.org_template_info是数据',response.data.data);
           this.org_template_info = response.data.data.org_template_info;
           this.loading = false;
           //   this.adminUser = response.data.data.users

src/xt_pages/dialysis/template/DialysisPrintOrderFiftyThree.vue

@@ -1201,6 +1201,8 @@
       </table>
     </div>
   </div>
+
+  
   <div id="dialysis-print-box-1-2">
     <div class="dialysis-print-order">
       <table class="print-table">

src/xt_pages/user/courseOfDisease.vue

@@ -73,10 +73,10 @@
               <div class="record_content_panel">
                 <div style="background-color:rgb(245, 247, 250)" class="title">病程内容</div>
                 <!--v-html="current_select_record.content"-->
-                <!-- <div class="content">
+                <div class="content">
                   <span v-if="current_select_record" >{{current_select_record.content }}</span>
                   <span v-else></span>
-                </div> -->
+                </div>
                 <!-- <el-form>
                   <el-row style="margin-top: 20px;">
                     <el-col :span="6" style="margin-left: 20px;">