Browse Source

11月5日,排班样式

yq1 3 months ago
parent
commit
a9f471bcde

+ 2 - 2
src/pages/new_Patientscheduling/ScheduleItem.vue View File

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

+ 3 - 4
src/pages/new_Patientscheduling/index.vue View File

9
       @click-right=""
9
       @click-right=""
10
     />
10
     />
11
     <div >
11
     <div >
12
-      <van-tabs v-model:active="active" :sticky="true" title-active-color="#409eff" color="#409eff">
13
-        <!-- <van-tab title="上机参数"></van-tab>
14
-        <van-tab title="透析准备"></van-tab> -->
12
+      <new_content></new_content>
13
+      <!-- <van-tabs v-model:active="active" :sticky="true" title-active-color="#409eff" color="#409eff">
15
         <van-tab title="患者排班">
14
         <van-tab title="患者排班">
16
           <new_content></new_content>
15
           <new_content></new_content>
17
         </van-tab>
16
         </van-tab>
18
-      </van-tabs>
17
+      </van-tabs> -->
19
     </div>
18
     </div>
20
   </div>
19
   </div>
21
 </template>
20
 </template>

+ 45 - 32
src/pages/new_Patientscheduling/new_content.vue View File

25
         </div>
25
         </div>
26
       </div>
26
       </div>
27
     </div>
27
     </div>
28
-    <div style="margin-top: 20px;">
28
+    <div style="margin-top: 20px;height: 82vh;">
29
       <el-table
29
       <el-table
30
         :row-style="{ color: '#303133' }"
30
         :row-style="{ color: '#303133' }"
31
         :header-cell-style="{
31
         :header-cell-style="{
32
-        backgroundColor: '#409eff',
33
-        color: 'rgb(235 237 239)',
34
-      }"
32
+          backgroundColor: '#409eff',
33
+          color: 'rgb(235 237 239)',
34
+        }"
35
         border
35
         border
36
         :fit="true"
36
         :fit="true"
37
         :data="scheduleZone"
37
         :data="scheduleZone"
38
-        :height="tableContainHeight"
38
+        height="calc(100% - 0px)"
39
         ref="table"
39
         ref="table"
40
         style="table-layout: fixed;"
40
         style="table-layout: fixed;"
41
       >
41
       >
57
           <template slot-scope="scope">
57
           <template slot-scope="scope">
58
             <div>
58
             <div>
59
               <el-popover ref="popover" placement="top"
59
               <el-popover ref="popover" placement="top"
60
-                title=""
61
-                width=""
62
-                trigger="click"
63
-                content=""
64
-                
60
+                title=""width=""
61
+                trigger="click"content=""
62
+                popper-class="ellipsis-pop"
65
                 >
63
                 >
66
                 <div v-if="scope.row.Mon_M.patient_id !=''" >
64
                 <div v-if="scope.row.Mon_M.patient_id !=''" >
67
                   <el-button @click='patientedit(scope.row.Mon_M)'>调班</el-button>
65
                   <el-button @click='patientedit(scope.row.Mon_M)'>调班</el-button>
73
                 <!-- <schedule-item slot="reference" :schedule-detail="scope.row.Mon_M"></schedule-item> -->
71
                 <!-- <schedule-item slot="reference" :schedule-detail="scope.row.Mon_M"></schedule-item> -->
74
               </el-popover>
72
               </el-popover>
75
               <schedule-item v-popover:popover :schedule-detail="scope.row.Mon_M"></schedule-item>
73
               <schedule-item v-popover:popover :schedule-detail="scope.row.Mon_M"></schedule-item>
76
-              <!-- <schedule-item class="elpopvers1" v-popover:popover :schedule-detail="scope.row.Mon_M"></schedule-item> -->
77
-              <!-- v-popover:popover slot="reference" -->
74
+
78
             </div>
75
             </div>
79
           </template>
76
           </template>
80
         </el-table-column>
77
         </el-table-column>
84
               <el-popover ref="popover" placement="top"
81
               <el-popover ref="popover" placement="top"
85
                 title="" width=""
82
                 title="" width=""
86
                 trigger="click" content=""
83
                 trigger="click" content=""
84
+                popper-class="ellipsis-pop"
87
                 >
85
                 >
88
                 <div v-if="scope.row.Mon_A.patient_id !=''">
86
                 <div v-if="scope.row.Mon_A.patient_id !=''">
89
                   <el-button @click='patientedit(scope.row.Mon_A)'>调班</el-button>
87
                   <el-button @click='patientedit(scope.row.Mon_A)'>调班</el-button>
93
                   <el-button @click='newappend(scope.row.Mon_A)'>新增</el-button>
91
                   <el-button @click='newappend(scope.row.Mon_A)'>新增</el-button>
94
                 </div>
92
                 </div>
95
               </el-popover>
93
               </el-popover>
96
-              <!-- v-popover:popover -->
97
               <schedule-item v-popover:popover :schedule-detail="scope.row.Mon_A"></schedule-item>
94
               <schedule-item v-popover:popover :schedule-detail="scope.row.Mon_A"></schedule-item>
98
             </div>
95
             </div>
99
           </template>
96
           </template>
102
         <el-table-column prop="Mon_N" label="晚上" min-width="60" align="center">
99
         <el-table-column prop="Mon_N" label="晚上" min-width="60" align="center">
103
           <template slot-scope="scope">
100
           <template slot-scope="scope">
104
             <div>
101
             <div>
105
-              <el-popover ref="popover"
102
+              <el-popover
106
                 placement="top" title=""
103
                 placement="top" title=""
107
-                width="" trigger="click"
104
+                min-width="" trigger="click"
108
                 content=""
105
                 content=""
106
+                popper-class="ellipsis-pop"
107
+                
109
                 >
108
                 >
110
                 <div v-if="scope.row.Mon_N.patient_id !=''">
109
                 <div v-if="scope.row.Mon_N.patient_id !=''">
110
+                  <!-- <span @click='patientedit(scope.row.Mon_N)'>调班</span>
111
+                  <span @click='delete_click(scope.row.Mon_N)' v-if="scope.row.Mon_N.stage==0">删除</span> -->
111
                   <el-button @click='patientedit(scope.row.Mon_N)'>调班</el-button>
112
                   <el-button @click='patientedit(scope.row.Mon_N)'>调班</el-button>
112
                   <el-button @click="delete_click(scope.row.Mon_N)" v-if="scope.row.Mon_N.stage==0">删除</el-button>
113
                   <el-button @click="delete_click(scope.row.Mon_N)" v-if="scope.row.Mon_N.stage==0">删除</el-button>
113
                 </div>
114
                 </div>
114
-                <div style="text-align: center;" v-if="scope.row.Mon_N.patient_id ==''">
115
+                <div style="text-align: center;" v-if="scope.row.Mon_N.patient_id ==0">
116
+                  <!-- <span @click='newappend(scope.row.Mon_N)'>新增</span> -->
115
                   <el-button @click='newappend(scope.row.Mon_N)'>新增</el-button>
117
                   <el-button @click='newappend(scope.row.Mon_N)'>新增</el-button>
116
                 </div>
118
                 </div>
119
+                <schedule-item slot="reference" :schedule-detail="scope.row.Mon_N"></schedule-item>
117
               </el-popover>
120
               </el-popover>
118
-              <!-- v-popover:popover -->
119
-              <schedule-item v-popover:popover :schedule-detail="scope.row.Mon_N"></schedule-item>
120
             </div>
121
             </div>
121
           </template>
122
           </template>
122
         </el-table-column>
123
         </el-table-column>
322
           <div style="flex: 1;margin-right: 10px;">
323
           <div style="flex: 1;margin-right: 10px;">
323
             患者:
324
             患者:
324
             <input type="text" v-model="add_arr.patient_add" onfocus="this.blur();" @click="clickhuanzhes2= !clickhuanzhes2" class="borders" >
325
             <input type="text" v-model="add_arr.patient_add" onfocus="this.blur();" @click="clickhuanzhes2= !clickhuanzhes2" class="borders" >
326
+            <!-- <el-input type="text" size="mini" v-model="add_arr.patient_add" onfocus="this.blur();" 
327
+                  @click="clickhuanzhes2= !clickhuanzhes2" style="width: 120px;" >
328
+            </el-input> -->
325
           </div>
329
           </div>
326
             <!-- 点击修改  :close-on-click-modal = 'false'-->
330
             <!-- 点击修改  :close-on-click-modal = 'false'-->
327
             <el-dialog class="huanzhe_xiu"
331
             <el-dialog class="huanzhe_xiu"
329
             :append-to-body = 'true'
333
             :append-to-body = 'true'
330
 
334
 
331
             :show-close="false"
335
             :show-close="false"
332
-              width="50%">
336
+              width="70%">
333
               <div>
337
               <div>
334
-                <div class="listBox">
338
+                <div style="border-bottom: 1px solid #e5e5e5;">
335
                   <van-search v-model="schedulingVal2" @clear="onclear2"
339
                   <van-search v-model="schedulingVal2" @clear="onclear2"
336
                   @input="onUpdate2" placeholder="请输入搜索关键词" />
340
                   @input="onUpdate2" placeholder="请输入搜索关键词" />
341
+                </div>
342
+                <div class="listBox">
337
                   <div v-for="(item,index) in huangxiu_arr" :key='index' @click="Select_click2(item)">
343
                   <div v-for="(item,index) in huangxiu_arr" :key='index' @click="Select_click2(item)">
338
                     {{ item.name }}
344
                     {{ item.name }}
339
                   </div>
345
                   </div>
340
                 </div>
346
                 </div>
341
-                <div class="Cancelclass" @click="clickhuanzhes2 = !clickhuanzhes2">
347
+                <div class="Cancelclass" @click="clickhuanzhes2 = !clickhuanzhes2" >
342
                   取消
348
                   取消
343
                 </div>
349
                 </div>
344
               </div>
350
               </div>
351
               v-model="currentData.schedule_date"
357
               v-model="currentData.schedule_date"
352
               type="date"
358
               type="date"
353
               placeholder="选择日期"
359
               placeholder="选择日期"
354
-              style="width: 150px;font-size: 14px;"
360
+              style="width: 70%;font-size: 14px;"
355
               value-format="yyyy-MM-dd"
361
               value-format="yyyy-MM-dd"
356
               :clearable="false"
362
               :clearable="false"
357
               :editable = 'false'
363
               :editable = 'false'
512
       add_loading:false,//新增的加载
518
       add_loading:false,//新增的加载
513
       edit_loading:false,//修改的加载
519
       edit_loading:false,//修改的加载
514
       timeOutEvent:0,
520
       timeOutEvent:0,
515
-      tableContainHeight:1000,
521
+      tableContainHeight:"calc(100% -20px)",
516
       class_type: 0,
522
       class_type: 0,
517
       type: '全部班',
523
       type: '全部班',
518
       schedulingVal2:'',
524
       schedulingVal2:'',
610
 
616
 
611
   },
617
   },
612
   methods:{
618
   methods:{
619
+    showPopver(){
620
+      console.log('1111111222222');
621
+      
622
+    },
613
     // 数据源
623
     // 数据源
614
     getlist () {
624
     getlist () {
615
       if (this.type == '全部班') {
625
       if (this.type == '全部班') {
654
                 name:params.name
664
                 name:params.name
655
               }
665
               }
656
               fenqu_arr.push(fenquobj)
666
               fenqu_arr.push(fenquobj)
657
-              console.log('444444',params.device.sort());
658
               if(params.device.length>0){
667
               if(params.device.length>0){
659
 
668
 
660
                 params.device.forEach(function(device) {
669
                 params.device.forEach(function(device) {
661
-                  console.log('5555',device.sort)
662
-                  console.log();
663
                   var thisPa = {
670
                   var thisPa = {
664
                     area: params.name,
671
                     area: params.name,
665
                     zone_id: params.id,
672
                     zone_id: params.id,
1495
 }
1502
 }
1496
 .patient_name{
1503
 .patient_name{
1497
   padding: 6px 0;
1504
   padding: 6px 0;
1498
-
1499
 }
1505
 }
1500
 .el-dialog__wrapper{
1506
 .el-dialog__wrapper{
1501
   /deep/.el-dialog__header {
1507
   /deep/.el-dialog__header {
1502
       padding: 20px 20px 10px !important;
1508
       padding: 20px 20px 10px !important;
1503
       background: #409EFE !important;
1509
       background: #409EFE !important;
1504
   }
1510
   }
1505
-  ::deep(.el-dialog__header){
1506
-    padding: 20px 20px 10px !important;
1507
-      background: #409EFE !important;
1508
-  }
1511
+  // ::deep(.el-dialog__header){
1512
+  //   padding: 20px 20px 10px !important;
1513
+  //     background: #409EFE !important;
1514
+  // }
1509
 }
1515
 }
1510
 .xiugai2{
1516
 .xiugai2{
1511
   .toolOne {
1517
   .toolOne {
1596
       >div{
1602
       >div{
1597
         padding: 1rem .625rem;
1603
         padding: 1rem .625rem;
1598
         border-bottom: 1px solid #e5e5e5;
1604
         border-bottom: 1px solid #e5e5e5;
1599
-        font-size: .875rem;
1605
+        font-size: .975rem;
1600
         color:#323233;
1606
         color:#323233;
1601
       }
1607
       }
1602
       >ul li{
1608
       >ul li{
1614
     font-size: 14px;
1620
     font-size: 14px;
1615
     .el-input__inner{
1621
     .el-input__inner{
1616
       font-size: 14px;
1622
       font-size: 14px;
1623
+      padding: 0 5px;
1617
     }
1624
     }
1618
     .el-input__prefix{
1625
     .el-input__prefix{
1619
       font-size: 14px;
1626
       font-size: 14px;
1627
+      .el-icon-date:before {
1628
+          content: "";
1629
+      }
1620
     }
1630
     }
1621
   }
1631
   }
1632
+  .ellipsis-pop{
1633
+    min-width: 83px;
1634
+  }
1622
 </style>
1635
 </style>