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

package-lock.json

@@ -7943,7 +7943,7 @@
     },
     "normalize-wheel": {
       "version": "1.0.1",
-      "resolved": "http://registry.npm.taobao.org/normalize-wheel/download/normalize-wheel-1.0.1.tgz",
+      "resolved": "https://registry.npmjs.org/normalize-wheel/-/normalize-wheel-1.0.1.tgz",
       "integrity": "sha1-rsiGr/2wRQcNhWRH32Ls+GFG7EU="
     },
     "normalize.css": {
@@ -12948,9 +12948,9 @@
       "dev": true
     },
     "ssf": {
-      "version": "0.10.2",
-      "resolved": "https://registry.npmjs.org/ssf/-/ssf-0.10.2.tgz",
-      "integrity": "sha512-rDhAPm9WyIsY8eZEKyE8Qsotb3j/wBdvMWBUsOhJdfhKGLfQidRjiBUV0y/MkyCLiXQ38FG6LWW/VYUtqlIDZQ==",
+      "version": "0.10.3",
+      "resolved": "https://registry.npmjs.org/ssf/-/ssf-0.10.3.tgz",
+      "integrity": "sha512-pRuUdW0WwyB2doSqqjWyzwCD6PkfxpHAHdZp39K3dp/Hq7f+xfMwNAWIi16DyrRg4gg9c/RvLYkJTSawTPTm1w==",
       "requires": {
         "frac": "~1.1.2"
       }

package.json

@@ -47,7 +47,7 @@
     "dropzone": "5.2.0",
     "echarts": "3.8.5",
     "element-ui": "^2.13.0",
-    "file-saver": "1.3.3",
+    "file-saver": "^1.3.3",
     "font-awesome": "4.7.0",
     "js-cookie": "2.2.0",
     "jsonlint": "1.6.3",
@@ -73,7 +73,7 @@
     "vue-splitpane": "1.0.2",
     "vuedraggable": "^2.16.0",
     "vuex": "3.0.1",
-    "xlsx": "^0.11.16"
+    "xlsx": "^0.11.19"
   },
   "devDependencies": {
     "autoprefixer": "7.2.3",

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/workforce/appointment.vue

@@ -436,7 +436,9 @@
           }
           console.log(list)
           const data = this.formatJson(filterVal, list)
+          console.log("data",data)
           const filename = '排班模版'
+         
           excel.export_json_to_excel({
             multiHeader,
             header,
@@ -446,7 +448,7 @@
           })
           this.downloadLoading = false
         })
-
+     
       }, formatJson(filterVal, jsonData) {
         return jsonData.map(v =>
           filterVal.map(j => {