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_eighty.vue

@@ -657,9 +657,9 @@
                               >
                                 <template
                                   v-if="
-                                    (dialysisOrder &&
+                                    (record.dialysis_order &&
                                     monitor_record.operate_time ==
-                                      dialysisOrder.start_time)&&(org_id!=10414) && (org_id!=10683)
+                                      record.dialysis_order.start_time)
                                   "
                                   >【开始透析】
                                   </template>
@@ -682,7 +682,7 @@
                             </span>
                           </td>
                         </tr>
-                        <tr v-for="(monitor_record, s) in record.monitor_records2" :key="s">
+                        <!-- <tr v-for="(monitor_record, s) in record.monitor_records2" :key="s">
                           <td></td>
                           <td></td>
                           <td></td>
@@ -695,7 +695,7 @@
                           <td></td>
                           <td></td>
                           <td></td>
-                        </tr>
+                        </tr> -->
                       </tbody>
                     </table>
                   </td>

src/xt_pages/dialysis/template/DialysisPrintOrdereighty.vue

@@ -598,7 +598,7 @@
                         <td width="200">病情变化及处理</td>
                         <td width="200">责任护士</td>
                       </tr>
-                      <tr v-for="(monitor, monindex) in monitors" :key="monindex" style="page-break-inside: avoid;">
+                      <tr v-for="(monitor, monindex) in monitors" :key="monindex" style="">
                         <td>{{ getTime(monitor.operate_time, "{h}:{i}") }}</td>
                         <td>{{monitor.systolic_blood_pressure? monitor.systolic_blood_pressure + "/": ""}}
                           {{monitor.diastolic_blood_pressure? monitor.diastolic_blood_pressure: ""}}</td>