Browse Source

自备药

XMLWAN 4 years ago
parent
commit
832b8dc6c6
49 changed files with 199 additions and 405 deletions
  1. 11 1
      src/api/drug/drug.js
  2. 0 0
      src/router/index.js
  3. 0 0
      src/router/index_路由未分离前.js
  4. 0 0
      src/router/modules/createPatient.js
  5. 0 0
      src/router/modules/dataDictionary.js
  6. 0 0
      src/router/modules/dataDruguse.js
  7. 0 0
      src/router/modules/dataPrescription.js
  8. 0 0
      src/router/modules/dataPrint.js
  9. 0 0
      src/router/modules/dataShowconfig.js
  10. 0 0
      src/router/modules/dataTemplate.js
  11. 0 0
      src/router/modules/data_dict.js
  12. 0 0
      src/router/modules/data_upload.js
  13. 0 0
      src/router/modules/device.js
  14. 52 90
      src/router/modules/dialysis.js
  15. 0 0
      src/router/modules/dialysisRecord.js
  16. 0 0
      src/router/modules/drugs.js
  17. 0 0
      src/router/modules/integration.js
  18. 0 0
      src/router/modules/kuyiShopping.js
  19. 0 0
      src/router/modules/medical_scheduling.js
  20. 0 0
      src/router/modules/org.js
  21. 0 0
      src/router/modules/otherManagement.js
  22. 0 0
      src/router/modules/outpatientCharges.js
  23. 0 0
      src/router/modules/outpatientDoctorStation.js
  24. 0 0
      src/router/modules/outpatientPharmacy.js
  25. 0 0
      src/router/modules/outpatientRegistration.js
  26. 0 0
      src/router/modules/patient.js
  27. 13 13
      src/router/modules/qcd.js
  28. 0 0
      src/router/modules/role.js
  29. 0 0
      src/router/modules/roleManage.js
  30. 0 0
      src/router/modules/scrm.js
  31. 0 0
      src/router/modules/selfPreparedMedicine.js
  32. 0 0
      src/router/modules/service.js
  33. 0 0
      src/router/modules/shop.js
  34. 0 0
      src/router/modules/slow.js
  35. 0 0
      src/router/modules/specialDictionary.js
  36. 1 266
      src/router/modules/stock.js
  37. 0 0
      src/router/modules/systems.js
  38. 0 0
      src/router/modules/weight_sign.js
  39. 0 0
      src/router/modules/workforce.js
  40. 3 1
      src/xt_pages/dialysis/details/dialog/adviceDialog/AddGroupAdvice.vue
  41. 1 2
      src/xt_pages/stock/selfPreparedMedicine/components/addMedicine.vue
  42. 13 3
      src/xt_pages/stock/selfPreparedMedicine/components/medicineDetail.vue
  43. 9 4
      src/xt_pages/stock/selfPreparedMedicine/components/warehouseOut.vue
  44. 9 3
      src/xt_pages/stock/selfPreparedMedicine/components/warehousing.vue
  45. 49 10
      src/xt_pages/stock/selfPreparedMedicine/index.vue
  46. 30 6
      src/xt_pages/stock/selfPreparedMedicine/info.vue
  47. 3 6
      src/xt_pages/stock/selfPreparedMedicine/query.vue
  48. 1 0
      src/xt_pages/user/components/EditGroupAdvice.vue
  49. 4 0
      src/xt_pages/user/doctorAdvice.vue

+ 11 - 1
src/api/drug/drug.js View File

@@ -216,4 +216,14 @@ export function getDrugDescByDrugName(params){
216 216
       methods:"get",
217 217
       params:params
218 218
    })
219
-}
219
+}
220
+
221
+export function getDrugSet(params){
222
+  
223
+   return request({
224
+      url:"/api/drug/getdrugset",
225
+      methods:"get",
226
+      params:params
227
+   })
228
+}
229
+

+ 0 - 0
src/router/index.js View File


+ 0 - 0
src/router/index_路由未分离前.js View File


+ 0 - 0
src/router/modules/createPatient.js View File


+ 0 - 0
src/router/modules/dataDictionary.js View File


+ 0 - 0
src/router/modules/dataDruguse.js View File


+ 0 - 0
src/router/modules/dataPrescription.js View File


+ 0 - 0
src/router/modules/dataPrint.js View File


+ 0 - 0
src/router/modules/dataShowconfig.js View File


+ 0 - 0
src/router/modules/dataTemplate.js View File


+ 0 - 0
src/router/modules/data_dict.js View File


+ 0 - 0
src/router/modules/data_upload.js View File


+ 0 - 0
src/router/modules/device.js View File


+ 52 - 90
src/router/modules/dialysis.js View File

@@ -20,106 +20,68 @@ export default {
20 20
         noCache: true
21 21
       }
22 22
     },
23
+    {
24
+      path: '/dialysis/board',
25
+      component: () => import('@/xt_pages/dialysis/bulletinBoard'),
26
+      name: '数据看板',
27
+      meta: {
28
+        title: '数据看板',
29
+        noCache: true
30
+      }
31
+    },
23 32
     // {
24
-    //   path: '/dialysis/board',
25
-    //   component: () => import('@/xt_pages/dialysis/bulletinBoard'),
26
-    //   name: '数据看板',
33
+    //   path: '/dialysis/consumableDrugs',
34
+    //   component: () => import('@/xt_pages/dialysis/consumableDrugs'),
35
+    //   name: '耗材药品',
27 36
     //   meta: {
28
-    //     title: '数据看板',
37
+    //     title: '耗材药品',
29 38
     //     noCache: true
30 39
     //   }
31 40
     // },
32 41
     // {
33
-    //   path: '/dialysis/calling',
34
-    //   component: () => import('@/xt_pages/dialysis/calling'),
35
-    //   name: '透析叫号',
42
+    //   path: '/dialysis/consumableDrugs_print',
43
+    //   component: () => import('@/xt_pages/dialysis/consumableDrugs_print'),
44
+    //   hidden: true,
45
+    //   is_menu: false,
46
+    //   name: 'consumableDrugs_print',
36 47
     //   meta: {
37
-    //     title: '透析叫号',
48
+    //     title: 'consumableDrugs_print',
49
+    //     noCache: true
50
+    //   }
51
+    // },
52
+    // {
53
+    //   path: '/dialysis/dialysisDrugs_print',
54
+    //   component: () => import('@/xt_pages/dialysis/dialysisDrugs_print'),
55
+    //   hidden: true,
56
+    //   is_menu: false,
57
+    //   name: 'dialysisDrugs_print',
58
+    //   meta: {
59
+    //     title: 'dialysisDrugs_print',
60
+    //     noCache: true
61
+    //   }
62
+    // },
63
+    // {
64
+    //   path: '/dialysis/dialysisParameters_print',
65
+    //   component: () => import('@/xt_pages/dialysis/dialysisParameters_print'),
66
+    //   hidden: true,
67
+    //   is_menu: false,
68
+    //   name: 'dialysisParameters_print',
69
+    //   meta: {
70
+    //     title: 'dialysisParameters_print',
71
+    //     noCache: true
72
+    //   }
73
+    // },
74
+    // {
75
+    //   path: '/dialysis/allSummary_print',
76
+    //   component: () => import('@/xt_pages/dialysis/allSummary_print'),
77
+    //   hidden: true,
78
+    //   is_menu: false,
79
+    //   name: 'allSummary_print',
80
+    //   meta: {
81
+    //     title: 'allSummary_print',
38 82
     //     noCache: true
39 83
     //   }
40 84
     // },
41
-
42
-    {
43
-      path: '/dialysis/consumableDrugs',
44
-      component: () => import('@/xt_pages/dialysis/consumableDrugs'),
45
-      name: '耗材药品',
46
-      meta: {
47
-        title: '耗材药品',
48
-        noCache: true
49
-      }
50
-    },
51
-    {
52
-      path: '/dialysis/consumableDrugs_print',
53
-      component: () => import('@/xt_pages/dialysis/consumableDrugs_print'),
54
-      hidden: true,
55
-      is_menu: false,
56
-      name: 'consumableDrugs_print',
57
-      meta: {
58
-        title: 'consumableDrugs_print',
59
-        noCache: true
60
-      }
61
-    },
62
-    {
63
-      path: '/dialysis/dialysisDrugs_print',
64
-      component: () => import('@/xt_pages/dialysis/dialysisDrugs_print'),
65
-      hidden: true,
66
-      is_menu: false,
67
-      name: 'dialysisDrugs_print',
68
-      meta: {
69
-        title: 'dialysisDrugs_print',
70
-        noCache: true
71
-      }
72
-    },
73
-    {
74
-      path: '/dialysis/dialysisParameters_print',
75
-      component: () => import('@/xt_pages/dialysis/dialysisParameters_print'),
76
-      hidden: true,
77
-      is_menu: false,
78
-      name: 'dialysisParameters_print',
79
-      meta: {
80
-        title: 'dialysisParameters_print',
81
-        noCache: true
82
-      }
83
-    },
84
-    {
85
-      path: '/dialysis/allSummary_print',
86
-      component: () => import('@/xt_pages/dialysis/allSummary_print'),
87
-      hidden: true,
88
-      is_menu: false,
89
-      name: 'allSummary_print',
90
-      meta: {
91
-        title: 'allSummary_print',
92
-        noCache: true
93
-      }
94
-    },
95
-    {
96
-      path: '/dialysis/consumables_print',
97
-      component: () => import('@/xt_pages/dialysis/consumables_print'),
98
-      hidden: true,
99
-      is_menu: false,
100
-      name: 'consumables_print',
101
-      meta: {
102
-        title: 'consumables_print',
103
-        noCache: true
104
-      }
105
-    },
106
-    {
107
-      path: '/dialysis/allsummarydialog_print',
108
-      component: () => import('@/xt_pages/dialysis/allSummaryDialog_print'),
109
-      hidden: true,
110
-      is_menu: false,
111
-      name: 'allsummarydialog_print',
112
-      meta: {
113
-        title: 'allsummarydialog_print',
114
-        noCache: true
115
-      }
116
-    },
117
-    {
118
-      path:'/dialysis/dialysisdrugs_print',
119
-      component:()=>import('@/xt_pages/dialysis/dialysisDrugs_print'),
120
-      hidden:true,
121
-      is_menu:false
122
-    },
123 85
     {
124 86
       path: '/dialysis/record/:id',
125 87
       component: () => import('@/xt_pages/dialysis/dialysisPage'),

+ 0 - 0
src/router/modules/dialysisRecord.js View File


+ 0 - 0
src/router/modules/drugs.js View File


+ 0 - 0
src/router/modules/integration.js View File


+ 0 - 0
src/router/modules/kuyiShopping.js View File


+ 0 - 0
src/router/modules/medical_scheduling.js View File


+ 0 - 0
src/router/modules/org.js View File


+ 0 - 0
src/router/modules/otherManagement.js View File


+ 0 - 0
src/router/modules/outpatientCharges.js View File


+ 0 - 0
src/router/modules/outpatientDoctorStation.js View File


+ 0 - 0
src/router/modules/outpatientPharmacy.js View File


+ 0 - 0
src/router/modules/outpatientRegistration.js View File


+ 0 - 0
src/router/modules/patient.js View File


+ 13 - 13
src/router/modules/qcd.js View File

@@ -240,25 +240,25 @@ export default {
240 240
       }
241 241
     },
242 242
     {
243
-      path: '/qcd/workAnalysis/index',
244
-      component: () => import('@/xt_pages/qcd/workAnalysis/index'),
243
+      path: '/qcd/workAnalysis/doctor',
244
+      component: () => import('@/xt_pages/qcd/workAnalysis/doctor'),
245 245
       name: 'workAnalysisDoctor',
246 246
       meta: {
247 247
         title: '工作量分析统计',
248 248
         noCache: true
249 249
       }
250 250
     },
251
-    // {
252
-    //   path: '/qcd/workAnalysis/nurse',
253
-    //   hidden: true,
254
-    //   is_menu: false,
255
-    //   component: () => import('@/xt_pages/qcd/workAnalysis/nurse'),
256
-    //   name: 'workAnalysisNurse',
257
-    //   meta: {
258
-    //     title: '工作量分析统计护士',
259
-    //     noCache: true
260
-    //   }
261
-    // },
251
+    {
252
+      path: '/qcd/workAnalysis/nurse',
253
+      hidden: true,
254
+      is_menu: false,
255
+      component: () => import('@/xt_pages/qcd/workAnalysis/nurse'),
256
+      name: 'workAnalysisNurse',
257
+      meta: {
258
+        title: '工作量分析统计护士',
259
+        noCache: true
260
+      }
261
+    },
262 262
     {
263 263
       path: '/qcd/patientanalysis/checkStatistical',
264 264
       hidden: true,

+ 0 - 0
src/router/modules/role.js View File


+ 0 - 0
src/router/modules/roleManage.js View File


+ 0 - 0
src/router/modules/scrm.js View File


+ 0 - 0
src/router/modules/selfPreparedMedicine.js View File


+ 0 - 0
src/router/modules/service.js View File


+ 0 - 0
src/router/modules/shop.js View File


+ 0 - 0
src/router/modules/slow.js View File


+ 0 - 0
src/router/modules/specialDictionary.js View File


+ 1 - 266
src/router/modules/stock.js View File

@@ -12,90 +12,31 @@ export default {
12 12
     isChild: true
13 13
   },
14 14
   children: [
15
-    {
16
-      path: '/stock/consumablesManagement',
17
-      component: Layout,
18
-      redirect: '/stock/in',
19
-      name: 'consumablesManagement',
20
-      parentNum: 1,
21
-      meta: {
22
-        isChild: true,
23
-        title: 'consumablesManagement',
24
-        noCache: true
25
-      }
26
-    },
27 15
     {
28 16
       path: '/stock/in',
29 17
       component: () => import('@/xt_pages/stock/stockInOrder'),
30 18
       name: 'stockInOrder',
31
-      hidden: true,
32
-      is_menu: false,
33
-      num: 1,
34 19
       meta: { title: 'stockInOrder', noCache: true }
35 20
     },
36 21
     {
37 22
       path: '/stock/return',
38 23
       component: () => import('@/xt_pages/stock/salesReturnOrder'),
39 24
       name: 'salesReturnOrder',
40
-      hidden: true,
41
-      is_menu: false,
42
-      num: 1,
43 25
       meta: { title: 'salesReturnOrder', noCache: true }
44 26
     },
45 27
     {
46 28
       path: '/stock/out',
47 29
       component: () => import('@/xt_pages/stock/stockOutOrder'),
48 30
       name: 'stockOutOrder',
49
-      hidden: true,
50
-      is_menu: false,
51
-      num: 1,
52 31
       meta: { title: 'stockOutOrder', noCache: true }
53 32
     },
54 33
     {
55 34
       path: '/stock/cancel',
56 35
       component: () => import('@/xt_pages/stock/cancelStockOrder'),
57 36
       name: 'cancelStockOrder',
58
-      hidden: true,
59
-      is_menu: false,
60
-      num: 1,
61 37
       meta: { title: 'cancelStockOrder', noCache: true }
62 38
     },
63
-    {
64
-      path: '/stock/in/other',
65
-      component: () => import('@/xt_pages/stock/otherStockInOrder'),
66
-      name: 'otherStockInOrder',
67
-      hidden: true,
68
-      is_menu: false,
69
-      num: 1,
70
-      meta: { title: 'otherStockInOrder', noCache: true }
71
-    },
72
-    {
73
-      path: '/stock/return/other',
74
-      component: () => import('@/xt_pages/stock/otherSalesReturnOrder'),
75
-      name: 'otherSalesReturnOrder',
76
-      hidden: true,
77
-      is_menu: false,
78
-      num: 1,
79
-      meta: { title: 'otherSalesReturnOrder', noCache: true }
80
-    },
81
-    {
82
-      path: '/stock/out/other',
83
-      component: () => import('@/xt_pages/stock/otherStockOutOrder'),
84
-      name: 'otherStockOutOrder',
85
-      hidden: true,
86
-      is_menu: false,
87
-      num: 1,
88
-      meta: { title: 'otherStockOutOrder', noCache: true }
89
-    },
90
-    {
91
-      path: '/stock/cancel/other',
92
-      component: () => import('@/xt_pages/stock/otherCancelStockOrder'),
93
-      name: 'otherCancelStockOrder',
94
-      hidden: true,
95
-      is_menu: false,
96
-      num: 1,
97
-      meta: { title: 'otherCancelStockOrder', noCache: true }
98
-    },
39
+    
99 40
     // {
100 41
     //   path: "/stock/",
101 42
     //   component: Layout,
@@ -150,18 +91,12 @@ export default {
150 91
       path: '/stock/query',
151 92
       component: () => import('@/xt_pages/stock/stockQuery'),
152 93
       name: 'stockQuery',
153
-      hidden: true,
154
-      is_menu: false,
155
-      num: 1,
156 94
       meta: { title: 'stockQuery', noCache: true }
157 95
     },
158 96
     {
159 97
       path: '/stock/detail',
160 98
       component: () => import('@/xt_pages/stock/stockDetailIndex'),
161 99
       name: 'stockDetail',
162
-      hidden: true,
163
-      is_menu: false,
164
-      num: 1,
165 100
       meta: { title: 'stockDetail', noCache: true }
166 101
     },
167 102
     {
@@ -171,13 +106,6 @@ export default {
171 106
       hidden: true,
172 107
       is_menu: false,
173 108
       meta: { title: 'stockInOrderAdd', noCache: true }
174
-    },  {
175
-      path: '/drugstock/in/add',
176
-      component: () => import('@/xt_pages/stock/drugs/drugStockInOrderAdd'),
177
-      name: 'drugStockInOrderAdd',
178
-      hidden: true,
179
-      is_menu: false,
180
-      meta: { title: 'drugStockInOrderAdd', noCache: true }
181 109
     },
182 110
     {
183 111
       path: '/stock/in/detail',
@@ -186,13 +114,6 @@ export default {
186 114
       hidden: true,
187 115
       is_menu: false,
188 116
       meta: { title: 'stockInDetail', noCache: true }
189
-    }, {
190
-      path: '/drugstock/in/detail',
191
-      component: () => import('@/xt_pages/stock/drugs/drugStockInDetail'),
192
-      name: 'drugStockInDetail',
193
-      hidden: true,
194
-      is_menu: false,
195
-      meta: { title: 'drugStockInDetail', noCache: true }
196 117
     },
197 118
     {
198 119
       path: '/stock/return/detail',
@@ -201,13 +122,6 @@ export default {
201 122
       hidden: true,
202 123
       is_menu: false,
203 124
       meta: { title: 'salesReturnDetail', noCache: true }
204
-    }, {
205
-      path: '/drugstock/return/detail',
206
-      component: () => import('@/xt_pages/stock/drugs/drugSalesReturnDetail'),
207
-      name: 'drugSalesReturnDetail',
208
-      hidden: true,
209
-      is_menu: false,
210
-      meta: { title: 'drugSalesReturnDetail', noCache: true }
211 125
     },
212 126
     {
213 127
       path: '/stock/return/add',
@@ -216,13 +130,6 @@ export default {
216 130
       hidden: true,
217 131
       is_menu: false,
218 132
       meta: { title: 'salesReturnOrderAdd', noCache: true }
219
-    }, {
220
-      path: '/drugstock/return/add',
221
-      component: () => import('@/xt_pages/stock/drugs/drugSalesReturnOrderAdd'),
222
-      name: 'drugSalesReturnOrderAdd',
223
-      hidden: true,
224
-      is_menu: false,
225
-      meta: { title: 'drugSalesReturnOrderAdd', noCache: true }
226 133
     },
227 134
     {
228 135
       path: '/stock/out/add',
@@ -231,13 +138,6 @@ export default {
231 138
       hidden: true,
232 139
       is_menu: false,
233 140
       meta: { title: 'stockOutOrderAdd', noCache: true }
234
-    }, {
235
-      path: '/drugstock/out/add',
236
-      component: () => import('@/xt_pages/stock/drugs/drugStockOutOrderAdd'),
237
-      name: 'drugStockOutOrderAdd',
238
-      hidden: true,
239
-      is_menu: false,
240
-      meta: { title: 'drugStockOutOrderAdd', noCache: true }
241 141
     },
242 142
     {
243 143
       path: '/stock/out/detail',
@@ -246,13 +146,6 @@ export default {
246 146
       hidden: true,
247 147
       is_menu: false,
248 148
       meta: { title: 'stockOutDetail', noCache: true }
249
-    }, {
250
-      path: '/drugstock/out/detail',
251
-      component: () => import('@/xt_pages/stock/drugs/drugStockOutDetail'),
252
-      name: 'drugStockOutDetail',
253
-      hidden: true,
254
-      is_menu: false,
255
-      meta: { title: 'drugStockOutDetail', noCache: true }
256 149
     },
257 150
     {
258 151
       path: '/stock/cancel/add',
@@ -261,13 +154,6 @@ export default {
261 154
       hidden: true,
262 155
       is_menu: false,
263 156
       meta: { title: 'cancelStockOrderAdd', noCache: true }
264
-    }, {
265
-      path: '/drugstock/cancel/add',
266
-      component: () => import('@/xt_pages/stock/drugs/cancelDrugStockOrderAdd'),
267
-      name: 'cancelDrugStockOrderAdd',
268
-      hidden: true,
269
-      is_menu: false,
270
-      meta: { title: 'cancelDrugStockOrderAdd', noCache: true }
271 157
     },
272 158
     {
273 159
       path: '/stock/cancel/detail',
@@ -276,21 +162,11 @@ export default {
276 162
       hidden: true,
277 163
       is_menu: false,
278 164
       meta: { title: 'cancelStockDetail', noCache: true }
279
-    },  {
280
-      path: '/drugstock/cancel/detail',
281
-      component: () => import('@/xt_pages/stock/drugs/cancelDrugStockDetail'),
282
-      name: 'cancelDrugStockDetail',
283
-      hidden: true,
284
-      is_menu: false,
285
-      meta: { title: 'cancelDrugStockDetail', noCache: true }
286 165
     },
287 166
     {
288 167
       path: '/stock/config',
289 168
       component: () => import('@/xt_pages/stock/index'),
290 169
       name: 'config',
291
-      hidden: true,
292
-      is_menu: false,
293
-      num: 1,
294 170
       meta: { title: 'config', noCache: true }
295 171
     },
296 172
     {
@@ -312,146 +188,5 @@ export default {
312 188
       is_menu: false,
313 189
       meta: { title: 'user_detail', noCache: true }
314 190
     },
315
-    {
316
-      path: '/stock/selfPreparedMedicine',
317
-      component: () => import('@/xt_pages/stock/selfPreparedMedicine/index'),
318
-      redirect: '/stock/selfPreparedMedicineIndex',
319
-      name: 'selfPreparedMedicine',
320
-      parentNum: 2,
321
-      meta: {
322
-        isChild: true,
323
-        title: 'selfPreparedMedicine',
324
-        noCache: true
325
-      }
326
-    },
327
-    {
328
-      path: '/stock/selfPreparedMedicineIndex',
329
-      component: () => import('@/xt_pages/stock/selfPreparedMedicine/index'),
330
-      name: 'selfPreparedMedicineIndex',
331
-      hidden: true,
332
-      is_menu: false,
333
-      num: 2,
334
-      meta: { title: 'selfPreparedMedicineIndex', noCache: true }
335
-    },
336
-    {
337
-      path: '/stock/selfPreparedMedicineQuery',
338
-      component: () => import('@/xt_pages/stock/selfPreparedMedicine/query'),
339
-      name: 'selfPreparedMedicineQuery',
340
-      hidden: true,
341
-      is_menu: false,
342
-      num: 2,
343
-      meta: { title: 'selfPreparedMedicineQuery', noCache: true }
344
-    },
345
-    {
346
-      path: '/stock/selfPreparedMedicineQueryPrint',
347
-      component: () => import('@/xt_pages/stock/selfPreparedMedicine/queryPrint'),
348
-      name: 'selfPreparedMedicineQueryPrint',
349
-      hidden: true,
350
-      is_menu: false,
351
-      meta: { title: 'selfPreparedMedicineQueryPrint', noCache: true }
352
-    },
353
-    {
354
-      path: '/stock/selfPreparedMedicineInfo',
355
-      component: () => import('@/xt_pages/stock/selfPreparedMedicine/info'),
356
-      name: 'selfPreparedMedicineInfo',
357
-      hidden: true,
358
-      is_menu: false,
359
-      num: 2,
360
-      meta: { title: 'selfPreparedMedicineInfo', noCache: true }
361
-    },
362
-    {
363
-      path: '/stock/drugs',
364
-      component: Layout,
365
-      redirect: '/stock/drugs/stock/in',
366
-      name: 'stockDrugs',
367
-      parentNum: 3,
368
-      meta: {
369
-        isChild: true,
370
-        title: 'stockDrugs',
371
-        noCache: true
372
-      }
373
-    },
374
-
375
-    {
376
-      path: '/stock/drugs/stock/in',
377
-      component: () => import('@/xt_pages/stock/drugs/drugStockInOrder'),
378
-      name: 'drugsStockIn',
379
-      hidden: true,
380
-      is_menu: false,
381
-      num: 3,
382
-      meta: { title: 'drugsStockIn', noCache: true }
383
-    },
384
-    {
385
-      path: '/stock/drugs/stock/out',
386
-      component: () => import('@/xt_pages/stock/drugs/drugStockOutOrder'),
387
-      name: 'drugsStockOut',
388
-      hidden: true,
389
-      is_menu: false,
390
-      num: 3,
391
-      meta: { title: 'drugsStockOut', noCache: true }
392
-    },
393
-    {
394
-      path: '/stock/drugs/stock/return',
395
-      component: () => import('@/xt_pages/stock/drugs/drugSalesReturnOrder'),
396
-      name: 'drugsStockReturn',
397
-      hidden: true,
398
-      is_menu: false,
399
-      num: 3,
400
-      meta: { title: 'drugsStockReturn', noCache: true }
401
-    },
402
-    {
403
-      path: '/stock/drugs/stock/cancel',
404
-      component: () => import('@/xt_pages/stock/drugs/cancelDrugStockOrder'),
405
-      name: 'drugsStockCancel',
406
-      hidden: true,
407
-      is_menu: false,
408
-      num: 3,
409
-      meta: { title: 'drugsStockCancel', noCache: true }
410
-    },
411
-    // {
412
-    //   path: '/stock/drugs/stock/adjustPrice',
413
-    //   component: () => import('@/xt_pages/stock/drugs/adjustPrice'),
414
-    //   name: 'drugsAdjustPrice',
415
-    //   hidden: true,
416
-    //   is_menu: false,
417
-    //   num: 3,
418
-    //   meta: { title: 'drugsAdjustPrice', noCache: true }
419
-    // },
420
-    // {
421
-    //   path: '/stock/drugs/stock/reportLoss',
422
-    //   component: () => import('@/xt_pages/stock/drugs/reportLoss'),
423
-    //   name: 'drugsReportLoss',
424
-    //   hidden: true,
425
-    //   is_menu: false,
426
-    //   num: 3,
427
-    //   meta: { title: 'drugsReportLoss', noCache: true }
428
-    // },
429
-    {
430
-      path: '/stock/drugs/stock/query',
431
-      component: () => import('@/xt_pages/stock/drugs/query'),
432
-      name: 'drugsQuery',
433
-      hidden: true,
434
-      is_menu: false,
435
-      num: 3,
436
-      meta: { title: 'drugsQuery', noCache: true }
437
-    },
438
-    // {
439
-    //   path: '/stock/drugs/stock/drugsSurplus',
440
-    //   component: () => import('@/xt_pages/stock/drugs/drugsSurplus'),
441
-    //   name: 'drugsSurplus',
442
-    //   hidden: true,
443
-    //   is_menu: false,
444
-    //   num: 3,
445
-    //   meta: { title: 'drugsSurplus', noCache: true }
446
-    // },
447
-    // {
448
-    //   path: '/stock/drugs/stock/drugsExpiryDate',
449
-    //   component: () => import('@/xt_pages/stock/drugs/drugsExpiryDate'),
450
-    //   name: 'drugsExpiryDate',
451
-    //   hidden: true,
452
-    //   is_menu: false,
453
-    //   num: 3,
454
-    //   meta: { title: 'drugsExpiryDate', noCache: true }
455
-    // },
456 191
   ]
457 192
 }

+ 0 - 0
src/router/modules/systems.js View File


+ 0 - 0
src/router/modules/weight_sign.js View File


+ 0 - 0
src/router/modules/workforce.js View File


+ 3 - 1
src/xt_pages/dialysis/details/dialog/adviceDialog/AddGroupAdvice.vue View File

@@ -389,7 +389,9 @@
389 389
                 ></el-option>
390 390
               </el-select>
391 391
             </el-form-item>
392
-
392
+            <!-- <div style="margin-left:120px;margin-top:-20px;font-size:12px;color:red">
393
+               库存不足50
394
+            </div> -->
393 395
             
394 396
           </el-col>
395 397
 

+ 1 - 2
src/xt_pages/stock/selfPreparedMedicine/components/addMedicine.vue View File

@@ -83,7 +83,6 @@ export default {
83 83
            }) 
84 84
         },
85 85
         handleCurrentChange(val){
86
-           console.log("val===",val)
87 86
            this.currentRow = val
88 87
            this.getRullListByDrugName(val.drug_name)
89 88
         },
@@ -94,7 +93,6 @@ export default {
94 93
            getRullListByDrugName(params).then(response=>{
95 94
               if(response.data.state ==  1){
96 95
                 var drugName =  response.data.data.drugName
97
-                console.log("drugname",drugName)
98 96
                 this.tableDatatwo = drugName
99 97
               }
100 98
            })
@@ -113,6 +111,7 @@ export default {
113 111
                 var msg = response.data.data.msg
114 112
                 this.$message.success("保存成功")
115 113
                 this.visible = false
114
+                this.$emit('getlist');
116 115
              }else {
117 116
                 this.$message.error("药品名称规格已存在")
118 117
              }

+ 13 - 3
src/xt_pages/stock/selfPreparedMedicine/components/medicineDetail.vue View File

@@ -24,7 +24,8 @@
24 24
                 placeholder="选择日期时间"
25 25
                 align="right"
26 26
                 format="yyyy-MM-dd"
27
-                value-format="yyyy-MM-dd">
27
+                value-format="yyyy-MM-dd"
28
+                @change="changeStartime">
28 29
             </el-date-picker>
29 30
                 <el-date-picker
30 31
                 v-model="end_time"
@@ -35,7 +36,8 @@
35 36
                 placeholder="选择日期时间"
36 37
                 align="right"
37 38
                 format="yyyy-MM-dd"
38
-                value-format="yyyy-MM-dd">
39
+                value-format="yyyy-MM-dd"
40
+                @change="changeEndtime">
39 41
             </el-date-picker>
40 42
         </div>
41 43
         <el-table :data="tableData" border style="width: 100%;" height="300" :row-style="{ color: '#303133' }" :header-cell-style="{backgroundColor: 'rgb(245, 247, 250)',color: '#606266'}" highlight-current-row>
@@ -152,7 +154,9 @@ export default {
152 154
                 }
153 155
                 if(this.type == 1){
154 156
                    stockDetail.push(...outStockDetail)
155
-                   this.tableData = stockDetail
157
+                   var arr = stockDetail
158
+                  var newarr  =  arr.sort((a,b)=>{ return a.storck_time-b.storck_time})
159
+                  this.tableData = newarr
156 160
                 }
157 161
                 
158 162
                 if(this.type == 2){
@@ -187,6 +191,12 @@ export default {
187 191
        getTimes(time) {
188 192
         return uParseTime(time, "{y}-{m}-{d}");
189 193
       },
194
+      changeStartime(){
195
+        this.getDrugDetail()   
196
+      },
197
+      changeEndtime(){
198
+        this.getDrugDetail()
199
+      }
190 200
     },
191 201
 
192 202
     created(){

+ 9 - 4
src/xt_pages/stock/selfPreparedMedicine/components/warehouseOut.vue View File

@@ -111,10 +111,15 @@ export default {
111 111
         // },
112 112
        
113 113
         saveOutStock(){
114
+           var arr=[]
115
+            for(let i=0;i<this.tableData.length;i++){
116
+              if(this.tableData[i].outstore_number){
117
+                  arr.push(this.tableData[i])
118
+              }
119
+            }
114 120
             const params = {
115
-               outStocks:this.tableData,
121
+               outStocks:arr,
116 122
             }
117
-            console.log("outStocks",params)
118 123
             if(this.admin_user_id ==''){
119 124
               this.$message.error("请选择出库人")
120 125
               return
@@ -122,8 +127,9 @@ export default {
122 127
           saveOutStock(params,this.start_time,this.admin_user_id,this.patient_id).then(response=>{
123 128
               if(response.data.state == 1){
124 129
                  var msg = response.data.data.msg
125
-                 console.log("msg",msg)
130
+                 this.$message.success("保存成功")
126 131
                  this.visible = false
132
+                 this.$emit('getlist');
127 133
               }
128 134
           })
129 135
         },
@@ -132,7 +138,6 @@ export default {
132 138
            const params = {
133 139
               patient_id:this.patient_id
134 140
            }
135
-           console.log("params",params)
136 141
           getDrugDataByPatientId(params).then(response=>{
137 142
              if(response.data.state == 1){
138 143
                var medicalList = response.data.data.medicalList

+ 9 - 3
src/xt_pages/stock/selfPreparedMedicine/components/warehousing.vue View File

@@ -27,6 +27,7 @@
27 27
             </el-select>
28 28
         </div>
29 29
         <el-table :data="tableData" border style="width: 100%;" height="300" :row-style="{ color: '#303133' }" :header-cell-style="{backgroundColor: 'rgb(245, 247, 250)',color: '#606266'}" highlight-current-row>
30
+           
30 31
             <el-table-column align="center" label="药品名称">
31 32
                 <template slot-scope="scope">{{scope.row.drug_name}}</template>
32 33
             </el-table-column>
@@ -109,20 +110,25 @@ export default {
109 110
         //   })
110 111
         // },
111 112
         saveStock(){
113
+            var arr=[]
114
+            for(let i=0;i<this.tableData.length;i++){
115
+              if(this.tableData[i].store_number){
116
+                  arr.push(this.tableData[i])
117
+              }
118
+            }
112 119
             const params ={
113
-               stocks:this.tableData
120
+               stocks:arr
114 121
             }
115 122
             if(this.admin_user_id ==''){
116 123
               this.$message.error("请选择入库人")
117 124
               return
118 125
             }
119
-           console.log("params",params)
120
-       
121 126
           saveStock(params,this.start_time,this.admin_user_id,this.patient_id).then(response=>{
122 127
               if(response.data.state == 1){
123 128
                  var msg = response.data.data.msg
124 129
                  this.$message.success("保存成功")
125 130
                  this.visible = false
131
+                 this.$emit('getlist');
126 132
               }
127 133
           })
128 134
         },

+ 49 - 10
src/xt_pages/stock/selfPreparedMedicine/index.vue View File

@@ -70,13 +70,15 @@
70 70
                             <template slot-scope="scope">{{scope.row.min_unit}}</template>
71 71
                         </el-table-column>
72 72
                         <el-table-column align="center" prop="name" label="自备数量" width="90">
73
-                            <template slot-scope="scope">{{ scope.row.Total }}</template>
73
+                            <template slot-scope="scope">
74
+                              {{getTotal(scope.row.patient_id,scope.row.id)}}
75
+                            </template>
74 76
                         </el-table-column>
75 77
                         <el-table-column align="center" prop="name" label="已使用" width="90">
76 78
                             <template slot-scope="scope">{{getCount(scope.row.patient_id,scope.row.drug_name,scope.row.drug_spec)}}</template>
77 79
                         </el-table-column>
78 80
                         <el-table-column align="center" prop="name" label="剩余" width="90">
79
-                            <template slot-scope="scope">{{scope.row.Total - getCount(scope.row.patient_id,scope.row.drug_name,scope.row.drug_spec)}}</template>
81
+                            <template slot-scope="scope">{{getTotal(scope.row.patient_id,scope.row.id)- getCount(scope.row.patient_id,scope.row.drug_name,scope.row.drug_spec)}}</template>
80 82
                         </el-table-column>
81 83
                         <!-- <el-table-column align="center" prop="name" label="停用" width="90">
82 84
                             <template slot-scope="scope">
@@ -85,7 +87,10 @@
85 87
                             </template>
86 88
                         </el-table-column> -->
87 89
                         <el-table-column align="center" prop="name" label="备注">
88
-                            <template slot-scope="scope">{{ scope.row.remarks }}</template>
90
+                            <!-- <template slot-scope="scope">{{ scope.row.remarks }}</template> -->
91
+                            <template slot-scope="scope">
92
+                                {{getRemarks(scope.row.patient_id,scope.row.id)}}
93
+                            </template>
89 94
                         </el-table-column>
90 95
                         <el-table-column align="center" prop="name" label="操作" width="180">
91 96
                             <template slot-scope="scope">
@@ -111,10 +116,10 @@
111 116
                 <el-button type="primary" @click="saveRadio">确 定</el-button>
112 117
             </span>
113 118
         </el-dialog>
114
-        <add-medicine ref="addMedicine"></add-medicine>
119
+        <add-medicine ref="addMedicine" @getlist="getlist"></add-medicine>
115 120
         <medicine-detail ref="medicineDetail"></medicine-detail>
116
-        <warehousing ref="warehousing"></warehousing>
117
-        <warehouse-out ref="warehouseOut"></warehouse-out>
121
+        <warehousing  ref="warehousing" @getlist="getlist"></warehousing>
122
+        <warehouse-out ref="warehouseOut" @getlist="getlist"></warehouse-out>
118 123
     </div>
119 124
 </template>
120 125
 
@@ -126,7 +131,7 @@ import medicineDetail from "./components/medicineDetail"
126 131
 import warehousing from "./components/warehousing"
127 132
 import warehouseOut from "./components/warehouseOut"
128 133
 const moment = require('moment')
129
-import { getCurrentPatient,saveRadio,getStockList,DeleteDrugName } from "@/api/drug/drug"
134
+import { getCurrentPatient,saveRadio,getStockList,DeleteDrugName,getDrugSet } from "@/api/drug/drug"
130 135
 export default {
131 136
     components:{
132 137
         BreadCrumb,
@@ -164,6 +169,7 @@ export default {
164 169
             start_time:moment(new Date()).add('year',0).format("YYYY-MM-DD"),
165 170
             search_input:"",
166 171
             patient_id:0,
172
+            stockList:[],
167 173
             outStocklist:[]
168 174
         }
169 175
     },
@@ -235,14 +241,18 @@ export default {
235 241
                start_time:this.start_time,
236 242
                keyword:this.search_input,
237 243
             }
238
-           
239 244
           getStockList(params).then(response=>{
240 245
              if(response.data.state == 1){
246
+                var medicalList = response.data.data.medicalList
247
+                console.log("medicalist",medicalList)
248
+                this.tableData = medicalList
241 249
                 var stocklist =  response.data.data.stocklist
250
+                console.log("stocklist",stocklist)
251
+                this.stockList = stocklist
242 252
                 var outstocklist = response.data.data.outStocklist
243 253
                 this.outStocklist = outstocklist
244
-                this.tableData = stocklist
245
-
254
+                console.log("outStockList",outstocklist)
255
+              
246 256
               }
247 257
           })  
248 258
         },
@@ -278,11 +288,40 @@ export default {
278 288
               }
279 289
            }
280 290
            return total
291
+        },
292
+
293
+        getDrugSet(){
294
+         getDrugSet().then(response=>{
295
+            if(response.data.state == 1){
296
+              var drugset =  response.data.data.drugSet
297
+              this.radio  = drugset.drug_start.toString()
298
+            }
299
+         })
300
+        },
301
+
302
+        getTotal(patientid,id){
303
+          var total = 0
304
+          for(let i=0;i<this.stockList.length;i++){
305
+             if(patientid == this.stockList[i].patient_id && id == this.stockList[i].medic_id){
306
+                total = this.stockList[i].Total
307
+             }
308
+          }
309
+          return total
310
+        },
311
+        getRemarks(patientid,id){
312
+          var remarks = ""  
313
+           for(let i=0;i<this.stockList.length;i++){
314
+             if(patientid == this.stockList[i].patient_id && id == this.stockList[i].medic_id){
315
+                remarks = this.stockList[i].remarks
316
+             }
317
+          }
318
+          return remarks
281 319
         }
282 320
     },
283 321
     created(){
284 322
       //获取当前机构下的所有患者
285 323
       this.getCurrentPatient()
324
+      this.getDrugSet()
286 325
     },
287 326
     watch: {
288 327
      tablePatient: function() {

+ 30 - 6
src/xt_pages/stock/selfPreparedMedicine/info.vue View File

@@ -95,7 +95,7 @@
95 95
             <el-radio v-model="radio" label="2">不开启</el-radio>
96 96
             <span slot="footer" class="dialog-footer">
97 97
                 <el-button @click="dialogVisible = false">取 消</el-button>
98
-                <el-button type="primary" @click="dialogVisible = false">确 定</el-button>
98
+                <el-button type="primary" @click="saveRadio">确 定</el-button>
99 99
             </span>
100 100
         </el-dialog>
101 101
        
@@ -239,7 +239,7 @@ import addMedicine from "./components/addMedicine"
239 239
 import medicineDetail from "./components/medicineDetail"
240 240
 import warehousing from "./components/warehousing"
241 241
 import warehouseOut from "./components/warehouseOut"
242
-import { getAllDrugName,saveDrugName,getdrugNameList,getRulleName,getUnitByBaseId,saveRulleName,EditRullerName,updatedRulleName,DeleteDrugById,DeleteDrugStand }  from "@/api/drug/drug"
242
+import { getAllDrugName,saveDrugName,getdrugNameList,getRulleName,getUnitByBaseId,saveRulleName,EditRullerName,updatedRulleName,DeleteDrugById,DeleteDrugStand,saveRadio,getDrugSet }  from "@/api/drug/drug"
243 243
 export default {
244 244
     components:{
245 245
         BreadCrumb,
@@ -274,7 +274,7 @@ export default {
274 274
             value: '',
275 275
             tableData:[],
276 276
             dialogVisible:false,
277
-            radio:'1',
277
+            radio:'2',
278 278
             drugDialogVisible:false,
279 279
             options:[],
280 280
             drugName:[],
@@ -532,7 +532,7 @@ export default {
532 532
              drug_stock_limit:this.form.drug_stock_limit, 
533 533
              drug_name:drug_name
534 534
            }
535
-           console.log("params999",params)
535
+         
536 536
          updatedRulleName(params).then(response=>{
537 537
             if(response.data.state == 1){
538 538
                var rullername = response.data.data.RullerName
@@ -586,13 +586,37 @@ export default {
586 586
           })
587 587
           .catch(() => {
588 588
           })
589
-       }
589
+       },
590
+
591
+         saveRadio(){
592
+          const params = {
593
+            radio:this.radio
594
+          }
595
+         saveRadio(params).then(response=>{
596
+            if(response.data.state == 1){
597
+              var drugset = response.data.data.drugSet
598
+              this.$message.success("保存成功")
599
+              this.dialogVisible = false
600
+            } 
601
+          }) 
602
+        },
603
+
604
+        getDrugSet(){
605
+         getDrugSet().then(response=>{
606
+            if(response.data.state == 1){
607
+              var drugset =  response.data.data.drugSet
608
+              this.radio  = drugset.drug_start.toString()
609
+            }
610
+         })
611
+        }
590 612
     },
591 613
     created(){
592 614
        //获取药品库所有药品名称
593 615
        this.getAllDrugName()
594
-
595 616
        this.getdrugNameList()
617
+
618
+       //获取设置
619
+       this.getDrugSet()
596 620
       
597 621
      
598 622
     },

+ 3 - 6
src/xt_pages/stock/selfPreparedMedicine/query.vue View File

@@ -87,13 +87,13 @@
87 87
                     <template slot-scope="scope">{{ scope.row.min_unit }}</template>
88 88
                 </el-table-column>
89 89
                 <el-table-column align="center" prop="name" label="自备量" width="80">
90
-                    <template slot-scope="scope">{{ scope.row.store_number }}</template>
90
+                    <template slot-scope="scope">{{ scope.row.Total }}</template>
91 91
                 </el-table-column>
92 92
                 <el-table-column align="center" prop="name" label="已使用" width="80">
93 93
                     <template slot-scope="scope">{{ scope.row.Count }}</template>
94 94
                 </el-table-column>
95 95
                 <el-table-column align="center" prop="name" label="剩余" width="80">
96
-                    <template slot-scope="scope">{{ scope.row.store_number - scope.row.Count }}</template>
96
+                    <template slot-scope="scope">{{ scope.row.Total - scope.row.Count }}</template>
97 97
                 </el-table-column>
98 98
             </el-table>
99 99
         </div>
@@ -166,7 +166,6 @@ export default {
166 166
         getAllDrugName().then(response=>{
167 167
           if(response.data.state == 1){
168 168
              var drugName =  response.data.data.drugName
169
-             console.log("drugName",drugName)
170 169
              this.drugName = drugName
171 170
 
172 171
              this.getlist()
@@ -180,7 +179,6 @@ export default {
180 179
         getRulleName(params).then(response=>{
181 180
            if(response.data.state == 1){
182 181
              var rulleName = response.data.data.rulleName
183
-             console.log("rulleName",rulleName)
184 182
              this.rulleName = rulleName
185 183
            }
186 184
         })  
@@ -217,7 +215,6 @@ export default {
217 215
             drug_spec:this.drug_spec,
218 216
             search_input:this.search_input
219 217
           }
220
-          console.log("params====",params)
221 218
         getAllPatientStockList(params).then(response=>{
222 219
             if(response.data.state == 1){
223 220
               var stocklist = response.data.data.stocklist
@@ -233,7 +230,7 @@ export default {
233 230
                    }
234 231
                 }
235 232
               }
236
-              console.log("stocklist3333",stocklist)
233
+
237 234
               this.tableData = stocklist
238 235
             }
239 236
         })   

+ 1 - 0
src/xt_pages/user/components/EditGroupAdvice.vue View File

@@ -401,6 +401,7 @@
401 401
                   :value="item.id"
402 402
                 ></el-option>
403 403
               </el-select>
404
+              
404 405
             </el-form-item>
405 406
           </el-col>
406 407
           <el-col :span="14">

+ 4 - 0
src/xt_pages/user/doctorAdvice.vue View File

@@ -964,6 +964,9 @@
964 964
                   :value="item.id"
965 965
                 ></el-option>
966 966
               </el-select>
967
+              <!-- <div style="color:red;font-size:12px;">
968
+                库存不足50
969
+              </div> -->
967 970
               </el-form-item>
968 971
             </el-col>
969 972
 
@@ -1057,6 +1060,7 @@
1057 1060
                     >
1058 1061
                     </el-option>
1059 1062
                   </el-select>
1063
+                
1060 1064
                 </el-col>
1061 1065
               </el-form-item>
1062 1066
             </el-col>