Merge branch '20230223_pad_vue_new_branch' of http://git.shengws.com/csx/Pad_New into 20230223_pad_vue_new_branch

src/pages/main/template/DialysisPrintOrderServentynine.vue

@@ -417,6 +417,7 @@ import { getDataConfig } from "@/utils/data";
 import { jsGetAge, uParseTime } from "@/utils/tools";
 import LabelBox from "../printItem/LabelBox";
 import { fetchAllAdminUsers } from "@/api/doctor";
+import {Toast} from 'vant'
 // import DialysisPrintOrderOne from './template/dialysisPrintOrderOne'
 // import DialysisPrintOrderTwo from './template/dialysisPrintOrderTwo'
 import print from "print-js";
@@ -1152,10 +1153,14 @@ export default {
     },
     getcheckData(val){
       if(val.length >0){
-        const a = val.join(',')
-        console.log('a',a);
-        this.$toast(a +" 未填");
-        return a
+        let message = `记录单未填数据:\n${val.join("\n")}`;
+        Toast({
+          duration:0,
+          message:message,
+          closeOnClick:true,
+          closeOnClickOverlay:true,
+        })
+        return message
       }else{
         this.$toast('核对完成')
       }

src/pages/main/template/DialysisPrintOrderSeventyeight.vue

@@ -81,7 +81,7 @@
             </tr>
             <tr>
               <td>
-                <div class="row" style="padding: 2px 0; line-height: 23px;display: flex;" >
+                <div class="row" style="display: flex;" >
                   <div class="inline_block" style="flex: 0.8;">
                     T:
                     <div class="under_line" style="width: 40px; text-align: center"
@@ -137,7 +137,7 @@
                   </div>
                 </div>
 
-                <div class="row" style="padding: 2px 0; line-height: 23px; display: flex">
+                <div class="row" style="display: flex">
                   <!-- <div class="inline_block" style="flex: 1;">
                     透析间期：
                     <div class="under_line" style=" width: 50%;text-align: center; white-space: normal;">
@@ -162,10 +162,10 @@
                       <span v-if="predialysis&&predialysis.symptom_before_dialysis==''&&predialysis.symptom_before_dialysis_other==''">/</span>
                     </div>
                   </div>
-                  
+
                 </div>
 
-                <div class="row" style="padding: 2px 0; line-height: 23px; display: flex">
+                <div class="row" style="display: flex">
                   <div class="inline_block" style="flex: 1;">
                     内瘘：
                     <div class="under_line"
@@ -190,7 +190,7 @@
                   </div>
                 </div>
 
-                <div class="row" style="padding: 2px 0; line-height: 23px; display: flex">
+                <div class="row" style="display: flex">
                   <div class="inline_block" style="flex: 1;">
                     合并症：
                     <div class="under_line"
@@ -210,7 +210,7 @@
                   </div> -->
                 </div>
 
-                <div class="row" style="padding: 2px 0; line-height: 23px; display: flex">
+                <div class="row" style="display: flex">
                   <div class="inline_block" style="flex: 1;">
                     干体重：
                     <div
@@ -236,7 +236,7 @@
                     </div>kg
                   </div>
                 </div>
-                <div class="row" style="padding: 2px 0; line-height: 23px; display: flex">
+                <div class="row" style="display: flex">
                   <div class="inline_block" style="flex: 1;">
                     体重增加：
                     <div
@@ -260,7 +260,7 @@
                 </div>
               </td>
               <td>
-                <div class="row" style="padding: 2px 0; line-height: 23px; display: flex">
+                <div class="row" style="display: flex">
                   <div class="inline_block" style="flex: 0.8">
                     T:
                     <div
@@ -314,7 +314,7 @@
                     mmHg
                   </div>
                 </div>
-                <div class="row" style="padding: 2px 0; line-height: 23px; display: flex">
+                <div class="row" style="display: flex">
                   <div class="inline_block" style="flex: 1">
                     凝血：
                     <div class="under_line"
@@ -331,7 +331,7 @@
                   </div>
 
                 </div>
-                <div class="row" style="padding: 2px 0; line-height: 23px; display: flex">
+                <div class="row" style="display: flex">
                   <div class="inline_block" style="flex: 1">
                     内瘘：
                     <div class="under_line"
@@ -352,7 +352,7 @@
                   </div>
                 </div>
 
-                <div class="row" style="padding: 2px 0; line-height: 23px; display: flex">
+                <div class="row" style="display: flex">
                   <div class="inline_block" style="flex: 1">
                     并发症：
                     <div class="under_line"
@@ -371,7 +371,7 @@
                   </div>
                 </div>
 
-                <div class="row" style="padding: 2px 0; line-height: 23px; display: flex"
+                <div class="row" style="display: flex"
                 >
                   <div class="inline_block" style="flex: 1">
                     实际超滤量：
@@ -409,7 +409,7 @@
                   </div>
                 </div>
 
-                <div class="row" style="padding: 2px 0; line-height: 23px; display: flex">
+                <div class="row" style="display: flex">
                   <div class="inline_block" style="flex: 1">
                     体重减少：
                     <div class="under_line"
@@ -445,7 +445,7 @@
             </tr>
             <tr>
               <td colspan="2">
-                <div class="row" style="padding: 2px 0; line-height: 23px; display: flex">
+                <div class="row" style="display: flex">
                   <div class="inline_block" style="flex: 1">
                     处方脱水量：
                     <div class="under_line" style="width: 50px; text-align: center">
@@ -497,7 +497,7 @@
                   </div>
                 </div>
 
-                <div class="row" style="padding: 2px 0; line-height: 23px; display: flex">
+                <div class="row" style="display: flex">
                   <div class="inline_block" style="flex: 2">
                     血管通路：
                     <div class="under_line" style="width: 60%; text-align: center">
@@ -528,11 +528,11 @@
                   </div>
                 </div>
 
-                <div class="row" style="padding: 2px 0; line-height: 23px; display: flex">
-                
+                <div class="row" style="display: flex">
+
                 </div>
 
-                <div class="row" style="padding: 2px 0; line-height: 23px">
+                <div class="row" style="">
                     <div class="inline_block">
                       抗凝剂：
                       <div
@@ -545,13 +545,13 @@
                             : "/"
                         }}
                         </span>
-                        
+
                       </div>
                     </div>
                     <div
                       class="inline_block"
                       style="margin-left: 20px"
-                      v-if="prescription.anticoagulant != 5 && 
+                      v-if="prescription.anticoagulant != 5 &&
                       prescription.anticoagulant !=1 && prescription.anticoagulant !=''"
                     >
                       首剂：
@@ -578,7 +578,7 @@
                      <span v-if="prescription.anticoagulant == 11">iu</span>
                      <span v-if="prescription.anticoagulant == 13">iu</span>
 
-                  
+
                     </div>
                     <div class="inline_block" style="margin-left: 20px">
                       维持：
@@ -640,7 +640,7 @@
                       ml
                     </div>
                     <div class="inline_block" style="margin-left: 20px"
-                      v-if="prescription.anticoagulant != 5 && 
+                      v-if="prescription.anticoagulant != 5 &&
                       prescription.anticoagulant != 1 && prescription.anticoagulant !=''"
                     >
                       总量：
@@ -666,7 +666,7 @@
                        <span v-if="prescription.anticoagulant == 10">iu</span>
                       <span v-if="prescription.anticoagulant == 11">iu</span>
                       <span v-if="prescription.anticoagulant == 13">iu</span>
-                   
+
                     </div>
                     <div class="inline_block" style="flex: 1">
                       透析机型：
@@ -676,7 +676,7 @@
                     </div>
                 </div>
 
-                <div class="row" style="padding: 2px 0; line-height: 23px">
+                <div class="row" style="">
                   <div class="inline_block">
                     透析液配方：钾：
                     <div
@@ -848,7 +848,7 @@
                       <td>
                         {{ monitor.ultrafiltration_rate ? monitor.ultrafiltration_rate : '0' }} /
                         {{ monitor.ultrafiltration_volume ? monitor.ultrafiltration_volume : '0'  }}
-                        
+
                       </td>
                       <td>
                         {{ monitor.replacement_rate ? monitor.replacement_rate : '0' }} /
@@ -1008,7 +1008,7 @@
           </tr>
           <tr>
             <td>
-              <div class="row" style="padding: 2px 0;line-height:23px;display:flex;">
+              <div class="row" style="display:flex;">
                 <div class="inline_block" style="flex:1;">
                   实际治疗时间：
                   <div class="under_line" style="width: 20px;text-align: center">
@@ -1028,7 +1028,7 @@
                 </div>
 
               </div>
-              <div class="row" style="padding: 2px 0;line-height:23px;display:flex;">
+              <div class="row" style="display:flex;">
                 <div class="inline_block" style="flex:1;">
                   治疗小结：
                   <div class="under_line" style="width: 860px;line-height: 25px;text-align: left;margin-left: 2px;display: inline-block;white-space: normal;">
@@ -1041,7 +1041,7 @@
           </tr>
           <tr>
             <td>
-              <div class="row" style="padding: 2px 0;line-height:23px;display:flex;">
+              <div class="row" style="display:flex;">
                 <div class="inline_block" style="flex:1;">
                   穿刺护士：
                   <div class="under_line" style="width: 80px;text-align: center">
@@ -1247,6 +1247,7 @@ export default {
   methods: {
     checkData() {
       var checkDate =[]
+      var monearr = []
       if (this.predialysis.temperature == '') {
         const obj = "透前体温"
         checkDate.push(obj)
@@ -1304,7 +1305,7 @@ export default {
       }  if (this.afterdialysis.complication == 0) {
         const obj17 = "并发症"
         checkDate.push(obj17)
-      } if (this.afterdialysis.actual_displacement == 0 && 
+      } if (this.afterdialysis.actual_displacement == 0 &&
         (this.prescription.mode_id ==2 || this.prescription.mode_id ==12)) {
         const obj18 = "实际置换量"
         checkDate.push(obj18)
@@ -1329,11 +1330,11 @@ export default {
       } if (this.prescription.mode == '') {
         const obj25 = "透析方式"
         checkDate.push(obj25)
-      } if (this.prescription.displace_liqui_part == '' && 
+      } if (this.prescription.displace_liqui_part == '' &&
       (this.prescription.mode_id ==2 ||this.prescription.mode_id ==12)) {
         const obj26 = "置换方式"
         checkDate.push(obj26)
-      } if (this.prescription.displace_liqui_value == 0 && 
+      } if (this.prescription.displace_liqui_value == 0 &&
       (this.prescription.mode_id ==2 ||this.prescription.mode_id ==12)) {
         const obj27 = "置换总量"
         checkDate.push(obj27)
@@ -1358,19 +1359,19 @@ export default {
       } if (this.prescription.anticoagulant_name == 0) {
         const obj33 = "抗凝剂"
         checkDate.push(obj33)
-      } if (this.prescription.anticoagulant_shouji == 0 && 
+      } if (this.prescription.anticoagulant_shouji == 0 &&
         this.prescription.anticoagulant !=1 && this.prescription.anticoagulant !=''
       ) {
         const obj34 = "首剂"
         checkDate.push(obj34)
-      } 
+      }
       // if (this.prescription.anticoagulant_weichi == 0 &&
       //   this.prescription.anticoagulant !=1 && this.prescription.anticoagulant !=''
       // ) {
       //   const obj35 = "维持"
       //   checkDate.push(obj35)
-      // } 
-      if (this.prescription.anticoagulant_zongliang == 0 && 
+      // }
+      if (this.prescription.anticoagulant_zongliang == 0 &&
         this.prescription.anticoagulant !=1 && this.prescription.anticoagulant !='' && prescription.anticoagulant != 5
       ) {
         const obj36 = "总量"
@@ -1460,7 +1461,7 @@ export default {
       } if (this.prescription.creater == 0) {
         const obj51 = "治疗医生"
         checkDate.push(obj51)
-      } 
+      }
       if(this.doctor_advices.length > 0){
         this.doctor_advices.map((item) =>{
           if(item.id > 0 && (item.created_time || item.start_time)){
@@ -1471,56 +1472,52 @@ export default {
           }
         })
       }
-      // if (this.doctor_advices.length > 0) {
-      //   let num = 0;
-      //   this.doctor_advices.map((item) => {
-      //     if (item.id > 0 && (item.created_time || item.start_time)) {
-      //       this.users.map((it) => {
-      //         if (it.id == item.advice_doctor) {
-      //           if (it.user_type == 3) {
-      //             num++;
-      //             
-      //             // this.$message.closeAll();
-      //             // this.$message.error("存在不是医生保存的医嘱");
-      //           } else if (
-      //             it.id == item.execution_staff &&
-      //             item.execution_staff > 0
-      //           ) {
-      //             if (it.user_type == 2) {
-      //               num++;
-      //               this.$message.closeAll();
-      //               this.$message.error("存在不是护士执行的医嘱");
-      //             }
-      //           } else if (it.id == item.checker && item.checker > 0) {
-      //             if (it.user_type == 2) {
-      //               num++;
-      //               this.$message.closeAll();
-      //               this.$message.error("存在不是护士核对的医嘱");
-      //             }
-      //           }
-      //         } else if (
-      //           it.id == item.execution_staff &&
-      //           item.execution_staff > 0
-      //         ) {
-      //           if (it.user_type == 2) {
-      //             num++;
-      //             this.$message.closeAll();
-      //             this.$message.error("存在不是护士执行的医嘱");
-      //           }
-      //         } else if (it.id == item.checker && item.checker > 0) {
-      //           if (it.user_type == 2) {
-      //             num++;
-      //             this.$message.closeAll();
-      //             this.$message.error("存在不是护士核对的医嘱");
-      //           }
-      //         }
-      //       });
-      //     }
-      //   });
-      //   if (num == 0) {
-      //     this.$message.success("核对完成");
-      //   }
-      // }
+      if(this.monitors.length >0){
+        for(let i in this.monitors){
+        if(this.monitors[i].blood_flow_volume ==0){
+        const obj55 = '监测第'+((i*1)+1)+'行血流量'
+        monearr.push(obj55)
+        } if(this.monitors[i].venous_pressure ==0 ||
+        this.monitors[i].transmembrane_pressure ==0
+        ){
+        const obj56 = '监测第'+((i*1)+1)+'行静脉压/跨膜压'
+        monearr.push(obj56)
+        } if(this.monitors[i].ultrafiltration_rate ==0){
+        const obj57 = '监测第'+((i*1)+1)+'行超滤率'
+        monearr.push(obj57)
+        } if(this.monitors[i].ultrafiltration_volume == 0 && i !=0){
+        const obj53 = '监测第'+((i*1)+1)+'行超滤量'
+        monearr.push(obj53)
+        } if(this.monitors[i].replacement_rate ==0 && this.prescription.mode =='HDF'
+        ){
+        const obj58 = '监测第'+((i*1)+1)+'行置换率'
+        monearr.push(obj58)
+        } if(this.monitors[i].displacement_quantity == 0 && this.prescription.mode =='HDF'&& i !=0){
+        const obj54 = '监测第'+((i*1)+1)+'行置换量'
+        monearr.push(obj54)
+        }  if(this.monitors[i].sodium_concentration ==0 ){
+        // this.monitors[i].temperature == 0
+        const obj59 = '监测第'+((i*1)+1)+'行钠浓度/温度'
+        monearr.push(obj59)
+        } if(this.monitors[i].pulse_frequency ==0){
+        const obj60 = '监测第'+((i*1)+1)+'行脉搏'
+        monearr.push(obj60)
+        } if(this.monitors[i].breathing_rate ==0){
+        const obj61 = '监测第'+((i*1)+1)+'行呼吸'
+        monearr.push(obj61)
+        } if(this.monitors[i].systolic_blood_pressure ==0 ||
+        this.monitors.diastolic_blood_pressure==0){
+        const obj62 = '监测第'+((i*1)+1)+'行血压'
+        monearr.push(obj62)
+        }
+
+        }
+      }
+      if(monearr.length>0){
+        checkDate =checkDate.concat(monearr)
+        console.log('1111',checkDate.concat(monearr));
+      }
+
       this.getcheckData(checkDate)
     },
     getDisplaceLiquiPart: function (val) {
@@ -2002,10 +1999,14 @@ export default {
     },
     getcheckData(val){
       if(val.length >0){
-        const a = val.join(',')
-        console.log('a',a);
-        this.$toast(a +" 未填");
-        return a
+        let message = `记录单未填数据:\n${val.join("\n")}`;
+        Toast({
+          duration:0,
+          message:message,
+          closeOnClick:true,
+          closeOnClickOverlay:true,
+        })
+        return message
       }else{
         this.$toast('核对完成');
       }
@@ -2153,7 +2154,7 @@ export default {
 .row {
   font-size: 14px;
   line-height: 20px;
-  padding: 5px 0;
+  padding: 3px;
 }
 
 .inline_block {

src/pages/main/template/DialysisPrintOrderSeventythree.vue

@@ -1,6 +1,6 @@
 <template>
   <div id="dialysis-print-box-1">
-    <div style="margin-left: 10px;" id="dialysis-print-box-1-1" class="dialysis-print-order print-template-two print_page_main_content" >
+    <div  id="dialysis-print-box-1-1" class="dialysis-print-order print-template-two print_page_main_content" >
       <div style="display:inline-block;width:100%;text-align:center;">
         <div class="order-yy-name" style="letter-spacing: 0;font-weight:600;font-size:22px;display:inline-block;">{{orgname}}</div>
         <div class="order-title" style="letter-spacing: 0;font-weight:600;font-size:22px;display:inline-block;">

src/pages/main/template/DialysisPrintOrdereighty.vue

@@ -1095,7 +1095,7 @@ import { getDialysisRecord } from '@/api/dialysis'
 import { getDataConfig } from '@/utils/data'
 import { jsGetAge, uParseTime, uParseTimeOne } from '@/utils/tools'
 import LabelBox from '../printItem/LabelBox'
-
+import {Toast} from 'vant'
 // import DialysisPrintOrderOne from './template/dialysisPrintOrderOne'
 // import DialysisPrintOrderTwo from './template/dialysisPrintOrderTwo'
 import print from 'print-js'
@@ -2047,10 +2047,14 @@ export default {
     },
     getcheckData(val){
       if(val.length >0){
-        const a = val.join(',')
-        console.log('a',a);
-        this.$toast(a +" 未填");
-        return a
+        let message = `记录单未填数据:\n${val.join("\n")}`;
+        Toast({
+          duration:0,
+          message:message,
+          closeOnClick:true,
+          closeOnClickOverlay:true,
+        })
+        return message
       }else{
         this.$toast('核对完成');
       }

src/pages/main/template/DialysisPrintOrdereightyone.vue

@@ -1122,7 +1122,7 @@ import { getDataConfig } from '@/utils/data'
 import { EasyScroller } from 'easyscroller'
 import { jsGetAge, uParseTime, uParseTimeOne } from '@/utils/tools'
 import LabelBox from '../printItem/LabelBox'
-
+import {Toast} from 'vant'
 // import DialysisPrintOrderOne from './template/dialysisPrintOrderOne'
 // import DialysisPrintOrderTwo from './template/dialysisPrintOrderTwo'
 import print from 'print-js'
@@ -2085,10 +2085,15 @@ export default {
     },
     getcheckData(val){
       if(val.length >0){
-        const a = val.join(',')
-        console.log('a',a);
-        this.$toast(a +" 未填");
-        return a
+        let message = `记录单未填数据:\n${val.join("\n")}`;
+        Toast({
+          duration:0,
+          message:message,
+          closeOnClick:true,
+          closeOnClickOverlay:true,
+        })
+       
+        return message
       }else{
         this.$toast('核对完成');
       }

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,19 +25,20 @@
         </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;"
+        class="eltable"
       >
         <el-table-column
           prop="area"
@@ -57,11 +58,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 +72,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 +82,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 +92,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 +100,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 +324,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 +334,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 +358,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 +519,7 @@ export default{
       add_loading:false,//新增的加载
       edit_loading:false,//修改的加载
       timeOutEvent:0,
-      tableContainHeight:1000,
+      tableContainHeight:"calc(100% -20px)",
       class_type: 0,
       type: '全部班',
       schedulingVal2:'',
@@ -610,6 +617,10 @@ export default{
 
   },
   methods:{
+    showPopver(){
+      console.log('1111111222222');
+      
+    },
     // 数据源
     getlist () {
       if (this.type == '全部班') {
@@ -654,12 +665,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 +1503,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 {
@@ -1558,7 +1565,6 @@ export default{
     font-size: 18px;
     border-top: 1px solid #e5e5e5;
   }
-
 </style>
 <style lang="scss">
   .xiugai{
@@ -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,26 @@ 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;
+  }
+  .el-table .el-table__cell {
+    padding: 5px 0 !important;
+    min-width: 0;
+    -webkit-box-sizing: border-box;
+    box-sizing: border-box;
+    text-overflow: ellipsis;
+    vertical-align: middle;
+    position: relative;
+    text-align: left;
+  }
 </style>