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

src/pages/control/index.vue

@@ -1068,9 +1068,18 @@
       background:#f7f7fa;
       color:#000;
       font-weight:bold;
+      td span{
+        display: inline-block;
+      }
     }
     .table tr td{
       background:#f7f7fa;
+      td span{
+        display: inline-block;
+      }
+    }
+    td span{
+      display: inline-block;
     }
   }
   .modeRed{
@@ -1089,8 +1098,6 @@
   .redFont{
     color: red;
   }
-  td span{
-    display: inline-block;
-  }
+  
   </style>
   

src/pages/monitoring/index.vue

@@ -1006,6 +1006,9 @@ export default {
   .table tr td{
     background:#f7f7fa;
   }
+  td span{
+    display: inline-block;
+  }
 }
 .modeRed{
   color:#ed5555;
@@ -1023,7 +1026,5 @@ export default {
 .redFont{
   color: red;
 }
-td span{
-  display: inline-block;
-}
+
 </style>

src/pages/new_Patientscheduling/ScheduleItem.vue

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

src/pages/new_Patientscheduling/new_content.vue

@@ -56,7 +56,6 @@
         ></el-table-column>
         <el-table-column prop="Mon_M" label="上午" min-width="60" align="center">
           <template slot-scope="scope">
-            <div>
               <el-popover ref="popover" placement="top"
                 title=""width=""
                 trigger="click"content=""
@@ -72,8 +71,6 @@
                 <!-- <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>
-
-            </div>
           </template>
         </el-table-column>
         <el-table-column prop="Mon_A" label="下午" min-width="60" align="center">
@@ -123,9 +120,6 @@
           </template>
         </el-table-column>
       </el-table>
-      <!-- <div style="position: fixed;top: 50vh;left: 50vw;">
-        <van-loading type="spinner" v-show="loading" color="#1989fa"/>
-      </div> -->
     </div>
     <!-- 日期 -->
     <van-popup v-model="dateShow" position="bottom" :style="{ height: '40%' }">
@@ -1621,6 +1615,8 @@ export default{
     .el-input__inner{
       font-size: 14px;
       padding: 0 5px;
+      padding-right: 0px !important;
+      padding-left: 0px !important;
     }
     .el-input__prefix{
       font-size: 14px;
@@ -1630,7 +1626,7 @@ export default{
     }
   }
   .ellipsis-pop{
-    min-width: 83px;
+    min-width: 83px !important;
   }
   .el-table .el-table__cell {
     padding: 5px 0 !important;
@@ -1642,4 +1638,10 @@ export default{
     position: relative;
     text-align: left;
   }
+  .eltable{
+    .cell{
+      padding-left: 0px !important;
+      padding-right: 0px !important;
+    }
+  }
 </style>