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

src/router/modules/dialysis.js

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

src/xt_pages/dialysis/bloodPresssWatch.vue

@@ -259,6 +259,16 @@
           >批量打印</el-button
         >
       </template>
+      <template v-if="this.template_id == 40">
+        <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">
@@ -839,6 +849,8 @@ export default {
         this.$router.push({ path: "/dialysis/print/batch/thirtyThree" });
       } else if (this.template_id == 39) {
         this.$router.push({ path: "/dialysis/print/batch/thirtyNine" });
+      } else if (this.template_id == 40) {
+        this.$router.push({ path: "/dialysis/print/batch/forty" });
       }
     },
     batchPrintActionOne: function() {

src/xt_pages/dialysis/template/DialysisPrintOrderForty.vue

@@ -542,7 +542,7 @@
                 </td>
                 <td width="10">(</td>
                 <td width="35">首剂</td>
-                <td width="40">
+                <td width="50">
                     <div class="under-line">&nbsp;
                     <span v-if="prescription.anticoagulant==2">{{prescription.anticoagulant_shouji}}</span>
                     </div>
@@ -550,14 +550,14 @@
                 <td width="20">mg</td>
                 <td width="10"></td>
                 <td width="35">追加</td>
-                <td width="40">
+                <td width="50">
                     <div class="under-line">&nbsp;
                     <span v-if="prescription.anticoagulant==2">{{prescription.anticoagulant_weichi}}</span>
                     </div>
                 </td>
                 <td width="40">mg/h</td>
                 <td width="35">总量</td>
-                <td width="40">
+                <td width="50">
                     <div class="under-line">&nbsp;
                     <span v-if="prescription.anticoagulant==2">{{prescription.anticoagulant_zongliang}}</span>
                     </div>

src/xt_pages/outpatientDoctorStation/doctorDesk.vue

@@ -3554,8 +3554,10 @@
         }
       },
       currentChange(currentRow, oldCurrentRow) {
-        this.newPatientId = oldCurrentRow.id;
-        this.patientid = oldCurrentRow.id;
+        if(oldCurrentRow){
+          this.newPatientId = oldCurrentRow.id;
+          this.patientid = oldCurrentRow.id;
+        }
         let isShowDailog = false
         for (let i = 0; i < this.prescriptions.length; i++) {
           if ((this.prescriptions[i].id == 0 && this.prescriptions[i].advices.length > 0) || (this.prescriptions[i].id == 0 && this.prescriptions[i].project.length > 0)) {

src/xt_pages/stock/drugs/drugStockInOrderDetailPrint.vue

@@ -11,6 +11,7 @@
           <div style="font-size:22px;font-weight:bold;text-align:center;">{{ orgName }}</div>
           <div class="order-title" style="font-size:18px;padding-top:0;">药品入库登记表</div>
 
+          <div style="float: left;margin-bottom: 1px;">单据编号：{{WarehouseInfo.warehouse.warehousing_order}}</div>
           <div style="float: right;margin-bottom: 1px;">{{getDateTwo()}}</div>
 
           <table class="print-table" border="1">

src/xt_pages/stock/drugs/drugStockOutOrderDetailPrint.vue

@@ -11,6 +11,7 @@
          <div class="order-yy-name" style="font-size:22px;font-weight:bold;letter-spacing:0px;">{{orgName}}</div>
           <div class="order-title" style="font-weight:500;font-size:18px;">药品出库登记表</div>
 
+          <div style="float: left;margin-bottom: 1px;">单据编号：{{warehousingOutInfo.info.warehouse_out_order_number}}</div>
           <div style="float: right;margin-bottom: 1px;">{{getDateTwo()}}</div>
 
           <table class="print-table" border="1">

src/xt_pages/stock/stockInOrderDetailPrint.vue

@@ -15,9 +15,15 @@
                         <div style="font-size:22px;font-weight:bold;">{{ orgName }}</div>
                         <span style="font-weight:500;font-size:18px;">耗材入库登记单</span>
                     </div>
-                    <div style="text-align:right;margin-bottom:1px;font-size: 18px;">
-                      打印时间：{{time_now}}
+                    <div style="display:flex;justify-content: space-between;">
+                      <div style="text-align:left;margin-bottom:1px;font-size: 18px;">
+                        单据编号：{{WarehouseInfo.warehouse.warehousing_order}}
+                      </div>
+                      <div style="text-align:right;margin-bottom:1px;font-size: 18px;">
+                        打印时间：{{time_now}}
+                      </div>
                     </div>
+                    
                     <div class="table_panel">
                         <table class="table">
                             <thead>

src/xt_pages/stock/stockOutOrderDetailPrint.vue

@@ -15,8 +15,13 @@
                         <div style="font-size:22px;font-weight:bold;">{{ orgName }}</div>
                         <span class="main_title">耗材出库登记单</span>
                     </div>
-                    <div style="text-align:right;margin-bottom:1px;font-size: 18px;">
-                      打印日期：{{time_now}}
+                    <div style="display:flex;justify-content: space-between;">
+                      <div style="text-align:left;margin-bottom:1px;font-size: 18px;">
+                        单据编号：{{warehousingOutInfo.info.warehouse_out_order_number}}
+                      </div>
+                      <div style="text-align:right;margin-bottom:1px;font-size: 18px;">
+                        打印日期：{{time_now}}
+                      </div>
                     </div>
                     <div class="table_panel">
                         <table class="table">