Merge branch '20230223_pc_vue_new_branch' of http://git.shengws.com/csx/Vue_New into 20230223_pc_vue_new_branch

src/router/modules/dialysis.js

@@ -975,6 +975,18 @@ export default {
         noCache: true
       }
     },
+    {
+      path: '/dialysis/print/batch/seventythree',
+      component: () =>
+        import('@/xt_pages/dialysis/batch_print/batch_print_order_seventythree'),
+      hidden: true,
+      is_menu: false,
+      name: 'batch_print_order_seventythree',
+      meta: {
+        title: '批量打印',
+        noCache: true
+      }
+    },
     {
       path: '/dialysis/flow',
       component: () => import('@/xt_pages/dialysis/dialysisFlow'),

src/xt_pages/dialysis/batch_print/batch_print_order_seventyone.vue

@@ -8,7 +8,7 @@
         icon="el-icon-printer"
         @click="printThisPage"
         type="primary"
-      >打印71
+      >打印
       </el-button>
     </div>
     <div class="app-container">
@@ -314,11 +314,11 @@
                 </div>
                 <div style="flex: 1;">
                   医师签名
-                  <span class="under-line" style="display: inline-block;width: 50%;" v-if="setAdminUserES(record.prescription,'prescription_doctor') == ''">
-                    {{ getAdminUser(record.prescription, 'prescription_doctor')}}
+                  <span class="under-line" style="display: inline-block;width: 50%;" v-if="setAdminUserES(record.prescription,'creater') == ''">
+                    {{ getAdminUser(record.prescription, 'creater')}}
                   </span>
                   <span class="under-line" style="display: inline-block;width: 50%;" v-else>
-                    <img style="height:30px;" :src="setAdminUserES(record.prescription,'prescription_doctor')" alt srcset />
+                    <img style="height:30px;" :src="setAdminUserES(record.prescription,'creater')" alt srcset />
                   </span>
                 </div>
               </div>
@@ -332,7 +332,7 @@
                 <div style="flex: 1;">
                   透 (滤) 器
                   <span class="under-line" style="display: inline-block;width: 50%;" >
-                    
+
                     {{  record.prescription && record.prescription.dialysis_dialyszers
                         ? record.prescription.dialysis_dialyszers : "/"
                     }}
@@ -343,8 +343,8 @@
                 <div style="flex: 1;">
                   灌流器
                   <span class="under-line" style="display: inline-block;width: 50%;">
-                    {{  record.prescription && record.prescription.dialysis_irrigation 
-                      ? record.prescription.dialysis_irrigation : "/" 
+                    {{  record.prescription && record.prescription.dialysis_irrigation
+                      ? record.prescription.dialysis_irrigation : "/"
                     }}
                   </span>
                 </div>
@@ -388,7 +388,7 @@
                 <div style="flex: 1;">
                   穿刺针
                   <span class="under-line" style="display: inline-block;width: 50%;">
-                    {{ record.assessment_before_dislysis && record.assessment_before_dislysis.puncture_needle 
+                    {{ record.assessment_before_dislysis && record.assessment_before_dislysis.puncture_needle
                       ? record.assessment_before_dislysis.puncture_needle : "/" }}
                   </span>
                 </div>
@@ -523,7 +523,7 @@
                       {{ monitor.dialysate_temperature ? monitor.dialysate_temperature : "/" }}
                     </span>
                   </td>
-        
+
                   <td>
                     <span v-if="getTime(monitor.operate_time) != ''">
                       {{ monitor.pulse_frequency ? monitor.pulse_frequency : "/" }}
@@ -540,7 +540,7 @@
                       {{ monitor.breathing_rate ? monitor.breathing_rate : "/" }}
                     </span>
                   </td>
-        
+
                   <td>
                     <span v-if="getTime(monitor.operate_time) != ''">
                       {{
@@ -718,8 +718,8 @@
                     <div style="flex:1">
                       医师签名
                       <div class="under-line" style="display: inline-block;width: 50%;">
-                        <span v-if="setAdminUserES(record.prescription, 'prescription_doctor') == ''">{{getAdminUser(record.prescription, 'prescription_doctor')}}</span>
-                        <img class="es-img" :src="setAdminUserES(record.prescription, 'prescription_doctor')" alt="" srcset="" v-else style="height: 30px;">
+                        <span v-if="setAdminUserES(record.prescription, 'creater') == ''">{{getAdminUser(record.prescription, 'creater')}}</span>
+                        <img class="es-img" :src="setAdminUserES(record.prescription, 'creater')" alt="" srcset="" v-else style="height: 30px;">
                       </div>
                     </div>
                     <div style="flex:1">

src/xt_pages/dialysis/bloodPresssWatch.vue

@@ -444,7 +444,7 @@
           :disabled="selecting_schs.length == 0"
           @click="batchPrintAction"
           type="primary"
-          >批量打印71</el-button>
+          >批量打印</el-button>
       </template>
       <template v-if="this.template_id == 72">
         <el-button
@@ -455,6 +455,15 @@
           type="primary"
           >批量打印</el-button>
       </template>
+      <template v-if="this.template_id == 73">
+        <el-button
+          size="small"
+          icon="el-icon-printer"
+          :disabled="selecting_schs.length == 0"
+          @click="batchPrintAction"
+          type="primary"
+          >批量打印</el-button>
+      </template>
     </div>
     <div class="app-container">
       <!-- <div class="filter-container">
@@ -2218,6 +2227,8 @@ export default {
         this.$router.push({ path: "/dialysis/print/batch/seventyone" });
       }else if (this.template_id == 72) {
         this.$router.push({ path: "/dialysis/print/batch/seventytwo" });
+      }else if (this.template_id == 73) {
+        this.$router.push({ path: "/dialysis/print/batch/seventythree" });
       }
     },
     batchPrintActionOne: function() {

src/xt_pages/dialysis/dialysisPrintOrder.vue

@@ -904,6 +904,18 @@
         >
         </div>
       </template>
+      <template v-if="org_template_info.template_id == 73">
+        <div>
+          <el-button
+          :loading="loading"
+          size="small"
+          icon="el-icon-printer"
+          @click="printThisPage"
+          type="primary"
+          >打印</el-button
+        >
+        </div>
+      </template>
     </div>
     <div class="app-container" style="min-height: 0">
       <!--<div class="order-print-btn"-->
@@ -1391,6 +1403,11 @@
           >
           </DialysisPrintOrderSeventyTwo>
 
+          <DialysisPrintOrderSeventythree
+          v-bind:childResponse="childResponse"
+            v-if="org_template_info.template_id == 73"
+          ></DialysisPrintOrderSeventythree>
+
           <DialysisPrintOrderZero
             v-bind:childResponse="childResponse"
             v-if="org_template_info.template_id == 199"
@@ -1487,6 +1504,7 @@ import DialysisPrintOrderSixtynine from './template/DialysisPrintOrderSixtynine'
 import DialysisPrintOrderSeventy from './template/DialysisPrintOrderSeventy'
 import DialysisPrintOrderseventyone from './template/DialysisPrintOrderseventyone'
 import DialysisPrintOrderSeventyTwo from './template/DialysisPrintOrderSeventyTwo'
+import DialysisPrintOrderSeventythree from './template/DialysisPrintOrderSeventythree'
 import DialysisPrintOrderZero from './template/DialysisPrintOrderZero'
 export default {
   name: "dialysisPrintOrder",
@@ -1563,6 +1581,7 @@ export default {
     DialysisPrintOrderSeventy,
     DialysisPrintOrderseventyone,
     DialysisPrintOrderSeventyTwo,
+    DialysisPrintOrderSeventythree,
     DialysisPrintOrderZero,
     LabelBox,
     BreadCrumb,
@@ -2225,6 +2244,14 @@ export default {
           style: style,
           scanStyles: false,
         });
+      }else if (this.org_template_info.template_id == 73 ) {
+        printJS({
+          printable: "dialysis-print-box-1",
+          type: "html",
+          style: style2,
+          scanStyles: false,
+        });
+        console.log('77777',this.org_template_info.template_id);
       }
        else if (this.org_template_info.template_id == 199 ) {
         printJS({