Browse Source

医护管理

XMLWAN 4 years ago
parent
commit
1ece6e0b01
4 changed files with 62 additions and 60 deletions
  1. 4 4
      package-lock.json
  2. 2 2
      package.json
  3. 53 53
      src/router/modules/dialysis.js
  4. 3 1
      src/xt_pages/workforce/appointment.vue

+ 4 - 4
package-lock.json View File

@@ -7943,7 +7943,7 @@
7943 7943
     },
7944 7944
     "normalize-wheel": {
7945 7945
       "version": "1.0.1",
7946
-      "resolved": "http://registry.npm.taobao.org/normalize-wheel/download/normalize-wheel-1.0.1.tgz",
7946
+      "resolved": "https://registry.npmjs.org/normalize-wheel/-/normalize-wheel-1.0.1.tgz",
7947 7947
       "integrity": "sha1-rsiGr/2wRQcNhWRH32Ls+GFG7EU="
7948 7948
     },
7949 7949
     "normalize.css": {
@@ -12948,9 +12948,9 @@
12948 12948
       "dev": true
12949 12949
     },
12950 12950
     "ssf": {
12951
-      "version": "0.10.2",
12952
-      "resolved": "https://registry.npmjs.org/ssf/-/ssf-0.10.2.tgz",
12953
-      "integrity": "sha512-rDhAPm9WyIsY8eZEKyE8Qsotb3j/wBdvMWBUsOhJdfhKGLfQidRjiBUV0y/MkyCLiXQ38FG6LWW/VYUtqlIDZQ==",
12951
+      "version": "0.10.3",
12952
+      "resolved": "https://registry.npmjs.org/ssf/-/ssf-0.10.3.tgz",
12953
+      "integrity": "sha512-pRuUdW0WwyB2doSqqjWyzwCD6PkfxpHAHdZp39K3dp/Hq7f+xfMwNAWIi16DyrRg4gg9c/RvLYkJTSawTPTm1w==",
12954 12954
       "requires": {
12955 12955
         "frac": "~1.1.2"
12956 12956
       }

+ 2 - 2
package.json View File

@@ -47,7 +47,7 @@
47 47
     "dropzone": "5.2.0",
48 48
     "echarts": "3.8.5",
49 49
     "element-ui": "^2.13.0",
50
-    "file-saver": "1.3.3",
50
+    "file-saver": "^1.3.3",
51 51
     "font-awesome": "4.7.0",
52 52
     "js-cookie": "2.2.0",
53 53
     "jsonlint": "1.6.3",
@@ -73,7 +73,7 @@
73 73
     "vue-splitpane": "1.0.2",
74 74
     "vuedraggable": "^2.16.0",
75 75
     "vuex": "3.0.1",
76
-    "xlsx": "^0.11.16"
76
+    "xlsx": "^0.11.19"
77 77
   },
78 78
   "devDependencies": {
79 79
     "autoprefixer": "7.2.3",

+ 53 - 53
src/router/modules/dialysis.js View File

@@ -38,59 +38,59 @@ export default {
38 38
         noCache: true
39 39
       }
40 40
     },
41
-    {
42
-      path: '/dialysis/consumableDrugs',
43
-      component: () => import('@/xt_pages/dialysis/consumableDrugs'),
44
-      name: '耗材药品',
45
-      meta: {
46
-        title: '耗材药品',
47
-        noCache: true
48
-      }
49
-    },
50
-    {
51
-      path: '/dialysis/consumableDrugs_print',
52
-      component: () => import('@/xt_pages/dialysis/consumableDrugs_print'),
53
-      hidden: true,
54
-      is_menu: false,
55
-      name: 'consumableDrugs_print',
56
-      meta: {
57
-        title: 'consumableDrugs_print',
58
-        noCache: true
59
-      }
60
-    },
61
-    {
62
-      path: '/dialysis/dialysisDrugs_print',
63
-      component: () => import('@/xt_pages/dialysis/dialysisDrugs_print'),
64
-      hidden: true,
65
-      is_menu: false,
66
-      name: 'dialysisDrugs_print',
67
-      meta: {
68
-        title: 'dialysisDrugs_print',
69
-        noCache: true
70
-      }
71
-    },
72
-    {
73
-      path: '/dialysis/dialysisParameters_print',
74
-      component: () => import('@/xt_pages/dialysis/dialysisParameters_print'),
75
-      hidden: true,
76
-      is_menu: false,
77
-      name: 'dialysisParameters_print',
78
-      meta: {
79
-        title: 'dialysisParameters_print',
80
-        noCache: true
81
-      }
82
-    },
83
-    {
84
-      path: '/dialysis/allSummary_print',
85
-      component: () => import('@/xt_pages/dialysis/allSummary_print'),
86
-      hidden: true,
87
-      is_menu: false,
88
-      name: 'allSummary_print',
89
-      meta: {
90
-        title: 'allSummary_print',
91
-        noCache: true
92
-      }
93
-    },
41
+    // {
42
+    //   path: '/dialysis/consumableDrugs',
43
+    //   component: () => import('@/xt_pages/dialysis/consumableDrugs'),
44
+    //   name: '耗材药品',
45
+    //   meta: {
46
+    //     title: '耗材药品',
47
+    //     noCache: true
48
+    //   }
49
+    // },
50
+    // {
51
+    //   path: '/dialysis/consumableDrugs_print',
52
+    //   component: () => import('@/xt_pages/dialysis/consumableDrugs_print'),
53
+    //   hidden: true,
54
+    //   is_menu: false,
55
+    //   name: 'consumableDrugs_print',
56
+    //   meta: {
57
+    //     title: 'consumableDrugs_print',
58
+    //     noCache: true
59
+    //   }
60
+    // },
61
+    // {
62
+    //   path: '/dialysis/dialysisDrugs_print',
63
+    //   component: () => import('@/xt_pages/dialysis/dialysisDrugs_print'),
64
+    //   hidden: true,
65
+    //   is_menu: false,
66
+    //   name: 'dialysisDrugs_print',
67
+    //   meta: {
68
+    //     title: 'dialysisDrugs_print',
69
+    //     noCache: true
70
+    //   }
71
+    // },
72
+    // {
73
+    //   path: '/dialysis/dialysisParameters_print',
74
+    //   component: () => import('@/xt_pages/dialysis/dialysisParameters_print'),
75
+    //   hidden: true,
76
+    //   is_menu: false,
77
+    //   name: 'dialysisParameters_print',
78
+    //   meta: {
79
+    //     title: 'dialysisParameters_print',
80
+    //     noCache: true
81
+    //   }
82
+    // },
83
+    // {
84
+    //   path: '/dialysis/allSummary_print',
85
+    //   component: () => import('@/xt_pages/dialysis/allSummary_print'),
86
+    //   hidden: true,
87
+    //   is_menu: false,
88
+    //   name: 'allSummary_print',
89
+    //   meta: {
90
+    //     title: 'allSummary_print',
91
+    //     noCache: true
92
+    //   }
93
+    // },
94 94
     {
95 95
       path: '/dialysis/record/:id',
96 96
       component: () => import('@/xt_pages/dialysis/dialysisPage'),

+ 3 - 1
src/xt_pages/workforce/appointment.vue View File

@@ -436,7 +436,9 @@
436 436
           }
437 437
           console.log(list)
438 438
           const data = this.formatJson(filterVal, list)
439
+          console.log("data",data)
439 440
           const filename = '排班模版'
441
+         
440 442
           excel.export_json_to_excel({
441 443
             multiHeader,
442 444
             header,
@@ -446,7 +448,7 @@
446 448
           })
447 449
           this.downloadLoading = false
448 450
         })
449
-
451
+     
450 452
       }, formatJson(filterVal, jsonData) {
451 453
         return jsonData.map(v =>
452 454
           filterVal.map(j => {