Merge branch '20230223_pad_vue_new_branch' of http://git.shengws.com/csx/Pad_New into 20230223_pad_vue_new_branch

src/pages/main/PrintIndex.vue

@@ -384,6 +384,13 @@
         v-if="org_template_info.template_id == 73"
       ></DialysisPrintOrderSeventythree>
       
+      <DialysisPrintOrderServentyFour
+        ref="childOne"
+        style="margin-top: 60px"
+        v-bind:childResponse="childResponse"
+        v-if="org_template_info.template_id == 74"
+      ></DialysisPrintOrderServentyFour>
+
       <DialysisPrintOrderseventyfive
         ref="childOne"
         style="margin-top: 60px"
@@ -405,6 +412,12 @@
         v-if="org_template_info.template_id == 78" 
       >
       </DialysisPrintOrderSeventyeight>
+      <DialysisPrintOrderServentynine
+        ref="childOne"
+        style="margin-top: 60px"
+        v-bind:childResponse="childResponse"
+        v-if="org_template_info.template_id == 79">
+      </DialysisPrintOrderServentynine>
     </div>
     
     <!--<side-bar :active_index="0" v-if="isShow == true"></side-bar>-->
@@ -471,9 +484,11 @@ import DialysisPrintOrderSeventy from './template/DialysisPrintOrderSeventy'
 import DialysisPrintOrderseventyone from './template/DialysisPrintOrderseventyone'
 import DialysisPrintOrderseventytwo from './template/DialysisPrintOrderseventytwo'
 import DialysisPrintOrderSeventythree from './template/DialysisPrintOrderSeventythree'
+import DialysisPrintOrderServentyFour from './template/DialysisPrintOrderServentyFour'
 import DialysisPrintOrderseventyfive from './template/DialysisPrintOrderseventyfive'
 import DialysisPrintOrderSeventysix from './template/DialysisPrintOrderSeventysix'
 import DialysisPrintOrderSeventyeight from './template/DialysisPrintOrderSeventyeight'
+import DialysisPrintOrderServentynine from './template/DialysisPrintOrderServentynine'
 export default {
   name: "PrintIndex",
   components: {
@@ -532,9 +547,11 @@ export default {
     DialysisPrintOrderseventyone,
     DialysisPrintOrderseventytwo,
     DialysisPrintOrderSeventythree,
+    DialysisPrintOrderServentyFour,
     DialysisPrintOrderseventyfive,
     DialysisPrintOrderSeventysix,
-    DialysisPrintOrderSeventyeight
+    DialysisPrintOrderSeventyeight,
+    DialysisPrintOrderServentynine
   },
   data() {
     return {

src/pages/main/template/DialysisPrintOrderSeventysix.vue

@@ -409,7 +409,8 @@
                     透析(滤)器：
                     <div class="under_line" style="width: 50%;text-align: center">
 <!--                      {{prescription.dialyzer_perfusion_apparatus?prescription.dialyzer_perfusion_apparatus:'/'}}-->
-                      <span v-if="org_id!=10677">{{ prescription.dialyzer_perfusion_apparatus ? prescription.dialyzer_perfusion_apparatus : "" }}</span> 
+                      <span v-if="org_id!=10677">{{ prescription.dialysis_dialyszers ? prescription.dialysis_dialyszers : "" }}</span> 
+                      {{prescription.dialysis_strainer ? prescription.dialysis_strainer :''}}
                       <!-- <span v-if="org_id!=10677">{{prescription.dialysis_dialyszers?prescription.dialysis_dialyszers:"/"}}</span> 
                       {{dialysisOrder.dialysis_dialyszers }} -->
                     </div>

src/pages/main/template/DialysisPrintOrderseventyfive.vue

@@ -360,8 +360,9 @@
               <div
                 class="under_line"
                 style="width: 100px; text-align: center"
-              >
-                <span style="display: inline-block;" v-if="setAdminUserES(prescription.creater) == ''">
+              > 
+                <span style="height: 30px;display: inline-block;"></span>
+                <span style="" v-if="setAdminUserES(prescription.creater) == ''">
                   {{ getAdminUser(prescription.creater)}}
                 </span>
                 <span style="display: inline-block;" v-else>
@@ -815,17 +816,17 @@
           </div>
         </div>
         <!-- 透析小结 -->
-        <div class="rows" style="width: 100%;border: 1px solid black;height: 120px;white-space: normal;padding: 5px;">
-          <div style="height: 80px;width: 100%;">
+        <div class="rows" style="width: 100%;border: 1px solid black;white-space: normal;padding: 5px;">
+          <div style="width: 100%;">
             <div style="margin-bottom: 10px;">
               宣教知识：
-              <span class="under_line" style="white-space: normal;width: 80%;">
+              <span style="white-space: normal;border-bottom: 1px solid black;">
                 {{ summary.mission ? summary.mission : '/' }}
               </span>
             </div>
             <div>
               治疗小结:
-              <span class="under_line" style="white-space: normal;width: 80%;">
+              <span style="white-space: normal;border-bottom: 1px solid black;">
                 {{ summary.dialysis_summary ? summary.dialysis_summary : "/"}}
               </span>
             </div>