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/class.vue

@@ -380,7 +380,6 @@ export default {
            getDoctorScheduleList(params).then(response=>{
               if(response.data.state == 1){
                  var schedules = response.data.data.schedules
-                  console.log("schedules",schedules)
                  for(let i=0;i<schedules.length;i++){
                     if(schedules[i].class_attributes == 1){
                         schedules[i].class_attributes ="出勤"
@@ -429,7 +428,6 @@ export default {
         getScheduleDetail(id).then(response=>{
            if(response.data.state == 1){
              var scheduleDetail = response.data.data.scheduleDetail
-             console.log("scheduledetail",scheduleDetail)
              this.form.id = scheduleDetail.id
              this.form.class_name = scheduleDetail.class_name
              this.form.class_attributes = scheduleDetail.class_attributes
@@ -546,9 +544,6 @@ export default {
         },
      changtime(){
          //计算时长
-        console.log("timeone",this.form.timeone_start)
-        console.log("timeonend",this.form.timeone_end)
-        console.log("timeonetype",this.form.timeone_type)
         var longtime = 0
         var timeone = 0
         var timetwo = 0
@@ -564,7 +559,7 @@ export default {
           var timeone =  this.timeDifference(this.form.timeone_start,oneHours)
          timeone = timeone
         }
-       console.log("时间选择1时长",this.timeStamp(timeone))
+     
                 
         //时间选择2的时间差
         if(this.form.timetwo_type == 1){
@@ -578,18 +573,12 @@ export default {
             var timetwo =  this.timeDifference(this.form.timetwo_start,oneHours)
             timetwo = timetwo
         }
-          console.log("timetwo",timetwo)
-          console.log("时间选择2时长",this,this.timeStamp(timetwo))
                   
         longtime = timeone + timetwo
-        console.log("longtime",longtime)
         this.form.work_time = this.timeStamp(longtime)
      },
      changtimeTwo(){
            //计算时长
-        console.log("timeone",this.form.timeone_start)
-        console.log("timeonend",this.form.timeone_end)
-        console.log("timeonetype",this.form.timeone_type)
         var longtime = 0
         var timeone = 0
         var timetwo = 0
@@ -605,7 +594,6 @@ export default {
           var timeone =  this.timeDifference(this.form.timeone_start,oneHours)
          timeone = timeone
         }
-       console.log("时间选择1时长",this.timeStamp(timeone))
                 
         //时间选择2的时间差
         if(this.form.timetwo_type == 1){
@@ -619,11 +607,8 @@ export default {
             var timetwo =  this.timeDifference(this.form.timetwo_start,oneHours)
             timetwo = timetwo
         }
-          console.log("timetwo",timetwo)
-          console.log("时间选择2时长",this,this.timeStamp(timetwo))
                   
         longtime = timeone + timetwo
-        console.log("longtime",longtime)
         this.form.work_time = this.timeStamp(longtime) 
      }
     },
@@ -631,16 +616,6 @@ export default {
         //获取班种列表
         this.getList()
     },
-    watch: {
-    //  监听对象数据变化
-    work_time: {
-      handler(newVal, oldVal) {
-        console.log(newVal)
-        console,log(oldVal)
-      },
-      deep: true  // 非常非常重要，这个是深度监听，默认是false。true的时候才能监听到对象的变化
-    }
-   }
 }
 </script>
 <style scoped>

src/xt_pages/medicalScheduling/index.vue

@@ -40,7 +40,7 @@
             </div>
             <div class="schedulingTable" style="display:flex;justify-content: space-between;">
                 <div style="width: 70%">
-                    <el-table :data="tableData" border :header-cell-style="{backgroundColor: 'rgb(245, 247, 250)', color: '#606266'}" :row-style="{ color: '#303133' }"  @cell-click="clickThis">
+                    <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}}
@@ -51,7 +51,7 @@
                                 <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>
+                                        {{ getClass(scope.row.user_name,1) }}<i v-if="getTimestamp(weekDayArr[0])>=timeNow?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>
@@ -65,7 +65,7 @@
                                 <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>
+                                        {{ getClass(scope.row.user_name,2) }}<i v-if="getTimestamp(weekDayArr[1])>=timeNow?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>
@@ -79,7 +79,7 @@
                                 <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>
+                                        {{ getClass(scope.row.user_name,3) }}<i v-if="getTimestamp(weekDayArr[2])>=timeNow?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>
@@ -93,7 +93,7 @@
                                 <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>
+                                        {{ getClass(scope.row.user_name,4) }}<i v-if="getTimestamp(weekDayArr[3])>=timeNow?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>
@@ -107,7 +107,7 @@
                                 <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>
+                                        {{ getClass(scope.row.user_name,5) }}<i v-if="getTimestamp(weekDayArr[4])>=timeNow?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>
@@ -121,7 +121,7 @@
                                 <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>
+                                        {{ getClass(scope.row.user_name,6) }}<i v-if="getTimestamp(weekDayArr[5])>=timeNow?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>
@@ -135,7 +135,7 @@
                                 <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>
+                                        {{ getClass(scope.row.user_name,0) }}<i v-if="getTimestamp(weekDayArr[6])>=timeNow?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>
@@ -244,7 +244,7 @@ export default {
         search(){},
         toPrint(){
             this.$router.push({
-                path: '/medicalScheduling/schedule/print?starttime='+this.getTimestamp(this.weekDayArr[0])+"&endtime="+this.getTimestamp(this.weekDayArr[6]),
+                path: '/medicalScheduling/schedule/print?starttime='+this.getTimestamp(this.weekDayArr[0])+"&endtime="+this.getTimestamp(this.weekDayArr[6])+"&weekArr="+ this.weekDayArr,
                 // query: { date: date }
             })
         },
@@ -450,7 +450,6 @@ export default {
             getStaffScheduleList(params).then(response=>{
                 if(response.data.state == 1){
                     var staffList =  response.data.data.staffList
-                   console.log("所有排班数据",staffList)
                     for(let i=0;i<staffList.length;i++){
                     if(staffList[i].schedule_week == 0){
                         staffList[i].class_index = 0
@@ -474,7 +473,6 @@ export default {
                         staffList[i].class_index = 6
                     }
                     }
-                    console.log("staffList--------",staffList)
                     let tempArr = [], newArr = []
                     for (let i = 0; i < staffList.length; i++) {
                         if (tempArr.indexOf(staffList[i].user_name) === -1) {
@@ -501,7 +499,6 @@ export default {
                     
                       }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)
                       }
                     })
                     console.log("arr=======",arr)
@@ -626,7 +623,6 @@ export default {
                             // console.log("arr",arr)
                           }
                         })
-                        console.log("全部=======",arr)
                         arr.sort(this.compare('user_type'))
                         this.tableData = arr
                     }
@@ -675,8 +671,6 @@ export default {
         })
         },
         toSearch(){
-            console.log("医护人员姓名",this.keywords)
-            
             const params = {
             user_name: this.keywords,
             start_time:this.getTimestamp(this.weekDayArr[0]),
@@ -685,7 +679,6 @@ export default {
             toSearchScheduleList(params).then(response=>{
                 if(response.data.state == 1){
                     var staffList =  response.data.data.staffList
-                    console.log("stafflist",staffList)
                     let tempArr = [], newArr = []
                     for (let i = 0; i < staffList.length; i++) {
                         if (tempArr.indexOf(staffList[i].user_name) === -1) {
@@ -729,7 +722,6 @@ export default {
             start_time:this.getTimestamp(this.weekDayArr[0]),
             end_time:this.getTimestamp(this.weekDayArr[6])
             }
-            console.log("params",params)
             this.$confirm(
             '是否要清除当周排班? <br>清除后,信息将无法恢复',
             '删除提示',
@@ -780,7 +772,6 @@ export default {
             UpdateContinusSchedule(params).then(response=>{
                 if(response.data.state == 1){
                 var schedule =  response.data.data.schedule
-                console.log("schedule",schedule)
                 this.$message.success("保存成功")
                 }
             })
@@ -798,8 +789,6 @@ export default {
             this.currentFirstDate1 = num + 1
         },
         submitAction(formName){
-            console.log("数据",this.typeOptions)
-            console.log("2222",this.timeOptions)
             var label = ""
             for(let i=0;i<this.timeOptions.length;i++){
                if(this.form.copyWeek == this.timeOptions[i].value){
@@ -808,9 +797,7 @@ export default {
             }
            var start = label.split('~')
            var copy_startime = this.getTimestamp(start[0])   
-           console.log("copy_startime",copy_startime)   
            var copy_endtime = this.getTimestamp(start[1]) 
-           console.log("copy_endtime",copy_endtime)
 
             const params = {
               start_time:this.getTimestamp(this.weekDayArr[0]),
@@ -818,13 +805,11 @@ export default {
               copy_startime:copy_startime,
               copy_endtime:copy_endtime,
             }
-            console.log("params",params)
            this.$refs[formName].validate(valid=>{
               if(valid){
                 copyStaffSchedule(params).then(response=>{
                    if(response.data.state == 1){
                      var msg = response.data.data.msg
-                     console.log("msg",msg)
                      this.$message.success("复制成功")
                      this.newVisible = false
                    }else{
@@ -841,6 +826,16 @@ export default {
                 return value2 - value1;
             }
         },
+       tableCellStyle (row, rowIndex, column) {
+         var week = (row.column.label).split('');
+         var weeks = week[4]+week[5]+week[6]+week[7]+week[8]+week[9]+week[10]+week[11]+week[12]
+        //  console.log("week",week)
+         console.log("weeks",weeks)
+         var weekdate =  this.getTimestamp(weeks)
+         if(weekdate  < this.timeNow){
+           return 'background-color:#e5e5e5;'
+          }
+       },
     },
     created(){
         //获取医护人员
@@ -877,9 +872,7 @@ export default {
             
         }
       var now = moment().locale('zh-cn').format('YYYY-MM-DD 00:00:00')
-      console.log('now',now)
       this.timeNow = this.getTimestamp(now)
-      console.log("timenow",this.timeNow)
       
     }
 }

src/xt_pages/medicalScheduling/medical_print.vue

@@ -22,13 +22,13 @@
                             <thead>
                                 <tr>
                                     <td width="120">医护姓名</td>
-                                    <td width="120">周一</td>
-                                    <td width="120">周二</td>
-                                    <td width="120">周三</td>
-                                    <td width="120">周四</td>
-                                    <td width="120">周五</td>
-                                    <td width="120">周六</td>
-                                    <td width="120">周日</td>
+                                    <td width="120">周一<br />({{ weekArr[0] }})</td>
+                                    <td width="120">周二<br />({{ weekArr[1] }})</td>
+                                    <td width="120">周三<br />({{ weekArr[2] }})</td>
+                                    <td width="120">周四<br />({{ weekArr[3] }})</td>
+                                    <td width="120">周五<br />({{ weekArr[4] }})</td>
+                                    <td width="120">周六<br />({{ weekArr[5] }})</td>
+                                    <td width="120">周日<br />({{ weekArr[6] }})</td>
                                 </tr>
                             </thead>
                             <tbody>
@@ -74,7 +74,7 @@ export default {
     },
     methods:{
       printAction: function() {
-          const style = '@media print { .print_main_content { background-color: white; width:960px;  margin:0 auto; padding: 0 0 20px 0; } .order_title_panl { text-align: center; } .main_title { font-size: 18px; line-height: 40px; font-weight: 500; } .table_panel { } .table { width: 100%; border: 1px solid; border-collapse: collapse; padding: 2px; } thead tr td { border: 1px solid; text-align: center; font-size: 20px; padding: 15px 5px; } tbody tr td { border: 1px solid; text-align: center; font-size: 18px; padding: 10px 5px; } .proj { padding: 5px 0; text-align: left; } .proj_title { font-size: 16px; font-weight: 500; line-height: 25px; } .proj_item { font-size: 15px; line-height: 20px; } .zone_name { font-weight: 500; } }'
+          const style = '@media print { .print_main_content { background-color: white; width:960px;  margin:0 auto; padding: 0 0 20px 0; } .order_title_panl { text-align: center; } .main_title { font-size: 18px; line-height: 40px; font-weight: 500; } .table_panel { } .table { width: 100%; border: 1px solid; border-collapse: collapse; padding: 2px; } thead tr td { border: 1px solid; text-align: center; font-size: 16px; padding: 15px 5px; } tbody tr td { border: 1px solid; text-align: center; font-size: 16px; padding: 10px 5px; white-space: pre-line;} .proj { padding: 5px 0; text-align: left; } .proj_title { font-size: 16px; font-weight: 500; line-height: 25px; } .proj_item { font-size: 15px; line-height: 20px; } .zone_name { font-weight: 500; } }'
 
           printJS({
           printable: 'print_content',
@@ -87,7 +87,6 @@ export default {
       getDoctorList(){
         getDoctorList().then(response=>{
           var list =  response.data.data.list
-          console.log("医护列表",list)
           this.doctorlist = list
           this.getStaffScheduleList()
         })
@@ -101,7 +100,6 @@ export default {
          getStaffScheduleList(params).then(response=>{
             if(response.data.state == 1){
               var staffList = response.data.data.staffList
-              console.log("staffList",staffList)
 
               let tempArr = [], newArr = []
               for (let i = 0; i < staffList.length; i++) {
@@ -129,10 +127,10 @@ export default {
               
                 }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'))
+              console.log("表哥数据----------",arr)
               this.tableData = arr
               
             }
@@ -152,7 +150,18 @@ export default {
               } 
             }
           })
-          return newClass
+          if(newClass.indexOf("(") > -1){
+            let num = newClass.indexOf("(")
+            let a = newClass.slice(0, num) + '\n' + newClass.slice(num)
+            return a
+          }else if(newClass.indexOf("（") > -1) {
+            let num = newClass.indexOf("（")
+            let a = newClass.slice(0, num) + '\n' + newClass.slice(num)
+            return a
+          }else{
+            return newClass
+          }
+          
         }
       },
       getNowFormatDate() {
@@ -180,11 +189,10 @@ export default {
     },
     created(){
       var starttime =  this.$route.query.starttime
-      console.log("starttime",starttime)
       this.start_time = starttime
       var endtime =  this.$route.query.endtime
-      console.log("endtime",endtime)
       this.end_time = endtime
+      this.weekArr = this.$route.query.weekArr.split(',')
       //获取该机构所有医护人员
       this.getDoctorList()
     }
@@ -214,6 +222,7 @@ export default {
       border: 1px solid;
       border-collapse: collapse;
       padding: 2px;
+      
 
       thead {
         tr {
@@ -232,7 +241,7 @@ export default {
             text-align: center;
             font-size: 18px;
             padding: 10px 5px;
-
+            white-space: pre-line;
             .proj {
               padding: 5px 0;
               text-align: left;