1

src/xt_pages/medicalScheduling/index.vue

@@ -48,7 +48,7 @@
                         </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)">
+                                <div @click="hangdleClick(scope.row,scope.$index,0)">
                                     <el-dropdown trigger="click" @command="changeSchedule">
                                         <span class="el-dropdown-link">
                                         {{ getClass(scope.row.user_name,1) }}<i class="el-icon-arrow-down el-icon--right"></i>
@@ -62,7 +62,7 @@
                         </el-table-column>
                         <el-table-column prop="name" :label="'周二\n(' + weekDayArr[1] + ')'" style="width:14%" align="center">
                              <template slot-scope="scope">
-                                <div @click="hangdleClick(scope.row,scope.$index)">
+                                <div @click="hangdleClick(scope.row,scope.$index,1)">
                                     <el-dropdown trigger="click" @command="changeSchedule">
                                         <span class="el-dropdown-link">
                                         {{ getClass(scope.row.user_name,2) }}<i class="el-icon-arrow-down el-icon--right"></i>
@@ -76,7 +76,7 @@
                         </el-table-column>
                         <el-table-column prop="name" :label="'周三\n(' + weekDayArr[2] + ')'" style="width:14%" align="center">
                              <template slot-scope="scope">
-                                <div @click="hangdleClick(scope.row,scope.$index)">
+                                <div @click="hangdleClick(scope.row,scope.$index,2)">
                                     <el-dropdown trigger="click" @command="changeSchedule">
                                         <span class="el-dropdown-link">
                                         {{ getClass(scope.row.user_name,3) }}<i class="el-icon-arrow-down el-icon--right"></i>
@@ -90,7 +90,7 @@
                         </el-table-column>
                         <el-table-column prop="name" :label="'周四\n(' + weekDayArr[3] + ')'" style="width:14%" align="center">
                              <template slot-scope="scope">
-                                <div @click="hangdleClick(scope.row,scope.$index)">
+                                <div @click="hangdleClick(scope.row,scope.$index,3)">
                                     <el-dropdown trigger="click" @command="changeSchedule">
                                         <span class="el-dropdown-link">
                                         {{ getClass(scope.row.user_name,4) }}<i class="el-icon-arrow-down el-icon--right"></i>
@@ -104,7 +104,7 @@
                         </el-table-column>
                         <el-table-column prop="name" :label="'周五\n(' + weekDayArr[4] + ')'" style="width:14%" align="center">
                              <template slot-scope="scope">
-                                <div @click="hangdleClick(scope.row,scope.$index)">
+                                <div @click="hangdleClick(scope.row,scope.$index,4)">
                                     <el-dropdown trigger="click" @command="changeSchedule">
                                         <span class="el-dropdown-link">
                                         {{ getClass(scope.row.user_name,5) }}<i class="el-icon-arrow-down el-icon--right"></i>
@@ -118,7 +118,7 @@
                         </el-table-column>
                         <el-table-column prop="name" :label="'周六\n(' + weekDayArr[5] + ')'" style="width:14%" align="center">
                              <template slot-scope="scope">
-                                <div @click="hangdleClick(scope.row,scope.$index)">
+                                <div @click="hangdleClick(scope.row,scope.$index,5)">
                                     <el-dropdown trigger="click" @command="changeSchedule">
                                         <span class="el-dropdown-link">
                                         {{ getClass(scope.row.user_name,6) }}<i class="el-icon-arrow-down el-icon--right"></i>
@@ -132,7 +132,7 @@
                         </el-table-column>
                         <el-table-column prop="name" :label="'周日\n(' + weekDayArr[6] + ')'" style="width:14%" align="center">
                              <template slot-scope="scope">
-                                <div @click="hangdleClick(scope.row,scope.$index)">
+                                <div @click="hangdleClick(scope.row,scope.$index,6)">
                                     <el-dropdown trigger="click" @command="changeSchedule">
                                         <span class="el-dropdown-link">
                                         {{ getClass(scope.row.user_name,0) }}<i class="el-icon-arrow-down el-icon--right"></i>
@@ -283,9 +283,13 @@ export default {
                 }
             }) 
         },
-        hangdleClick(val,index){
+        hangdleClick(val,index,num){
          console.log("val",val)
          this.docobj = val
+         if(this.getTimestamp(this.weekDayArr[num]) < this.timeNow){
+            this.$message.warning("过去日期不可以编辑")
+            return
+         }
         },
         clickThis(row, column, cell, event){
             // console.log("row",row)
@@ -492,14 +496,16 @@ export default {
                         }
                     }
                     let arr = [...newArr]
-                    console.log("arr=======",arr)
-                    this.doctorlist.map((item,index) => {
-                        if(!(arr[index] && item.admin_user_id == arr[index].admin_user_id)){
-                            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('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) {
                     
-                    console.log("arr",arr)
+                      }else{
+                        arr.splice(index, 0, {user_name: item.user_name, admin_user_id: item.admin_user_id, list: []})
+                        // console.log("arr",arr)
+                      }
+                    })
                     this.tableData = arr
         
                 
@@ -561,14 +567,16 @@ export default {
                         }
                     }
                     let arr = [...newArr]
-
-                    this.doctorlist.map((item,index) => {
-                        if(!(arr[index] && item.admin_user_id == arr[index].admin_user_id)){
-                        arr.splice(index,0,{user_name:item.user_name,admin_user_id: item.admin_user_id,list: []})
-                        }
+                    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: []})
+                        // console.log("arr",arr)
+                      }
                     })
-
-                    console.log(arr)
                     this.tableData = arr
                 }
             })
@@ -605,40 +613,55 @@ export default {
 
                     if(id == 0){
                         let arr = [...newArr]
-                        this.doctorlist.map((item,index) => {
-                            if(!(arr[index] && item.admin_user_id == arr[index].admin_user_id)){
-                                arr.splice(index,0,{user_name:item.user_name,admin_user_id: item.admin_user_id,list: []})
-                            }
+                        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: []})
+                            // console.log("arr",arr)
+                          }
                         })
                         this.tableData = arr
                     }
                     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)
-                            }
+                        if (item.user_type == 2) {
+                            newDoctor.push(item)
+                        }
                         })
-                        newDoctor.map((item,index) => {
-                            if(!(arr[index] && item.admin_user_id == arr[index].admin_user_id)){
-                                arr.splice(index,0,{user_name:item.user_name,admin_user_id: item.admin_user_id,list: []})
-                            }
+                        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)
+                          }
                         })
                         this.tableData = arr
                     }
                     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)
-                            }
+                        if (item.user_type == 3) {
+                            newDoctor.push(item)
+                        }
                         })
-                        newDoctor.map((item,index) => {
-                            if(!(arr[index] && item.admin_user_id == arr[index].admin_user_id)){
-                                arr.splice(index,0,{user_name:item.user_name,admin_user_id: item.admin_user_id,list: []})
-                            }
+                        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)
+                          }
                         })
                         this.tableData = arr
                     }
@@ -680,14 +703,16 @@ export default {
                         this.tableData = newArr
                     }else{
                         let arr = [...newArr]
-                        this.doctorlist.map((item,index) => {
-                            if(!(arr[index] && item.admin_user_id == arr[index].admin_user_id)){
-                                arr.splice(index,0,{user_name:item.user_name,admin_user_id: item.admin_user_id,list: []})
-                            }
-                        })
+                        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) {
                         
-            
-                        console.log(arr)
+                          }else{
+                            arr.splice(index, 0, {user_name: item.user_name, admin_user_id: item.admin_user_id, list: []})
+                            // console.log("arr",arr)
+                          }
+                        })
                         this.tableData = arr
                     }
                 }
@@ -803,7 +828,14 @@ export default {
                 })
               }
            })
-        }
+        },
+        compare(property){
+            return function(a,b){
+                var value1 = a[property];
+                var value2 = b[property];
+                return value1 - value2;
+            }
+        },
     },
     created(){
         //获取医护人员
@@ -858,7 +890,7 @@ export default {
     border-radius: 4px;
 }
 .classBox{
-    width:25%;
+    width:28%;
     height: 100%;
     border: 1px solid #EBEEF5;
     .classTitle{
@@ -878,6 +910,7 @@ export default {
         flex-direction: column;
         >div>p{
             line-height: 30px;
+            color: rgb(48, 49, 51);
         }
         .classMainBox{
             height: 350px;

src/xt_pages/medicalScheduling/medical_print.vue

@@ -121,12 +121,16 @@ export default {
                 }
               }
               let arr = [...newArr]
-              this.doctorlist.map((item,index) => {
-                if(!(arr[index] && item.admin_user_id == arr[index].admin_user_id)){
-                  arr.splice(index,0,{user_name:item.user_name,admin_user_id: item.admin_user_id,list: []})
-                }
+              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: []})
+                  // console.log("arr",arr)
+                }
               })
-              console.log(arr)
               this.tableData = arr
               
             }
@@ -163,7 +167,14 @@ export default {
         }
         var currentdate = year + seperator1 + month + seperator1 + strDate;
         return currentdate;
-      }
+      },
+      compare(property){
+        return function(a,b){
+            var value1 = a[property];
+            var value2 = b[property];
+            return value1 - value2;
+        }
+      },
     },
     created(){
       var starttime =  this.$route.query.starttime