Merge branch '20230223_pc_vue_new_branch' of http://git.shengws.com/csx/Vue_New into 20230223_pc_vue_new_branch

src/xt_pages/dialysis/batch_print/batch_print_order_seventythree.vue

@@ -1118,7 +1118,6 @@
                         </tr>
 
                         <tr v-for="(monitor_record, j) in record.monitor_records" :key="j">
-        
                           <td>
                             {{
                               getTime(monitor_record.operate_time, "{h}:{i}")
@@ -1180,8 +1179,8 @@
                                   v-if=" record.dialysis_order && monitor_record.operate_time == 
                                     record.dialysis_order.start_time
                                   "
-                                  >【开始透析】引血 {{ record.dialysis_order.blood_drawing }} ml/min</template
-                                >
+                                  >【开始透析】引血 {{ record.dialysis_order.blood_drawing }} ml/min
+                                </template>
                                 {{ monitor_record.dispose }} {{ monitor_record.end }}
                                  &nbsp;
                                 &nbsp;
@@ -1429,8 +1428,7 @@
                 </tr>
                 <tr>
                   <td>
-                    <div
-                      class="row"
+                    <div class="row"
                       style="padding: 2px 0; line-height: 23px; display: flex"
                     >
                       <div class="inline_block" style="flex: 1">
@@ -1851,7 +1849,19 @@
                 </tr>
               </tbody>
             </table>
+            <div style="text-align: right;margin-top: 10px;">
+              患者签名：
+              <div class="under_line" style="width: 120px;">
+                <img v-if="record.dialysis_order.url!=''"
+                  style="height: 30px"
+                  :src="record.dialysis_order == null? 0: record.dialysis_order.url"
+                  alt=""
+                  srcset=""
+                />
+              </div>
+            </div>
           </div>
+          
         </div>
       </div>
     </div>

src/xt_pages/dialysis/batch_print/option_check_box.vue

@@ -47,8 +47,8 @@ export default {
 }
 .check_box_panel .did_checked::after {
     content: "√";
-    font-size: 10px;
-    margin-left: 2px;
+    font-size: 15px;
+    margin-left: -5px;
     position: absolute;
 }
 </style>

src/xt_pages/dialysis/template/DialysisPrintOrderSeventythree.vue

@@ -1086,7 +1086,7 @@
                                 "
                                 >【开始透析】引血{{ dialysisOrder.blood_drawing }} ml/min
                                 </template>
-                              
+                
                                 {{ monitor.dispose }} {{ monitor.end }}  &nbsp;
                               &nbsp;
                             </span>
@@ -1356,8 +1356,7 @@
               </tr>
               <tr>
                 <td colspan="7">
-                  <div
-                    class="row"
+                  <div class="row"
                     style="padding: 2px 0; line-height: 23px; display: flex"
                   >
                     <div >
@@ -1641,11 +1640,18 @@
                   </div>
                 </td>
               </tr>
-
-
             </tbody>
           </table>
-          <!-- <div  class="print-yema">1</div> -->
+          <div style="text-align: right;margin-top: 10px;">
+            患者签名：
+            <div class="under_line" style="width: 120px;">
+              <img v-if="dialysisOrder.url!=''&&dialysisOrder !=null"
+                style="height: 30px"
+                :src="dialysisOrder == null? 0: dialysisOrder.url"
+                alt="" srcset=""
+              />
+            </div>
+          </div>
         </div>
       </div>
     </div>

src/xt_pages/user/components/PatientDetail.vue

@@ -1269,103 +1269,105 @@
       </div>
       <div id="print-info-box" v-else>
         <div class="print_main_content" style="font-family:SimSun;">
-          <div class="order_title" style="font-size: 40px;font-weight: 600;text-align: center;">{{ orgname }}</div>
-          <div class="order_title" style="font-size: 40px;font-weight: 600;margin-bottom: 10px;text-align: center;">血液净化治疗患者首次门诊病历</div>
+          <div style="font-size: 35px;font-weight: 600;text-align: center;margin-top: 30px;">
+            海拉尔普爱{{ orgname }}
+          </div>
+          <div style="font-size: 35px;font-weight: 600;margin-bottom: 10px;text-align: center;">血液净化治疗患者首次门诊病历</div>
           <div >
             <table border="1" style="border-collapse: collapse;text-align: center;">
               <tbody>
                 <tr>
-                  <td style="width:8%;padding: 5px 0px;font-size: 25px;font-weight: 500;">
+                  <td style="width:8%;padding: 5px 0px;font-size: 22px;font-weight: 500;">
                     姓名
                   </td>
-                  <td style="padding: 5px 0px;font-size: 25px;width:15%;">
+                  <td style="padding: 5px 0px;font-size: 22px;width:15%;">
                     {{ patientPrint.name }}
                   </td>
-                  <td style="padding: 5px 0px;font-size: 25px;font-weight: 500;width:7%;">
+                  <td style="padding: 5px 0px;font-size: 22px;font-weight: 500;width:7%;">
                     性别
                   </td>
-                  <td style="padding: 5px 0px;font-size: 25px;width:5%;">
+                  <td style="padding: 5px 0px;font-size: 22px;width:5%;">
                     {{ patientPrint.gender }}
                   </td>
-                  <td style="padding: 5px 0px;font-size: 25px;font-weight: 500;width:8%;">
+                  <td style="padding: 5px 0px;font-size: 22px;font-weight: 500;width:8%;">
                     年龄
                   </td>
-                  <td style="padding: 5px 0px;font-size: 25px;width:10%;">
+                  <td style="padding: 5px 0px;font-size: 22px;width:10%;">
                     {{ patientPrint.age }}岁
                   </td>
-                  <td style="padding: 5px 0px;font-size: 25px;font-weight: 500;width:12%;">
+                  <td style="padding: 5px 0px;font-size: 22px;font-weight: 500;width:12%;">
                     报销方式
                   </td>
-                  <td style="padding: 5px 0px;font-size: 25px;width: 15%;">
+                  <td style="padding: 5px 0px;font-size: 22px;width: 15%;">
                     {{patientPrint.reimbursement_way_id }}
                   </td>
-                  <td style="padding: 5px 0px;font-size: 25px;font-weight: 500;width:10%;">
+                  <td style="padding: 5px 0px;font-size: 22px;font-weight: 500;width:10%;">
                     透析号
                   </td>
-                  <td style="padding: 5px 0px;font-size: 25px;width:10%;">
+                  <td style="padding: 5px 0px;font-size: 22px;width:10%;">
                     {{patientPrint.dialysis_no}}
                   </td>
                 </tr>
                 <tr>
-                  <td style="padding: 5px 0px;font-size: 25px;font-weight: 500;">
+                  <td style="padding: 5px 0px;font-size: 22px;font-weight: 500;">
                     电话
                   </td>
-                  <td style="padding: 5px 0px;font-size: 25px;">
+                  <td style="padding: 5px 0px;font-size: 22px;">
                     {{ patientPrint.phone }}
                   </td>
-                  <td  style="padding: 5px 0px;font-size: 25px;font-weight: 500;">
+                  <td  style="padding: 5px 0px;font-size: 22px;font-weight: 500;">
                     民族
                   </td>
-                  <td colspan="3" style="padding: 5px 0px;font-size: 25px;">
+                  <td colspan="3" style="padding: 5px 0px;font-size: 22px;">
                     {{ patientPrint.nation }}
                   </td>
-                  <td style="padding: 5px 0px;font-size: 25px;font-weight: 500;">
+                  <td style="padding: 5px 0px;font-size: 22px;font-weight: 500;">
                     身份证号
                   </td>
-                  <td colspan="3" style="padding: 5px 0px;font-size: 25px;">
+                  <td colspan="3" style="padding: 5px 0px;font-size: 22px;">
                     {{ patientPrint.id_card_no }}
                   </td>
                 </tr>
                  <tr>
-                  <td style="padding: 5px 0px;font-size: 25px;font-weight: 500;">
+                  <td style="padding: 5px 0px;font-size: 22px;font-weight: 500;">
                     联系人
                   </td>
-                  <td style="padding: 5px 0px;font-size: 25px;">
+                  <td style="padding: 5px 0px;font-size: 22px;">
                     {{ patientPrint.contact_name }}
                   </td>
-                  <td  style="padding: 5px 0px;font-size: 25px;font-weight: 500;">
+                  <td  style="padding: 5px 0px;font-size: 22px;font-weight: 500;">
                     电话
                   </td>
-                  <td colspan="3" style="padding: 5px 0px;font-size: 25px;">
+                  <td colspan="3" style="padding: 5px 0px;font-size: 22px;">
                     {{ patientPrint.home_telephone }}
                   </td>
-                  <td style="padding: 5px 0px;font-size: 25px;font-weight: 500;">
+                  <td style="padding: 5px 0px;font-size: 22px;font-weight: 500;">
                     联系地址
                   </td>
-                  <td colspan="3" style="padding: 5px 0px;font-size: 25px;">
+                  <td colspan="3" style="padding: 5px 0px;font-size: 22px;">
                     {{ patientPrint.home_address }}
                   </td>
                 </tr>
                 <tr>
-                  <td colspan="2" style="padding: 5px 0px;font-size: 25px;font-weight: 500;">
+                  <td colspan="2" style="padding: 5px 0px;font-size: 22px;font-weight: 500;">
                     首次透析时间
                   </td>
-                  <td colspan="4" style="padding: 5px 0px;font-size: 25px;">
+                  <td colspan="4" style="padding: 5px 0px;font-size: 22px;">
                     {{ patientPrint.first_dialysis_date }}
                   </td>
-                  <td style="padding: 5px 0px;font-size: 25px;font-weight: 500;">
+                  <td style="padding: 5px 0px;font-size: 22px;font-weight: 500;">
                     血管通路
                   </td>
-                  <td colspan="3" style="padding: 5px 0px;font-size: 25px;">
+                  <td colspan="3" style="padding: 5px 0px;font-size: 22px;">
                      <!-- {{ patientVascularAccessOne.blood_access_part_id }} {{ patientVascularAccessOne.blood_access_part_opera_id }} -->
                   </td>
                 </tr>
 
                 <tr>
-                  <td style="padding: 5px 0px;font-size: 25px; font-weight: 500;">
+                  <td style="padding: 5px 0px;font-size: 22px; font-weight: 500;">
                     主诉
                   </td>
-                  <td colspan="9" style="text-align: left; padding:0px 5px ;font-size: 25px;">
+                  <td colspan="9" style="text-align: left; padding:0px 5px ;font-size: 22px;">
                     {{ patientPrint.patient_complains }}
                   </td>
                 </tr>
@@ -1473,7 +1475,7 @@
               </tbody>
             </table>
             <div class="print_footnote_panel">
-              <div class="proj" style="text-align: center;">
+              <div class="proj" style="">
                  <span class="proj_title">医生签名：
                     <span v-if="patientPrint!=undefined&&getDcotorName(patientPrint.doctor) == ''">{{getDcotorNameOne(patientPrint.doctor)}}</span>
                     <span v-else>
@@ -1801,7 +1803,7 @@ export default {
       const style =
         "@page {margin-top:10px;}@media print { .print_main_content { background-color: white; width:960px; margin:0 auto; padding: 0 0 20px 0; } .print_main_content .order_title { text-align: center; font-size: 23px; line-height: 50px; font-weight: 500; } .print_main_content table { width: 100%; border-collapse: collapse; padding: 2px; }  .print_main_content table tbody tr{page-break-inside:avoid;} .print_main_content table tbody tr td { border: 1px solid; text-align: center; padding: 10px 8px; } .td_proj_title { font-size: 18px; line-height: 25px; font-weight: 500; } .td_proj_content { font-size: 18px; line-height: 25px; } .td_align_left { text-align: left; } .print_footnote_panel { font-size: 17px; line-height: 40px; } .print_footnote_panel .proj { display: inline-block; width: 49%; } .print_footnote_panel .proj .proj_title { font-weight: 500;} }";
       const style1 =
-        "@page {margin-top:10px;}@media print { .print_main_content { background-color: white; width:960px; margin:0 auto; padding: 0 0 20px 0; } .print_main_content table { width: 100%; padding: 2px; }  .print_main_content table tbody tr{page-break-inside:avoid;} .print_main_content table tbody tr td { border: 1px solid; text-align: center; padding: 10px 8px; } .td_proj_title { font-size: 25px; line-height: 25px; font-weight: 500; } .td_proj_content { font-size: 25px; line-height: 25px; } .td_align_left { text-align: left; } .print_footnote_panel { font-size: 25px; line-height: 40px; } .print_footnote_panel .proj { display: inline-block; width: 49%; } .print_footnote_panel .proj .proj_title { font-weight: 500;} }";
+        "@page {margin-top:10px;}@media print { .print_main_content { background-color: white; width:960px; margin:0 auto; padding: 0 0 20px 0; } .print_main_content table { width: 100%; padding: 2px; }  .print_main_content table tbody tr{page-break-inside:avoid;} .print_main_content table tbody tr td { border: 1px solid; text-align: center; padding: 10px 8px; } .td_proj_title { font-size: 22px; line-height: 25px; font-weight: 500; } .td_proj_content { font-size: 22px; line-height: 25px; } .td_align_left { text-align: left; } .print_footnote_panel { font-size: 22px; line-height: 40px; } .print_footnote_panel .proj { display: inline-block; width: 49%; } .print_footnote_panel .proj .proj_title { font-weight: 500;} }";
       if(this.org_id != 10206 && this.org_id !=0){
         console.log('1111111');
         

src/xt_pages/user/coursePrint.vue

@@ -48,7 +48,7 @@
 
             </div>
           </div>
-          <div class="row" style="border-bottom:1px solid #000; display: flex;padding-bottom: 10px;padding-top: 12px;" 
+          <div class="row" style="border-bottom:1px solid #000; display:flex;padding-bottom: 10px;padding-top: 12px;font-family: SimSun;" 
            v-else>
             <div  style="flex:1;text-align: center;">
               姓名：
@@ -69,8 +69,7 @@
               </div>
             </div>
 
-
-            <div style="flex:1;text-align: left;" >
+            <div style="flex:1.5;text-align: left;" >
               日期：
               <div style="text-align: left;display:inline-block;" >
                 <!-- {{getTime(record[0].record_time,'{y}-{m}-{d} {h}:{i}')}} -->
@@ -82,7 +81,7 @@
             <div class="inline_block" style="display: inline-block;" v-if="org_id !=10206 && org_id !=0">
               <div>{{getTime(item.record_time,'{y}-{m}-{d} {h}:{i}')}}</div>
             </div>
-            <div class="inline_block" style="margin-left: 30px;display: inline-block;">
+            <div class="inline_block" style="margin-left: 30px;display: inline-block;" v-if="org_id !=10206 && org_id !=0">
               <div>{{item.title}}</div>
             </div>
             <div class="inline_block" style="width:100%; word-wrap: break-word; word-break: break-all;">