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

src/xt_pages/dialysis/details/dialog/adviceDialog/AddGroupAdvice.vue

@@ -732,6 +732,7 @@ export default {
 
                 this.resetForm(formName);
                 this.groupAddFormVisible = false;
+                this.$parent.getDialysisScheduleDetail()
                 return false;
               }
             }

src/xt_pages/medicalScheduling/index.vue

@@ -43,18 +43,15 @@
                     <el-table :data="tableData" border :header-cell-style="{backgroundColor: 'rgb(245, 247, 250)', color: '#606266'}" :row-style="{ color: '#303133' }"  @cell-click="clickThis" :cell-style="tableCellStyle">
                         <el-table-column prop="name" label="医护姓名" style="width:16%" align="center">
                             <template slot-scope="scope">
-                                <span>{{scope.row.user_name}}</span>
+                                 {{scope.row.user_name}}
                             </template>
                         </el-table-column>
                         <el-table-column :label="'周一\n(' + weekDayArr[0] + ')'" style="width:200px" align="center">
                             <template slot-scope="scope">
                                 <div @click="hangdleClick(scope.row,scope.$index,0)">
                                     <el-dropdown trigger="click" @command="changeSchedule">
-                                        <span class="el-dropdown-link" v-if='getClassAttributes(scope.row.user_name,1) == 2' style="color:red">
-                                            <span>{{ getClass(scope.row.user_name,1) }}</span><i v-if="getTimestamp(weekDayArr[0])>=timeNow && scope.row.admin_user_id!=1000000?true:false" class="el-icon-arrow-down el-icon--right"></i>
-                                        </span>
-                                        <span class="el-dropdown-link" v-else>
-                                            <span>{{ getClass(scope.row.user_name,1) }}</span><i v-if="getTimestamp(weekDayArr[0])>=timeNow && scope.row.admin_user_id!=1000000?true:false" class="el-icon-arrow-down el-icon--right"></i>
+                                        <span class="el-dropdown-link">
+                                        {{ getClass(scope.row.user_name,1) }}<i v-if="getTimestamp(weekDayArr[0])>=timeNow && scope.row.admin_user_id!=1000000?true:false" class="el-icon-arrow-down el-icon--right"></i>
                                         </span>
                                         <el-dropdown-menu slot="dropdown" >
                                             <el-dropdown-item  :command="item.id" icon="el-icon-plus" :disabled="getTimestamp(weekDayArr[0])<timeNow?true:false" v-for="(item,index) in schedulelist" :key="index">{{item.class_name}}</el-dropdown-item>
@@ -67,11 +64,8 @@
                              <template slot-scope="scope">
                                 <div @click="hangdleClick(scope.row,scope.$index,1)">
                                     <el-dropdown trigger="click" @command="changeSchedule">
-                                        <span class="el-dropdown-link" v-if='getClassAttributes(scope.row.user_name,2) == 2' style="color:red">
-                                            <span>{{ getClass(scope.row.user_name,2) }}</span><i v-if="getTimestamp(weekDayArr[1])>=timeNow&&scope.row.admin_user_id!=1000000?true:false" class="el-icon-arrow-down el-icon--right"></i>
-                                        </span>
-                                        <span class="el-dropdown-link" v-else>
-                                            <span>{{ getClass(scope.row.user_name,2) }}</span><i v-if="getTimestamp(weekDayArr[1])>=timeNow&&scope.row.admin_user_id!=1000000?true:false" class="el-icon-arrow-down el-icon--right"></i>
+                                        <span class="el-dropdown-link">
+                                        {{ getClass(scope.row.user_name,2) }}<i v-if="getTimestamp(weekDayArr[1])>=timeNow&&scope.row.admin_user_id!=1000000?true:false" class="el-icon-arrow-down el-icon--right"></i>
                                         </span>
                                         <el-dropdown-menu slot="dropdown" >
                                             <el-dropdown-item  :command="item.id" icon="el-icon-plus" :disabled="getTimestamp(weekDayArr[1])<timeNow?true:false" v-for="(item,index) in schedulelist" :key="index">{{item.class_name}}</el-dropdown-item>
@@ -84,11 +78,8 @@
                              <template slot-scope="scope">
                                 <div @click="hangdleClick(scope.row,scope.$index,2)">
                                     <el-dropdown trigger="click" @command="changeSchedule">
-                                        <span class="el-dropdown-link" v-if='getClassAttributes(scope.row.user_name,3) == 2' style="color:red">
-                                            <span>{{ getClass(scope.row.user_name,3) }}</span><i v-if="getTimestamp(weekDayArr[2])>=timeNow&&scope.row.admin_user_id!=1000000?true:false" class="el-icon-arrow-down el-icon--right"></i>
-                                        </span>
-                                        <span class="el-dropdown-link" v-else>
-                                            <span>{{ getClass(scope.row.user_name,3) }}</span><i v-if="getTimestamp(weekDayArr[2])>=timeNow&&scope.row.admin_user_id!=1000000?true:false" class="el-icon-arrow-down el-icon--right"></i>
+                                        <span class="el-dropdown-link">
+                                        {{ getClass(scope.row.user_name,3) }}<i v-if="getTimestamp(weekDayArr[2])>=timeNow&&scope.row.admin_user_id!=1000000?true:false" class="el-icon-arrow-down el-icon--right"></i>
                                         </span>
                                         <el-dropdown-menu slot="dropdown" >
                                             <el-dropdown-item  :command="item.id" icon="el-icon-plus" :disabled="getTimestamp(weekDayArr[2])<timeNow?true:false" v-for="(item,index) in schedulelist" :key="index">{{item.class_name}}</el-dropdown-item>
@@ -101,11 +92,8 @@
                              <template slot-scope="scope">
                                 <div @click="hangdleClick(scope.row,scope.$index,3)">
                                     <el-dropdown trigger="click" @command="changeSchedule">
-                                        <span class="el-dropdown-link" v-if='getClassAttributes(scope.row.user_name,4) == 2' style="color:red">
-                                            <span>{{ getClass(scope.row.user_name,4) }}</span><i v-if="getTimestamp(weekDayArr[3])>=timeNow&&scope.row.admin_user_id!=1000000?true:false" class="el-icon-arrow-down el-icon--right"></i>
-                                        </span>
-                                        <span class="el-dropdown-link" v-else>
-                                            <span>{{ getClass(scope.row.user_name,4) }}</span><i v-if="getTimestamp(weekDayArr[3])>=timeNow&&scope.row.admin_user_id!=1000000?true:false" class="el-icon-arrow-down el-icon--right"></i>
+                                        <span class="el-dropdown-link">
+                                        {{ getClass(scope.row.user_name,4) }}<i v-if="getTimestamp(weekDayArr[3])>=timeNow&&scope.row.admin_user_id!=1000000?true:false" class="el-icon-arrow-down el-icon--right"></i>
                                         </span>
                                         <el-dropdown-menu slot="dropdown" >
                                             <el-dropdown-item  :command="item.id" icon="el-icon-plus" :disabled="getTimestamp(weekDayArr[3])<timeNow?true:false" v-for="(item,index) in schedulelist" :key="index">{{item.class_name}}</el-dropdown-item>
@@ -118,11 +106,8 @@
                              <template slot-scope="scope">
                                 <div @click="hangdleClick(scope.row,scope.$index,4)">
                                     <el-dropdown trigger="click" @command="changeSchedule">
-                                        <span class="el-dropdown-link" v-if='getClassAttributes(scope.row.user_name,5) == 2' style="color:red">
-                                            <span>{{ getClass(scope.row.user_name,5) }}</span><i v-if="getTimestamp(weekDayArr[4])>=timeNow&&scope.row.admin_user_id!=1000000?true:false" class="el-icon-arrow-down el-icon--right"></i>
-                                        </span>
-                                        <span class="el-dropdown-link" v-else>
-                                            <span>{{ getClass(scope.row.user_name,5) }}</span><i v-if="getTimestamp(weekDayArr[4])>=timeNow&&scope.row.admin_user_id!=1000000?true:false" class="el-icon-arrow-down el-icon--right"></i>
+                                        <span class="el-dropdown-link">
+                                        {{ getClass(scope.row.user_name,5) }}<i v-if="getTimestamp(weekDayArr[4])>=timeNow&&scope.row.admin_user_id!=1000000?true:false" class="el-icon-arrow-down el-icon--right"></i>
                                         </span>
                                         <el-dropdown-menu slot="dropdown" >
                                             <el-dropdown-item  :command="item.id" icon="el-icon-plus" :disabled="getTimestamp(weekDayArr[4])<timeNow?true:false" v-for="(item,index) in schedulelist" :key="index">{{item.class_name}}</el-dropdown-item>
@@ -135,11 +120,8 @@
                              <template slot-scope="scope">
                                 <div @click="hangdleClick(scope.row,scope.$index,5)">
                                     <el-dropdown trigger="click" @command="changeSchedule">
-                                        <span class="el-dropdown-link" v-if='getClassAttributes(scope.row.user_name,6) == 2' style="color:red">
-                                            <span>{{ getClass(scope.row.user_name,6) }}</span><i v-if="getTimestamp(weekDayArr[5])>=timeNow&&scope.row.admin_user_id!=1000000?true:false" class="el-icon-arrow-down el-icon--right"></i>
-                                        </span>
-                                        <span class="el-dropdown-link" v-else>
-                                            <span>{{ getClass(scope.row.user_name,6) }}</span><i v-if="getTimestamp(weekDayArr[5])>=timeNow&&scope.row.admin_user_id!=1000000?true:false" class="el-icon-arrow-down el-icon--right"></i>
+                                        <span class="el-dropdown-link">
+                                        {{ getClass(scope.row.user_name,6) }}<i v-if="getTimestamp(weekDayArr[5])>=timeNow&&scope.row.admin_user_id!=1000000?true:false" class="el-icon-arrow-down el-icon--right"></i>
                                         </span>
                                         <el-dropdown-menu slot="dropdown" >
                                             <el-dropdown-item  :command="item.id" icon="el-icon-plus" :disabled="getTimestamp(weekDayArr[5])<timeNow?true:false" v-for="(item,index) in schedulelist" :key="index">{{item.class_name}}</el-dropdown-item>
@@ -152,11 +134,8 @@
                              <template slot-scope="scope">
                                 <div @click="hangdleClick(scope.row,scope.$index,6)">
                                     <el-dropdown trigger="click" @command="changeSchedule">
-                                        <span class="el-dropdown-link" v-if='getClassAttributes(scope.row.user_name,0) == 2' style="color:red">
-                                            <span>{{ getClass(scope.row.user_name,0) }}</span><i v-if="getTimestamp(weekDayArr[6])>=timeNow&&scope.row.admin_user_id!=1000000?true:false" class="el-icon-arrow-down el-icon--right"></i>
-                                        </span>
-                                        <span class="el-dropdown-link" v-else>
-                                            <span>{{ getClass(scope.row.user_name,0) }}</span><i v-if="getTimestamp(weekDayArr[6])>=timeNow&&scope.row.admin_user_id!=1000000?true:false" class="el-icon-arrow-down el-icon--right"></i>
+                                        <span class="el-dropdown-link">
+                                        {{ getClass(scope.row.user_name,0) }}<i v-if="getTimestamp(weekDayArr[6])>=timeNow&&scope.row.admin_user_id!=1000000?true:false" class="el-icon-arrow-down el-icon--right"></i>
                                         </span>
                                         <el-dropdown-menu slot="dropdown" >
                                             <el-dropdown-item  :command="item.id" icon="el-icon-plus" :disabled="getTimestamp(weekDayArr[6])<timeNow?true:false" v-for="(item,index) in schedulelist" :key="index">{{item.class_name}}</el-dropdown-item>
@@ -273,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(){
@@ -475,7 +453,7 @@ export default {
             getStaffScheduleList(params).then(response=>{
                 if(response.data.state == 1){
                     var staffList =  response.data.data.staffList
-                    
+                    console.log("stafflist",staffList)                
                     var sevenStr = ""
                     var oneStr = ""
                     var twoStr = ""
@@ -675,6 +653,13 @@ export default {
                         sixStr = strSix
                      }
                     }
+                    console.log("周一",oneStr)
+                    console.log("周er",twoStr)
+                    console.log("周三",threeStr)
+                    console.log("周四",fourStr)
+                    console.log("周五",fiveStr)
+                    console.log("周六",sixStr)
+                    console.log("周日",sevenStr)
                     let tempArr = [], newArr = []
                     for (let i = 0; i < staffList.length; i++) {
                         if (tempArr.indexOf(staffList[i].user_name) === -1) {
@@ -682,14 +667,13 @@ export default {
                                 user_name: staffList[i].user_name,
                                 admin_user_id:staffList[i].admin_user_id,
                                 user_type:staffList[i].doctor_type,
-                                user_type:staffList[i].doctor_type,
-                                list: [{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,class_attributes:staffList[i].class_attributes}]
+                                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,user_type:staffList[i].doctor_type,class_attributes:staffList[i].class_attributes})
+                                    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})
                                 }
                             }
                         }
@@ -715,12 +699,13 @@ export default {
                     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)
-                    console.log('arr',arr)
+                     obj.admin_user_id = "1000000"
+                     obj.user_name = "合计"
+                     obj.user_type = 10
+                     obj.list = arr2
+                     arr.push(obj)
+                     console.log("arr------",arr)
+                    this.tableData = []
                     this.tableData = arr
         
                 
@@ -747,25 +732,6 @@ export default {
             }
         
         },
-        getClassAttributes(name,index){
-            if(name != undefined){
-                let newClass = '';
-                this.tableData.map(item => {
-                if(item.user_name == name){
-                    if(item.list){
-                        item.list.map(it => {
-                            if(it.schedule_week == index){
-                                newClass = it.class_attributes
-                            }
-                        })
-                    }
-                    
-                }
-                })
-                return newClass
-            }
-        
-        },
 
      unique(arr) { 
         const res = new Map();
@@ -987,13 +953,13 @@ export default {
                             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,admin_user_id:staffList[i].admin_user_id,schedule_week:staffList[i].schedule_week,user_type:staffList[i].doctor_type,class_attributes:staffList[i].class_attributes}]
+                            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,user_type:staffList[i].doctor_type,class_attributes:staffList[i].class_attributes})
+                            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,})
                             }
                         }
                         }
@@ -1133,13 +1099,13 @@ export default {
                             newArr.push({
                                 user_name: staffList[i].user_name,
                                 admin_user_id:staffList[i].admin_user_id,
-                                list: [{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,class_attributes:staffList[i].class_attributes}]
+                                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,user_type:staffList[i].doctor_type,class_attributes:staffList[i].class_attributes})
+                                    newArr[j].list.push({class_name:staffList[i].class_name,admin_user_id:staffList[i].admin_user_id,schedule_week:staffList[i].schedule_week})
                                 }
                             }
                         }
@@ -1159,7 +1125,7 @@ export default {
                             // console.log("arr",arr)
                           }
                         })
-                        console.log("arr",arr)
+                        // console.log("arr",arr)
                         this.tableData = arr
                     }
                 }
@@ -1276,11 +1242,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;'
           }
@@ -1368,7 +1344,7 @@ export default {
 </style>
 <style lang="scss">
 .schedulingTable{
-    .el-table .cell {
+    .el-table th .cell {
         white-space: pre-line;/*保留换行符*/
     }
 }

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
+                    }
+            
               
             }
          })
@@ -371,11 +459,11 @@ export default {
               } 
             }
           })
-          if(newClass.indexOf("(") > -1){
+          if(newClass && newClass.indexOf("(") > -1){
             let num = newClass.indexOf("(")
             let a = newClass.slice(0, num) + '\n' + newClass.slice(num)
             return a
-          }else if(newClass.indexOf("（") > -1) {
+          }else if(newClass && newClass.indexOf("（") > -1) {
             let num = newClass.indexOf("（")
             let a = newClass.slice(0, num) + '\n' + newClass.slice(num)
             return a
@@ -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()
     }