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

src/xt_pages/medicalScheduling/index.vue

@@ -43,15 +43,18 @@
                     <el-table :data="tableData" border :header-cell-style="{backgroundColor: 'rgb(245, 247, 250)', color: '#606266'}" :row-style="{ color: '#303133' }"  @cell-click="clickThis" :cell-style="tableCellStyle">
                         <el-table-column prop="name" label="医护姓名" style="width:16%" align="center">
                             <template slot-scope="scope">
-                                 {{scope.row.user_name}}
+                                <span>{{scope.row.user_name}}</span>
                             </template>
                         </el-table-column>
                         <el-table-column :label="'周一\n(' + weekDayArr[0] + ')'" style="width:200px" align="center">
                             <template slot-scope="scope">
                                 <div @click="hangdleClick(scope.row,scope.$index,0)">
                                     <el-dropdown trigger="click" @command="changeSchedule">
-                                        <span class="el-dropdown-link">
-                                        {{ getClass(scope.row.user_name,1) }}<i v-if="getTimestamp(weekDayArr[0])>=timeNow && scope.row.admin_user_id!=1000000?true:false" class="el-icon-arrow-down el-icon--right"></i>
+                                        <span class="el-dropdown-link" v-if='getClassAttributes(scope.row.user_name,1) == 2' style="color:red">
+                                            <span>{{ getClass(scope.row.user_name,1) }}</span><i v-if="getTimestamp(weekDayArr[0])>=timeNow && scope.row.admin_user_id!=1000000?true:false" class="el-icon-arrow-down el-icon--right"></i>
+                                        </span>
+                                        <span class="el-dropdown-link" v-else>
+                                            <span>{{ getClass(scope.row.user_name,1) }}</span><i v-if="getTimestamp(weekDayArr[0])>=timeNow && scope.row.admin_user_id!=1000000?true:false" class="el-icon-arrow-down el-icon--right"></i>
                                         </span>
                                         <el-dropdown-menu slot="dropdown" >
                                             <el-dropdown-item  :command="item.id" icon="el-icon-plus" :disabled="getTimestamp(weekDayArr[0])<timeNow?true:false" v-for="(item,index) in schedulelist" :key="index">{{item.class_name}}</el-dropdown-item>
@@ -64,8 +67,11 @@
                              <template slot-scope="scope">
                                 <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 v-if="getTimestamp(weekDayArr[1])>=timeNow&&scope.row.admin_user_id!=1000000?true:false" class="el-icon-arrow-down el-icon--right"></i>
+                                        <span class="el-dropdown-link" v-if='getClassAttributes(scope.row.user_name,2) == 2' style="color:red">
+                                            <span>{{ getClass(scope.row.user_name,2) }}</span><i v-if="getTimestamp(weekDayArr[1])>=timeNow&&scope.row.admin_user_id!=1000000?true:false" class="el-icon-arrow-down el-icon--right"></i>
+                                        </span>
+                                        <span class="el-dropdown-link" v-else>
+                                            <span>{{ getClass(scope.row.user_name,2) }}</span><i v-if="getTimestamp(weekDayArr[1])>=timeNow&&scope.row.admin_user_id!=1000000?true:false" class="el-icon-arrow-down el-icon--right"></i>
                                         </span>
                                         <el-dropdown-menu slot="dropdown" >
                                             <el-dropdown-item  :command="item.id" icon="el-icon-plus" :disabled="getTimestamp(weekDayArr[1])<timeNow?true:false" v-for="(item,index) in schedulelist" :key="index">{{item.class_name}}</el-dropdown-item>
@@ -78,8 +84,11 @@
                              <template slot-scope="scope">
                                 <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 v-if="getTimestamp(weekDayArr[2])>=timeNow&&scope.row.admin_user_id!=1000000?true:false" class="el-icon-arrow-down el-icon--right"></i>
+                                        <span class="el-dropdown-link" v-if='getClassAttributes(scope.row.user_name,3) == 2' style="color:red">
+                                            <span>{{ getClass(scope.row.user_name,3) }}</span><i v-if="getTimestamp(weekDayArr[2])>=timeNow&&scope.row.admin_user_id!=1000000?true:false" class="el-icon-arrow-down el-icon--right"></i>
+                                        </span>
+                                        <span class="el-dropdown-link" v-else>
+                                            <span>{{ getClass(scope.row.user_name,3) }}</span><i v-if="getTimestamp(weekDayArr[2])>=timeNow&&scope.row.admin_user_id!=1000000?true:false" class="el-icon-arrow-down el-icon--right"></i>
                                         </span>
                                         <el-dropdown-menu slot="dropdown" >
                                             <el-dropdown-item  :command="item.id" icon="el-icon-plus" :disabled="getTimestamp(weekDayArr[2])<timeNow?true:false" v-for="(item,index) in schedulelist" :key="index">{{item.class_name}}</el-dropdown-item>
@@ -92,8 +101,11 @@
                              <template slot-scope="scope">
                                 <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 v-if="getTimestamp(weekDayArr[3])>=timeNow&&scope.row.admin_user_id!=1000000?true:false" class="el-icon-arrow-down el-icon--right"></i>
+                                        <span class="el-dropdown-link" v-if='getClassAttributes(scope.row.user_name,4) == 2' style="color:red">
+                                            <span>{{ getClass(scope.row.user_name,4) }}</span><i v-if="getTimestamp(weekDayArr[3])>=timeNow&&scope.row.admin_user_id!=1000000?true:false" class="el-icon-arrow-down el-icon--right"></i>
+                                        </span>
+                                        <span class="el-dropdown-link" v-else>
+                                            <span>{{ getClass(scope.row.user_name,4) }}</span><i v-if="getTimestamp(weekDayArr[3])>=timeNow&&scope.row.admin_user_id!=1000000?true:false" class="el-icon-arrow-down el-icon--right"></i>
                                         </span>
                                         <el-dropdown-menu slot="dropdown" >
                                             <el-dropdown-item  :command="item.id" icon="el-icon-plus" :disabled="getTimestamp(weekDayArr[3])<timeNow?true:false" v-for="(item,index) in schedulelist" :key="index">{{item.class_name}}</el-dropdown-item>
@@ -106,8 +118,11 @@
                              <template slot-scope="scope">
                                 <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 v-if="getTimestamp(weekDayArr[4])>=timeNow&&scope.row.admin_user_id!=1000000?true:false" class="el-icon-arrow-down el-icon--right"></i>
+                                        <span class="el-dropdown-link" v-if='getClassAttributes(scope.row.user_name,5) == 2' style="color:red">
+                                            <span>{{ getClass(scope.row.user_name,5) }}</span><i v-if="getTimestamp(weekDayArr[4])>=timeNow&&scope.row.admin_user_id!=1000000?true:false" class="el-icon-arrow-down el-icon--right"></i>
+                                        </span>
+                                        <span class="el-dropdown-link" v-else>
+                                            <span>{{ getClass(scope.row.user_name,5) }}</span><i v-if="getTimestamp(weekDayArr[4])>=timeNow&&scope.row.admin_user_id!=1000000?true:false" class="el-icon-arrow-down el-icon--right"></i>
                                         </span>
                                         <el-dropdown-menu slot="dropdown" >
                                             <el-dropdown-item  :command="item.id" icon="el-icon-plus" :disabled="getTimestamp(weekDayArr[4])<timeNow?true:false" v-for="(item,index) in schedulelist" :key="index">{{item.class_name}}</el-dropdown-item>
@@ -120,8 +135,11 @@
                              <template slot-scope="scope">
                                 <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 v-if="getTimestamp(weekDayArr[5])>=timeNow&&scope.row.admin_user_id!=1000000?true:false" class="el-icon-arrow-down el-icon--right"></i>
+                                        <span class="el-dropdown-link" v-if='getClassAttributes(scope.row.user_name,6) == 2' style="color:red">
+                                            <span>{{ getClass(scope.row.user_name,6) }}</span><i v-if="getTimestamp(weekDayArr[5])>=timeNow&&scope.row.admin_user_id!=1000000?true:false" class="el-icon-arrow-down el-icon--right"></i>
+                                        </span>
+                                        <span class="el-dropdown-link" v-else>
+                                            <span>{{ getClass(scope.row.user_name,6) }}</span><i v-if="getTimestamp(weekDayArr[5])>=timeNow&&scope.row.admin_user_id!=1000000?true:false" class="el-icon-arrow-down el-icon--right"></i>
                                         </span>
                                         <el-dropdown-menu slot="dropdown" >
                                             <el-dropdown-item  :command="item.id" icon="el-icon-plus" :disabled="getTimestamp(weekDayArr[5])<timeNow?true:false" v-for="(item,index) in schedulelist" :key="index">{{item.class_name}}</el-dropdown-item>
@@ -134,8 +152,11 @@
                              <template slot-scope="scope">
                                 <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 v-if="getTimestamp(weekDayArr[6])>=timeNow&&scope.row.admin_user_id!=1000000?true:false" class="el-icon-arrow-down el-icon--right"></i>
+                                        <span class="el-dropdown-link" v-if='getClassAttributes(scope.row.user_name,0) == 2' style="color:red">
+                                            <span>{{ getClass(scope.row.user_name,0) }}</span><i v-if="getTimestamp(weekDayArr[6])>=timeNow&&scope.row.admin_user_id!=1000000?true:false" class="el-icon-arrow-down el-icon--right"></i>
+                                        </span>
+                                        <span class="el-dropdown-link" v-else>
+                                            <span>{{ getClass(scope.row.user_name,0) }}</span><i v-if="getTimestamp(weekDayArr[6])>=timeNow&&scope.row.admin_user_id!=1000000?true:false" class="el-icon-arrow-down el-icon--right"></i>
                                         </span>
                                         <el-dropdown-menu slot="dropdown" >
                                             <el-dropdown-item  :command="item.id" icon="el-icon-plus" :disabled="getTimestamp(weekDayArr[6])<timeNow?true:false" v-for="(item,index) in schedulelist" :key="index">{{item.class_name}}</el-dropdown-item>
@@ -252,7 +273,8 @@ export default {
         search(){},
         toPrint(){
             this.$router.push({
-                path: '/medicalScheduling/schedule/print?starttime='+this.getTimestamp(this.weekDayArr[0])+"&endtime="+this.getTimestamp(this.weekDayArr[6])+"&weekArr="+ this.weekDayArr+'&typeValue='+this.typeValue,
+                path: '/medicalScheduling/schedule/print?starttime='+this.getTimestamp(this.weekDayArr[0])+"&endtime="+this.getTimestamp(this.weekDayArr[6])+"&weekArr="+ this.weekDayArr,
+                // query: { date: date }
             })
         },
         getDoctorList(){
@@ -453,6 +475,7 @@ export default {
             getStaffScheduleList(params).then(response=>{
                 if(response.data.state == 1){
                     var staffList =  response.data.data.staffList                
+
                     var sevenStr = ""
                     var oneStr = ""
                     var twoStr = ""
@@ -662,13 +685,6 @@ export default {
                         sixStr = strSix
                      }
                     }
-                    console.log("周一",oneStr)
-                    console.log("周er",twoStr)
-                    console.log("周三",threeStr)
-                    console.log("周四",fourStr)
-                    console.log("周五",fiveStr)
-                    console.log("周六",sixStr)
-                    console.log("周日",sevenStr)
                     let tempArr = [], newArr = []
                     for (let i = 0; i < staffList.length; i++) {
                         if (tempArr.indexOf(staffList[i].user_name) === -1) {
@@ -676,13 +692,14 @@ export default {
                                 user_name: staffList[i].user_name,
                                 admin_user_id:staffList[i].admin_user_id,
                                 user_type:staffList[i].doctor_type,
-                                list: [{class_name:staffList[i].class_name,schedule_week:staffList[i].schedule_week}]
+                                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);
                         } 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})
                                 }
                             }
                         }
@@ -708,13 +725,12 @@ export default {
                     arr2.push({class_name:sixStr,schedule_week:6})
                     arr2.push({class_name:zeroStr,schedule_week:0})
                     var obj = {}
-                     obj.admin_user_id = "1000000"
-                     obj.user_name = "合计"
-                     obj.user_type = 10
-                     obj.list = arr2
-                     arr.push(obj)
-                     console.log("arr------",arr)
-                    this.tableData = []
+                    obj.admin_user_id = "1000000"
+                    obj.user_name = "合计"
+                    obj.user_type = 10
+                    obj.list = arr2
+                    arr.push(obj)
+                    console.log('arr',arr)
                     this.tableData = arr
         
                 
@@ -741,6 +757,25 @@ export default {
             }
         
         },
+        getClassAttributes(name,index){
+            if(name != undefined){
+                let newClass = '';
+                this.tableData.map(item => {
+                if(item.user_name == name){
+                    if(item.list){
+                        item.list.map(it => {
+                            if(it.schedule_week == index){
+                                newClass = it.class_attributes
+                            }
+                        })
+                    }
+                    
+                }
+                })
+                return newClass
+            }
+        
+        },
 
      unique(arr) { 
         const res = new Map();
@@ -969,13 +1004,13 @@ export default {
                             user_name: staffList[i].user_name,
                             admin_user_id:staffList[i].admin_user_id,
                             user_type:staffList[i].doctor_type,
-                            list: [{class_name:staffList[i].class_name,schedule_week:staffList[i].schedule_week}]
+                            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})
                             }
                         }
                         }
@@ -1115,13 +1150,13 @@ export default {
                             newArr.push({
                                 user_name: staffList[i].user_name,
                                 admin_user_id:staffList[i].admin_user_id,
-                                list: [{class_name:staffList[i].class_name,schedule_week:staffList[i].schedule_week}]
+                                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})
+                                    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})
                                 }
                             }
                         }
@@ -1141,7 +1176,7 @@ export default {
                             // console.log("arr",arr)
                           }
                         })
-                        // console.log("arr",arr)
+                        console.log("arr",arr)
                         this.tableData = arr
                     }
                 }
@@ -1258,21 +1293,11 @@ export default {
             }
         },
        tableCellStyle (row, rowIndex, column) {
-        // console.log("row",row.column.label)
          var week = (row.column.label).split('');
+         var weeks = week[4]+week[5]+week[6]+week[7]+week[8]+week[9]+week[10]+week[11]+week[12]
         //  console.log("week",week)
-         var weeks = ""
-         if (week.length == 14) {
-            weeks = week[4]+week[5]+week[6]+week[7]+week[8]+week[9]+week[10]+week[11]+week[12]
-         }
-         if(week.length == 13){
-           weeks = week[4]+week[5]+week[6]+week[7]+week[8]+week[9]+week[10]+week[11]
-         }
-        //  console.log("week",week)
-        // console.log("weeks",weeks)
+        //  console.log("weeks",weeks)
          var weekdate =  this.getTimestamp(weeks)
-        //  console.log("日期",weekdate)
-        //  console.log("当前日期",this.timeNow)
          if(weekdate  < this.timeNow){
            return 'background-color:#e5e5e5;'
           }
@@ -1360,7 +1385,7 @@ export default {
 </style>
 <style lang="scss">
 .schedulingTable{
-    .el-table th .cell {
+    .el-table .cell {
         white-space: pre-line;/*保留换行符*/
     }
 }