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

@@ -1,6 +1,6 @@
 <template>
   <div>
-    <!-- <el-button type="primary" @click="checkData">一键核对</el-button> -->
+    <el-button type="primary" @click="checkData">一键核对</el-button>
     <div id="dialysis-print-box-1">
       <div
         id="dialysis-print-box-1-1"
@@ -584,9 +584,8 @@
                         </td>
                         <td v-if="org_id != 9836">{{ monitor.dialysate_temperature ? monitor.dialysate_temperature : "" }}</td>
                         <td v-if="org_id == 9836">{{ monitor.temperature ? monitor.temperature : "" }}</td>
-                        <td><template  v-if="org_id == 10223">{{ monitor.conductivity ? monitor.conductivity : "" }}</template>
-                        <template v-else>{{ monitor.sodium_concentration ? monitor.sodium_concentration : "" }}<template>
-                        </td>
+                        <td v-if="org_id != 9538">{{ monitor.conductivity ? monitor.conductivity : "" }}</td>
+                        <td v-if="org_id == 9538">{{ monitor.sodium_concentration ? monitor.sodium_concentration : "" }}</td>
                         <td v-if="(dialysisOrder && monitor.operate_time > dialysisOrder.end_time) || (dialysisOrder && monitor.operate_time < dialysisOrder.start_time)">
                           {{ monitor.ultrafiltration_volume ? monitor.ultrafiltration_volume : "" }}
                         </td>

src/xt_pages/user/components/PatientDetail.vue

@@ -969,9 +969,16 @@
           class="order_title"
           align="center"
           style="margin-bottom:20px;font-size:35px"
+          v-if="org_id != 10223"
         >
           签到卡
         </div>
+        <div
+          class="order_title"
+          align="center"
+          style="margin-bottom:20px;font-size:25px"
+          v-if="org_id == 10223"
+        >三优血液透析中心</div>
         <div align="center" style="margin-bottom:4px;font-size:25px">
           姓名:<span>&nbsp;&nbsp;{{ patientPrint.name }}</span
           ><br />
@@ -1072,6 +1079,7 @@ const defaultForm = {
   expense_kind: "",
   contact_name: "",
   sch_remark:"",
+  org_id:0
 };
 
 export default {
@@ -1172,6 +1180,7 @@ export default {
     }
   },
   created() {
+    this.org_id = this.$store.getters.xt_user.org.id
     this.styleOptions = this.$store.getters.patient_types;
     // this.partitionOptions = this.$store.getters.partitions;
     this.maritalOptions = getDataConfig("patient", "marital_options");