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

src/router/modules/dialysis.js

@@ -38,6 +38,59 @@ export default {
         noCache: true
       }
     },
+    {
+      path: '/dialysis/consumableDrugs',
+      component: () => import('@/xt_pages/dialysis/consumableDrugs'),
+      name: '耗材药品',
+      meta: {
+        title: '耗材药品',
+        noCache: true
+      }
+    },
+    {
+      path: '/dialysis/consumableDrugs_print',
+      component: () => import('@/xt_pages/dialysis/consumableDrugs_print'),
+      hidden: true,
+      is_menu: false,
+      name: 'consumableDrugs_print',
+      meta: {
+        title: 'consumableDrugs_print',
+        noCache: true
+      }
+    },
+    {
+      path: '/dialysis/dialysisDrugs_print',
+      component: () => import('@/xt_pages/dialysis/dialysisDrugs_print'),
+      hidden: true,
+      is_menu: false,
+      name: 'dialysisDrugs_print',
+      meta: {
+        title: 'dialysisDrugs_print',
+        noCache: true
+      }
+    },
+    {
+      path: '/dialysis/dialysisParameters_print',
+      component: () => import('@/xt_pages/dialysis/dialysisParameters_print'),
+      hidden: true,
+      is_menu: false,
+      name: 'dialysisParameters_print',
+      meta: {
+        title: 'dialysisParameters_print',
+        noCache: true
+      }
+    },
+    {
+      path: '/dialysis/allSummary_print',
+      component: () => import('@/xt_pages/dialysis/allSummary_print'),
+      hidden: true,
+      is_menu: false,
+      name: 'allSummary_print',
+      meta: {
+        title: 'allSummary_print',
+        noCache: true
+      }
+    },
     {
       path: '/dialysis/record/:id',
       component: () => import('@/xt_pages/dialysis/dialysisPage'),

src/xt_pages/dialysis/template/DialysisPrintOrderTwentyThree.vue

@@ -836,19 +836,19 @@
                         <label-box :isChecked="afterdialysis.cruor?(afterdialysis.cruor.indexOf('透析器-Ⅲ度') > -1 ? true : false):false" showValue="Ⅲ级"></label-box>&nbsp;
                       </td>
                       <td width="30">A管:</td>
-                      <td width="220">
-                        <label-box :isChecked="afterdialysis.intravenous_tube == 1 ? true : false" showValue="0级"></label-box>&nbsp;
-                        <label-box :isChecked="afterdialysis.intravenous_tube == 2 ? true : false" showValue="Ⅰ级"></label-box>&nbsp;
-                        <label-box :isChecked="afterdialysis.intravenous_tube == 3 ? true : false" showValue="Ⅱ级"></label-box>&nbsp;
-                        <label-box :isChecked="afterdialysis.intravenous_tube == 4 ? true : false" showValue="Ⅲ级"></label-box>&nbsp;
-                      </td>
-                      <td width="30">V管:</td>
                       <td width="220">
                         <label-box :isChecked="afterdialysis.arterial_tube == 1 ? true : false" showValue="0级"></label-box>&nbsp;
                         <label-box :isChecked="afterdialysis.arterial_tube == 2 ? true : false" showValue="Ⅰ级"></label-box>&nbsp;
                         <label-box :isChecked="afterdialysis.arterial_tube == 3 ? true : false" showValue="Ⅱ级"></label-box>&nbsp;
                         <label-box :isChecked="afterdialysis.arterial_tube == 4 ? true : false" showValue="Ⅲ级"></label-box>&nbsp;
                       </td>
+                      <td width="30">V管:</td>
+                      <td width="220">
+                        <label-box :isChecked="afterdialysis.intravenous_tube == 1 ? true : false" showValue="0级"></label-box>&nbsp;
+                        <label-box :isChecked="afterdialysis.intravenous_tube == 2 ? true : false" showValue="Ⅰ级"></label-box>&nbsp;
+                        <label-box :isChecked="afterdialysis.intravenous_tube == 3 ? true : false" showValue="Ⅱ级"></label-box>&nbsp;
+                        <label-box :isChecked="afterdialysis.intravenous_tube == 4 ? true : false" showValue="Ⅲ级"></label-box>&nbsp;
+                      </td>
                       <td></td>
                   </tr>
                 </tbody>

src/xt_pages/medicalScheduling/index.vue

@@ -3,7 +3,7 @@
         <div class="position">
             <bread-crumb :crumbs="crumbs"></bread-crumb>
             <div style="display:flex;align-items:center">
-                <!-- <el-button type="primary" @click="setting">设置</el-button> -->
+                <el-button type="primary" @click="setting">设置</el-button>
                 <el-button type="primary" @click="DeleteStaffSchedule">清除</el-button>
                 <el-button type="primary" @click="copyStaffSchedule">复制</el-button>
                 <el-button type="primary" icon="el-icon-printer" @click="toPrint">打印</el-button>
@@ -214,7 +214,7 @@
                     <el-tabs v-model="activeName">
                         <el-tab-pane label="护士" name="nurse">
                             <el-table
-                                :data="nurseList"
+                                :data="nurseTableData"
                                 border
                                 height="250"
                                 style="width: 100%">
@@ -262,7 +262,7 @@
 
                         <el-tab-pane label="医生" name="doctor">
                             <el-table
-                                :data="doctorList"
+                                :data="doctorTableData"
                                 border
                                 height="250"
                                 style="width: 100%">
@@ -333,6 +333,7 @@
 const moment = require('moment')
 import BreadCrumb from '@/xt_pages/components/bread-crumb'
 import { getDoctorList,getScheduleList,addSchedule,getStaffScheduleList,getNextWeekList,getScheduleByDoctorId,toSearchScheduleList,DeleteStaffSchedule,copyStaffSchedule,UpdateContinusSchedule,SaveNurseSort,SaveIsSchedule } from '@/api/doctorSchedule'
+import { constants } from 'crypto'
 export default {
     components:{
         BreadCrumb
@@ -391,28 +392,11 @@ export default {
            arrSeven:[],
 
            //
-           nurseTableData: [{
-            date: '2016-05-02',
-            name: '王小虎',
-            address: '上海市普陀区金沙江路 1518 弄'
-            }, {
-            date: '2016-05-04',
-            name: '王小虎',
-            address: '上海市普陀区金沙江路 1517 弄'
-            }, {
-            date: '2016-05-01',
-            name: '王小虎',
-            address: '上海市普陀区金沙江路 1519 弄'
-            }, {
-            date: '2016-05-03',
-            name: '王小虎',
-            address: '上海市普陀区金沙江路 1516 弄'
-            }],
             nurseVisible:false,
             activeName:'nurse',
             radio:'1',
-            nurseList:[],
-            doctorList:[],
+            nurseTableData:[],
+            doctorTableData:[],
         }
     },
     methods:{
@@ -428,26 +412,33 @@ export default {
                 if(response.data.state == 1){
                     var list =  response.data.data.list
                     console.log("医护列表",list)
-                    this.tableData = list
-                    this.doctorlist = list
+                    // this.tableData = list
+                    // let arr = []
+                    // list.map(item => {
+                    //     if(item.is_sort == 1){
+                    //         arr.push(item)
+                    //     }
+                    // })
+                    // this.doctorlist = arr
                     //获取班种列表
                     this.getStaffScheduleList()
 
                     var doctorlist =  response.data.data.doctorlist
+                    let arr = []
                     for(let i=0;i<doctorlist.length;i++){
-                       if(doctorlist[i].sort == 0){
+                        if(doctorlist[i].sort == 0){
                           doctorlist[i].sort = ""
-                       }
+                        }
                     }
                     console.log('doctorlist',doctorlist)
-                    this.doctorList = doctorlist
+                    this.doctorTableData = doctorlist
                     var nurselist = response.data.data.nurselist
                     for(let i=0;i<nurselist.length;i++){
-                       if(nurselist[i].sort == 0){
+                        if(nurselist[i].sort == 0){
                            nurselist[i].sort = ""
-                       }
+                        }
                     }
-                    this.nurseList = nurselist
+                    this.nurseTableData = nurselist
                 }
             })
         },
@@ -852,7 +843,8 @@ 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,
+                                is_sort:staffList[i].is_sort,
+                                sort:staffList[i].sort,
                                 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}]
                             })
                             tempArr.push(staffList[i].user_name);
@@ -864,18 +856,66 @@ 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 newNurse = []
+                    let newDoctor = []
+                    arr.map(item => {
+                        if(item.user_type == 2){
+                            newDoctor.push(item)
+                        }
+                        if(item.user_type == 3){
+                            newNurse.push(item)
+                        }
+                    })
+                    //护士
+                    newNurse.sort(this.compare('admin_user_id'))
+                    let newNurseTableData = []
+                    this.nurseTableData.map(item => {
+                        if(item.is_sort == 1){
+                            newNurseTableData.push(item)
+                        }
+                    })
+                    newNurseTableData.sort(this.compare('admin_user_id'))
+                    newNurseTableData.map((item,index) => {
+                        if (newNurse[index] && item.admin_user_id == newNurse[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})
-                      }
+                        }else{
+                            newNurse.splice(index, 0, {user_name: item.user_name, admin_user_id: item.admin_user_id, list: [],user_type:item.user_type,is_sort:item.is_sort,sort:item.sort})
+                        }
+                    })
+                    newNurse.sort(this.compare('sort'))
+
+                    //医生
+                    newDoctor.sort(this.compare('admin_user_id'))
+                    let newDoctorTableData = []
+                    this.doctorTableData.map(item => {
+                        if(item.is_sort == 1){
+                            newDoctorTableData.push(item)
+                        }
+                    })
+                    newDoctorTableData.sort(this.compare('admin_user_id'))
+                    newDoctorTableData.map((item,index) => {
+                        if (newDoctor[index] && item.admin_user_id == newDoctor[index].admin_user_id) {
+
+                        }else{
+                            newDoctor.splice(index, 0, {user_name: item.user_name, admin_user_id: item.admin_user_id, list: [],user_type:item.user_type,is_sort:item.is_sort,sort:item.sort})
+                        }
                     })
-                    arr.sort(this.compare('user_type'))
+                    newDoctor.sort(this.compare('sort'))
 
+
+                    // 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})
@@ -890,7 +930,12 @@ export default {
                     obj.user_type = 10
                     obj.list = arr2
                     arr.push(obj)
-                    this.tableData = arr
+
+                    let data = []
+                    data.push(...newNurse)
+                    data.push(...newDoctor)
+                    data.push(obj)
+                    this.tableData = data
 
 
                 }
@@ -1160,33 +1205,83 @@ export default {
                     let tempArr = [], newArr = []
                     for (let i = 0; i < staffList.length; i++) {
                         if (tempArr.indexOf(staffList[i].user_name) === -1) {
-                        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,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}]
-                        })
-                        tempArr.push(staffList[i].user_name);
+                            newArr.push({
+                                user_name: staffList[i].user_name,
+                                admin_user_id:staffList[i].admin_user_id,
+                                user_type:staffList[i].doctor_type,
+                                is_sort:staffList[i].is_sort,
+                                sort:staffList[i].sort,
+                                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}]
+                            })
+                            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})
+                            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})
+                                }
                             }
                         }
-                        }
                     }
+                    
                     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 newNurse = []
+                    let newDoctor = []
+                    arr.map(item => {
+                        if(item.user_type == 2){
+                            newDoctor.push(item)
+                        }
+                        if(item.user_type == 3){
+                            newNurse.push(item)
+                        }
+                    })
+                    //护士
+                    newNurse.sort(this.compare('admin_user_id'))
+                    let newNurseTableData = []
+                    this.nurseTableData.map(item => {
+                        if(item.is_sort == 1){
+                            newNurseTableData.push(item)
+                        }
+                    })
+                    newNurseTableData.sort(this.compare('admin_user_id'))
+                    newNurseTableData.map((item,index) => {
+                        if (newNurse[index] && item.admin_user_id == newNurse[index].admin_user_id) {
+
+                        }else{
+                            newNurse.splice(index, 0, {user_name: item.user_name, admin_user_id: item.admin_user_id, list: [],user_type:item.user_type,is_sort:item.is_sort,sort:item.sort})
+                        }
+                    })
+                    newNurse.sort(this.compare('sort'))
 
-                      }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)
-                      }
+                    //医生
+                    newDoctor.sort(this.compare('admin_user_id'))
+                    let newDoctorTableData = []
+                    this.doctorTableData.map(item => {
+                        if(item.is_sort == 1){
+                            newDoctorTableData.push(item)
+                        }
+                    })
+                    newDoctorTableData.sort(this.compare('admin_user_id'))
+                    newDoctorTableData.map((item,index) => {
+                        if (newDoctor[index] && item.admin_user_id == newDoctor[index].admin_user_id) {
+                    
+                        }else{
+                            newDoctor.splice(index, 0, {user_name: item.user_name, admin_user_id: item.admin_user_id, list: [],user_type:item.user_type,is_sort:item.is_sort,sort:item.sort})
+                        }
                     })
-                    arr.sort(this.compare('user_type'))
+                    newDoctor.sort(this.compare('sort'))
+
+
+                    // 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})
@@ -1196,12 +1291,17 @@ 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)
-                    this.tableData = arr
+                    obj.admin_user_id = "1000000"
+                    obj.user_name = "合计"
+                    obj.user_type = 10
+                    obj.list = arr2
+                    arr.push(obj)
+
+                    let data = []
+                    data.push(...newNurse)
+                    data.push(...newDoctor)
+                    data.push(obj)
+                    this.tableData = data
                 }
             })
         },
@@ -1221,75 +1321,114 @@ 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}]
+                                user_type:staffList[i].doctor_type,
+                                is_sort:staffList[i].is_sort,
+                                sort:staffList[i].sort,
+                                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}]
                             })
                             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})
+                                    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})
                                 }
                             }
                         }
                     }
 
+                    let arr = [...newArr]
+                    let newNurse = []
+                    let newDoctor = []
+                    arr.map(item => {
+                        if(item.user_type == 2){
+                            newDoctor.push(item)
+                        }
+                        if(item.user_type == 3){
+                            newNurse.push(item)
+                        }
+                    })
+
                     if(id == 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) {
+                        //护士
+                        newNurse.sort(this.compare('admin_user_id'))
+                        let newNurseTableData = []
+                        this.nurseTableData.map(item => {
+                            if(item.is_sort == 1){
+                                newNurseTableData.push(item)
+                            }
+                        })
+                        newNurseTableData.sort(this.compare('admin_user_id'))
+                        newNurseTableData.map((item,index) => {
+                            if (newNurse[index] && item.admin_user_id == newNurse[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)
-                          }
+                            }else{
+                                newNurse.splice(index, 0, {user_name: item.user_name, admin_user_id: item.admin_user_id, list: [],user_type:item.user_type,is_sort:item.is_sort,sort:item.sort})
+                            }
                         })
-                        arr.sort(this.compare('user_type'))
-                        this.tableData = arr
+                        newNurse.sort(this.compare('sort'))
+
+                        //医生
+                        newDoctor.sort(this.compare('admin_user_id'))
+                        let newDoctorTableData = []
+                        this.doctorTableData.map(item => {
+                            if(item.is_sort == 1){
+                                newDoctorTableData.push(item)
+                            }
+                        })
+                        newDoctorTableData.sort(this.compare('admin_user_id'))
+                        newDoctorTableData.map((item,index) => {
+                            if (newDoctor[index] && item.admin_user_id == newDoctor[index].admin_user_id) {
+                        
+                            }else{
+                                newDoctor.splice(index, 0, {user_name: item.user_name, admin_user_id: item.admin_user_id, list: [],user_type:item.user_type,is_sort:item.is_sort,sort:item.sort})
+                            }
+                        })
+                        newDoctor.sort(this.compare('sort'))
+                        
+                        let data = []
+                        data.push(...newNurse)
+                        data.push(...newDoctor)
+                        this.tableData = data
                     }
                     if(id == 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.sort(this.compare('admin_user_id'))
+                        let newDoctorTableData = []
+                        this.doctorTableData.map(item => {
+                            if(item.is_sort == 1){
+                                newDoctorTableData.push(item)
+                            }
                         })
-                        newDoctor.map((item, index) => {
-                        if (arr[index] && item.admin_user_id == arr[index].admin_user_id) {
+                        newDoctorTableData.sort(this.compare('admin_user_id'))
+                        newDoctorTableData.map((item,index) => {
+                            if (newDoctor[index] && item.admin_user_id == newDoctor[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)
-                          }
+                            }else{
+                                newDoctor.splice(index, 0, {user_name: item.user_name, admin_user_id: item.admin_user_id, list: [],user_type:item.user_type,is_sort:item.is_sort,sort:item.sort})
+                            }
                         })
-                        this.tableData = arr
+                        newDoctor.sort(this.compare('sort'))
+                        this.tableData = newDoctor
                     }
                     if(id == 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)
-                        }
+                        newNurse.sort(this.compare('admin_user_id'))
+                        let newNurseTableData = []
+                        this.nurseTableData.map(item => {
+                            if(item.is_sort == 1){
+                                newNurseTableData.push(item)
+                            }
                         })
-                        newDoctor.map((item, index) => {
-                        if (arr[index] && item.admin_user_id == arr[index].admin_user_id) {
+                        newNurseTableData.sort(this.compare('admin_user_id'))
+                        newNurseTableData.map((item,index) => {
+                            if (newNurse[index] && item.admin_user_id == newNurse[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)
-                          }
+                            }else{
+                                newNurse.splice(index, 0, {user_name: item.user_name, admin_user_id: item.admin_user_id, list: [],user_type:item.user_type,is_sort:item.is_sort,sort:item.sort})
+                            }
                         })
-                        this.tableData = arr
+                        newNurse.sort(this.compare('sort'))
+                        this.tableData = newNurse
                     }
 
             }

src/xt_pages/medicalScheduling/medical_print.vue

@@ -79,6 +79,9 @@ export default {
           arrSix:[],
           arrSeven:[],
           typevalue:0,
+          
+          doctorTableData:[],
+          nurseTableData:[]
         }
     },
     methods:{
@@ -98,352 +101,400 @@ export default {
           var list =  response.data.data.list
           this.doctorlist = list
           this.getScheduleByDoctorId()
+
+          //
+          var doctorlist =  response.data.data.doctorlist
+          let arr = []
+          for(let i=0;i<doctorlist.length;i++){
+              if(doctorlist[i].sort == 0){
+                doctorlist[i].sort = ""
+              }
+          }
+          console.log('doctorlist',doctorlist)
+          this.doctorTableData = doctorlist
+          var nurselist = response.data.data.nurselist
+          for(let i=0;i<nurselist.length;i++){
+              if(nurselist[i].sort == 0){
+                  nurselist[i].sort = ""
+              }
+          }
+          this.nurseTableData = nurselist
         })
       },
       //获取本周的所有排班列表
       getScheduleByDoctorId(){
-          const params = {
-            start_time:this.start_time,
-            end_time:this.end_time,
-            doctor_id:this.typevalue,
-         }
-         console.log("parasm",params)
-         getScheduleByDoctorId(params).then(response=>{
-            if(response.data.state == 1){
+        const params = {
+          start_time:this.start_time,
+          end_time:this.end_time,
+          doctor_id:this.typevalue,
+        }
+        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 oneStr = ""
-                    var twoStr = ""
-                    var threeStr = ""
-                    var fourStr = ""
-                    var fiveStr = ""
-                    var sixStr = ""
-                    for(let i=0;i<staffList.length;i++){
-                    if(staffList[i].schedule_week == 0){
-                        staffList[i].class_index = 0
-                         var arr = []
-                        this.arrZero.push(staffList[i].class_name)
-                        for(let i=0;i<this.arrZero.length;i++){
-                           if(this.arrZero[i]!=''){
-                              arr.push(this.arrZero[i])
-                           }
-                        }
-                        var countedNames = arr.reduce(function (allNames, name) { 
-                            if (name in allNames) {
-                                allNames[name]++;
-                            }
-                            else {
-                                allNames[name] = 1;
-                            }
-                            return allNames;
-                        }, {});
-                        let objKey = Object.keys(countedNames)
-                        let objVal = Object.values(countedNames)
-                        var zeroStr = ''
-                        objKey.map((item,index) => {
-                        let objVal = Object.values(countedNames)
-                            zeroStr += item + objVal[index] + '\n'
-                        })
-                        sevenStr = zeroStr
-                    }
-                    if(staffList[i].schedule_week == 1){
-                        staffList[i].class_index = 1
-                        var arr = []
-                        this.arrOne.push(staffList[i].class_name)
-                        for(let i=0;i<this.arrOne.length;i++){
-                           if(this.arrOne[i]!=''){
-                              arr.push(this.arrOne[i])
-                           }
-                        }
-                        var countedNames = arr.reduce(function (allNames, name) { 
-                            if (name in allNames) {
-                                allNames[name]++;
-                            }
-                            else {
-                                allNames[name] = 1;
-                            }
-                            return allNames;
-                        }, {});
-                        let objKey = Object.keys(countedNames)
-                        let objVal = Object.values(countedNames)
-                        let strOne = ''
-                        objKey.map((item,index) => {
-                        let objVal = Object.values(countedNames)
-                            strOne += item + objVal[index] + '\n'
-                        })
-                        oneStr  = strOne
-                    }
-                    if(staffList[i].schedule_week == 2){
-                        staffList[i].class_index = 2
-                         var arr = []
-                        this.arrTwo.push(staffList[i].class_name)
-                        for(let i=0;i<this.arrTwo.length;i++){
-                           if(this.arrTwo[i]!=''){
-                              arr.push(this.arrTwo[i])
-                           }
-                        }
-                        var countedNames = arr.reduce(function (allNames, name) { 
-                            if (name in allNames) {
-                                allNames[name]++;
-                            }
-                            else {
-                                allNames[name] = 1;
-                            }
-                            return allNames;
-                        }, {});
-                        let objKey = Object.keys(countedNames)
-                        let objVal = Object.values(countedNames)
-                        let strTwo = ''
-                        objKey.map((item,index) => {
-                        let objVal = Object.values(countedNames)
-                            strTwo += item + objVal[index] + '\n'
-                        })
-                         twoStr = strTwo
-                    }
-                    if(staffList[i].schedule_week == 3){
-                        staffList[i].class_index = 3
-                         var arr = []
-                        this.arrThree.push(staffList[i].class_name)
-                        for(let i=0;i<this.arrThree.length;i++){
-                           if(this.arrThree[i]!=''){
-                              arr.push(this.arrThree[i])
-                           }
-                        }
-                        var countedNames = arr.reduce(function (allNames, name) { 
-                            if (name in allNames) {
-                                allNames[name]++;
-                            }
-                            else {
-                                allNames[name] = 1;
-                            }
-                            return allNames;
-                        }, {});
-                        let objKey = Object.keys(countedNames)
-                        let objVal = Object.values(countedNames)
-                        let strThree = ''
-                        objKey.map((item,index) => {
-                        let objVal = Object.values(countedNames)
-                            strThree += item + objVal[index] + '\n'
-                        })
-                        threeStr = strThree
-                    }
-                    if(staffList[i].schedule_week == 4){
-                        staffList[i].class_index = 4
-                        var arr = []
-                        this.arrFour.push(staffList[i].class_name)
-                        for(let i=0;i<this.arrFour.length;i++){
-                           if(this.arrFour[i]!=''){
-                              arr.push(this.arrFour[i])
-                           }
-                        }
-                        var countedNames = arr.reduce(function (allNames, name) { 
-                            if (name in allNames) {
-                                allNames[name]++;
-                            }
-                            else {
-                                allNames[name] = 1;
-                            }
-                            return allNames;
-                        }, {});
-                        let objKey = Object.keys(countedNames)
-                        let objVal = Object.values(countedNames)
-                        let strFour = ''
-                        objKey.map((item,index) => {
-                        let objVal = Object.values(countedNames)
-                            strFour += item + objVal[index] + '\n'
-                        })
-                        fourStr = strFour
-                    }
-                    if(staffList[i].schedule_week == 5){
-                        staffList[i].class_index = 5
+              var sevenStr = ""
+              var oneStr = ""
+              var twoStr = ""
+              var threeStr = ""
+              var fourStr = ""
+              var fiveStr = ""
+              var sixStr = ""
+              for(let i=0;i<staffList.length;i++){
+              if(staffList[i].schedule_week == 0){
+                  staffList[i].class_index = 0
+                    var arr = []
+                  this.arrZero.push(staffList[i].class_name)
+                  for(let i=0;i<this.arrZero.length;i++){
+                      if(this.arrZero[i]!=''){
+                        arr.push(this.arrZero[i])
+                      }
+                  }
+                  var countedNames = arr.reduce(function (allNames, name) { 
+                      if (name in allNames) {
+                          allNames[name]++;
+                      }
+                      else {
+                          allNames[name] = 1;
+                      }
+                      return allNames;
+                  }, {});
+                  let objKey = Object.keys(countedNames)
+                  let objVal = Object.values(countedNames)
+                  var zeroStr = ''
+                  objKey.map((item,index) => {
+                  let objVal = Object.values(countedNames)
+                      zeroStr += item + objVal[index] + '\n'
+                  })
+                  sevenStr = zeroStr
+              }
+              if(staffList[i].schedule_week == 1){
+                  staffList[i].class_index = 1
+                  var arr = []
+                  this.arrOne.push(staffList[i].class_name)
+                  for(let i=0;i<this.arrOne.length;i++){
+                      if(this.arrOne[i]!=''){
+                        arr.push(this.arrOne[i])
+                      }
+                  }
+                  var countedNames = arr.reduce(function (allNames, name) { 
+                      if (name in allNames) {
+                          allNames[name]++;
+                      }
+                      else {
+                          allNames[name] = 1;
+                      }
+                      return allNames;
+                  }, {});
+                  let objKey = Object.keys(countedNames)
+                  let objVal = Object.values(countedNames)
+                  let strOne = ''
+                  objKey.map((item,index) => {
+                  let objVal = Object.values(countedNames)
+                      strOne += item + objVal[index] + '\n'
+                  })
+                  oneStr  = strOne
+              }
+              if(staffList[i].schedule_week == 2){
+                  staffList[i].class_index = 2
+                    var arr = []
+                  this.arrTwo.push(staffList[i].class_name)
+                  for(let i=0;i<this.arrTwo.length;i++){
+                      if(this.arrTwo[i]!=''){
+                        arr.push(this.arrTwo[i])
+                      }
+                  }
+                  var countedNames = arr.reduce(function (allNames, name) { 
+                      if (name in allNames) {
+                          allNames[name]++;
+                      }
+                      else {
+                          allNames[name] = 1;
+                      }
+                      return allNames;
+                  }, {});
+                  let objKey = Object.keys(countedNames)
+                  let objVal = Object.values(countedNames)
+                  let strTwo = ''
+                  objKey.map((item,index) => {
+                  let objVal = Object.values(countedNames)
+                      strTwo += item + objVal[index] + '\n'
+                  })
+                    twoStr = strTwo
+              }
+              if(staffList[i].schedule_week == 3){
+                  staffList[i].class_index = 3
+                    var arr = []
+                  this.arrThree.push(staffList[i].class_name)
+                  for(let i=0;i<this.arrThree.length;i++){
+                      if(this.arrThree[i]!=''){
+                        arr.push(this.arrThree[i])
+                      }
+                  }
+                  var countedNames = arr.reduce(function (allNames, name) { 
+                      if (name in allNames) {
+                          allNames[name]++;
+                      }
+                      else {
+                          allNames[name] = 1;
+                      }
+                      return allNames;
+                  }, {});
+                  let objKey = Object.keys(countedNames)
+                  let objVal = Object.values(countedNames)
+                  let strThree = ''
+                  objKey.map((item,index) => {
+                  let objVal = Object.values(countedNames)
+                      strThree += item + objVal[index] + '\n'
+                  })
+                  threeStr = strThree
+              }
+              if(staffList[i].schedule_week == 4){
+                  staffList[i].class_index = 4
+                  var arr = []
+                  this.arrFour.push(staffList[i].class_name)
+                  for(let i=0;i<this.arrFour.length;i++){
+                      if(this.arrFour[i]!=''){
+                        arr.push(this.arrFour[i])
+                      }
+                  }
+                  var countedNames = arr.reduce(function (allNames, name) { 
+                      if (name in allNames) {
+                          allNames[name]++;
+                      }
+                      else {
+                          allNames[name] = 1;
+                      }
+                      return allNames;
+                  }, {});
+                  let objKey = Object.keys(countedNames)
+                  let objVal = Object.values(countedNames)
+                  let strFour = ''
+                  objKey.map((item,index) => {
+                  let objVal = Object.values(countedNames)
+                      strFour += item + objVal[index] + '\n'
+                  })
+                  fourStr = strFour
+              }
+              if(staffList[i].schedule_week == 5){
+                  staffList[i].class_index = 5
 
-                         var arr = []
-                        this.arrFive.push(staffList[i].class_name)
-                        for(let i=0;i<this.arrFive.length;i++){
-                           if(this.arrFive[i]!=''){
-                              arr.push(this.arrFive[i])
-                           }
-                        }
-                        var countedNames = arr.reduce(function (allNames, name) { 
-                            if (name in allNames) {
-                                allNames[name]++;
-                            }
-                            else {
-                                allNames[name] = 1;
-                            }
-                            return allNames;
-                        }, {});
-                        let objKey = Object.keys(countedNames)
-                        let objVal = Object.values(countedNames)
-                        let strFive = ''
-                        objKey.map((item,index) => {
-                        let objVal = Object.values(countedNames)
-                            strFive += item + objVal[index] + '\n'
-                        })
-                         fiveStr = strFive
-                    }
-                    if(staffList[i].schedule_week == 6){
-                        staffList[i].class_index = 6
-                         var arr = []
-                        this.arrSix.push(staffList[i].class_name)
-                        for(let i=0;i<this.arrSix.length;i++){
-                           if(this.arrSix[i]!=''){
-                              arr.push(this.arrSix[i])
-                           }
-                        }
-                        var countedNames = arr.reduce(function (allNames, name) { 
-                            if (name in allNames) {
-                                allNames[name]++;
-                            }
-                            else {
-                                allNames[name] = 1;
-                            }
-                            return allNames;
-                        }, {});
-                        let objKey = Object.keys(countedNames)
-                        let objVal = Object.values(countedNames)
-                        let strSix = ''
-                        objKey.map((item,index) => {
-                        let objVal = Object.values(countedNames)
-                            strSix += item + objVal[index] + '\n'
-                        })
-                        sixStr = strSix
-                     }
-                    }
+                    var arr = []
+                  this.arrFive.push(staffList[i].class_name)
+                  for(let i=0;i<this.arrFive.length;i++){
+                      if(this.arrFive[i]!=''){
+                        arr.push(this.arrFive[i])
+                      }
+                  }
+                  var countedNames = arr.reduce(function (allNames, name) { 
+                      if (name in allNames) {
+                          allNames[name]++;
+                      }
+                      else {
+                          allNames[name] = 1;
+                      }
+                      return allNames;
+                  }, {});
+                  let objKey = Object.keys(countedNames)
+                  let objVal = Object.values(countedNames)
+                  let strFive = ''
+                  objKey.map((item,index) => {
+                  let objVal = Object.values(countedNames)
+                      strFive += item + objVal[index] + '\n'
+                  })
+                    fiveStr = strFive
+              }
+              if(staffList[i].schedule_week == 6){
+                  staffList[i].class_index = 6
+                    var arr = []
+                  this.arrSix.push(staffList[i].class_name)
+                  for(let i=0;i<this.arrSix.length;i++){
+                      if(this.arrSix[i]!=''){
+                        arr.push(this.arrSix[i])
+                      }
+                  }
+                  var countedNames = arr.reduce(function (allNames, name) { 
+                      if (name in allNames) {
+                          allNames[name]++;
+                      }
+                      else {
+                          allNames[name] = 1;
+                      }
+                      return allNames;
+                  }, {});
+                  let objKey = Object.keys(countedNames)
+                  let objVal = Object.values(countedNames)
+                  let strSix = ''
+                  objKey.map((item,index) => {
+                  let objVal = Object.values(countedNames)
+                      strSix += item + objVal[index] + '\n'
+                  })
+                  sixStr = strSix
+                }
+              }
               let tempArr = [], newArr = []
               for (let i = 0; i < staffList.length; i++) {
-                if(tempArr.indexOf(staffList[i].user_name) === -1) {
+                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}]
+                    user_type:staffList[i].doctor_type,
+                    is_sort:staffList[i].is_sort,
+                    sort:staffList[i].sort,
+                    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}]
                   })
                   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})
+                      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})
                     }
                   }
                 }
               }
-              // 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'))
-              // 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
+              let arr = [...newArr]
+              let newNurse = []
+              let newDoctor = []
+              arr.map(item => {
+                if(item.user_type == 2){
+                  newDoctor.push(item)
+                }
+                if(item.user_type == 3){
+                  newNurse.push(item)
+                }
+              })
+
+              if(this.typevalue == 0){
+                //护士
+                newNurse.sort(this.compare('admin_user_id'))
+                let newNurseTableData = []
+                this.nurseTableData.map(item => {
+                    if(item.is_sort == 1){
+                        newNurseTableData.push(item)
+                    }
+                })
+                newNurseTableData.sort(this.compare('admin_user_id'))
+                newNurseTableData.map((item,index) => {
+                    if (newNurse[index] && item.admin_user_id == newNurse[index].admin_user_id) {
+                
+                    }else{
+                        newNurse.splice(index, 0, {user_name: item.user_name, admin_user_id: item.admin_user_id, list: [],user_type:item.user_type,is_sort:item.is_sort,sort:item.sort})
+                    }
+                })
+                newNurse.sort(this.compare('sort'))
+
+                //医生
+                newDoctor.sort(this.compare('admin_user_id'))
+                let newDoctorTableData = []
+                this.doctorTableData.map(item => {
+                    if(item.is_sort == 1){
+                        newDoctorTableData.push(item)
                     }
-                    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
+                })
+                newDoctorTableData.sort(this.compare('admin_user_id'))
+                newDoctorTableData.map((item,index) => {
+                    if (newDoctor[index] && item.admin_user_id == newDoctor[index].admin_user_id) {
+                
+                    }else{
+                        newDoctor.splice(index, 0, {user_name: item.user_name, admin_user_id: item.admin_user_id, list: [],user_type:item.user_type,is_sort:item.is_sort,sort:item.sort})
+                    }
+                })
+                newDoctor.sort(this.compare('sort'))
+                
+                
+
+                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)
+
+                let data = []
+                data.push(...newNurse)
+                data.push(...newDoctor)
+                data.push(obj)
+                this.tableData = data
+              }
+              if(this.typevalue == 2){
+                newDoctor.sort(this.compare('admin_user_id'))
+                let newDoctorTableData = []
+                this.doctorTableData.map(item => {
+                    if(item.is_sort == 1){
+                        newDoctorTableData.push(item)
                     }
-                    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
+                })
+                newDoctorTableData.sort(this.compare('admin_user_id'))
+                newDoctorTableData.map((item,index) => {
+                    if (newDoctor[index] && item.admin_user_id == newDoctor[index].admin_user_id) {
+                
+                    }else{
+                        newDoctor.splice(index, 0, {user_name: item.user_name, admin_user_id: item.admin_user_id, list: [],user_type:item.user_type,is_sort:item.is_sort,sort:item.sort})
                     }
-            
-              
+                })
+                newDoctor.sort(this.compare('sort'))
+                
+                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
+                newDoctor.push(obj)
+                this.tableData = newDoctor
+              }
+              if(this.typevalue == 3){
+                newNurse.sort(this.compare('admin_user_id'))
+                let newNurseTableData = []
+                this.nurseTableData.map(item => {
+                    if(item.is_sort == 1){
+                        newNurseTableData.push(item)
+                    }
+                })
+                newNurseTableData.sort(this.compare('admin_user_id'))
+                newNurseTableData.map((item,index) => {
+                    if (newNurse[index] && item.admin_user_id == newNurse[index].admin_user_id) {
+                
+                    }else{
+                        newNurse.splice(index, 0, {user_name: item.user_name, admin_user_id: item.admin_user_id, list: [],user_type:item.user_type,is_sort:item.is_sort,sort:item.sort})
+                    }
+                })
+                newNurse.sort(this.compare('sort'))
+                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
+                newNurse.push(obj)
+                this.tableData = newNurse
+              }
             }
-         })
+        })
       },
       getClass(name,index){
         if(name != undefined){

src/xt_pages/medicalScheduling/schedulingStatistics.vue

@@ -80,40 +80,27 @@
                 <line-chart :options="chart"></line-chart>
             </div>
             <div class="tableTitle">统计表</div>
-            <el-table
-                :data="tableData"
-                height="250"
-                border
-                style="width: 100">
-                <el-table-column
-                align="center"
-                prop="date"
-                label="医护姓名"
-                width="180">
+            <el-table :data="tableData" height="250" border style="width: 100">
+                <el-table-column align="center" prop="date" label="医护姓名" width="100">
+                    <template slot-scope="scope">
+                        <span>{{scope.row.user_name}}</span>
+                    </template>
                 </el-table-column>
-                <el-table-column
-                 :label="modeItem.class_name"
-                 property="number"
-                 align="center"
-                 min-width="100"
-                 v-for="(modeItem, index) in scheduleList"
-                 :key="index"
-                >
+                <el-table-column :label="modeItem.class_name" property="number" align="center" min-width="100" v-for="(modeItem, index) in scheduleList" :key="index">
+                    <template slot-scope="scope">
+                        <span>{{ getCount(scope.row.doctor_id,modeItem.class_name) }}</span>
+                    </template>
                 </el-table-column>
-                <el-table-column
-                 align="center"
-                 prop="address"
-                 label="总工时/小时">
+                <el-table-column align="center" prop="address" label="总工时/小时">
+                   <template slot-scope="scope">
+                        <span v-if="scope.row.totalminute">{{ scope.row.totalminute / 60 }}</span>
+                    </template> 
                 </el-table-column>
-                <el-table-column
-                 align="center"
-                 prop="address"
-                 label="出勤/天">
+                <el-table-column align="center" prop="attendance" label="出勤/天">
+                    <!-- <span v-if='scope.row.attendance'>{{ scope.row.attendance ? scope.row.attendance : '' }}</span> -->
                 </el-table-column>
-                 <el-table-column
-                 align="center"
-                 prop="address"
-                 label="缺勤/天">
+                <el-table-column align="center" prop="absence" label="缺勤/天">
+                    <!-- <span v-if="scope.row.absence">{{ scope.row.absence ? scope.row.absence : '' }}</span> -->
                 </el-table-column>
             </el-table>
         </div>
@@ -125,7 +112,7 @@
 import echarts from "echarts";
 import BreadCrumb from '@/xt_pages/components/bread-crumb'
 import LineChart from "../qcd/components/LineChart";
-import {getDoctorList,getScheduleList,getScheduleListTotal,toSearchTotal,changeOption,getchartlist }  from '@/api/doctorSchedule'
+import {getDoctorList,getScheduleList,getScheduleListTotal,toSearchTotal,changeOption }  from '@/api/doctorSchedule'
 export default {
     components:{
         BreadCrumb,
@@ -268,6 +255,8 @@ export default {
             start_time:0,
             end_time:0,
 
+            doctorlist:[]
+
         }
     },
     created(){
@@ -277,26 +266,30 @@ export default {
         this.weekNum = this.getYearWeek(year,month,date)
         this.todayDate=this.formatDate(new Date())
         this.setDate(new Date())
-        
 
-      //获取所有排班种
-      this.getScheduleList()
-   
-      // 获取统计表的数据
-      this.getlist()
+        //获取所以医护人员
+        this.getDoctorList()
+
 
-      //获取所以医护人员
-      this.getDoctorList()
+        //获取所有排班种
+        this.getScheduleList()
+    
+        // 获取统计表的数据
+        this.getlist()
 
-      //获取统计图列表
-      this.getchartlist()
+      
     },
     methods:{
         getDoctorList(){
-            getDoctorList().then(response=>{
-             if(response.data.state == 1){  
+           getDoctorList().then(response=>{
+             if(response.data.state == 1){
                  var list =  response.data.data.list
-                 console.log("医护列表",list)
+                 var doctorlist =  response.data.data.doctorlist
+                 var nurselist =  response.data.data.nurselist
+                 this.doctorlist.push(...nurselist)
+                 this.doctorlist.push(...doctorlist)
+                 
+                 console.log("医护列表",this.doctorlist)
                }
            })
         },
@@ -309,8 +302,8 @@ export default {
             const params = {
               keyword:this.keywords, 
             }
-           console.log("params",params)
-          toSearchTotal(params).then(response=>{
+            console.log("params",params)
+            toSearchTotal(params).then(response=>{
              if(response.data.state == 1){
                 var scheduleTotal = response.data.data.scheduletotal 
                 console.log("scheduletotal",scheduleTotal) 
@@ -398,7 +391,6 @@ export default {
             this.end_time = this.getTimestamp(monthEndTime)
             console.log('monthEndTime',this.getTimestamp(monthEndTime))
             this.getlist()
-            this.getchartlist()
         },
         getFullDate(targetDate) {
             var D, y, m, d;
@@ -437,25 +429,81 @@ export default {
                this.start_time = this.getTimestamp(this.weekDayArr[0]),
                this.end_time = this.getTimestamp(this.weekDayArr[6])
             }
-          const params = {
-              start_time:this.start_time,
-              end_time:this.end_time,
-           }
-           console.log("params",params)
-          getScheduleListTotal(params).then(response=>{
-             if(response.data.state == 1){
-                //获取每个班次对应的次数
-               var scheudleTotal =  response.data.data.scheudletotal
-               console.log("scheudletotal",scheudleTotal)
-               //获取总分钟数
-               var list = response.data.data.list
-               console.log("list",list)
-               var workday = response.data.data.workDay
-               console.log("workday",workday)
-               var noWorkDay = response.data.data.noWorkDay
-               console.log("noWorkDay",noWorkDay)
-             }
-          })
+            const params = {
+                start_time:this.start_time,
+                end_time:this.end_time,
+            }
+            console.log("params",params)
+            getScheduleListTotal(params).then(response=>{
+                if(response.data.state == 1){
+                    //获取每个班次对应的次数
+                    var scheudleTotal =  response.data.data.scheudletotal
+                    console.log("scheudletotal",scheudleTotal)
+                    //获取总分钟数
+                    var list = response.data.data.list
+                    console.log("list",list)
+                    var workday = response.data.data.workDay
+                    console.log("workday",workday)
+                    var noWorkDay = response.data.data.noWorkDay
+                    console.log("noWorkDay",noWorkDay)
+
+                    let tempArr = [], newArr = []
+                    for (let i = 0; i < scheudleTotal.length; i++) {
+                        if (tempArr.indexOf(scheudleTotal[i].user_name) === -1) {
+                            newArr.push({
+                                user_name: scheudleTotal[i].user_name,
+                                doctor_id:scheudleTotal[i].doctor_id,
+                                list: [{class_name:scheudleTotal[i].class_name,doctor_id:scheudleTotal[i].doctor_id,Count:scheudleTotal[i].Count}]
+                            })
+                            tempArr.push(scheudleTotal[i].user_name);
+                        } else {
+                            for (let j = 0; j < newArr.length; j++) {
+                                if (newArr[j].user_name == scheudleTotal[i].user_name) {
+                                    newArr[j].list.push({class_name:scheudleTotal[i].class_name,doctor_id:scheudleTotal[i].doctor_id,Count:scheudleTotal[i].Count})
+                                }
+                            }
+                        }
+                    }
+
+                    newArr.map(item => {
+                        list.map(it => {
+                            if(item.doctor_id == it.doctor_id){
+                                item.totalminute = it.totalminute
+                            }
+                        })
+                    })
+                    newArr.map(item => {
+                        workday.map(it => {
+                            if(item.doctor_id == it.doctor_id){
+                                item.attendance = it.Count
+                            }
+                        })
+                    })
+                    newArr.map(item => {
+                        noWorkDay.map(it => {
+                            if(item.doctor_id == it.doctor_id){
+                                item.absence = it.Count
+                            }
+                        })
+                    })
+                    
+                    let arr = [...newArr]
+
+                    arr.sort(this.compare('doctor_id'))
+                    this.doctorlist.sort(this.compare('admin_user_id'))
+                    this.doctorlist.forEach((item, index) => {
+                      if (arr[index] && item.admin_user_id == arr[index].doctor_id) {
+                    
+                      }else{
+                        arr.splice(index, 0, {user_name: item.user_name, doctor_id: item.admin_user_id, list: []})
+                      }
+                    })
+                    
+
+                    console.log('newArr',arr)
+                    this.tableData = arr
+                }
+            })
         },
         changeOption(val){
             if(this.timeSlot == 1){
@@ -466,7 +514,7 @@ export default {
               doctor_type: parseInt(val),
             }
             console.log("params",params)
-           changeOption(params).then(response=>{
+            changeOption(params).then(response=>{
               if(response.data.state == 1){
                 var scheduletotal =  response.data.data.scheduletotal
                 console.log("scheduletotal",scheduletotal)
@@ -477,39 +525,41 @@ export default {
                 var worknoday = response.data.data.workday
                 console.log("worknoday",worknoday)
               }
-           })
+            })
         },
-       changeTime(val){
-         this.start_time = val.getTime()/1000
-         this.getlist()
-         this.getchartlist()
-       },
-       changeTimeTwo(val){
-         this.end_time = val.getTime()/1000
-         this.getlist()
-         this.getchartlist()
-       },
-
-       getchartlist(){
-           if(this.timeSlot == 1){
-               this.start_time = this.getTimestamp(this.weekDayArr[0]),
-               this.end_time = this.getTimestamp(this.weekDayArr[6])
+        changeTime(val){
+            this.start_time = val.getTime()/1000
+            this.getlist()
+        },
+        changeTimeTwo(val){
+            this.end_time = val.getTime()/1000
+            this.getlist()
+        },
+        compare(property){
+            return function(a,b){
+                var value1 = a[property];
+                var value2 = b[property];
+                return value2 - value1;
             }
-           const params = {
-              start_time:this.start_time,
-              end_time:this.end_time,   
-           }
-          getchartlist(params).then(response=>{
-             if(response.data.state == 1){
-               //统计每个医护人员总工时  
-               var list = response.data.data.list 
-               console.log("总工时",list)
-               //统计每个医护人员出勤的总工时
-               var workDaylist =  response.data.data.workDaylist
-               console.log("出勤工时",workDaylist)
-             }
-          }) 
-       }
+        },
+        getCount(id,name){
+            if(id != undefined){
+                let Count = '';
+                this.tableData.map(item => {
+                    if(item.doctor_id == id){
+                        if(item.list){
+                            item.list.map(it => {
+                                if(it.class_name == name){
+                                    Count = it.Count
+                                }
+                            })
+                        }
+                        
+                    }
+                })
+                return Count
+            }   
+        }
     }
 }
 </script>