[dev]

1、修复打印生日为undefined
2、增加打印标签功能

src/views/pharmacyManagement/business/deploy/audit.vue

@@ -173,17 +173,17 @@
 
         <div class="right">
           <div class="print" id="print">
-            <div class="bq"  v-if="activePrint==='标签'">
-              <div class="title">{{detailData.yljgName || '默默事中医院取药标签打印(门诊)'}}</div>
-              <div class="body">
-                <div class="lef">
+            <div style="display: flex;flex-direction: column;width:400px;height: 250px;padding: 20px;"  v-if="activePrint==='标签'">
+              <div style="font-size: 25px;font-weight: 500;margin: 10px 0;display: flex;align-items: center;justify-content:center;">{{detailData.yljgName || '默默事中医院取药标签打印(门诊)'}}</div>
+              <div style="display: flex;justify-content:space-between;height:100px;margin-top: 20px;">
+                <div style="display: flex;flex-direction: column;width: 200px;height:100px;justify-content:center;">
                   <JsBarcode
                     :presno="detailData.preNo"
                   ></JsBarcode>
                 </div>
-                <div class="rig">
-                  <div class="hz">患者：<div class="bold">{{detailData.name}}，{{detailData.sex}}，{{detailData.age}}岁</div></div>
-                  <div class="hz">出生日期：<div class="bold">{{detailData.birth}}</div></div>
+                <div style="display: flex;flex-direction: column;width: 160px;">
+                  <div style="display: flex;margin: 6px 0 5px;font-size: 15px;width: 160px;">患者：<div style="font-weight: 500;">{{detailData.name}}，{{detailData.sex}}，{{detailData.age}}岁</div></div>
+                  <div style="display: flex;margin: 6px 0 5px;font-size: 15px;width: 160px;">出生日期：<div style="font-weight: 500;">{{detailData.birth}}</div></div>
                 </div>
               </div>
             </div>
@@ -280,8 +280,8 @@
                 <div>{{entrust1111}}</div>
               </div>
             </div>
-            <el-button class="printbutton" v-print="'#print'">打 印</el-button>
           </div>
+          <el-button class="printbutton" v-print="'#print'">打 印</el-button>
         </div>
 
       </div>
@@ -812,6 +812,7 @@ export default {
       selectOrderDetail({id:id}).then((response) => {
         this.form = response.data;
         this.detailData = response.data;
+        this.detailData.birth = this.detailData.birth?this.detailData.birth:'';
         this.detailData.presType = '普通处方'; //TODO neo
         console.log('handlePrint detailData', this.detailData)
         this.openPrint = true;
@@ -932,6 +933,7 @@ export default {
       justify-content:center;
       align-items:center;
       width: 1070px;
+      box-shadow: 0 0 50px rgba(0, 0, 0, 0.5);
       .bq{
         display: flex;
         flex-direction: column;
@@ -1239,17 +1241,19 @@ export default {
           display: flex;
         }
       }
-      .printbutton{
-        display: flex;
-        justify-content:center;
-        align-items:center;
-        background-color: #1ab394;
-        color: #FFFFFF;
-        font-size: 20px;
-        margin-top: 40px;
-        width: 300px;
-        height: 50px;
-      }
+
+    }
+    .printbutton{
+      margin-top: 50px;
+      display: flex;
+      justify-content:center;
+      align-items:center;
+      background-color: #1ab394;
+      color: #FFFFFF;
+      font-size: 20px;
+      margin-top: 40px;
+      width: 300px;
+      height: 50px;
     }
 
   }