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

@@ -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>
@@ -154,7 +154,7 @@
                             {{item.class_name}}&nbsp;({{item.timeone_start}}~{{item.timeone_type}}{{item.timeone_end}} <span v-if="item.timetwo_start!=''">{{item.timetwo_start}}~{{item.timetwo_type}}{{item.timetwo_end}}</span> )
                            </p>
                         </div>
-                        <el-checkbox style="text-align:center"  v-model="isChecked" @change="toContinuous">连续排班</el-checkbox>
+                        <el-checkbox style="text-align:center;padding-bottom: 10px;"  v-model="isChecked" @change="toContinuous">连续排班</el-checkbox>
                     </div>
                 </div>
             </div>
@@ -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 }
             })
         },
@@ -287,7 +287,7 @@ export default {
         //  console.log("val",val)
          this.docobj = val
          if(this.getTimestamp(this.weekDayArr[num]) < this.timeNow){
-            this.$message.warning("过去日期不可以编辑")
+            this.$message.error("过去日期不可以编辑")
             return
          }
         },
@@ -897,7 +897,7 @@ export default {
 .classBox{
     width:28%;
     height: 100%;
-    border: 1px solid #EBEEF5;
+    border: 1px solid #d0d3da;
     .classTitle{
         height: 42px;
         text-align: center;

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',
@@ -153,7 +153,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() {
@@ -184,6 +195,8 @@ export default {
       this.start_time = starttime
       var endtime =  this.$route.query.endtime
       this.end_time = endtime
+      this.weekArr = this.$route.query.weekArr.split(',')
+      console.log(22222222222,this.$route.query.weekArr.split(','))
       //获取该机构所有医护人员
       this.getDoctorList()
     }
@@ -213,13 +226,14 @@ export default {
       border: 1px solid;
       border-collapse: collapse;
       padding: 2px;
+      
 
       thead {
         tr {
           td {
             border: 1px solid;
             text-align: center;
-            font-size: 20px;
+            font-size: 18px;
             padding: 15px 5px;
           }
         }
@@ -231,7 +245,7 @@ export default {
             text-align: center;
             font-size: 18px;
             padding: 10px 5px;
-
+            white-space: pre-line;
             .proj {
               padding: 5px 0;
               text-align: left;