新分支

src/xt_pages/dialysis/details/dialog/monitor_dialog.vue

@@ -242,6 +242,7 @@
                 || org_id == 10445
                 || org_id == 10410 ||
                 org_id == 10495 ||
+                org_id == 10375 ||
                 org_id == 10485) &&
                 org_id!=10387
             "
@@ -312,7 +313,7 @@
               org_id != 9555
               && org_id!=10432 && org_id!=10445
               && org_id!=10410 && org_id!=10495 &&
-               org_id!=10485 )
+               org_id!=10485 && org_id!=10395 )
               || org_id == 10387
             "
           >
@@ -366,7 +367,8 @@
                 org_id == 10432 ||
                 org_id == 10445 ||
                 org_id == 10410 ||
-                org_id == 10495 
+                org_id == 10495  ||
+                org_id == 10395
                 || org_id == 10485)
                 && org_id!=10387
             "
@@ -420,7 +422,7 @@
               org_id!=10432 &&
               org_id!=10445 &&
               org_id!=10410 && org_id!=10495
-              && org_id!=10485) ||
+              && org_id!=10485 && org_id!=10395) ||
               org_id == 10387
             "
           >
@@ -481,7 +483,8 @@
                 template_id == 56 ||
                 org_id ==10432 ||
                 org_id ==10445 ||
-                org_id ==10410
+                org_id ==10410 ||
+                org_id == 10395
 
                )
             "
@@ -510,6 +513,7 @@
               template_id != 56 &&
               org_id !=10432 &&
               org_id !=10445 &&
+              org_id!=10395 && 
               org_id !=10410
             "
           >
@@ -556,7 +560,8 @@
                 template_id == 48 ||
                 org_id == 10340 ||
                 org_id == 10432 ||
-                org_id == 10445)
+                org_id == 10445 ||
+                org_id == 10395)
             "
           >
             <template slot-scope="scope">
@@ -588,7 +593,8 @@
               template_id != 48 &&
               org_id !=10340 &&
               org_id !=10432 &&
-              org_id !=10445
+              org_id !=10445 &&
+              org_id!=10395
             "
           >
             <template slot-scope="scope">
@@ -1245,7 +1251,8 @@
                 org_id == 10445 ||
                 org_id == 10410 ||
                 org_id == 10495 ||
-                org_id == 10485)
+                org_id == 10485 ||
+                org_id == 10395)
                 && org_id!=10387
             "
           >
@@ -1302,7 +1309,8 @@
               org_id!=10445 &&
               org_id!=10410 &&
               org_id!=10495 &&
-              org_id!=10485
+              org_id!=10485 &&
+              org_id!=10395
               )
               || org_id == 10387
             "
@@ -1345,7 +1353,8 @@
               template_id != 53 &&
               org_id!=10432 &&
               org_id!=10445 &&
-              org_id!=10410
+              org_id!=10410 &&
+              org_id!=10395
             "
           >
             <el-form-item label="置换率(L/h)：" :prop="isName('置换率')"
@@ -1370,7 +1379,8 @@
                 template_id == 48 ||
                 org_id==10432 ||
                 org_id!=10445 ||
-                org_id!=10410)
+                org_id!=10410 ||
+                org_id!=10395)
             "
           >
             <el-form-item label="置换率(ml/min)：" :prop="isName('置换率')"
@@ -1402,7 +1412,8 @@
               template_id != 48 &&
               org_id!=10340 &&
               org_id!=10432 &&
-              org_id!=10445
+              org_id!=10445 &&
+              org_id!=10395
             "
           >
             <el-form-item label="置换量(L)：" :prop="isName('置换量')"
@@ -1430,7 +1441,8 @@
                 template_id == 48 ||
                 org_id!=10340 ||
                 org_id ==10432 ||
-                org_id ==10445)
+                org_id ==10445 ||
+                org_id == 10395)
             "
           >
             <el-form-item label="置换量(ml)：" :prop="isName('置换量')"

src/xt_pages/medicalScheduling/index.vue

@@ -443,7 +443,7 @@ export default {
                     this.getStaffScheduleList()
 
                     var doctorlist =  response.data.data.doctorlist
-                    let arr = []
+                  
                     for(let i=0;i<doctorlist.length;i++){
                         if(doctorlist[i].sort == 0){
                           doctorlist[i].sort = ""
@@ -647,7 +647,7 @@ export default {
             getStaffScheduleList(params).then(response=>{
                 if(response.data.state == 1){
                     var staffList =  response.data.data.staffList
-                    // console.log("获取所有排班",staffList)
+                    console.log("获取所有排班",staffList)
                     var sevenStr = ""
                     var oneStr = ""
                     var twoStr = ""
@@ -691,6 +691,7 @@ export default {
                         })
                         sevenStr = zeroStr
                     }
+                    
                     if(staffList[i].schedule_week == 1){
                         staffList[i].class_index = 1
                         var arr = []
@@ -772,6 +773,8 @@ export default {
                         })
                         threeStr = strThree
                     }
+
+
                     if(staffList[i].schedule_week == 4){
                         staffList[i].class_index = 4
                         var arr = []
@@ -799,6 +802,8 @@ export default {
                         })
                         fourStr = strFour
                     }
+
+                    
                     if(staffList[i].schedule_week == 5){
                         staffList[i].class_index = 5
 
@@ -827,6 +832,7 @@ export default {
                         })
                          fiveStr = strFive
                     }
+
                     if(staffList[i].schedule_week == 6){
                         staffList[i].class_index = 6
                          var arr = []
@@ -857,7 +863,8 @@ export default {
                     }
                     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) {
+                            console.log("tempArr",staffList[i].user_name)
                             newArr.push({
                                 user_name: staffList[i].user_name,
                                 admin_user_id:staffList[i].admin_user_id,
@@ -869,17 +876,17 @@ export default {
                             tempArr.push(staffList[i].user_name);
                         } else {
                             for (let j = 0; j < newArr.length; j++) {
-                                if (newArr[j].user_name == staffList[i].user_name) {
+                                if (newArr[j].admin_user_id == staffList[i].admin_user_id) {
                                     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]
+                    console.log("newArr22o2o2o2o2wo",newArr)
+                    let arrTen = [...newArr]
                     let newNurse = []
                     let newDoctor = []
-                    arr.map(item => {
+                    arrTen.map(item => {
                         if(item.user_type == 2){
                             newDoctor.push(item)
                         }
@@ -904,7 +911,7 @@ export default {
                         }
                     })
                     newNurse.sort(this.compare('sort'))
-
+                    console.log("newNurse",newNurse)
                     //医生
                     newDoctor.sort(this.compare('admin_user_id'))
                     let newDoctorTableData = []
@@ -924,25 +931,15 @@ export default {
                     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})
                     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})
+                    arr2.push({class_name:sevenStr,schedule_week:0})
                     var obj = {}
                     obj.admin_user_id = "1000000"
                     obj.user_name = "合计"
@@ -951,11 +948,14 @@ export default {
                     arr.push(obj)
 
                     let data = []
+                  
                     data.push(...newNurse)
                     data.push(...newDoctor)
                     data.push(obj)
                     console.log("data2o2oo2o2o2o22o",data)
-                    this.tableData = this.distinct(data)
+                    
+                    // this.tableData = this.distinct(data)
+                    this.tableData = data
 
 
                 }
@@ -1071,6 +1071,7 @@ export default {
                         })
                         sevenStr = zeroStr
                     }
+
                     if(staffList[i].schedule_week == 1){
                         staffList[i].class_index = 1
                         var arr = []
@@ -1322,7 +1323,7 @@ export default {
                     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})
+                    arr2.push({class_name:sevenStr,schedule_week:0})
                     var obj = {}
                     obj.admin_user_id = "1000000"
                     obj.user_name = "合计"
@@ -1641,7 +1642,7 @@ export default {
                         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})
+                        arr2.push({class_name:sevenStr,schedule_week:0})
                         var obj = {}
                         obj.admin_user_id = "1000000"
                         obj.user_name = "合计"
@@ -1680,7 +1681,7 @@ export default {
                         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})
+                        arr2.push({class_name:sevenStr,schedule_week:0})
                         var obj = {}
                         obj.admin_user_id = "1000000"
                         obj.user_name = "合计"
@@ -1718,7 +1719,7 @@ export default {
                         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})
+                        arr2.push({class_name:sevenStr,schedule_week:0})
                         var obj = {}
                         obj.admin_user_id = "1000000"
                         obj.user_name = "合计"