1

src/router/modules/dialysis.js

@@ -316,6 +316,18 @@ export default {
         noCache: true
       }
     },
+    {
+      path: '/dialysis/print/batch/twentyFive',
+      component: () =>
+        import('@/xt_pages/dialysis/batch_print/batch_print_order_twentyFive'),
+      hidden: true,
+      is_menu: false,
+      name: 'dialysis_batch_twentyFive',
+      meta: {
+        title: '批量打印',
+        noCache: true
+      }
+    },
     {
       path: '/dialysis/print/batch/thirty',
       component: () =>

src/xt_pages/dialysis/batch_print/batch_print_order_six.vue

@@ -979,6 +979,8 @@
                           <td width="50">血流量<br />(ml/min)</td>
                           <td width="50">静脉压<br />(mmHg)</td>
                           <td width="50">跨膜压<br />(mmHg)</td>
+                          <td width="60" v-if="org_id != 9836">透析液温度(°C)</td>
+                          <td width="60" v-if="org_id == 9836">体温(°C)</td>
                           <td width="60">透析液温度(°C)</td>
                           <td width="50">电导度<br />(ms/cm)</td>
                           <td width="50">超滤量<br />(ml)</td>
@@ -1049,13 +1051,20 @@
                                 : ""
                             }}
                           </td>
-                          <td>
+                          <td v-if="org_id != 9836">
                             {{
                               monitor_record.dialysate_temperature
                                 ? monitor_record.dialysate_temperature
                                 : ""
                             }}
                           </td>
+                          <td v-if="org_id == 9836">
+                            {{
+                              monitor_record.temperature
+                                ? monitor_record.temperature
+                                : ""
+                            }}
+                          </td>
                           <td>
                             {{
                               monitor_record.sodium_concentration
@@ -2023,7 +2032,8 @@ export default {
         "出血",
         "心衰",
         "腹痛"
-      ]
+      ],
+      org_id:''
     };
   },
   created() {
@@ -2037,6 +2047,7 @@ export default {
     this.nutrition_arr = getDataConfig("hemodialysis", "nutrition");
     var xtuser = this.$store.getters.xt_user;
     this.orgname = xtuser.org.org_name;
+    this.org_id = this.$store.getters.xt_user.org.id
     //   this.orgname = "遂溪方济医院";
     this.modeOptions = this.$store.getters.treatment_mode;
     //   this.replacementWays = this.$store.getters.replacement_ways;

src/xt_pages/dialysis/bloodPresssWatch.vue

@@ -199,6 +199,16 @@
           >
         </div>
       </template>
+      <template v-if="this.template_id == 25">
+        <el-button
+          size="small"
+          icon="el-icon-printer"
+          :disabled="selecting_schs.length == 0"
+          @click="batchPrintAction"
+          type="primary"
+          >批量打印</el-button
+        >
+      </template>
       <template v-if="this.template_id == 30">
         <el-button
           size="small"
@@ -785,6 +795,8 @@ export default {
         this.$router.push({ path: "/dialysis/print/batch/twenty" });
       } else if (this.template_id == 22) {
         this.$router.push({ path: "/dialysis/print/batch/twentyTwo" });
+      } else if (this.template_id == 25) {
+        this.$router.push({ path: "/dialysis/print/batch/twentyFive" });
       } else if (this.template_id == 30) {
         this.$router.push({ path: "/dialysis/print/batch/thirty" });
       } else if (this.template_id == 32) {

src/xt_pages/dialysis/template/DialysisPrintOrderSix.vue

@@ -501,7 +501,8 @@
                       <td width="50">血流量<br />(ml/min)</td>
                       <td width="50">静脉压<br />({{monitors[0]&&monitors[0]['venous_pressure_type'] == 2 ? 'kpa' : 'mmHg'}})</td>
                       <td width="50">跨膜压<br />({{monitors[0]&&monitors[0]['transmembrane_pressure_type'] == 2 ? 'kpa' : 'mmHg'}})</td>
-                      <td width="60">透析液温度(°C)</td>
+                      <td width="60" v-if="org_id != 9836">透析液温度(°C)</td>
+                      <td width="60" v-if="org_id == 9836">体温(°C)</td>
                       <td width="50">电导度<br />(ms/cm)</td>
                       <td width="50">超滤量<br />(ml)</td>
                       <td v-if="prescription.mode_id == 2 || prescription.mode_id == 5 || prescription.mode_id == 12" width="50">
@@ -543,7 +544,8 @@
                           {{ monitor.transmembrane_pressure ? monitor.transmembrane_pressure : 0 }}
                         </span>
                       </td>
-                      <td>{{ monitor.dialysate_temperature ? monitor.dialysate_temperature : "" }}</td>
+                      <td v-if="org_id != 9836">{{ monitor.dialysate_temperature ? monitor.dialysate_temperature : "" }}</td>
+                      <td v-if="org_id == 9836">{{ monitor.temperature ? monitor.temperature : "" }}</td>
                       <td>{{ monitor.sodium_concentration ? monitor.sodium_concentration : "" }}
                       </td>
                       <td v-if="(dialysisOrder && monitor.operate_time > dialysisOrder.end_time) || (dialysisOrder && monitor.operate_time < dialysisOrder.start_time)">

src/xt_pages/dialysis/template/DialysisPrintOrderTwentyFive.vue

@@ -806,7 +806,7 @@
                   <td width="20">ml</td>
                   <td width="30">V端</td>
                   <td width="30">
-                    <div class="under-line">{{ afterdialysis.cvc_v ? afterdialysis.cvc_v : "" }}</div>
+                    <div class="under-line">&nbsp;{{ afterdialysis.cvc_v ? afterdialysis.cvc_v : "" }}</div>
                   </td>
                   <td width="20">ml</td>
                   <td></td>

src/xt_pages/stock/detail/print.vue

@@ -74,6 +74,15 @@
 
             </tbody>
           </table>
+
+          <div style="display:flex;margin-top:20px;float:right;">
+            <div style="width:50px;">审批：</div><div style="width:100px;"></div>
+            <div style="width:80px;">药材主任：</div><div style="width:100px;"></div>
+            <div style="width:50px;">会计：</div><div style="width:100px;"></div>
+            <div style="width:50px;">审核：</div><div style="width:100px;"></div>
+            <div style="width:70px;">制单人：</div><div style="width:100px;"></div>
+          </div>
+
         </div>
 
       </div>

src/xt_pages/stock/drugs/drugCancelDetailPrint.vue

@@ -10,7 +10,8 @@
         <div class="dialysis-print-order">
          <div class="order-yy-name">{{orgname}}</div>
           <div class="order-title">退库单</div>
-        <div style="float: right;margin-bottom: 10px;">{{getDateTwo()}}</div>
+          <div style="float: left;margin-bottom: 10px;">{{getDateOne()}}</div>
+          <div style="float: right;margin-bottom: 10px;">{{getDateTwo()}}</div>
 
           <table class="print-table" border="1">
             <tbody>
@@ -61,6 +62,14 @@
 
             </tbody>
           </table>
+
+          <div style="display:flex;margin-top:20px;float:right;">
+            <div style="width:50px;">审批：</div><div style="width:100px;"></div>
+            <div style="width:80px;">药材主任：</div><div style="width:100px;"></div>
+            <div style="width:50px;">会计：</div><div style="width:100px;"></div>
+            <div style="width:50px;">审核：</div><div style="width:100px;"></div>
+            <div style="width:70px;">制单人：</div><div style="width:100px;"></div>
+          </div>
         </div>
 
       </div>
@@ -105,6 +114,9 @@
       }
     },
     methods: {
+      getDateOne(){
+        return "出库日期: "+this.start_time +"~"+this.end_time
+      },
       getDateTwo(){
         var ptime = Math.round(new Date().getTime() / 1000)
         return "打印单日期："+uParseTime(ptime, '{y}-{m}-{d}')

src/xt_pages/stock/drugs/drugCancelOurderPrint.vue

@@ -10,7 +10,8 @@
         <div class="dialysis-print-order">
          <div class="order-yy-name">{{orgname}}</div>
           <div class="order-title">退货单</div>
-        <div style="float: right;margin-bottom: 10px;">{{getDateTwo()}}</div>
+          <div style="float: left;margin-bottom: 10px;">{{getDateOne()}}</div>
+          <div style="float: right;margin-bottom: 10px;">{{getDateTwo()}}</div>
 
           <table class="print-table" border="1">
             <tbody>
@@ -60,6 +61,14 @@
 
             </tbody>
           </table>
+
+          <div style="display:flex;margin-top:20px;float:right;">
+            <div style="width:50px;">审批：</div><div style="width:100px;"></div>
+            <div style="width:80px;">药材主任：</div><div style="width:100px;"></div>
+            <div style="width:50px;">会计：</div><div style="width:100px;"></div>
+            <div style="width:50px;">审核：</div><div style="width:100px;"></div>
+            <div style="width:70px;">制单人：</div><div style="width:100px;"></div>
+          </div>
         </div>
 
       </div>
@@ -104,6 +113,9 @@
       }
     },
     methods: {
+      getDateOne(){
+        return "退货日期: "+this.start_time +"~"+this.end_time
+      },
       getDateTwo(){
         var ptime = Math.round(new Date().getTime() / 1000)
         return "打印单日期："+uParseTime(ptime, '{y}-{m}-{d}')

src/xt_pages/stock/drugs/drugOutOrderPrint.vue

@@ -10,7 +10,8 @@
         <div class="dialysis-print-order">
          <div class="order-yy-name">{{orgname}}</div>
           <div class="order-title">出库单</div>
-        <div style="float: right;margin-bottom: 10px;">{{getDateTwo()}}</div>
+          <div style="float: left;margin-bottom: 10px;">{{getDateOne()}}</div>
+          <div style="float: right;margin-bottom: 10px;">{{getDateTwo()}}</div>
 
           <table class="print-table" border="1">
             <tbody>
@@ -68,6 +69,14 @@
 
             </tbody>
           </table>
+
+          <div style="display:flex;margin-top:20px;float:right;">
+            <div style="width:50px;">审批：</div><div style="width:100px;"></div>
+            <div style="width:80px;">药材主任：</div><div style="width:100px;"></div>
+            <div style="width:50px;">会计：</div><div style="width:100px;"></div>
+            <div style="width:50px;">审核：</div><div style="width:100px;"></div>
+            <div style="width:70px;">制单人：</div><div style="width:100px;"></div>
+          </div>
         </div>
 
       </div>
@@ -112,6 +121,9 @@
       }
     },
     methods: {
+      getDateOne(){
+        return "出库日期: "+this.start_time +"~"+this.end_time
+      },
       getDateTwo(){
         var ptime = Math.round(new Date().getTime() / 1000)
         return "打印单日期："+uParseTime(ptime, '{y}-{m}-{d}')

src/xt_pages/stock/drugs/drugPrint.vue

@@ -10,7 +10,8 @@
         <div class="dialysis-print-order">
          <div class="order-yy-name">{{orgname}}</div>
           <div class="order-title">入库单</div>
-        <div style="float: right;margin-bottom: 10px;">{{getDateTwo()}}</div>
+          <div style="float: left;margin-bottom: 10px;">{{getDateOne()}}</div>
+          <div style="float: right;margin-bottom: 10px;">{{getDateTwo()}}</div>
 
           <table class="print-table" border="1">
             <tbody>
@@ -60,6 +61,14 @@
 
             </tbody>
           </table>
+
+          <div style="display:flex;margin-top:20px;float:right;">
+            <div style="width:50px;">审批：</div><div style="width:100px;"></div>
+            <div style="width:80px;">药材主任：</div><div style="width:100px;"></div>
+            <div style="width:50px;">会计：</div><div style="width:100px;"></div>
+            <div style="width:50px;">审核：</div><div style="width:100px;"></div>
+            <div style="width:70px;">制单人：</div><div style="width:100px;"></div>
+          </div>
         </div>
 
       </div>
@@ -104,6 +113,9 @@
       }
     },
     methods: {
+      getDateOne(){
+        return "入库日期: "+this.start_time +"~"+this.end_time
+      },
       getDateTwo(){
         var ptime = Math.round(new Date().getTime() / 1000)
         return "打印单日期："+uParseTime(ptime, '{y}-{m}-{d}')

src/xt_pages/workforce/appointment.vue

@@ -91,7 +91,7 @@
     <div class="app-container">
       <!-- <el-row>
         <el-col :span="24"> -->
-      <div style="margin-left:832px;position:fixed;z-index:99">
+      <div style="right:30px;position:fixed;z-index:99">
        <span>导出周次:</span>
         <el-date-picker
           v-model="weekTime"