XMLWAN hace 4 años
padre
commit
d9d31d8479

+ 11 - 2
src/xt_pages/medicalScheduling/class.vue Ver fichero

@@ -320,7 +320,8 @@ export default {
320 320
             showError:false,
321 321
             limit:10,
322 322
             page:1,
323
-            total:0
323
+            total:0,
324
+            minute:0,
324 325
         }
325 326
     },
326 327
     methods:{
@@ -347,8 +348,10 @@ export default {
347 348
                     timetwo_type:this.form.timetwo_type,
348 349
                     timetwo_end:this.form.timetwo_end,
349 350
                     work_time:this.form.work_time,
350
-                    remarks:this.form.remarks
351
+                    remarks:this.form.remarks,
352
+                    minute:this.minute,
351 353
                  }
354
+                 console.log("params",params)
352 355
                 saveDoctorSchedules(params).then(response=>{
353 356
                   if(response.data.state == 1){
354 357
                     var schedules = response.data.data.schedules
@@ -433,6 +436,7 @@ export default {
433 436
              this.form.class_attributes = scheduleDetail.class_attributes
434 437
              this.form.timeone_start = scheduleDetail.timeone_start
435 438
              this.form.timeone_end = scheduleDetail.timeone_end
439
+             this.minute = scheduleDetail.minute
436 440
              if(scheduleDetail.timeone_type == 0){
437 441
                 this.form.timeone_type = ""
438 442
              }else{
@@ -475,6 +479,7 @@ export default {
475 479
              work_time:this.form.work_time,
476 480
              remarks:this.form.remarks,
477 481
              user_org_id:this.form.user_org_id,
482
+             minute:this.minute,
478 483
          }
479 484
         this.$refs[formName].validate(valid=>{
480 485
           if(valid){
@@ -552,6 +557,7 @@ export default {
552 557
           var timeone = this.timeDifference(this.form.timeone_start,this.form.timeone_end)
553 558
            timeone = timeone
554 559
        }
560
+
555 561
        if(this.form.timeone_type == 2){
556 562
           var hour = this.form.timeone_end.split(":")
557 563
           var hous = parseInt(hour[0]) + 24
@@ -575,6 +581,7 @@ export default {
575 581
         }
576 582
                   
577 583
         longtime = timeone + timetwo
584
+        this.minute = longtime
578 585
         this.form.work_time = this.timeStamp(longtime)
579 586
      },
580 587
      changtimeTwo(){
@@ -609,6 +616,8 @@ export default {
609 616
         }
610 617
                   
611 618
         longtime = timeone + timetwo
619
+        console.log('longtime',longtime)
620
+        this.minute = longtime
612 621
         this.form.work_time = this.timeStamp(longtime) 
613 622
      }
614 623
     },

+ 16 - 16
src/xt_pages/medicalScheduling/index.vue Ver fichero

@@ -3,7 +3,7 @@
3 3
         <div class="position">
4 4
             <bread-crumb :crumbs="crumbs"></bread-crumb>
5 5
             <div style="display:flex;align-items:center">
6
-                <!-- <el-button type="primary" @click="setting">设置</el-button> -->
6
+                <el-button type="primary" @click="setting">设置</el-button>
7 7
                 <el-button type="primary" @click="DeleteStaffSchedule">清除</el-button>
8 8
                 <el-button type="primary" @click="copyStaffSchedule">复制</el-button>
9 9
                 <el-button type="primary" icon="el-icon-printer" @click="toPrint">打印</el-button>
@@ -433,21 +433,21 @@ export default {
433 433
                     //获取班种列表
434 434
                     this.getStaffScheduleList()
435 435
 
436
-                    // var doctorlist =  response.data.data.doctorlist
437
-                    // for(let i=0;i<doctorlist.length;i++){
438
-                    //    if(doctorlist[i].sort == 0){
439
-                    //       doctorlist[i].sort = ""
440
-                    //    }
441
-                    // }
442
-                    // console.log('doctorlist',doctorlist)
443
-                    // this.doctorList = doctorlist
444
-                    // var nurselist = response.data.data.nurselist
445
-                    // for(let i=0;i<nurselist.length;i++){
446
-                    //    if(nurselist[i].sort == 0){
447
-                    //        nurselist[i].sort = ""
448
-                    //    }
449
-                    // }
450
-                    // this.nurseList = nurselist
436
+                    var doctorlist =  response.data.data.doctorlist
437
+                    for(let i=0;i<doctorlist.length;i++){
438
+                       if(doctorlist[i].sort == 0){
439
+                          doctorlist[i].sort = ""
440
+                       }
441
+                    }
442
+                    console.log('doctorlist',doctorlist)
443
+                    this.doctorList = doctorlist
444
+                    var nurselist = response.data.data.nurselist
445
+                    for(let i=0;i<nurselist.length;i++){
446
+                       if(nurselist[i].sort == 0){
447
+                           nurselist[i].sort = ""
448
+                       }
449
+                    }
450
+                    this.nurseList = nurselist
451 451
                 }
452 452
             })
453 453
         },

+ 9 - 1
src/xt_pages/medicalScheduling/schedulingStatistics.vue Ver fichero

@@ -283,6 +283,9 @@ export default {
283 283
     },
284 284
     methods:{
285 285
         toSearch(){},
286
+        changeOption(){
287
+
288
+        },
286 289
         formatDate(date){      
287 290
             var year = date.getFullYear()+'.'       
288 291
             var month = (date.getMonth()+1)+'.';
@@ -398,8 +401,13 @@ export default {
398 401
            }
399 402
           getScheduleListTotal(params).then(response=>{
400 403
              if(response.data.state == 1){
401
-               var list =  response.data.data.list
404
+                //获取每个班次对应的次数
405
+               var scheudleTotal =  response.data.data.scheudletotal
406
+               console.log("scheudletotal",scheudleTotal)
407
+               //获取总分钟数
408
+               var list = response.data.data.list
402 409
                console.log("list",list)
410
+                
403 411
              }
404 412
           })
405 413
         }