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/DialysisPrintOrderThirtyOne.vue

@@ -265,7 +265,7 @@
               电导度
               <div class="inline_block under_line" style="width:100px;">
                   {{ prescription.conductivity ? prescription.conductivity : " " }}
-              </div>kg
+              </div>mS/m
           </div>
       </div>
       <div class="row">
@@ -407,7 +407,7 @@
               <td width="60">BP</td>
               <td width="40">心率</td>
               <td width="40">血流速</td>
-              <td width="80">静脉压/动脉压</td>
+              <td width="100">静脉压/动脉压</td>
               <td width="40">超滤量</td>
               <td width="40">TMP</td>
               <td width="40">电导率</td>
@@ -589,8 +589,8 @@
             医生签名
             <span style="display: inline-block;width:100px;text-align: left;">
               &nbsp;
-              <span v-if="setAdminUserES(summary==null? 0 : (summary.modifier?summary.modifier:summary.creater)) == ''"> {{ getAdminUser(summary==null?0:(summary.modifier?summary.modifier:summary.creater)) }} </span>
-              <img style="height:30px;" :src="setAdminUserES(summary==null?0:(summary.modifier?summary.modifier:summary.creater))" alt="" srcset="" v-else />
+              <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:30px;" :src="setAdminUserES(prescription==null?0:(prescription.prescription_doctor?prescription.prescription_doctor:''))" alt="" srcset="" v-else />
               <!-- <span v-if="doctorForm.url === ''">{{ doctorForm.doctor }}</span>
               <span v-if="doctorForm.url !== ''">
                 <img class="es-img" style="height:30px;" :src="doctorForm.url" />
@@ -916,9 +916,8 @@ export default {
           )
           this.assessmentafter = response.data.data.assessmentAfterDislysis
           console.log('上次透后体重', this.assessmentafter)
-          var doctorAdevieInfo = response.data.data.doctorAdevieInfo
+          var doctorAdevieInfo = response.data.data.advices
           var tableAdvice = doctorAdevieInfo
-          console.log('医生', tableAdvice)
           if (tableAdvice.length === 0) {
             var obj = { advice_name: '', start_time: '' }
             var obj1 = { advice_name: '', start_time: '' }
@@ -1217,7 +1216,7 @@ export default {
             this.AlPanel = this.anticoagulantsConfit[thisALID]
           }
 
-          this.advices = response.data.data.advices
+          this.advices = JSON.parse(JSON.stringify(response.data.data.advices))
           this.monitors = response.data.data.monitors
           console.log('透析监测', this.monitors)
           this.summary = response.data.data.summary

src/xt_pages/dialysis/template/DialysisPrintOrderTwentyEight.vue

@@ -342,7 +342,7 @@
               <tbody>
               <tr>
                 <td width="70">血管通路:</td>
-                <td width="600">
+                <td width="620">
                   <div>
                     <label-box :isChecked="predialysis.blood_access_part_opera_name.indexOf('自体内瘘') > -1 ? true : false" showValue="自体内瘘"></label-box>
                     &nbsp;
@@ -599,7 +599,7 @@
                 <td width='30'>A液:</td>
                 <td width="10">钙</td>
                 <td width="10">(</td>
-                <td width="200">
+                <td width="210">
                   <label-box :isChecked="prescription.dialysate_formulation_name.indexOf('A液：钙(1.25mmol/L)钾(2.0mmol/L)') > -1 ? true : prescription.dialysate_formulation_name.indexOf('A液：钙(1.25mmol/L)钾(3.5mmol/L)') > -1 ? true : false" showValue="1.25mmol/L"></label-box>
                   &nbsp;
                   <label-box :isChecked="prescription.dialysate_formulation_name.indexOf('A液：钙(1.5mmol/L)钾(2.0mmol/L)') > -1 ? true : prescription.dialysate_formulation_name.indexOf('A液：钙(1.5mmol/L)钾(3.5mmol/L)') > -1 ? true : false" showValue="1.5mmol/L"></label-box>
@@ -608,7 +608,7 @@
                 <td width="10">)</td>
                 <td width="10">钾</td>
                 <td width="10">(</td>
-                <td width="200">
+                <td width="210">
                   <label-box :isChecked="prescription.dialysate_formulation_name.indexOf('A液：钙(1.25mmol/L)钾(2.0mmol/L)') > -1 ? true : prescription.dialysate_formulation_name.indexOf('A液：钙(1.5mmol/L)钾(2.0mmol/L)') > -1 ? true : false" showValue="2.0mmol/L"></label-box>
                   &nbsp;
                   <label-box :isChecked="prescription.dialysate_formulation_name.indexOf('A液：钙(1.25mmol/L)钾(3.5mmol/L)') > -1 ? true : prescription.dialysate_formulation_name.indexOf('A液：钙(1.5mmol/L)钾(3.5mmol/L)') > -1 ? true : false" showValue="3.5mmol/L"></label-box>
@@ -776,7 +776,7 @@
             透析监测
           </td>
 
-          <td width="100">时间</td>
+          <td width="60">时间</td>
           <td width="40" style="line-height:20px">T<br />℃</td>
           <td width="80" style="line-height:20px">Bp<br />mmHg</td>
           <td width="40" style="line-height:20px">P<br />次/分</td>
@@ -795,7 +795,7 @@
         </tr>
 
         <tr v-for="monitor in monitors" :key="monitor.id">
-          <td style="height:30px;">
+          <td style="height:20px;">
             &nbsp;
             <!-- <template>
               <span v-if="monitor.monitoring_date">
@@ -862,17 +862,17 @@
           <td :rowspan="doctor_advices.length + 1" width="30" class="title-box">
             医嘱内容
           </td>
-          <td style="font-size: 16px" width="10%">时间</td>
+          <td style="font-size: 16px" width="8%">时间</td>
           <td style="font-size: 16px" colspan="2">医嘱内容</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" width="10%">时间</td>
+          <td style="font-size: 16px" width="8%">时间</td>
         </tr>
         <!-- <template v-for="group in doctor_advices" > -->
 
         <tr v-for="(advice, advice_index) in doctor_advices" :key="advice_index">
-          <td height="35px">
+          <td height="30px">
               <span v-if="advice.start_time">
                 {{ getTime(advice.start_time, "{h}:{i}") }}
               </span>
@@ -2013,8 +2013,8 @@ export default {
             if (this.org_template_info.org_id == 9535) {
               this.isShowZero = true
             }
-            if (this.monitors.length < 13) {
-              var nl = 13 - this.monitors.length
+            if (this.monitors.length < 9) {
+              var nl = 9 - this.monitors.length
               for (let index = 0; index < nl; index++) {
                 this.monitors.push([])
               }