Merge branch '20200710_pc_vue_new_branch' of http://git.shengws.com/csx/Vue_New into 20200710_pc_vue_new_branch

src/xt_pages/medicalScheduling/index.vue

@@ -252,7 +252,7 @@ export default {
             getDoctorList().then(response=>{
                 if(response.data.state == 1){
                     var list =  response.data.data.list
-                    console.log("医护列表",list)
+                    // console.log("医护列表",list)
                     this.tableData = list
                     this.doctorlist = list
                     //获取班种列表
@@ -264,7 +264,7 @@ export default {
             getScheduleList().then(response=>{
                 if(response.data.state == 1){
                     var schedulelist = response.data.data.scheduleList
-                    console.log("schedulelist",schedulelist)
+                    // console.log("schedulelist",schedulelist)
                     for(let i=0;i<schedulelist.length;i++){
                     if(schedulelist[i].timeone_type == 1){
                         schedulelist[i].timeone_type = "当日"
@@ -284,7 +284,7 @@ export default {
             }) 
         },
         hangdleClick(val,index,num){
-         console.log("val",val)
+        //  console.log("val",val)
          this.docobj = val
          if(this.getTimestamp(this.weekDayArr[num]) < this.timeNow){
             this.$message.warning("过去日期不可以编辑")
@@ -297,7 +297,7 @@ export default {
             // console.log("日期",this.weekDayArr)
             var week = (column.label).split('');
             var weeks = week[0]+week[1]
-            console.log("weeks",weeks)
+            // console.log("weeks",weeks)
             if(weeks == "周日"){
             this.schedule_week = 0
             this.schedule_date = this.weekDayArr[6]
@@ -335,14 +335,14 @@ export default {
             }
             }
             let arr = [...this.tableData]
-            console.log("arr===",arr)
+            // console.log("arr===",arr)
             for(let i=0;i<arr.length;i++){
             if(this.docobj.id == arr[i].id){
                 arr[i].class_name = class_name
                 arr[i].class_index = this.schedule_week
             }
             }
-            console.log("arr",arr)
+            // console.log("arr",arr)
             this.tableData = arr
             const params = {
             doctor_id:this.docobj.admin_user_id,
@@ -353,12 +353,12 @@ export default {
             end_time:this.getTimestamp(this.weekDayArr[6]),
             schedule_date:this.getTimestamp(this.schedule_date)
             }
-            console.log("params",params)
+            // console.log("params",params)
             
             addSchedule(params).then(response=>{
             if(response.data.state == 1){
                 var schedule = response.data.data.schedule
-                console.log("schedule",schedule)
+                // console.log("schedule",schedule)
                 this.$message.success("保存成功")
                 this.getStaffScheduleList()
                 }
@@ -450,7 +450,7 @@ export default {
             getStaffScheduleList(params).then(response=>{
                 if(response.data.state == 1){
                     var staffList =  response.data.data.staffList
-                    console.log("所有排班数据",staffList)
+                   console.log("所有排班数据",staffList)
                     for(let i=0;i<staffList.length;i++){
                     if(staffList[i].schedule_week == 0){
                         staffList[i].class_index = 0
@@ -478,7 +478,6 @@ export default {
                     let tempArr = [], newArr = []
                     for (let i = 0; i < staffList.length; i++) {
                         if (tempArr.indexOf(staffList[i].user_name) === -1) {
-                            console.log("触发了没")
                             newArr.push({
                                 user_name: staffList[i].user_name,
                                 admin_user_id:staffList[i].admin_user_id,
@@ -487,10 +486,9 @@ export default {
                             })
                             tempArr.push(staffList[i].user_name);
                         } else {
-                            console.log("hheh")
                             for (let j = 0; j < newArr.length; j++) {
                                 if (newArr[j].user_name == staffList[i].user_name) {
-                                    newArr[j].list.push({class_name:staffList[i].class_name,admin_user_id:staffList[i].admin_user_id,schedule_week:staffList[i].schedule_week})
+                                    newArr[j].list.push({class_name:staffList[i].class_name,admin_user_id:staffList[i].admin_user_id,schedule_week:staffList[i].schedule_week,user_type:staffList[i].doctor_type})
                                 }
                             }
                         }
@@ -502,10 +500,12 @@ export default {
                       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: []})
+                        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)
                       }
                     })
+                    console.log("arr=======",arr)
+                    arr.sort(this.compare('user_type'))
                     this.tableData = arr
         
                 
@@ -555,13 +555,14 @@ export default {
                         newArr.push({
                             user_name: staffList[i].user_name,
                             admin_user_id:staffList[i].admin_user_id,
+                            user_type:staffList[i].doctor_type,
                             list: [{class_name:staffList[i].class_name,schedule_week:staffList[i].schedule_week}]
                         })
                         tempArr.push(staffList[i].user_name);
                         } else {
                         for (let j = 0; j < newArr.length; j++) {
                             if (newArr[j].user_name == staffList[i].user_name) {
-                            newArr[j].list.push({class_name:staffList[i].class_name,admin_user_id:staffList[i].admin_user_id,schedule_week:staffList[i].schedule_week})
+                            newArr[j].list.push({class_name:staffList[i].class_name,admin_user_id:staffList[i].admin_user_id,schedule_week:staffList[i].schedule_week, user_type:staffList[i].doctor_type,})
                             }
                         }
                         }
@@ -573,10 +574,11 @@ export default {
                       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: []})
+                        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'))
                     this.tableData = arr
                 }
             })
@@ -597,6 +599,7 @@ export default {
                     for (let i = 0; i < staffList.length; i++) {
                         if (tempArr.indexOf(staffList[i].user_name) === -1) {
                             newArr.push({
+                                user_type:staffList[i].doctor_type,
                                 user_name: staffList[i].user_name,
                                 admin_user_id:staffList[i].admin_user_id,
                                 list: [{class_name:staffList[i].class_name,schedule_week:staffList[i].schedule_week}]
@@ -605,7 +608,7 @@ export default {
                         } else {
                             for (let j = 0; j < newArr.length; j++) {
                                 if (newArr[j].user_name == staffList[i].user_name) {
-                                    newArr[j].list.push({class_name:staffList[i].class_name,admin_user_id:staffList[i].admin_user_id,schedule_week:staffList[i].schedule_week})
+                                    newArr[j].list.push({class_name:staffList[i].class_name,admin_user_id:staffList[i].admin_user_id,schedule_week:staffList[i].schedule_week, user_type:staffList[i].doctor_type})
                                 }
                             }
                         }
@@ -619,10 +622,12 @@ export default {
                           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: []})
+                            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)
                           }
                         })
+                        console.log("全部=======",arr)
+                        arr.sort(this.compare('user_type'))
                         this.tableData = arr
                     }
                     if(id == 2){
@@ -833,7 +838,7 @@ export default {
             return function(a,b){
                 var value1 = a[property];
                 var value2 = b[property];
-                return value1 - value2;
+                return value2 - value1;
             }
         },
     },