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

@@ -318,19 +318,19 @@
                     <tbody>
                     <tr>
                         <td width="60">时间</td>
-                        <td width="80" style="height:20px;line-height:20px">血压</td>
-                        <td width="60" style="height:20px;line-height:20px">脉搏</td>
+                        <td width="80" style="height:20px;line-height:20px">血压<br />mmHg</td>
+                        <td width="60" style="height:20px;line-height:20px">脉搏<br />(次/分)</td>
                         <td width="60" style="height:20px;line-height:20px">KTV</td>
-                        <td width="60" style="height:20px;line-height:20px">血流量</td>
-                        <td width="60" style="height:20px;line-height:20px">静脉压</td>
-                        <td width="60" style="height:20px;line-height:20px">动脉压</td>
-                        <td width="60" style="height:20px;line-height:20px">跨膜压</td>
-                        <td width="60" style="height:20px;line-height:20px">温度</td>
-                        <td width="60" style="height:20px;line-height:20px">超滤率</td>
-                        <td width="60" style="height:20px;line-height:20px">超滤量</td>
-                        <td width="60" style="height:20px;line-height:20px" v-if="record.prescription.mode_id == 2">置换率</td>
-                        <td width="60" style="height:20px;line-height:20px" v-if="record.prescription.mode_id == 2">置换量</td>
-                        <td width="60" style="height:20px;line-height:20px">血容量</td>
+                        <td width="60" style="height:20px;line-height:20px">血流量<br />(ml/min)</td>
+                        <td width="60" style="height:20px;line-height:20px">静脉压<br />mmHg</td>
+                        <td width="60" style="height:20px;line-height:20px">动脉压<br />mmHg</td>
+                        <td width="60" style="height:20px;line-height:20px">跨膜压<br />mmHg</td>
+                        <td width="60" style="height:20px;line-height:20px">温度<br />°C</td>
+                        <td width="60" style="height:20px;line-height:20px">超滤率<br />ml/h</td>
+                        <td width="60" style="height:20px;line-height:20px">超滤量<br />ml</td>
+                        <td width="60" style="height:20px;line-height:20px" v-if="prescription.mode_id == 2">置换率<br /><br />ml/h</td>
+                        <td width="60" style="height:20px;line-height:20px" v-if="prescription.mode_id == 2">置换量<br /><br />ml</td>
+                        <td width="60" style="height:20px;line-height:20px">血容量<br />ml</td>
                         <td width="">病情变化及处理</td>
                     </tr>
 

src/xt_pages/dialysis/template/DialysisPrintOrderFortyThree.vue

@@ -294,19 +294,19 @@
               <tbody>
               <tr>
                   <td width="60">时间</td>
-                  <td width="80" style="height:20px;line-height:20px">血压</td>
-                  <td width="60" style="height:20px;line-height:20px">脉搏</td>
+                  <td width="80" style="height:20px;line-height:20px">血压<br />mmHg</td>
+                  <td width="60" style="height:20px;line-height:20px">脉搏<br />(次/分)</td>
                   <td width="60" style="height:20px;line-height:20px">KTV</td>
-                  <td width="60" style="height:20px;line-height:20px">血流量</td>
-                  <td width="60" style="height:20px;line-height:20px">静脉压</td>
-                  <td width="60" style="height:20px;line-height:20px">动脉压</td>
-                  <td width="60" style="height:20px;line-height:20px">跨膜压</td>
-                  <td width="60" style="height:20px;line-height:20px">温度</td>
-                  <td width="60" style="height:20px;line-height:20px">超滤率</td>
-                  <td width="60" style="height:20px;line-height:20px">超滤量</td>
-                  <td width="60" style="height:20px;line-height:20px" v-if="prescription.mode_id == 2">置换率</td>
-                  <td width="60" style="height:20px;line-height:20px" v-if="prescription.mode_id == 2">置换量</td>
-                  <td width="60" style="height:20px;line-height:20px">血容量</td>
+                  <td width="60" style="height:20px;line-height:20px">血流量<br />(ml/min)</td>
+                  <td width="60" style="height:20px;line-height:20px">静脉压<br />mmHg</td>
+                  <td width="60" style="height:20px;line-height:20px">动脉压<br />mmHg</td>
+                  <td width="60" style="height:20px;line-height:20px">跨膜压<br />mmHg</td>
+                  <td width="60" style="height:20px;line-height:20px">温度<br />°C</td>
+                  <td width="60" style="height:20px;line-height:20px">超滤率<br />ml/h</td>
+                  <td width="60" style="height:20px;line-height:20px">超滤量<br />ml</td>
+                  <td width="60" style="height:20px;line-height:20px" v-if="prescription.mode_id == 2">置换率<br /><br />ml/h</td>
+                  <td width="60" style="height:20px;line-height:20px" v-if="prescription.mode_id == 2">置换量<br /><br />ml</td>
+                  <td width="60" style="height:20px;line-height:20px">血容量<br />ml</td>
                   <td width="">病情变化及处理</td>
               </tr>
 

src/xt_pages/dialysis/template/DialysisPrintOrderThirtyEight.vue

@@ -220,8 +220,8 @@
             <div style="width:16%;">医生：
               <span style="display: inline-block;text-align: left;">
                 &nbsp;
-                <span v-if="setAdminUserES(prescription==null?0:(prescription.prescription_doctor?prescription.prescription_doctor:'')) == ''"> {{ getAdminUser(prescription==null?0:(prescription.prescription_doctor?prescription.prescription_doctor:'')) }} </span>
-                <img style="height:20px;" :src="setAdminUserES(prescription==null?0:(prescription.prescription_doctor?prescription.prescription_doctor:''))" alt="" srcset="" v-else />
+                <span v-if="setAdminUserES(prescription==null?0:(prescription.creater?prescription.creater:'')) == ''"> {{ getAdminUser(prescription==null?0:(prescription.creater?prescription.creater:'')) }} </span>
+                <img style="height:20px;" :src="setAdminUserES(prescription==null?0:(prescription.creater?prescription.creater:''))" alt="" srcset="" v-else />
               </span>
             </div>
             <div style="width:16%;">透前评估护士：
@@ -397,8 +397,8 @@
             <div style="width:16%;">值班医生：
               <span style="display: inline-block;text-align: left;">
                 &nbsp;
-                <span v-if="setAdminUserES(prescription==null?0:(prescription.prescription_doctor?prescription.prescription_doctor:'')) == ''"> {{ getAdminUser(prescription==null?0:(prescription.prescription_doctor?prescription.prescription_doctor:'')) }} </span>
-                <img style="height:20px;" :src="setAdminUserES(prescription==null?0:(prescription.prescription_doctor?prescription.prescription_doctor:''))" alt="" srcset="" v-else />
+                <span v-if="setAdminUserES(prescription==null?0:(prescription.creater?prescription.creater:'')) == ''"> {{ getAdminUser(prescription==null?0:(prescription.creater?prescription.creater:'')) }} </span>
+                <img style="height:20px;" :src="setAdminUserES(prescription==null?0:(prescription.creater?prescription.creater:''))" alt="" srcset="" v-else />
               </span>
             </div>
             <div style="width:16%;">责任护士：
@@ -423,8 +423,8 @@
         <div style="text-align:right;line-height:30px;">签名医生：
           <span style="display: inline-block;text-align: left;">
             &nbsp;
-            <span v-if="setAdminUserES(prescription==null?0:(prescription.prescription_doctor?prescription.prescription_doctor:'')) == ''"> {{ getAdminUser(prescription==null?0:(prescription.prescription_doctor?prescription.prescription_doctor:'')) }} </span>
-            <img style="height:20px;" :src="setAdminUserES(prescription==null?0:(prescription.prescription_doctor?prescription.prescription_doctor:''))" alt="" srcset="" v-else />
+            <span v-if="setAdminUserES(prescription==null?0:(prescription.creater?prescription.creater:'')) == ''"> {{ getAdminUser(prescription==null?0:(prescription.creater?prescription.creater:'')) }} </span>
+            <img style="height:20px;" :src="setAdminUserES(prescription==null?0:(prescription.creater?prescription.creater:''))" alt="" srcset="" v-else />
           </span>
         </div>
       </div>
@@ -663,7 +663,7 @@ export default {
         this.$message.error('钠未填')
       }else if(this.prescription.amylaceum == ""){
         this.$message.error('葡萄糖未填')
-      }else if(this.prescription.prescription_doctor == 0){
+      }else if(this.prescription.creater == 0){
         this.$message.error('医生未填')
       }else if(this.predialysis.creater == 0){
         this.$message.error('透前评估护士未填')