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

@@ -119,7 +119,7 @@
                       .blood_access_part_id
                       ? record.assessment_before_dislysis
                           .blood_access_part_id
-                      : 0
+                      : ''
                   }}
                   {{ bloodAccessParOperaName(record.assessment_before_dislysis.blood_access_part_opera_id) }}
                   <!-- {{ blood_access_part_opera_name }} bloodAccessParOperaName-->
@@ -909,7 +909,7 @@
             </table>
           </div>
 
-          <div  style="border: 1px solid black;border-bottom:none;width: 99%;">
+          <div  style="border: 1px solid black;border-bottom:none;width: 99%;box-sizing: border-box;">
             <div class="row" style="display: flex;">
               <div class="inline_block" style="flex: 1">
                 上机护士：
@@ -1101,7 +1101,7 @@
               <div class="inline_block" style="flex: 1">
                 穿刺：
                 <div class="under_line"
-                  style="width: 90px; text-align: center"
+                  style="width: 70%; text-align: center;white-space: normal;"
                 >
                   {{ record.assessment_after_dislysis.internal_fistula ? record.assessment_after_dislysis.internal_fistula : "/" }}
                 </div>
@@ -1110,7 +1110,7 @@
               <div class="inline_block" style="flex: 1">
                 透析器：
                 <div class="under_line"
-                  style="width: 90px; text-align: center"
+                  style="width: 74%; text-align: center;white-space: normal;"
                 >
                   {{ record.assessment_after_dislysis.cruor ? record.assessment_after_dislysis.cruor : "/" }}
                 </div>

src/xt_pages/dialysis/template/DialysisPrintOrderseventyfive.vue

@@ -103,8 +103,8 @@
                 style=" width: 52%;
                   text-align: center; white-space: normal;
                 ">
-                {{ predialysis.blood_access_part_id }}
-                {{ predialysis.blood_access_part_opera_name }}
+                {{ predialysis.blood_access_part_id ? predialysis.blood_access_part_id : '' }}
+                {{ predialysis.blood_access_part_opera_name ? predialysis.blood_access_part_opera_name : '' }}
               </div>
             </div>
             <div class="inline_block" style="flex: 1;" >
@@ -432,7 +432,7 @@
                 v-for="(advice, advice_index) in doctor_advices"
                 :key="advice_index"
               >
-                <td style="line-height:35px">
+                <td height="32px" style="line-height:35px">
                   <span v-if="advice.start_time">
                     {{ getTime(advice.start_time, "{h}:{i}") }}
                   </span>
@@ -515,6 +515,7 @@
                   />
                 </td>
               </tr>
+
             </tbody>
           </table>
         </div>
@@ -626,7 +627,7 @@
           </table>
         </div>
 
-        <div  style="border: 1px solid black;border-bottom:none;border-top:none;width: 99%;">
+        <div  style="border: 1px solid black;border-bottom:none;border-top:none;width: 99%;box-sizing: content-box;">
           <div class="row" style="display: flex;">
             <div class="inline_block" style="flex: 1">
               上机护士：
@@ -722,7 +723,7 @@
             <div class="inline_block" style="flex: 1">
               穿刺：
               <div class="under_line"
-                style="width: 90px; text-align: center"
+                style="width: 70%; text-align: center;white-space: normal;"
               >
                 {{ afterdialysis.internal_fistula ? afterdialysis.internal_fistula : "/" }}
               </div>
@@ -731,7 +732,7 @@
             <div class="inline_block" style="flex: 1">
               透析器：
               <div class="under_line"
-                style="width: 90px; text-align: center"
+                style="width: 74%; text-align: center;white-space:normal;"
               >
                 {{ afterdialysis.cruor ? afterdialysis.cruor : "/" }}
               </div>
@@ -809,7 +810,7 @@
           </div>
         </div>
         <!-- 透析小结 -->
-        <div style="width: 99%;border: 1px solid black;white-space: normal;">
+        <div style="width: 99%;border: 1px solid black;white-space: normal;box-sizing: content-box;">
           <div style="padding: 5px;">
             <div style="margin-bottom: 10px;">
               宣教知识：
@@ -1664,6 +1665,7 @@ export default {
           this.patientInfo.first_dialysis_date = "";
         }
         this.check = response.data.data.check;
+        console.log('this.check12121',this.check);
         this.xtdate = response.data.data.xtdate;
         this.predialysis = response.data.data.PredialysisEvaluation;
         console.log('透前评估', this.predialysis)
@@ -1891,8 +1893,8 @@ export default {
           this.doctor_advices[index]["isShow"] = 2;
         }
 
-        console.log("时间我我我哦我我",response.data.data.advices)
-        console.log("新时间我哦我哦",this.doctor_advices)
+        console.log("时间我我我哦我我",response.data.data)
+        console.log("新时间我哦我哦医嘱121",this.doctor_advices)
 
 
         if(this.org_id ==10206 || this.org_id ==10489 || this.org_id ==10644 || this.org_id ==10633){
@@ -2080,25 +2082,40 @@ export default {
         }
 
 
-        if (this.doctor_advices.length + this.projectsOne.length <= 6) {
-            var nl = 6 - (this.doctor_advices.length + this.projectsOne.length);
-            this.print_length = 6;
+        // if (this.doctor_advices.length + this.projectsOne.length <= 6) {
+        //   var nl = 6 - (this.doctor_advices.length + this.projectsOne.length);
+        //   this.print_length = 6;
+
+        //   for (let index = 0; index < nl; index++) {
+        //     if (
+        //       this.projectsOne[index] == undefined ||
+        //       this.projectsOne[index].length <= 0
+        //     ) {
+        //       this.projectsOne.push([]);
+        //     } else {
+        //       continue;
+        //     }
+        //   }
+        // }
+        if (this.doctor_advices.length <= 5) {
+          console.log('111111',this.doctor_advices.length);
+          var nl = 5
+          this.print_length = 5
 
-            for (let index = 0; index < nl; index++) {
-              if (
-                this.projectsOne[index] == undefined ||
-                this.projectsOne[index].length <= 0
-              ) {
-                this.projectsOne.push([]);
-              } else {
-                continue;
-              }
+          for (let index = 0; index < nl; index++) {
+            if (
+              this.doctor_advices[index] == undefined ||
+              this.doctor_advices[index].length <= 0
+            ) {
+              this.doctor_advices.push([])
+            } else {
+              continue
             }
           }
-
+        }
 
         this.totollength = this.doctor_advices.length + this.monitors.length;
-        console.log("this.totollength",this.totollength)
+        console.log("this.totollength2222222",this.totollength)
         if (this.totollength > 18) {
           var temp_advice_length = 17 - this.monitors.length;
           var doctor_advices_1 = [];