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

src/xt_pages/dialysis/batch_print/batch_print_order_six.vue

                             透析液温度(°C)
                           </td>
                           <td width="60" v-if="org_id == 9836">体温(°C)</td>
-                          <td width="50">电导度<br />(ms/cm)</td>
+                        <td width="50" v-if="org_id != 10121 && org_id != 9675&& org_id != 0">电导度<br />(ms/cm)</td>
+                        <td width="50" v-if="org_id == 10121|| org_id == 9675|| org_id == 0">SpO₂<br />(%)</td>
                           <td width="50">超滤量<br />(ml)</td>
                           <td
                             v-if="
                                 : ""
                             }}
                           </td>
-                          <td>
+                          <td v-if="org_id != 10121 && org_id != 9675&& org_id != 0">
                             {{
                               monitor_record.conductivity
                                 ? monitor_record.conductivity
                                 : ""
                             }}
                           </td>
+                          <td v-if="org_id == 10121|| org_id == 9675|| org_id == 0">
+                          {{
+                            monitor_record.blood_oxygen_saturation
+                              ? monitor_record.blood_oxygen_saturation
+                              : ""
+                          }}
+                        </td>
                           <td>
                             <span v-if="monitor_record.operate_time">{{
                               monitor_record.ultrafiltration_volume

src/xt_pages/dialysis/template/DialysisPrintOrderSix.vue

                         <td width="60" v-if="org_id != 9836">透析液温度(°C)</td>
                         <td width="60" v-if="org_id == 9836">体温(°C)</td>
 
-                        <td width="50" v-if="org_id != 10121 && org_id != 9675&& org_id != 0">电导度<br />(ms/cm)</td>
-                        <td width="50" v-if="org_id == 10121|| org_id == 9675|| org_id == 0">SpO₂<br />(%)</td>
+                        <td
+                          width="50"
+                          v-if="
+                            org_id != 10121 && org_id != 9675 && org_id != 0
+                          "
+                        >
+                          电导度<br />(ms/cm)
+                        </td>
+                        <td
+                          width="50"
+                          v-if="
+                            org_id == 10121 || org_id == 9675 || org_id == 0
+                          "
+                        >
+                          SpO₂<br />(%)
+                        </td>
                         <td width="50">超滤量<br />(ml)</td>
                         <td
                           v-if="
                           {{ monitor.temperature ? monitor.temperature : "" }}
                         </td>
 
-
-                        <td v-if="org_id != 9538 && org_id != 10121 && org_id != 9675&& org_id != 0">
+                        <td
+                          v-if="
+                            org_id != 9538 &&
+                            org_id != 10121 &&
+                            org_id != 9675 &&
+                            org_id != 0
+                          "
+                        >
                           {{ monitor.conductivity ? monitor.conductivity : "" }}
                         </td>
                         <td v-if="org_id == 9538">
                               : ""
                           }}
                         </td>
-                        <td v-if="org_id == 10121|| org_id == 9675|| org_id == 0">
+                        <td
+                          v-if="
+                            org_id == 10121 || org_id == 9675 || org_id == 0
+                          "
+                        >
                           {{
                             monitor.blood_oxygen_saturation
                               ? monitor.blood_oxygen_saturation
                           v-if="
                             (dialysisOrder &&
                               monitor.operate_time > dialysisOrder.end_time) ||
-
                             (dialysisOrder &&
                               monitor.operate_time < dialysisOrder.start_time)
                           "
             </tbody>
           </table>
         </div>
-        
 
         <template v-if="this.totollength > 13">
           <div style="display: inline-block; width: 100%; text-align: center">