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/template/DialysisPrintOrderFortySeven.vue

@@ -1204,18 +1204,6 @@
                           置换量<br />(L)
                         </td>
                         <td width="210">病情变化及处理</td>
-
-                        <!-- <td width="100">时间</td>
-                    <td width="30">T<br>C°</td>
-                    <td width="30">P<br/>次/分</td>
-                    <td width="30">R<br/>次/分</td>
-                    <td width="100">BP<br/>mmHg</td>
-                    <td width="60">静脉压/动脉压<br/>mmHg</td>
-                    <td width="80">血流量<br/>ml/min</td>
-                    <td width="90">超滤量累计L</td>
-                    <td width="80">钠浓度<br/>mmol/L</td>
-                    <td width="240">病情特殊情况处理<br/>及专科护理措施记录</td>
-                    <td  width="100">护士签名</td> -->
                       </tr>
 
                       <tr
@@ -1436,10 +1424,6 @@
                           医嘱内容
                         </td>
                       </tr>
-                      <!-- <tr style="line-height:35px;padding:8px 5px;">
-                    <td colspan="4" style="font-size: 16px">开医嘱</td>
-                    <td colspan="3" style="font-size: 16px">执行核对医嘱</td>
-                  </tr> -->
                       <tr style="line-height: 35px; padding: 8px 5px">
                         <td style="font-size: 16px" width="10%">时间</td>
                         <td style="font-size: 16px" colspan="2" width="45%">
@@ -1521,12 +1505,6 @@
                             >({{ advice.remark }})</span
                           >
                         </td>
-                        <!-- <td colspan="2" height="60px" style="text-align: center" v-else >
-                      <span>{{advice.delivery_way}}</span>
-                      <span>{{advice.execution_frequency}}</span>
-                      <span v-if="advice.remark.length > 0">({{advice.remark}})</span>
-                    </td> -->
-                        <!-- <td width="10%" v-if="(advice.children && advice.children.length > 0 || advice.parent_id > 0) && advice.isShow == 2" ></td> -->
                         <td height="32px" v-if="advice.advice_doctor">
                           <span
                             v-if="setAdminUserES(advice.advice_doctor) == ''"
@@ -1544,7 +1522,7 @@
                           <span v-if="setAdminUserES(advice.doctor) == ''">{{
                             getAdminUser(advice.doctor)
                           }}</span>
-                          <img
+                           <img
                             style="height: 30px"
                             :src="setAdminUserES(advice.doctor)"
                             alt=""
@@ -1552,10 +1530,6 @@
                             v-else
                           />
                         </td>
-                        <!-- <td height="35px">
-                      <span v-if="setAdminUserES(advice.checker) == ''">{{getAdminUser(advice.checker)}}</span>
-                      <img style="height:20px;" :src="setAdminUserES(advice.checker)" alt="" srcset="" v-else>
-                    </td> -->
                         <td height="32px">
                           <span
                             v-if="setAdminUserES(advice.execution_staff) == ''"
@@ -1727,7 +1701,7 @@
           </div>
         </template>
         <div class="row" style="margin-top: -11px; position: relative">
-          <table class="proj_table">
+          <table border="1" class="proj_table" style="border-collapse: collapse;text-align:center ;">
             <template v-if="doctor_advices_2.length > 0">
               <tr style="line-height: 35px; padding: 8px 5px">
                 <td
@@ -1739,7 +1713,7 @@
                     font-size: 16px;
                     padding: 6px 8px;
                     line-height: 30px;
-                    border: 1px solid;
+                    border: 1px solid black;
                   "
                 >
                   医嘱内容
@@ -1753,14 +1727,14 @@
                 style="line-height: 35px; padding: 8px 5px"
                 class="split_table_tr"
               >
-                <td style="font-size: 16px" width="10%">时间</td>
-                <td style="font-size: 16px" colspan="2" width="45%">
+                <td style="font-size: 16px;border: 1px solid black;" width="10%">时间</td>
+                <td style="font-size: 16px;border: 1px solid black;" colspan="2" width="45%">
                   医嘱内容
                 </td>
-                <td style="font-size: 16px" width="10%">医生签名</td>
+                <td style="font-size: 16px;border: 1px solid black;" width="10%">医生签名</td>
                 <!-- <td style="font-size: 16px" width="10%">核对人签名</td> -->
-                <td style="font-size: 16px" width="10%">执行人签名</td>
-                <td style="font-size: 16px" width="10%">时间</td>
+                <td style="font-size: 16px;border: 1px solid black;" width="10%">执行人签名</td>
+                <td style="font-size: 16px;border: 1px solid black;" width="10%">时间</td>
               </tr>
               <!-- <template v-for="group in doctor_advices" > -->
               <tr
@@ -1768,7 +1742,7 @@
                 v-for="(advice, advice_index) in doctor_advices_2"
                 :key="advice_index"
               >
-                <td height="32px">
+                <td height="32px" style="border: 1px solid black;">
                   <span v-if="advice.start_time">
                     {{ getTime(advice.start_time, "{h}:{i}") }}
                   </span>
@@ -1778,7 +1752,7 @@
                   height="32px"
                   colspan="2"
                   class="advice-name"
-                  style="padding-left: 7px"
+                  style="padding-left: 7px;border: 1px solid black;"
                 >
                   <span v-if="advice.parent_id > 0">---></span>
                   <span>{{ advice.advice_name }}</span>
@@ -1825,13 +1799,7 @@
                     >({{ advice.remark }})</span
                   >
                 </td>
-                <!-- <td colspan="2" height="60px" style="text-align: center" v-else >
-                  <span>{{advice.delivery_way}}</span>
-                  <span>{{advice.execution_frequency}}</span>
-                  <span v-if="advice.remark.length > 0">({{advice.remark}})</span>
-                </td> -->
-                <!-- <td width="10%" v-if="(advice.children && advice.children.length > 0 || advice.parent_id > 0) && advice.isShow == 2" ></td> -->
-                <td height="32px">
+                <td height="32px" style="border: 1px solid black;">
                   <span v-if="setAdminUserES(advice.advice_doctor) == ''">{{
                     getAdminUser(advice.advice_doctor)
                   }}</span>
@@ -1853,11 +1821,8 @@
                     v-else
                   />
                 </td>
-                <!-- <td height="35px">
-                  <span v-if="setAdminUserES(advice.checker) == ''">{{getAdminUser(advice.checker)}}</span>
-                  <img style="height:20px;" :src="setAdminUserES(advice.checker)" alt="" srcset="" v-else>
-                </td> -->
-                <td height="32px">
+
+                <td height="32px" style="border: 1px solid black;">
                   <span v-if="setAdminUserES(advice.execution_staff) == ''">{{
                     getAdminUser(advice.execution_staff)
                   }}</span>
@@ -1869,7 +1834,7 @@
                     v-else
                   />
                 </td>
-                <td height="32px">
+                <td height="32px" style="border: 1px solid black;">
                   <span v-if="advice.execution_time">{{
                     getTime(advice.execution_time, "{h}:{i}")
                   }}</span>
@@ -1887,6 +1852,7 @@
                   font-size: 16px;
                   padding: 6px 8px;
                   line-height: 30px;
+                  border: 1px solid black;
                 "
               >
                 透析后情况

src/xt_pages/dialysis/template/DialysisPrintOrderSixtyeight.vue

@@ -2501,12 +2501,12 @@
          <div style="position: relative; left: 70%;top: 50px;width: 288px;">
           患者签名：
           <div class="under_line" style="width: 120px;">
-            <!-- <img
+            <img
               style="height: 30px"
               :src="dialysisOrder == null? 0: dialysisOrder.url"
               alt=""
               srcset=""
-            /> -->
+            />
           </div>
         </div>
       </div>