11月5日，排班样式

src/pages/new_Patientscheduling/ScheduleItem.vue

@@ -1,10 +1,10 @@
 <template>
   <!-- 排班表填充内容 -->
     <div >
-      <div>
+      <div style="min-width: 60px;min-height: 20px;">
           <span :class='modeColor(scheduleDetail.mode_id)'>{{scheduleDetail.patient}}</span>
+          <br/>
           <template v-if="schedulMode">
-            <br/>
             <span v-if="scheduleDetail.mode_id>0"  :class='modeColor(scheduleDetail.mode_id)' >{{'('+modename(scheduleDetail.mode_id)+')'}}</span>
           </template>
           <!-- <template v-if="schedulFlag">

src/pages/new_Patientscheduling/index.vue

@@ -9,13 +9,12 @@
       @click-right=""
     />
     <div >
-      <van-tabs v-model:active="active" :sticky="true" title-active-color="#409eff" color="#409eff">
-        <!-- <van-tab title="上机参数"></van-tab>
-        <van-tab title="透析准备"></van-tab> -->
+      <new_content></new_content>
+      <!-- <van-tabs v-model:active="active" :sticky="true" title-active-color="#409eff" color="#409eff">
         <van-tab title="患者排班">
           <new_content></new_content>
         </van-tab>
-      </van-tabs>
+      </van-tabs> -->
     </div>
   </div>
 </template>

src/pages/new_Patientscheduling/new_content.vue

@@ -25,17 +25,17 @@
         </div>
       </div>
     </div>
-    <div style="margin-top: 20px;">
+    <div style="margin-top: 20px;height: 82vh;">
       <el-table
         :row-style="{ color: '#303133' }"
         :header-cell-style="{
-        backgroundColor: '#409eff',
-        color: 'rgb(235 237 239)',
-      }"
+          backgroundColor: '#409eff',
+          color: 'rgb(235 237 239)',
+        }"
         border
         :fit="true"
         :data="scheduleZone"
-        :height="tableContainHeight"
+        height="calc(100% - 0px)"
         ref="table"
         style="table-layout: fixed;"
       >
@@ -57,11 +57,9 @@
           <template slot-scope="scope">
             <div>
               <el-popover ref="popover" placement="top"
-                title=""
-                width=""
-                trigger="click"
-                content=""
-                
+                title=""width=""
+                trigger="click"content=""
+                popper-class="ellipsis-pop"
                 >
                 <div v-if="scope.row.Mon_M.patient_id !=''" >
                   <el-button @click='patientedit(scope.row.Mon_M)'>调班</el-button>
@@ -73,8 +71,7 @@
                 <!-- <schedule-item slot="reference" :schedule-detail="scope.row.Mon_M"></schedule-item> -->
               </el-popover>
               <schedule-item v-popover:popover :schedule-detail="scope.row.Mon_M"></schedule-item>
-              <!-- <schedule-item class="elpopvers1" v-popover:popover :schedule-detail="scope.row.Mon_M"></schedule-item> -->
-              <!-- v-popover:popover slot="reference" -->
+
             </div>
           </template>
         </el-table-column>
@@ -84,6 +81,7 @@
               <el-popover ref="popover" placement="top"
                 title="" width=""
                 trigger="click" content=""
+                popper-class="ellipsis-pop"
                 >
                 <div v-if="scope.row.Mon_A.patient_id !=''">
                   <el-button @click='patientedit(scope.row.Mon_A)'>调班</el-button>
@@ -93,7 +91,6 @@
                   <el-button @click='newappend(scope.row.Mon_A)'>新增</el-button>
                 </div>
               </el-popover>
-              <!-- v-popover:popover -->
               <schedule-item v-popover:popover :schedule-detail="scope.row.Mon_A"></schedule-item>
             </div>
           </template>
@@ -102,21 +99,25 @@
         <el-table-column prop="Mon_N" label="晚上" min-width="60" align="center">
           <template slot-scope="scope">
             <div>
-              <el-popover ref="popover"
+              <el-popover
                 placement="top" title=""
-                width="" trigger="click"
+                min-width="" trigger="click"
                 content=""
+                popper-class="ellipsis-pop"
+                
                 >
                 <div v-if="scope.row.Mon_N.patient_id !=''">
+                  <!-- <span @click='patientedit(scope.row.Mon_N)'>调班</span>
+                  <span @click='delete_click(scope.row.Mon_N)' v-if="scope.row.Mon_N.stage==0">删除</span> -->
                   <el-button @click='patientedit(scope.row.Mon_N)'>调班</el-button>
                   <el-button @click="delete_click(scope.row.Mon_N)" v-if="scope.row.Mon_N.stage==0">删除</el-button>
                 </div>
-                <div style="text-align: center;" v-if="scope.row.Mon_N.patient_id ==''">
+                <div style="text-align: center;" v-if="scope.row.Mon_N.patient_id ==0">
+                  <!-- <span @click='newappend(scope.row.Mon_N)'>新增</span> -->
                   <el-button @click='newappend(scope.row.Mon_N)'>新增</el-button>
                 </div>
+                <schedule-item slot="reference" :schedule-detail="scope.row.Mon_N"></schedule-item>
               </el-popover>
-              <!-- v-popover:popover -->
-              <schedule-item v-popover:popover :schedule-detail="scope.row.Mon_N"></schedule-item>
             </div>
           </template>
         </el-table-column>
@@ -322,6 +323,9 @@
           <div style="flex: 1;margin-right: 10px;">
             患者：
             <input type="text" v-model="add_arr.patient_add" onfocus="this.blur();" @click="clickhuanzhes2= !clickhuanzhes2" class="borders" >
+            <!-- <el-input type="text" size="mini" v-model="add_arr.patient_add" onfocus="this.blur();" 
+                  @click="clickhuanzhes2= !clickhuanzhes2" style="width: 120px;" >
+            </el-input> -->
           </div>
             <!-- 点击修改  :close-on-click-modal = 'false'-->
             <el-dialog class="huanzhe_xiu"
@@ -329,16 +333,18 @@
             :append-to-body = 'true'
 
             :show-close="false"
-              width="50%">
+              width="70%">
               <div>
-                <div class="listBox">
+                <div style="border-bottom: 1px solid #e5e5e5;">
                   <van-search v-model="schedulingVal2" @clear="onclear2"
                   @input="onUpdate2" placeholder="请输入搜索关键词" />
+                </div>
+                <div class="listBox">
                   <div v-for="(item,index) in huangxiu_arr" :key='index' @click="Select_click2(item)">
                     {{ item.name }}
                   </div>
                 </div>
-                <div class="Cancelclass" @click="clickhuanzhes2 = !clickhuanzhes2">
+                <div class="Cancelclass" @click="clickhuanzhes2 = !clickhuanzhes2" >
                   取消
                 </div>
               </div>
@@ -351,7 +357,7 @@
               v-model="currentData.schedule_date"
               type="date"
               placeholder="选择日期"
-              style="width: 150px;font-size: 14px;"
+              style="width: 70%;font-size: 14px;"
               value-format="yyyy-MM-dd"
               :clearable="false"
               :editable = 'false'
@@ -512,7 +518,7 @@ export default{
       add_loading:false,//新增的加载
       edit_loading:false,//修改的加载
       timeOutEvent:0,
-      tableContainHeight:1000,
+      tableContainHeight:"calc(100% -20px)",
       class_type: 0,
       type: '全部班',
       schedulingVal2:'',
@@ -610,6 +616,10 @@ export default{
 
   },
   methods:{
+    showPopver(){
+      console.log('1111111222222');
+      
+    },
     // 数据源
     getlist () {
       if (this.type == '全部班') {
@@ -654,12 +664,9 @@ export default{
                 name:params.name
               }
               fenqu_arr.push(fenquobj)
-              console.log('444444',params.device.sort());
               if(params.device.length>0){
 
                 params.device.forEach(function(device) {
-                  console.log('5555',device.sort)
-                  console.log();
                   var thisPa = {
                     area: params.name,
                     zone_id: params.id,
@@ -1495,17 +1502,16 @@ export default{
 }
 .patient_name{
   padding: 6px 0;
-
 }
 .el-dialog__wrapper{
   /deep/.el-dialog__header {
       padding: 20px 20px 10px !important;
       background: #409EFE !important;
   }
-  ::deep(.el-dialog__header){
-    padding: 20px 20px 10px !important;
-      background: #409EFE !important;
-  }
+  // ::deep(.el-dialog__header){
+  //   padding: 20px 20px 10px !important;
+  //     background: #409EFE !important;
+  // }
 }
 .xiugai2{
   .toolOne {
@@ -1596,7 +1602,7 @@ export default{
       >div{
         padding: 1rem .625rem;
         border-bottom: 1px solid #e5e5e5;
-        font-size: .875rem;
+        font-size: .975rem;
         color:#323233;
       }
       >ul li{
@@ -1614,9 +1620,16 @@ export default{
     font-size: 14px;
     .el-input__inner{
       font-size: 14px;
+      padding: 0 5px;
     }
     .el-input__prefix{
       font-size: 14px;
+      .el-icon-date:before {
+          content: "";
+      }
     }
   }
+  .ellipsis-pop{
+    min-width: 83px;
+  }
 </style>