|
@@ -103,7 +103,7 @@
|
103
|
103
|
<el-table-column align="center" prop="address" label="总工时/小时">
|
104
|
104
|
<template slot-scope="scope">
|
105
|
105
|
<span v-if="scope.row.totalminute">{{ scope.row.totalminute / 60 }}</span>
|
106
|
|
- </template>
|
|
106
|
+ </template>
|
107
|
107
|
</el-table-column>
|
108
|
108
|
<el-table-column align="center" prop="attendance" label="出勤/天">
|
109
|
109
|
<!-- <span v-if='scope.row.attendance'>{{ scope.row.attendance ? scope.row.attendance : '' }}</span> -->
|
|
@@ -279,12 +279,12 @@ export default {
|
279
|
279
|
|
280
|
280
|
//获取所有排班种
|
281
|
281
|
this.getScheduleList()
|
282
|
|
-
|
|
282
|
+
|
283
|
283
|
// 获取统计表的数据
|
284
|
284
|
this.getlist()
|
285
|
|
-
|
286
|
|
-
|
287
|
|
-
|
|
285
|
+
|
|
286
|
+
|
|
287
|
+
|
288
|
288
|
},
|
289
|
289
|
methods:{
|
290
|
290
|
getDoctorList(){
|
|
@@ -298,11 +298,11 @@ export default {
|
298
|
298
|
|
299
|
299
|
this.doctorlist.push(...nurselist)
|
300
|
300
|
this.doctorlist.push(...doctorlist)
|
301
|
|
-
|
|
301
|
+
|
302
|
302
|
//获取统计图数据
|
303
|
303
|
this.getchartlist()
|
304
|
304
|
}
|
305
|
|
-
|
|
305
|
+
|
306
|
306
|
})
|
307
|
307
|
},
|
308
|
308
|
//搜索
|
|
@@ -312,22 +312,22 @@ export default {
|
312
|
312
|
this.end_time = this.getTimestamp(this.weekDayArr[6])
|
313
|
313
|
}
|
314
|
314
|
const params = {
|
315
|
|
- keyword:this.keywords,
|
|
315
|
+ keyword:this.keywords,
|
316
|
316
|
start_time:this.start_time,
|
317
|
317
|
end_time:this.end_time
|
318
|
318
|
}
|
319
|
|
- // console.log("params",params)
|
|
319
|
+ console.log("params",params)
|
320
|
320
|
toSearchTotal(params).then(response=>{
|
321
|
321
|
if(response.data.state == 1){
|
322
|
|
- var scheudleTotal = response.data.data.scheduletotal
|
323
|
|
- // console.log("scheduletotal",scheudleTotal)
|
|
322
|
+ var scheudleTotal = response.data.data.scheduletotal
|
|
323
|
+ // console.log("scheduletotal",scheudleTotal)
|
324
|
324
|
var list = response.data.data.list
|
325
|
325
|
// console.log("list",list)
|
326
|
326
|
var workday = response.data.data.workDay
|
327
|
327
|
// console.log("workday",workday)
|
328
|
328
|
var noWorkDay = response.data.data.noWorkDay
|
329
|
329
|
// console.log("noworkday",noWorkDay)
|
330
|
|
-
|
|
330
|
+
|
331
|
331
|
// var workdaylist = response.data.data.chartWorkDayMinute
|
332
|
332
|
|
333
|
333
|
// let arrtwo = [...workdaylist]
|
|
@@ -335,12 +335,12 @@ export default {
|
335
|
335
|
// this.doctorlist.sort(this.compare('admin_user_id'))
|
336
|
336
|
// this.doctorlist.forEach((item, index) => {
|
337
|
337
|
// if (arrtwo[index] && item.admin_user_id ==arrtwo[index].doctor_id) {
|
338
|
|
-
|
|
338
|
+
|
339
|
339
|
// }else{
|
340
|
340
|
// arrtwo.splice(index, 0, {user_name: item.user_name, doctor_id: item.admin_user_id,workminute: 0})
|
341
|
341
|
// }
|
342
|
342
|
// })
|
343
|
|
-
|
|
343
|
+
|
344
|
344
|
// let chartX = []
|
345
|
345
|
// let chartY = []
|
346
|
346
|
// arrtwo.map(item => {
|
|
@@ -350,7 +350,7 @@ export default {
|
350
|
350
|
// this.chart.xAxis.data = chartX
|
351
|
351
|
// this.chart.series[0].data = chartY
|
352
|
352
|
|
353
|
|
- // this.getArrLength(this.chart.xAxis.data)
|
|
353
|
+ // this.getArrLength(this.chart.xAxis.data)
|
354
|
354
|
|
355
|
355
|
let tempArr = [], newArr = []
|
356
|
356
|
for (let i = 0; i < scheudleTotal.length; i++) {
|
|
@@ -391,9 +391,9 @@ export default {
|
391
|
391
|
}
|
392
|
392
|
})
|
393
|
393
|
})
|
394
|
|
-
|
|
394
|
+
|
395
|
395
|
let arr = [...newArr]
|
396
|
|
-
|
|
396
|
+
|
397
|
397
|
if(this.keywords != ''){
|
398
|
398
|
this.tableData = arr
|
399
|
399
|
}else {
|
|
@@ -401,19 +401,19 @@ export default {
|
401
|
401
|
this.doctorlist.sort(this.compare('admin_user_id'))
|
402
|
402
|
this.doctorlist.forEach((item, index) => {
|
403
|
403
|
if (arr[index] && item.admin_user_id == arr[index].doctor_id) {
|
404
|
|
-
|
|
404
|
+
|
405
|
405
|
}else{
|
406
|
406
|
arr.splice(index, 0, {user_name: item.user_name, doctor_id: item.admin_user_id, list: []})
|
407
|
407
|
}
|
408
|
408
|
})
|
409
|
|
-
|
|
409
|
+
|
410
|
410
|
this.tableData = arr
|
411
|
411
|
this.$nextTick(() => {
|
412
|
412
|
this.$refs.tab.doLayout()
|
413
|
|
- })
|
|
413
|
+ })
|
414
|
414
|
}
|
415
|
415
|
}
|
416
|
|
- })
|
|
416
|
+ })
|
417
|
417
|
},
|
418
|
418
|
formatDate(date){
|
419
|
419
|
var year = date.getFullYear()+'.'
|
|
@@ -590,25 +590,25 @@ export default {
|
590
|
590
|
}
|
591
|
591
|
})
|
592
|
592
|
})
|
593
|
|
-
|
|
593
|
+
|
594
|
594
|
let arr = [...newArr]
|
595
|
595
|
|
596
|
596
|
arr.sort(this.compare('doctor_id'))
|
597
|
597
|
this.doctorlist.sort(this.compare('admin_user_id'))
|
598
|
598
|
this.doctorlist.forEach((item, index) => {
|
599
|
599
|
if (arr[index] && item.admin_user_id == arr[index].doctor_id) {
|
600
|
|
-
|
|
600
|
+
|
601
|
601
|
}else{
|
602
|
602
|
arr.splice(index, 0, {user_name: item.user_name, doctor_id: item.admin_user_id, list: []})
|
603
|
603
|
}
|
604
|
604
|
})
|
605
|
|
-
|
|
605
|
+
|
606
|
606
|
|
607
|
607
|
// console.log('newArr',arr)
|
608
|
608
|
this.tableData = arr
|
609
|
609
|
this.$nextTick(() => {
|
610
|
610
|
this.$refs.tab.doLayout()
|
611
|
|
- })
|
|
611
|
+ })
|
612
|
612
|
}
|
613
|
613
|
})
|
614
|
614
|
},
|
|
@@ -639,12 +639,12 @@ export default {
|
639
|
639
|
// this.doctorlist.sort(this.compare('admin_user_id'))
|
640
|
640
|
// this.doctorlist.forEach((item, index) => {
|
641
|
641
|
// if (arrtwo[index] && item.admin_user_id ==arrtwo[index].doctor_id) {
|
642
|
|
-
|
|
642
|
+
|
643
|
643
|
// }else{
|
644
|
644
|
// arrtwo.splice(index, 0, {user_name: item.user_name, doctor_id: item.admin_user_id,workminute: 0})
|
645
|
645
|
// }
|
646
|
646
|
// })
|
647
|
|
-
|
|
647
|
+
|
648
|
648
|
// let chartX = []
|
649
|
649
|
// let chartY = []
|
650
|
650
|
// arrtwo.map(item => {
|
|
@@ -654,7 +654,7 @@ export default {
|
654
|
654
|
// this.chart.xAxis.data = chartX
|
655
|
655
|
// this.chart.series[0].data = chartY
|
656
|
656
|
|
657
|
|
- // this.getArrLength(this.chart.xAxis.data)
|
|
657
|
+ // this.getArrLength(this.chart.xAxis.data)
|
658
|
658
|
let tempArr = [], newArr = []
|
659
|
659
|
for (let i = 0; i < scheudleTotal.length; i++) {
|
660
|
660
|
if (tempArr.indexOf(scheudleTotal[i].user_name) === -1) {
|
|
@@ -694,26 +694,26 @@ export default {
|
694
|
694
|
}
|
695
|
695
|
})
|
696
|
696
|
})
|
697
|
|
-
|
|
697
|
+
|
698
|
698
|
let arr = [...newArr]
|
699
|
699
|
if(val == 0){
|
700
|
700
|
arr.sort(this.compare('doctor_id'))
|
701
|
701
|
this.doctorlist.sort(this.compare('admin_user_id'))
|
702
|
702
|
this.doctorlist.forEach((item, index) => {
|
703
|
703
|
if (arr[index] && item.admin_user_id == arr[index].doctor_id) {
|
704
|
|
-
|
|
704
|
+
|
705
|
705
|
}else{
|
706
|
706
|
arr.splice(index, 0, {user_name: item.user_name, doctor_id: item.admin_user_id, list: []})
|
707
|
707
|
}
|
708
|
708
|
})
|
709
|
|
-
|
|
709
|
+
|
710
|
710
|
this.tableData = arr
|
711
|
711
|
}else if(val == 2){
|
712
|
712
|
arr.sort(this.compare('doctor_id'))
|
713
|
713
|
this.doctorArr.sort(this.compare('admin_user_id'))
|
714
|
714
|
this.doctorArr.forEach((item, index) => {
|
715
|
715
|
if (arr[index] && item.admin_user_id == arr[index].doctor_id) {
|
716
|
|
-
|
|
716
|
+
|
717
|
717
|
}else{
|
718
|
718
|
arr.splice(index, 0, {user_name: item.user_name, doctor_id: item.admin_user_id, list: []})
|
719
|
719
|
}
|
|
@@ -724,7 +724,7 @@ export default {
|
724
|
724
|
this.nurseArr.sort(this.compare('admin_user_id'))
|
725
|
725
|
this.nurseArr.forEach((item, index) => {
|
726
|
726
|
if (arr[index] && item.admin_user_id == arr[index].doctor_id) {
|
727
|
|
-
|
|
727
|
+
|
728
|
728
|
}else{
|
729
|
729
|
arr.splice(index, 0, {user_name: item.user_name, doctor_id: item.admin_user_id, list: []})
|
730
|
730
|
}
|
|
@@ -732,8 +732,8 @@ export default {
|
732
|
732
|
this.tableData = arr
|
733
|
733
|
this.$nextTick(() => {
|
734
|
734
|
this.$refs.tab.doLayout()
|
735
|
|
- })
|
736
|
|
- }
|
|
735
|
+ })
|
|
736
|
+ }
|
737
|
737
|
}
|
738
|
738
|
})
|
739
|
739
|
},
|
|
@@ -764,17 +764,17 @@ export default {
|
764
|
764
|
}
|
765
|
765
|
})
|
766
|
766
|
}
|
767
|
|
-
|
|
767
|
+
|
768
|
768
|
}
|
769
|
769
|
})
|
770
|
770
|
return Count
|
771
|
|
- }
|
|
771
|
+ }
|
772
|
772
|
},
|
773
|
773
|
// toPrint(){
|
774
|
774
|
// this.$router.push({
|
775
|
775
|
// path: '/medicalScheduling/statistics/print',
|
776
|
776
|
// // query: { date: date }
|
777
|
|
- // })
|
|
777
|
+ // })
|
778
|
778
|
// },
|
779
|
779
|
toPrint: function() {
|
780
|
780
|
this.downloadLoading = true
|
|
@@ -842,12 +842,12 @@ export default {
|
842
|
842
|
this.doctorlist.sort(this.compare('admin_user_id'))
|
843
|
843
|
this.doctorlist.forEach((item, index) => {
|
844
|
844
|
if (arr[index] && item.admin_user_id == arr[index].doctor_id) {
|
845
|
|
-
|
|
845
|
+
|
846
|
846
|
}else{
|
847
|
847
|
arr.splice(index, 0, {user_name: item.user_name, doctor_id: item.admin_user_id,workminute: 0})
|
848
|
848
|
}
|
849
|
849
|
})
|
850
|
|
-
|
|
850
|
+
|
851
|
851
|
let chartX = []
|
852
|
852
|
let chartY = []
|
853
|
853
|
arr.map(item => {
|