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

src/xt_pages/dialysis/template/DialysisPrintOrderTwentyOne.vue

@@ -352,7 +352,7 @@
                             <td width="70">透前体重:</td>
                             <td width="50">
                                 <div class="under-line">
-                                    &nbsp;{{ predialysis.weight_before ? parseFloat(predialysis.weight_before - predialysis.additional_weight).toFixed(2) : "" }}
+                                    &nbsp;{{ predialysis.weight_before ? parseFloat(predialysis.weight_before - predialysis.additional_weight).toFixed(2) : "/" }}
                                 </div>
                             </td>
                             <td width="20">Kg</td>
@@ -360,7 +360,7 @@
                             <td width="70">透后体重:</td>
                             <td width="50">
                                 <div class="under-line">
-                                    &nbsp;{{ afterdialysis.weight_after ? (afterdialysis.weight_after - afterdialysis.additional_weight) : "" }}
+                                    &nbsp;{{ afterdialysis.weight_after ? (afterdialysis.weight_after - afterdialysis.additional_weight) : "/" }}
                                 </div>
                             </td>
                             <td width="20">Kg</td>
@@ -717,7 +717,7 @@
               &nbsp;{{ monitor.breathing_rate ? monitor.breathing_rate : "" }}
             </td>
             <td>
-              &nbsp;{{ monitor.arterial_pressure ? monitor.arterial_pressure : "" }}
+              &nbsp;{{ monitor.arterial_pressure ? monitor.arterial_pressure : "/" }}
             </td>
             <td>
               &nbsp;{{ monitor.venous_pressure ? monitor.venous_pressure : "" }}

src/xt_pages/medicalScheduling/schedulingStatistics.vue

@@ -2,9 +2,9 @@
     <div class="main-contain">
         <div class="position">
             <bread-crumb :crumbs="crumbs"></bread-crumb>
-            <!-- <div style="display:flex;align-items:center">
+            <div style="display:flex;align-items:center">
                 <el-button type="primary" icon="el-icon-printer" @click='toPrint'>打印</el-button>
-            </div> -->
+            </div>
         </div>
         <div class="app-container">
             <div class="cell clearfix">
@@ -784,49 +784,42 @@ export default {
         toPrint: function() {
             this.downloadLoading = true
             import('@/vendor/Export2Excel').then(excel => {
-            const filterVal = ['医护姓名','早班','中班','晚班','夜班','全班']
-            const multiHeader = []
-            const header = []
-            const merges = []
-            let obj = {"name":"李四"}
-            let obj2 = {"name":"李四"}
-            let obj3 = {"name":"李四"}
-            var list = []
-            list.push(obj)
-            list.push(obj2)
-            list.push(obj3)
-            let i = 0
-            console.log("list",list)
-            const data = this.formatJson(filterVal, list)
+    　　　　  const tHeader = ['书刊编号', '书刊名称', 'ISBN/ISSN', '索取号', '定价','类别'];
+    　　　　  const filterVal = ['bookSn', 'title', 'isbnOrIssn', 'callNumber', 'price','category'];
+    　　　　　const list = [];
+    　　　　　const data = this.formatJson(filterVal, list);
             console.log("data",data)
-            const filename = '排班模版'
-            return false
-            excel.export_json_to_excel({
-                multiHeader,
-                header,
-                merges,
-                data,
-                filename
-            })
+    　　　   excel.export_json_to_excel(tHeader, data, '书刊数据');
+            // return false
+            // excel.export_json_to_excel({
+            //     multiHeader,
+            //     header,
+            //     merges,
+            //     data,
+            //     filename
+            // })
             this.downloadLoading = false
             })
-
-        },
-        formatJson(filterVal, jsonData) {
-            return jsonData.map(v =>
-            filterVal.map(j => {
-                console.log(v)
-                console.log(j)
-                console.log(v[j])
-
-                if (j === 'timestamp') {
-                return parseTime(v[j])
-                } else {
-                return v[j]
-                }
-            })
-            )
         },
+        // formatJson(filterVal, jsonData) {
+        //     return jsonData.map(v =>
+        //     filterVal.map(j => {
+        //         console.log("v",v)
+        //         console.log("j",j)
+        //         console.log("hhhh",v[j])
+
+        //         if (j === 'timestamp') {
+        //         return parseTime(v[j])
+        //         } else {
+        //         return v[j]
+        //         }
+        //     })
+        //     )
+        // },
+
+        　formatJson(filterVal, jsonData) {
+    　　　　　　return jsonData.map(v => filterVal.map(j => v[j]))
+    　　　 },
 
         //获取统计图数据
         getchartlist(){