调整打印数据

src/components/print/tag_60_40.vue

@@ -78,21 +78,21 @@ export default {
         const data = res.data;
         this.model = {
           patient: {
-            name: `${data['name']}`,
-            gender: `${data['sex']}`,
-            birthday: `${data['patientBirthday']}`,
+            name: data['name'],
+            gender: data['sex'],
+            birthday: data['patientBirthday'],
           },
           recipe: {
-            count: `${data['number']}`,
-            total: `${data['packageNumber']}`,
-            method: `${data['prescriptionusage']}`,
+            count: data['number'],
+            total: data['packageNumber'],
+            method: data['prescriptionusage'],
             volume: `${data['packageDose']}ml`,
           },
           department: [data['department'], data['bedNo']].filter(Boolean).join(' '),
           record: {
             title: `${data['medicalName']}(代煎中心)`,
-            date: `${data['createTime']}`,
-            no: `${data['preNo']}`,
+            date: data['createTime'],
+            no: data['preNo'],
             category: data['preMzZy'] === '1' ? '门诊' : '住院',
             remark: [data['frequency'], data['medicationTime']].filter(Boolean).join('，'),
           },

src/views/pda/pack/twice.vue

@@ -103,7 +103,7 @@ export default {
               ></el-option>
             </el-select>
           </el-form-item>
-          <el-form-item label="操作时间" prop="keepingTime">
+          <el-form-item label="操作时间" prop="date">
             <el-date-picker style="width:340px" v-model="queryParams.date"
                             type="datetimerange" value-format="yyyy-MM-dd HH:mm:ss"
                             start-placeholder="开始时间" end-placeholder="结束时间"

src/views/rescription/prescriptionCore/index.vue

@@ -1308,7 +1308,9 @@
     </el-dialog>
 
     <el-dialog title="打印预览" :visible.sync="showPrint" @closed="showPrintId = ''">
-      <print-container v-if="showPrintId" :id="showPrintId"></print-container>
+      <print-container v-if="showPrintId" :id="showPrintId"
+                       :load-express="showPrintExpressCom"
+      />
     </el-dialog>
   </div>
 </template>
@@ -1477,6 +1479,7 @@ export default {
       openPrint: false,
       showPrint: false, // 打印页面弹窗
       showPrintId: '', // 打印页面弹窗
+      showPrintExpressCom: false,
       activePrint: "标签",
       printTypeList: [
         { name: "标签", id: 0 },
@@ -1839,6 +1842,7 @@ export default {
     showPrintContentMethod(row) {
       this.showPrint = true;
       this.showPrintId = row.id;
+      this.showPrintExpressCom = row.expressExecutor === '顺丰';
     },
     consoleBtn(row) {
       this.reset();

src/views/rescription/prescriptionCore/printContainer.vue

@@ -9,25 +9,17 @@ export default {
   name: 'printContainer',
   props: {
     id: {type: [String, Number], required: true},
+    loadExpress: {type: Boolean, default: false},
   },
   components: {Print_express_75, Print_ticket_72, Print_recipe_a5, Print_tag_80_50},
   data() {
-    return {
-      selected: 0,
-    };
+    return {};
   },
   computed: {
     height() { return `${window.innerHeight * 0.8}`; },
     style() { return {height: `${this.height}px`}; },
   },
-  watch: {
-    selected(index) {
-      try {
-        const el = this.$refs[`print${index}`];
-        el['print'](true);
-      } catch (e) {}
-    },
-  },
+  watch: {},
   methods: {
     async print() {
       const keys = Object.keys(this.$refs).filter(key => key.startsWith('print'));
@@ -49,6 +41,12 @@ export default {
         });
       }
     },
+    select(index) {
+      try {
+        const el = this.$refs[`print${index}`];
+        el['print'](true);
+      } catch (e) {}
+    }
   },
 };
 </script>
@@ -56,17 +54,17 @@ export default {
 <template>
   <div>
     <el-button class="pin" type="primary" @click="print">组合打印</el-button>
-    <el-tabs tab-position="left" :style="style" v-model="selected">
-      <el-tab-pane label="标签" name="0">
+    <el-tabs tab-position="left" :style="style" @tab-click="select($event.index)">
+      <el-tab-pane label="标签">
         <print_tag_80_50 ref="print0" :id="id" @click="$event && update(0)"></print_tag_80_50>
       </el-tab-pane>
-      <el-tab-pane label="处方笺" name="1">
+      <el-tab-pane label="处方笺">
         <print_recipe_a5 ref="print1" :id="id" :style="style" @click="$event && update(1)"></print_recipe_a5>
       </el-tab-pane>
-      <el-tab-pane label="药品清单" name="2">
+      <el-tab-pane label="药品清单">
         <print_ticket_72 ref="print2" :id="id" :style="style" @click="$event && update(2)"></print_ticket_72>
       </el-tab-pane>
-      <el-tab-pane label="快递单" name="3">
+      <el-tab-pane v-if="loadExpress" label="顺丰面单">
         <print_express_75 ref="print3" :id="id" :style="style" @click="$event && update()"></print_express_75>
       </el-tab-pane>
     </el-tabs>