7月28日杨青

src/xt_pages/dialysis/batch_print/batch_print_order_sixtyseven.vue

@@ -493,19 +493,53 @@
           <div style="height: 80px;margin: 10px 0px;text-align: left;">
             <span>治疗小结：</span>
           </div>
-          <div style="text-align: left;">
-            <span style="">上机护士：
-              
-            </span>
-          <span style="margin-left:30px ;">核对护士：
-
-            </span>
-              <span style="margin-left:30px ;">下机护士：
-
-            </span>
-            <span style="margin-left:30px ;">医生：
-
-            </span>
+          <div style="text-align: left;width: 100%;">
+            <table>
+              <tr>
+                <td width="10%">上机护士：</td>
+                <td width="10%">
+                  <span>
+                <span
+                  v-if="
+                    setAdminUserES(
+                      dialysisOrder == null
+                        ? 0
+                        : dialysisOrder.start_nurse
+                    ) == ''
+                  "
+                >
+                  {{
+                    getAdminUser(
+                      dialysisOrder == null
+                        ? 0
+                        : dialysisOrder.start_nurse
+                    )
+                  }}</span
+                >
+                <img
+                  style="height: 30px"
+                  :src="
+                    setAdminUserES(
+                      dialysisOrder == null
+                        ? 0
+                        : dialysisOrder.start_nurse
+                    )
+                  "
+                  alt=""
+                  srcset=""
+                  v-else
+                />
+                  </span>
+                </td>
+                <td width="10%">核对护士：</td>
+                <td width="10%"></td>
+                <td width="10%">下机护士：</td>
+                <td width="10%"></td>
+                <td width="10%">医生：</td>
+                <td width="10%"></td>
+              </tr>
+            </table>
+          
           </div>
         </div>
           <template v-if="record.totallength > 14">
@@ -1067,8 +1101,8 @@ export default {
     padding: 10px;
   }
   .infoTitle{
-    background: #efe7e7;
-    border-top: 1px solid black;
+    // background: #efe7e7;
+    // border-top: 1px solid black;
     padding: 5px 0px;
     font-weight:bolder;
   }
@@ -1076,7 +1110,7 @@ export default {
     padding: 5px;
   }
   .table tr th{
-    background: #efe7e7;
+    // background: #efe7e7;
   }
 
 }

src/xt_pages/dialysis/dialysisPrintOrder.vue

@@ -821,7 +821,7 @@
         >
         </div>
       </template>
-      <!-- <template v-if="org_template_info.template_id == 67 ">
+      <template v-if="org_template_info.template_id == 67 ">
         <div>
           <el-button
           :loading="loading"
@@ -832,7 +832,7 @@
           >打印</el-button
         >
         </div>
-      </template> -->
+      </template>
     </div>
     <div class="app-container" style="min-height: 0">
       <!--<div class="order-print-btn"-->
@@ -2017,14 +2017,14 @@ export default {
           scanStyles: false,
         });
       }
-      // else if (this.org_template_info.template_id == 67 ) {
-      //   printJS({
-      //     printable: "dialysis-print-box-1",
-      //     type: "html",
-      //     style: style2,
-      //     scanStyles: false,
-      //   });
-      // }
+      else if (this.org_template_info.template_id == 67 ) {
+        printJS({
+          printable: "dialysis-print-box-1",
+          type: "html",
+          style: style2,
+          scanStyles: false,
+        });
+      }
       else if (
         this.org_template_info.template_id == 53
       ) {

src/xt_pages/dialysis/template/DialysisPrintOrdersixtySeven.vue

@@ -338,50 +338,53 @@
           <div style="height: 80px;margin: 10px 0px;text-align: left;">
             <span>治疗小结：</span>
           </div>
-          <div style="text-align: left;">
-            <span style="">上机护士：
-              <span>
-                <span
-                  v-if="
-                    setAdminUserES(
-                      dialysisOrder == null
-                        ? 0
-                        : dialysisOrder.start_nurse
-                    ) == ''
-                  "
-                >
-                  {{
-                    getAdminUser(
-                      dialysisOrder == null
-                        ? 0
-                        : dialysisOrder.start_nurse
-                    )
-                  }}</span
-                >
-                <img
-
-                  :src="
-                    setAdminUserES(
-                      dialysisOrder == null
-                        ? 0
-                        : dialysisOrder.start_nurse
-                    )
-                  "
-                  alt=""
-                  srcset=""
-                  v-else
-                />
-                </span>
-            </span>
-          <span style="margin-left:30px ;">核对护士：
-
-            </span>
-              <span style="margin-left:30px ;">下机护士：
-
-            </span>
-            <span style="margin-left:30px ;">医生：
-
-            </span>
+          <div style="text-align: left;width: 100%;">
+            <table>
+              <tr>
+                <td width="10%">上机护士：</td>
+                <td width="10%">
+                  <span>
+                    <span
+                      v-if="
+                        setAdminUserES(
+                          dialysisOrder == null
+                            ? 0
+                            : dialysisOrder.start_nurse
+                        ) == ''
+                      "
+                    >
+                      {{
+                        getAdminUser(
+                          dialysisOrder == null
+                            ? 0
+                            : dialysisOrder.start_nurse
+                        )
+                      }}</span>
+                    <img
+                      style="height: 30px"
+                      :src="
+                        setAdminUserES(
+                          dialysisOrder == null
+                            ? 0
+                            : dialysisOrder.start_nurse
+                        )
+                      "
+                      alt=""
+                      srcset=""
+                      v-else
+                    />
+                    
+                  </span>
+                </td>
+                <td width="10%">核对护士：</td>
+                <td width="10%"></td>
+                <td width="10%">下机护士：</td>
+                <td width="10%"></td>
+                <td width="10%">医生：</td>
+                <td width="10%"></td>
+              </tr>
+            </table>
+          
           </div>
         </div>
       </div>
@@ -1396,17 +1399,15 @@ export default {
     padding: 10px;
   }
   .infoTitle{
-    background: #efe7e7;
-    border-top: 1px solid black;
+    // background: #efe7e7;
+    // border-top: 1px solid black;
     padding: 5px 0px;
     font-weight:bolder;
   }
   .table tr td{
     padding: 5px;
   }
-  .table tr th{
-    background: #efe7e7;
-  }
+  
 
 }
 </style>

src/xt_pages/outpatientDoctorStation/print.vue

@@ -144,7 +144,8 @@ export default {
             scanStyles: false,
           });
         }, 500);
-      } else {
+      } 
+       else {
         const style =
           "@media print {#prescription-print{font-size:14px;}.prescription-print:last-child {page-break-after: auto;}.printTitle{font-size: 22px;text-align: center;font-weight: bold;}.infoTitle{display: flex;border-bottom: 2px solid #000;margin-top:10px;line-height: 1px; padding:0 10px;}.infoTitle p{width: 200px;font-size:14px;}.infoMain{display: flex;flex-wrap: wrap;border-bottom: 2px solid #000;padding:0 10px;}.infoMain div{width: 50%;line-height: 24px;}.prescriptionBox{padding:0 10px;min-height:450px;}.Rp{font-size: 22px;font-weight: bold;}.drugsBox{padding-left: 40px;margin-bottom: 10px;position: relative;}.drugsBox div{line-height: 20px;width:80%} .drugsOne{line-height: 1px;} .drugsOne span{margin-right: 20px;} .doctorBox{display: flex; justify-content: space-between; padding:0 10px; line-height: 1px; border-bottom: 2px solid #000;} .actionBar{display: flex; justify-content: space-between; line-height: 1px; padding:0 10px;} .actionBar p{width:150px;}}";
         printJS({

src/xt_pages/outpatientDoctorStation/template/prinSeven.vue

@@ -22,14 +22,14 @@
           {{ orgname }}处方笺
         </div>
         <div >
-          <div class="infoTitle">
-            <p>姓名：{{ item.patient.name ? item.patient.name : "" }}</p>
-            <p>
+          <div  style="display: flex;border-top: 2px solid #000;margin-top: 10px;line-height: 24px;padding: 0 10px;">
+            <p style="width: 200px;">姓名：{{ item.patient.name ? item.patient.name : "" }}</p>
+            <p style="width: 200px;">
               性别：
               <span v-if="item.patient.gender == 1">男</span>
               <span v-if="item.patient.gender == 2">女</span>
             </p>
-            <p>年龄：{{ getAge(item.patient) ? getAge(item.patient) : "" }}岁</p>
+            <p style="width: 200px;">年龄：{{ getAge(item.patient) ? getAge(item.patient) : "" }}岁</p>
           </div>
           <div class="infoMain">
             <div style="margin-bottom: 10px">
@@ -49,13 +49,13 @@
             <div style="margin-bottom: 10px" v-else>
               日期：{{ getTime(item.ctime) ? getTime(item.ctime) : "" }}
             </div>
-            <div>地址：{{ item.patient.home_address }}</div>
-            <div style="display: flex; width: 50%">
+            <div style="width: 100%;">地址：{{ item.patient.home_address }}</div>
+            <div style=" width: 50%">
               临床诊断：{{ getDiagnosis(item.info.diagnosis) }}
             </div>
           </div>
         </div>
-          <div class="prescriptionBox" >
+          <div class="prescriptionBox" style="min-height: 400px;">
             <div class="Rp">Rp:</div>
             <div
               class="drugsBox"
@@ -93,8 +93,8 @@
                     <div style="margin-bottom: 10px" v-else>
                       日期：{{ getTime(item.ctime) ? getTime(item.ctime) : "" }}
                     </div>
-                    <div>地址：{{ item.patient.home_address }}</div>
-                    <div style="display: flex; width: 50%">
+                    <div style="width: 100%">地址：{{ item.patient.home_address }}</div>
+                    <div style="width: 100%">
                       临床诊断：{{ getDiagnosis(item.info.diagnosis) }}
                     </div>
                   </div>
@@ -265,6 +265,13 @@
           <div  style="border-bottom: 2px solid #000; width: 100%;margin-right: 30px;padding: 0 10px;line-height: 24px;" >
             <p style="text-align: right;">医师：{{ item.doctor ? item.doctor : "" }}</p>
           </div>
+          <!-- <div style="display: flex;justify-content: space-around;border-bottom: 2px solid #000;">
+            <p style="width:300px;">大额处方患者意见： 
+              <el-radio v-model="radio" label="1">同意</el-radio>
+              <el-radio v-model="radio" label="2">不同意</el-radio>
+            </p>
+            <p style="text-align: right;">医师：{{ item.doctor ? item.doctor : "" }}</p>
+          </div> -->
 
           <div class="actionBar" >
             <!-- <p>审核：{{getDoctor(item.advices[0].checker)?getDoctor(item.advices[0].checker):""}}</p>
@@ -286,30 +293,18 @@
             </p>
             
           </div>
-          <div class="actionBar" style="margin-bottom: 10px;">
+          <div class="actionBar">
             <p style="width:300px;">大额处方患者意见： 
               <el-radio v-model="radio" label="1">同意</el-radio>
               <el-radio v-model="radio" label="2">不同意</el-radio>
             </p>
+            
             <p>收费员：</p>
           </div>
-          <div style="padding: 0px 10px;">
+          <div>
             <p >患者签名：</p>
           </div>
-
-          <!-- <div class="actionBar" v-else>
-            <p >审核、调配：</p>
-            <p >核对、发药：</p>
-            <p >
-              药费：{{
-                getTotalOne(item.id).toFixed(2)
-                  ? getTotalOne(item.id).toFixed(2)
-                  : 0
-              }}元
-            </p>
-           
-          </div> -->
-        <!-- </div> -->
+          
       </div>
     </div>
   </div>

src/xt_pages/outpatientDoctorStation/treatTemplate/printOne.vue

@@ -28,12 +28,14 @@
                     <span v-if="item.patient.gender == 2">女</span>
                 </div>
                 <div style="margin-bottom: 10px;width:25%">年龄：
-                    <span>{{getAge(item.patient)?getAge(item.patient):""}}</span>
+                    <span>{{getAge(item.patient)?getAge(item.patient):""}}岁</span>
                 </div>
                 <div style="margin-bottom: 10px;width:25%">参保类型：{{hisPatient.social_type?hisPatient.social_type:''}}
                 </div>
                 <div style="margin-bottom: 10px;width:50%;">联系电话：{{item.patient.phone}}</div>
-                <div style="width:50%;">地址：{{item.patient.unit_address}}</div>
+                <div style="width:50%;">地址：{{ item.patient.home_address }}
+                  <!-- {{item.patient.unit_address}} -->
+                </div>
                 <div style="width:100%;">诊断：{{getDiagnosis(item.info.diagnosis)}}</div>
             </div>
 
@@ -78,11 +80,7 @@
             <div style="display: flex; margin-top: 10px; line-height: 24px;padding: 0 10px;">
                 <div style="width: 300px;">开单医生：{{item.doctor?item.doctor:''}}</div>
                 <div style="width: 300px;">签章：</div>
-            </div>
-
-            <div class="actionBar">
-                <div>执行医生：{{item.doctor?item.doctor:''}}</div>
-                <div>费用：{{getTotalOne(item.id).toFixed(2)?getTotalOne(item.id).toFixed(2):''}}元</div>
+                <div style="width: 300px;">费用：{{getTotalOne(item.id).toFixed(2)?getTotalOne(item.id).toFixed(2):''}}元</div>
             </div>
 
             <table style="width:100%;text-align:center;line-height:25px;border-collapse: collapse;" border="1">
@@ -417,10 +415,11 @@
         })
       },
       getDiagnosis(id) {
-        var name = ''
+        let arr = id.split(",");
+        var name = "";
         for (let i = 0; i < this.diagnoses.length; i++) {
-          if (id == this.diagnoses[i].id) {
-            name = this.diagnoses[i].class_name
+          if (arr.indexOf(String(this.diagnoses[i].id)) > -1) {
+            name += this.diagnoses[i].class_name + " ";
           }
         }
         return name