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/medical_print.vue

               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}]
                 } 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})
                     }
                   }
                 }
                 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
               
             }
         return function(a,b){
             var value1 = a[property];
             var value2 = b[property];
-            return value1 - value2;
+            return value2 - value1;
         }
       },
     },