XMLWAN vor 5 Jahren
Ursprung
Commit
266a39bf1b
2 geänderte Dateien mit 138 neuen und 38 gelöschten Zeilen
  1. 17 7
      src/xt_pages/medicalScheduling/index.vue
  2. 121 31
      src/xt_pages/medicalScheduling/medical_print.vue

+ 17 - 7
src/xt_pages/medicalScheduling/index.vue Datei anzeigen

252
         search(){},
252
         search(){},
253
         toPrint(){
253
         toPrint(){
254
             this.$router.push({
254
             this.$router.push({
255
-                path: '/medicalScheduling/schedule/print?starttime='+this.getTimestamp(this.weekDayArr[0])+"&endtime="+this.getTimestamp(this.weekDayArr[6])+"&weekArr="+ this.weekDayArr,
256
-                // query: { date: date }
255
+                path: '/medicalScheduling/schedule/print?starttime='+this.getTimestamp(this.weekDayArr[0])+"&endtime="+this.getTimestamp(this.weekDayArr[6])+"&weekArr="+ this.weekDayArr+'&typeValue='+this.typeValue,
257
             })
256
             })
258
         },
257
         },
259
         getDoctorList(){
258
         getDoctorList(){
453
             }
452
             }
454
             getStaffScheduleList(params).then(response=>{
453
             getStaffScheduleList(params).then(response=>{
455
                 if(response.data.state == 1){
454
                 if(response.data.state == 1){
456
-                    var staffList =  response.data.data.staffList
457
-                    
455
+                    var staffList =  response.data.data.staffList                
458
                     var sevenStr = ""
456
                     var sevenStr = ""
459
                     var oneStr = ""
457
                     var oneStr = ""
460
                     var twoStr = ""
458
                     var twoStr = ""
698
                      obj.user_type = 10
696
                      obj.user_type = 10
699
                      obj.list = arr2
697
                      obj.list = arr2
700
                      arr.push(obj)
698
                      arr.push(obj)
699
+                     console.log("arr------",arr)
700
+                    this.tableData = []
701
                     this.tableData = arr
701
                     this.tableData = arr
702
         
702
         
703
                 
703
                 
1117
                             // console.log("arr",arr)
1117
                             // console.log("arr",arr)
1118
                           }
1118
                           }
1119
                         })
1119
                         })
1120
-                        console.log("arr",arr)
1120
+                        // console.log("arr",arr)
1121
                         this.tableData = arr
1121
                         this.tableData = arr
1122
                     }
1122
                     }
1123
                 }
1123
                 }
1234
             }
1234
             }
1235
         },
1235
         },
1236
        tableCellStyle (row, rowIndex, column) {
1236
        tableCellStyle (row, rowIndex, column) {
1237
+        // console.log("row",row.column.label)
1237
          var week = (row.column.label).split('');
1238
          var week = (row.column.label).split('');
1238
-         var weeks = week[4]+week[5]+week[6]+week[7]+week[8]+week[9]+week[10]+week[11]+week[12]
1239
         //  console.log("week",week)
1239
         //  console.log("week",week)
1240
-        //  console.log("weeks",weeks)
1240
+         var weeks = ""
1241
+         if (week.length == 14) {
1242
+            weeks = week[4]+week[5]+week[6]+week[7]+week[8]+week[9]+week[10]+week[11]+week[12]
1243
+         }
1244
+         if(week.length == 13){
1245
+           weeks = week[4]+week[5]+week[6]+week[7]+week[8]+week[9]+week[10]+week[11]
1246
+         }
1247
+        //  console.log("week",week)
1248
+        // console.log("weeks",weeks)
1241
          var weekdate =  this.getTimestamp(weeks)
1249
          var weekdate =  this.getTimestamp(weeks)
1250
+        //  console.log("日期",weekdate)
1251
+        //  console.log("当前日期",this.timeNow)
1242
          if(weekdate  < this.timeNow){
1252
          if(weekdate  < this.timeNow){
1243
            return 'background-color:#e5e5e5;'
1253
            return 'background-color:#e5e5e5;'
1244
           }
1254
           }

+ 121 - 31
src/xt_pages/medicalScheduling/medical_print.vue Datei anzeigen

54
 <script>
54
 <script>
55
 import BreadCrumb from '@/xt_pages/components/bread-crumb'
55
 import BreadCrumb from '@/xt_pages/components/bread-crumb'
56
 import print from 'print-js'
56
 import print from 'print-js'
57
-import { getDoctorList,getStaffScheduleList } from '@/api/doctorSchedule'
57
+import { getDoctorList,getScheduleByDoctorId } from '@/api/doctorSchedule'
58
 export default {
58
 export default {
59
     components:{
59
     components:{
60
         BreadCrumb
60
         BreadCrumb
78
           arrFive:[],
78
           arrFive:[],
79
           arrSix:[],
79
           arrSix:[],
80
           arrSeven:[],
80
           arrSeven:[],
81
+          typevalue:0,
81
         }
82
         }
82
     },
83
     },
83
     methods:{
84
     methods:{
96
         getDoctorList().then(response=>{
97
         getDoctorList().then(response=>{
97
           var list =  response.data.data.list
98
           var list =  response.data.data.list
98
           this.doctorlist = list
99
           this.doctorlist = list
99
-          this.getStaffScheduleList()
100
+          this.getScheduleByDoctorId()
100
         })
101
         })
101
       },
102
       },
102
       //获取本周的所有排班列表
103
       //获取本周的所有排班列表
103
-      getStaffScheduleList(){
104
+      getScheduleByDoctorId(){
104
           const params = {
105
           const params = {
105
             start_time:this.start_time,
106
             start_time:this.start_time,
106
             end_time:this.end_time,
107
             end_time:this.end_time,
108
+            doctor_id:this.typevalue,
107
          }
109
          }
108
-         getStaffScheduleList(params).then(response=>{
110
+         console.log("parasm",params)
111
+         getScheduleByDoctorId(params).then(response=>{
109
             if(response.data.state == 1){
112
             if(response.data.state == 1){
110
               var staffList = response.data.data.staffList
113
               var staffList = response.data.data.staffList
111
-              console.log("stafflist",staffList)
114
+               console.log("stafflist",staffList)
112
 
115
 
113
-                               var sevenStr = ""
116
+                   var sevenStr = ""
114
                     var oneStr = ""
117
                     var oneStr = ""
115
                     var twoStr = ""
118
                     var twoStr = ""
116
                     var threeStr = ""
119
                     var threeStr = ""
327
                   }
330
                   }
328
                 }
331
                 }
329
               }
332
               }
330
-              let arr = [...newArr]
331
-              arr.sort(this.compare('admin_user_id'))
332
-              this.doctorlist.sort(this.compare('admin_user_id'))
333
-              this.doctorlist.forEach((item, index) => {
334
-                if (arr[index] && item.admin_user_id == arr[index].admin_user_id) {
333
+              // let arr = [...newArr]
334
+              // arr.sort(this.compare('admin_user_id'))
335
+              // this.doctorlist.sort(this.compare('admin_user_id'))
336
+              // this.doctorlist.forEach((item, index) => {
337
+              //   if (arr[index] && item.admin_user_id == arr[index].admin_user_id) {
335
               
338
               
336
-                }else{
337
-                  arr.splice(index, 0, {user_name: item.user_name, admin_user_id: item.admin_user_id, list: [],user_type:item.user_type})
338
-                }
339
-              })
340
-              arr.sort(this.compare('user_type'))
341
-              let arr2 = []
342
-              arr2.push({class_name:oneStr,schedule_week:1})
343
-              arr2.push({class_name:twoStr,schedule_week:2})
344
-              arr2.push({class_name:threeStr,schedule_week:3})
345
-              arr2.push({class_name:fourStr,schedule_week:4})
346
-              arr2.push({class_name:fiveStr,schedule_week:5})
347
-              arr2.push({class_name:sixStr,schedule_week:6})
348
-              arr2.push({class_name:zeroStr,schedule_week:0})
349
-              var obj = {}
350
-              obj.admin_user_id = "1000000"
351
-              obj.user_name = "合计"
352
-              obj.user_type = 10
353
-              obj.list = arr2
354
-              arr.push(obj)
355
-              this.tableData = arr
339
+              //   }else{
340
+              //     arr.splice(index, 0, {user_name: item.user_name, admin_user_id: item.admin_user_id, list: [],user_type:item.user_type})
341
+              //   }
342
+              // })
343
+              // arr.sort(this.compare('user_type'))
344
+              // console.log("arr======",arr)
345
+
346
+                if(this.typevalue == 0){
347
+                   let arr = [...newArr]
348
+                    arr.sort(this.compare('admin_user_id'))
349
+                    this.doctorlist.sort(this.compare('admin_user_id'))
350
+                        this.doctorlist.forEach((item, index) => {
351
+                          if (arr[index] && item.admin_user_id == arr[index].admin_user_id) {
352
+                        
353
+                          }else{
354
+                            arr.splice(index, 0, {user_name: item.user_name, admin_user_id: item.admin_user_id, list: [],user_type:item.user_type})
355
+                            // console.log("arr",arr)
356
+                          }
357
+                        })
358
+                        arr.sort(this.compare('user_type'))
359
+                        let arr2 = []
360
+                          arr2.push({class_name:oneStr,schedule_week:1})
361
+                          arr2.push({class_name:twoStr,schedule_week:2})
362
+                          arr2.push({class_name:threeStr,schedule_week:3})
363
+                          arr2.push({class_name:fourStr,schedule_week:4})
364
+                          arr2.push({class_name:fiveStr,schedule_week:5})
365
+                          arr2.push({class_name:sixStr,schedule_week:6})
366
+                          arr2.push({class_name:zeroStr,schedule_week:0})
367
+                          var obj = {}
368
+                          obj.admin_user_id = "1000000"
369
+                          obj.user_name = "合计"
370
+                          obj.user_type = 10
371
+                          obj.list = arr2
372
+                          arr.push(obj)
373
+                          this.tableData = arr
374
+                    }
375
+                    if(this.typevalue == 2){
376
+                        let arr = [...newArr]
377
+                        arr.sort(this.compare('admin_user_id'))
378
+                        this.doctorlist.sort(this.compare('admin_user_id'))
379
+                        let newDoctor = []
380
+                        this.doctorlist.map(item => {
381
+                        if (item.user_type == 2) {
382
+                            newDoctor.push(item)
383
+                        }
384
+                        })
385
+                        newDoctor.map((item, index) => {
386
+                        if (arr[index] && item.admin_user_id == arr[index].admin_user_id) {
387
+                        
388
+                          }else{
389
+                            arr.splice(index, 0, {user_name: item.user_name, admin_user_id: item.admin_user_id, list: []})
390
+                            // console.log("arr",arr)
391
+                          }
392
+                        })
393
+                        let arr2 = []
394
+                          arr2.push({class_name:oneStr,schedule_week:1})
395
+                          arr2.push({class_name:twoStr,schedule_week:2})
396
+                          arr2.push({class_name:threeStr,schedule_week:3})
397
+                          arr2.push({class_name:fourStr,schedule_week:4})
398
+                          arr2.push({class_name:fiveStr,schedule_week:5})
399
+                          arr2.push({class_name:sixStr,schedule_week:6})
400
+                          arr2.push({class_name:zeroStr,schedule_week:0})
401
+                          var obj = {}
402
+                          obj.admin_user_id = "1000000"
403
+                          obj.user_name = "合计"
404
+                          obj.user_type = 10
405
+                          obj.list = arr2
406
+                          arr.push(obj)
407
+                          this.tableData = arr
408
+                    }
409
+                    if(this.typevalue == 3){
410
+                        let arr = [...newArr]
411
+                        arr.sort(this.compare('admin_user_id'))
412
+                        this.doctorlist.sort(this.compare('admin_user_id'))
413
+                        let newDoctor = []
414
+                        this.doctorlist.map(item => {
415
+                        if (item.user_type == 3) {
416
+                            newDoctor.push(item)
417
+                        }
418
+                        })
419
+                        newDoctor.map((item, index) => {
420
+                        if (arr[index] && item.admin_user_id == arr[index].admin_user_id) {
421
+                        
422
+                          }else{
423
+                            arr.splice(index, 0, {user_name: item.user_name, admin_user_id: item.admin_user_id, list: []})
424
+                            // console.log("arr",arr)
425
+                          }
426
+                        })
427
+                          let arr2 = []
428
+                          arr2.push({class_name:oneStr,schedule_week:1})
429
+                          arr2.push({class_name:twoStr,schedule_week:2})
430
+                          arr2.push({class_name:threeStr,schedule_week:3})
431
+                          arr2.push({class_name:fourStr,schedule_week:4})
432
+                          arr2.push({class_name:fiveStr,schedule_week:5})
433
+                          arr2.push({class_name:sixStr,schedule_week:6})
434
+                          arr2.push({class_name:zeroStr,schedule_week:0})
435
+                          var obj = {}
436
+                          obj.admin_user_id = "1000000"
437
+                          obj.user_name = "合计"
438
+                          obj.user_type = 10
439
+                          obj.list = arr2
440
+                          arr.push(obj)
441
+                          this.tableData = arr
442
+                    }
443
+            
356
               
444
               
357
             }
445
             }
358
          })
446
          })
414
       var endtime =  this.$route.query.endtime
502
       var endtime =  this.$route.query.endtime
415
       this.end_time = endtime
503
       this.end_time = endtime
416
       this.weekArr = this.$route.query.weekArr.split(',')
504
       this.weekArr = this.$route.query.weekArr.split(',')
505
+      this.typevalue = parseInt(this.$route.query.typeValue)
506
+      
417
       //获取该机构所有医护人员
507
       //获取该机构所有医护人员
418
       this.getDoctorList()
508
       this.getDoctorList()
419
     }
509
     }