医护管理

src/xt_pages/medicalScheduling/index.vue

@@ -252,8 +252,7 @@ export default {
         search(){},
         toPrint(){
             this.$router.push({
-                path: '/medicalScheduling/schedule/print?starttime='+this.getTimestamp(this.weekDayArr[0])+"&endtime="+this.getTimestamp(this.weekDayArr[6])+"&weekArr="+ this.weekDayArr,
-                // query: { date: date }
+                path: '/medicalScheduling/schedule/print?starttime='+this.getTimestamp(this.weekDayArr[0])+"&endtime="+this.getTimestamp(this.weekDayArr[6])+"&weekArr="+ this.weekDayArr+'&typeValue='+this.typeValue,
             })
         },
         getDoctorList(){
@@ -453,8 +452,7 @@ export default {
             }
             getStaffScheduleList(params).then(response=>{
                 if(response.data.state == 1){
-                    var staffList =  response.data.data.staffList
-                    
+                    var staffList =  response.data.data.staffList                
                     var sevenStr = ""
                     var oneStr = ""
                     var twoStr = ""
@@ -698,6 +696,8 @@ export default {
                      obj.user_type = 10
                      obj.list = arr2
                      arr.push(obj)
+                     console.log("arr------",arr)
+                    this.tableData = []
                     this.tableData = arr
         
                 
@@ -1117,7 +1117,7 @@ export default {
                             // console.log("arr",arr)
                           }
                         })
-                        console.log("arr",arr)
+                        // console.log("arr",arr)
                         this.tableData = arr
                     }
                 }
@@ -1234,11 +1234,21 @@ export default {
             }
         },
        tableCellStyle (row, rowIndex, column) {
+        // console.log("row",row.column.label)
          var week = (row.column.label).split('');
-         var weeks = week[4]+week[5]+week[6]+week[7]+week[8]+week[9]+week[10]+week[11]+week[12]
         //  console.log("week",week)
-        //  console.log("weeks",weeks)
+         var weeks = ""
+         if (week.length == 14) {
+            weeks = week[4]+week[5]+week[6]+week[7]+week[8]+week[9]+week[10]+week[11]+week[12]
+         }
+         if(week.length == 13){
+           weeks = week[4]+week[5]+week[6]+week[7]+week[8]+week[9]+week[10]+week[11]
+         }
+        //  console.log("week",week)
+        // console.log("weeks",weeks)
          var weekdate =  this.getTimestamp(weeks)
+        //  console.log("日期",weekdate)
+        //  console.log("当前日期",this.timeNow)
          if(weekdate  < this.timeNow){
            return 'background-color:#e5e5e5;'
           }

src/xt_pages/medicalScheduling/medical_print.vue

@@ -54,7 +54,7 @@
 <script>
 import BreadCrumb from '@/xt_pages/components/bread-crumb'
 import print from 'print-js'
-import { getDoctorList,getStaffScheduleList } from '@/api/doctorSchedule'
+import { getDoctorList,getScheduleByDoctorId } from '@/api/doctorSchedule'
 export default {
     components:{
         BreadCrumb
@@ -78,6 +78,7 @@ export default {
           arrFive:[],
           arrSix:[],
           arrSeven:[],
+          typevalue:0,
         }
     },
     methods:{
@@ -96,21 +97,23 @@ export default {
         getDoctorList().then(response=>{
           var list =  response.data.data.list
           this.doctorlist = list
-          this.getStaffScheduleList()
+          this.getScheduleByDoctorId()
         })
       },
       //获取本周的所有排班列表
-      getStaffScheduleList(){
+      getScheduleByDoctorId(){
           const params = {
             start_time:this.start_time,
             end_time:this.end_time,
+            doctor_id:this.typevalue,
          }
-         getStaffScheduleList(params).then(response=>{
+         console.log("parasm",params)
+         getScheduleByDoctorId(params).then(response=>{
             if(response.data.state == 1){
               var staffList = response.data.data.staffList
-              console.log("stafflist",staffList)
+               console.log("stafflist",staffList)
 
-                               var sevenStr = ""
+                   var sevenStr = ""
                     var oneStr = ""
                     var twoStr = ""
                     var threeStr = ""
@@ -327,32 +330,117 @@ export default {
                   }
                 }
               }
-              let arr = [...newArr]
-              arr.sort(this.compare('admin_user_id'))
-              this.doctorlist.sort(this.compare('admin_user_id'))
-              this.doctorlist.forEach((item, index) => {
-                if (arr[index] && item.admin_user_id == arr[index].admin_user_id) {
+              // let arr = [...newArr]
+              // arr.sort(this.compare('admin_user_id'))
+              // this.doctorlist.sort(this.compare('admin_user_id'))
+              // this.doctorlist.forEach((item, index) => {
+              //   if (arr[index] && item.admin_user_id == arr[index].admin_user_id) {
               
-                }else{
-                  arr.splice(index, 0, {user_name: item.user_name, admin_user_id: item.admin_user_id, list: [],user_type:item.user_type})
-                }
-              })
-              arr.sort(this.compare('user_type'))
-              let arr2 = []
-              arr2.push({class_name:oneStr,schedule_week:1})
-              arr2.push({class_name:twoStr,schedule_week:2})
-              arr2.push({class_name:threeStr,schedule_week:3})
-              arr2.push({class_name:fourStr,schedule_week:4})
-              arr2.push({class_name:fiveStr,schedule_week:5})
-              arr2.push({class_name:sixStr,schedule_week:6})
-              arr2.push({class_name:zeroStr,schedule_week:0})
-              var obj = {}
-              obj.admin_user_id = "1000000"
-              obj.user_name = "合计"
-              obj.user_type = 10
-              obj.list = arr2
-              arr.push(obj)
-              this.tableData = arr
+              //   }else{
+              //     arr.splice(index, 0, {user_name: item.user_name, admin_user_id: item.admin_user_id, list: [],user_type:item.user_type})
+              //   }
+              // })
+              // arr.sort(this.compare('user_type'))
+              // console.log("arr======",arr)
+
+                if(this.typevalue == 0){
+                   let arr = [...newArr]
+                    arr.sort(this.compare('admin_user_id'))
+                    this.doctorlist.sort(this.compare('admin_user_id'))
+                        this.doctorlist.forEach((item, index) => {
+                          if (arr[index] && item.admin_user_id == arr[index].admin_user_id) {
+                        
+                          }else{
+                            arr.splice(index, 0, {user_name: item.user_name, admin_user_id: item.admin_user_id, list: [],user_type:item.user_type})
+                            // console.log("arr",arr)
+                          }
+                        })
+                        arr.sort(this.compare('user_type'))
+                        let arr2 = []
+                          arr2.push({class_name:oneStr,schedule_week:1})
+                          arr2.push({class_name:twoStr,schedule_week:2})
+                          arr2.push({class_name:threeStr,schedule_week:3})
+                          arr2.push({class_name:fourStr,schedule_week:4})
+                          arr2.push({class_name:fiveStr,schedule_week:5})
+                          arr2.push({class_name:sixStr,schedule_week:6})
+                          arr2.push({class_name:zeroStr,schedule_week:0})
+                          var obj = {}
+                          obj.admin_user_id = "1000000"
+                          obj.user_name = "合计"
+                          obj.user_type = 10
+                          obj.list = arr2
+                          arr.push(obj)
+                          this.tableData = arr
+                    }
+                    if(this.typevalue == 2){
+                        let arr = [...newArr]
+                        arr.sort(this.compare('admin_user_id'))
+                        this.doctorlist.sort(this.compare('admin_user_id'))
+                        let newDoctor = []
+                        this.doctorlist.map(item => {
+                        if (item.user_type == 2) {
+                            newDoctor.push(item)
+                        }
+                        })
+                        newDoctor.map((item, index) => {
+                        if (arr[index] && item.admin_user_id == arr[index].admin_user_id) {
+                        
+                          }else{
+                            arr.splice(index, 0, {user_name: item.user_name, admin_user_id: item.admin_user_id, list: []})
+                            // console.log("arr",arr)
+                          }
+                        })
+                        let arr2 = []
+                          arr2.push({class_name:oneStr,schedule_week:1})
+                          arr2.push({class_name:twoStr,schedule_week:2})
+                          arr2.push({class_name:threeStr,schedule_week:3})
+                          arr2.push({class_name:fourStr,schedule_week:4})
+                          arr2.push({class_name:fiveStr,schedule_week:5})
+                          arr2.push({class_name:sixStr,schedule_week:6})
+                          arr2.push({class_name:zeroStr,schedule_week:0})
+                          var obj = {}
+                          obj.admin_user_id = "1000000"
+                          obj.user_name = "合计"
+                          obj.user_type = 10
+                          obj.list = arr2
+                          arr.push(obj)
+                          this.tableData = arr
+                    }
+                    if(this.typevalue == 3){
+                        let arr = [...newArr]
+                        arr.sort(this.compare('admin_user_id'))
+                        this.doctorlist.sort(this.compare('admin_user_id'))
+                        let newDoctor = []
+                        this.doctorlist.map(item => {
+                        if (item.user_type == 3) {
+                            newDoctor.push(item)
+                        }
+                        })
+                        newDoctor.map((item, index) => {
+                        if (arr[index] && item.admin_user_id == arr[index].admin_user_id) {
+                        
+                          }else{
+                            arr.splice(index, 0, {user_name: item.user_name, admin_user_id: item.admin_user_id, list: []})
+                            // console.log("arr",arr)
+                          }
+                        })
+                          let arr2 = []
+                          arr2.push({class_name:oneStr,schedule_week:1})
+                          arr2.push({class_name:twoStr,schedule_week:2})
+                          arr2.push({class_name:threeStr,schedule_week:3})
+                          arr2.push({class_name:fourStr,schedule_week:4})
+                          arr2.push({class_name:fiveStr,schedule_week:5})
+                          arr2.push({class_name:sixStr,schedule_week:6})
+                          arr2.push({class_name:zeroStr,schedule_week:0})
+                          var obj = {}
+                          obj.admin_user_id = "1000000"
+                          obj.user_name = "合计"
+                          obj.user_type = 10
+                          obj.list = arr2
+                          arr.push(obj)
+                          this.tableData = arr
+                    }
+            
               
             }
          })
@@ -414,6 +502,8 @@ export default {
       var endtime =  this.$route.query.endtime
       this.end_time = endtime
       this.weekArr = this.$route.query.weekArr.split(',')
+      this.typevalue = parseInt(this.$route.query.typeValue)
+      
       //获取该机构所有医护人员
       this.getDoctorList()
     }