Browse Source

发药提醒代码误提交撤回

WANGJIALIANG 4 years ago
parent
commit
b1b5acad86
1 changed files with 6 additions and 19 deletions
  1. 6 19
      src/main/resources/templates/mz/to-medicine.html

+ 6 - 19
src/main/resources/templates/mz/to-medicine.html

@@ -13,7 +13,7 @@
         letter-spacing:8px;
     }
 </style>
-<div class="row" style="height: calc(100% - 00px);">
+<div class="row">
     <div class="col-md-12 col-sm-12 col-xs-12">
         <div class="x_panel">
             <div class="panel-body">
@@ -55,51 +55,38 @@
                             <td rowspan="2" style="background: #FFF4C7;vertical-align: middle !important;font-weight: bold;" class="text-center"><span  id="winNum"></span>号窗口</td>
                             <td class="text-center" style="vertical-align: middle !important;background: #FFF4C7;font-weight: bold;">过号名单</td>
                             <td colspan="2" class="text-center" style="vertical-align: middle !important;background: #FFF4C7;font-weight: bold;">等待取药</td>
-                            <td colspan="2" class="text-center" style="vertical-align: middle !important;background: #FFF4C7;font-weight: bold;">正在配药</td>
                         </tr>
                         <tr style="background: #BBFDBC;">
                             <td  class="text-center" style="vertical-align: middle !important;color: red;" id="past1"></td>
                             <td class="text-center" style="vertical-align: middle !important;" id="current1"></td>
                             <td class="text-center" style="vertical-align: middle !important;" id="current2"></td>
-                            <td class="text-center" style="vertical-align: middle !important;" id="dispense1"></td>
-                            <td class="text-center" style="vertical-align: middle !important;" id="dispense2"></td>
                         </tr>
                         <tr style="background: #9CD4D4;">
-                            <td class="text-center" style="vertical-align: middle !important;width: 25%;font-weight: bold;">正在取药</td>
-                            <td class="text-center" style="vertical-align: middle !important;width: 15%;color: red;" id="past2"></td>
-                            <td class="text-center" style="vertical-align: middle !important;width: 15%" id="current3"></td>
-                            <td class="text-center" style="vertical-align: middle !important;width: 15%" id="current4"></td>
-                            <td class="text-center" style="vertical-align: middle !important;width: 15%" id="dispense3"></td>
-                            <td class="text-center" style="vertical-align: middle !important;width: 15%" id="dispense4"></td>
+                            <td class="text-center" style="vertical-align: middle !important;width: 34%;font-weight: bold;">正在取药</td>
+                            <td class="text-center" style="vertical-align: middle !important;width: 22%;color: red;" id="past2"></td>
+                            <td class="text-center" style="vertical-align: middle !important;width: 22%" id="current3"></td>
+                            <td class="text-center" style="vertical-align: middle !important;width: 22%" id="current4"></td>
                         </tr>
                         <tr style="background: #BBFDBC;">
                             <td rowspan="4" class="text-center" style="vertical-align: middle !important;color: red;font-weight: bold;font-size: 120px;" id="rightPerson"></td>
                             <td class="text-center" style="vertical-align: middle !important;color: red;" id="past3"></td>
                             <td class="text-center" style="vertical-align: middle !important;" id="current5"></td>
                             <td class="text-center" style="vertical-align: middle !important;" id="current6"></td>
-                            <td class="text-center" style="vertical-align: middle !important;" id="dispense5"></td>
-                            <td class="text-center" style="vertical-align: middle !important;" id="dispense6"></td>
                         </tr>
                         <tr style="background: #9CD4D4;">
                             <td class="text-center" style="vertical-align: middle !important;color: red;" id="past4"></td>
                             <td class="text-center" style="vertical-align: middle !important;" id="current7"></td>
                             <td class="text-center" style="vertical-align: middle !important;" id="current8"></td>
-                            <td class="text-center" style="vertical-align: middle !important;" id="dispense7"></td>
-                            <td class="text-center" style="vertical-align: middle !important;" id="dispense8"></td>
                         </tr>
                         <tr style="background: #BBFDBC;">
                             <td class="text-center" style="vertical-align: middle !important;color: red;" id="past5"></td>
                             <td class="text-center" style="vertical-align: middle !important;" id="current9"></td>
                             <td class="text-center" style="vertical-align: middle !important;" id="current10"></td>
-                            <td class="text-center" style="vertical-align: middle !important;" id="dispense9"></td>
-                            <td class="text-center" style="vertical-align: middle !important;" id="dispense10"></td>
                         </tr>
                         <tr style="background: #9CD4D4;">
                             <td class="text-center" style="vertical-align: middle !important;color: red;" id="past6"></td>
                             <td class="text-center" style="vertical-align: middle !important;" id="current11"></td>
                             <td class="text-center" style="vertical-align: middle !important;" id="current12"></td>
-                            <td class="text-center" style="vertical-align: middle !important;" id="dispense11"></td>
-                            <td class="text-center" style="vertical-align: middle !important;" id="dispense12"></td>
                         </tr>
                         </tbody>
                     </table>
@@ -126,7 +113,7 @@
             <div class="modal-header">
                 <button type="button" class="close" data-dismiss="modal"><span aria-hidden="true">×</span>
                 </button>
-                <h4 class="modal-title modal-title-thmz">请选择药房</h4>
+                <h4 class="modal-title">请选择药房</h4>
             </div>
             <div class="modal-body">
                 <form class="form-horizontal form-label-left" novalidate  autocomplete="off">