Merge branch 'new_pad_branch' of http://git.shengws.com/zhangbj/xt_pad into new_pad_branch

src/pages/main/dialog/new_order/AddNewOrders.vue

@@ -1,6 +1,6 @@
 <template>
   <div v-loading="loading">
-    <div class="Dialog" style="width: 16.8rem;" v-show="show_dialog_key == 0">
+    <div class="Dialog" style="width: 11.8rem;" v-show="show_dialog_key == 0">
       <div class="DialogTit">
         <div class="back" @click="backAction">
           <span class="iconfont">&#xe720;</span>返回
@@ -18,7 +18,12 @@
         <div style="overflow: hidden;">
           <div class="cell" style="margin-top: 0;">
             <label>医嘱类型</label>
-            <el-input class="typeInput" ref="advice_type" value="临时" disabled></el-input>
+            <el-input
+              class="typeInput"
+              ref="advice_type"
+              value="临时"
+              disabled
+            ></el-input>
           </div>
           <div class="cell" style="margin-top: 0;">
             <label>开始时间</label>
@@ -29,60 +34,97 @@
               @focus="selectStartTimeAction"
             ></el-input>
           </div>
-          <table class="table">
-            <tr>
-              <th width="30%">医嘱内容</th>
-              <th width="20%">药品规格</th>
-              <th width="10%">开药数量</th>
-              <th width="10%">单次用量</th>
-              <th width="15%">给药途径</th>
-              <th width="15%">执行频率</th>
-            </tr>
-            <template v-for="(advice, advice_index) in advices">
-              <tr
-                :key="advice_index"
-                @click="clickAdviceAction(advice_index)"
-                :class="{ 'row-class-active': (advice_index == selecting_advice_index && selecting_subdrug_index < 0) }"
-              >
-                <td
-                  style="text-align: left; padding-left: 5px; padding-right: 5px;"
-                >{{ advice.title }}</td>
-                <td v-if="advice.advice_desc">{{ advice.advice_desc }}{{advice.drug_spec_unit}}</td>
-                <td
-                  v-if="advice.prescribing_number"
-                >{{ advice.prescribing_number }}{{ advice.prescribing_number_unit }}</td>
-                <td v-else></td>
-                <td v-if="advice.single_dose">{{ advice.single_dose }} {{ advice.single_dose_unit }}</td>
-                <td v-else></td>
-                <td>{{ advice.delivery_way }}</td>
-                <td>{{ advice.execution_frequency }}</td>
-              </tr>
-              <tr
-                v-for="(subdrug, subdrug_index) in advice.subdrugs"
-                :key="advice_index + '_' + subdrug_index"
-                @click="clickSubdrugAction(advice_index, subdrug_index)"
-                :class="{ 'row-class-active': (advice_index == selecting_advice_index && subdrug_index == selecting_subdrug_index) }"
-              >
-                <td
-                  style="text-align: left; padding-right: 5px; padding-left: 25px;"
-                >{{ subdrug.title }}</td>
-                <td>{{ subdrug.advice_desc }} {{subdrug.drug_spec_unit}}</td>
-                <td>
-                  <span
-                    v-if="subdrug.prescribing_number"
-                  >{{ subdrug.prescribing_number }}{{ subdrug.prescribing_number_unit }}</span>
-                </td>
-                <td>
-                  <span
-                    v-if="subdrug.single_dose"
-                  >{{ subdrug.single_dose }} {{ subdrug.single_dose_unit }}</span>
-                </td>
-                <!--<td v-if="subdrug.single_dose">{{ subdrug.single_dose }} {{ subdrug.single_dose_unit }}</td>-->
-                <td></td>
-                <td></td>
+        </div>
+        <div style="overflow: hidden;margin-top: 15px">
+          <div class="cell" style="margin-top: 0;">
+            <label>开嘱医生: {{ $store.getters.user.user.user_name }}</label>
+          </div>
+          <div class="cell" style="margin-top: 0;">
+            <label>开嘱时间 {{ record_date_str }}</label>
+          </div>
+        </div>
+        <div
+          id="newDialogContent"
+          class="DialogContent choose"
+          style="height: 6.2rem;"
+        >
+          <div class="newAddTable">
+            <table class="table">
+              <tr>
+                <th width="30%">医嘱内容</th>
+                <th width="20%">药品规格</th>
+                <th width="10%">开药数量</th>
+                <th width="10%">单次用量</th>
+                <th width="15%">给药途径</th>
+                <th width="15%">执行频率</th>
               </tr>
-            </template>
-          </table>
+              <template v-for="(advice, advice_index) in advices">
+                <tr
+                  :key="advice_index"
+                  @click="clickAdviceAction(advice_index)"
+                  :class="{
+                    'row-class-active':
+                      advice_index == selecting_advice_index &&
+                      selecting_subdrug_index < 0
+                  }"
+                >
+                  <td
+                    style="text-align: left; padding-left: 5px; padding-right: 5px;"
+                  >
+                    {{ advice.title }}
+                  </td>
+                  <td v-if="advice.advice_desc">
+                    {{ advice.advice_desc }}{{ advice.drug_spec_unit }}
+                  </td>
+                  <td v-if="advice.prescribing_number">
+                    {{ advice.prescribing_number
+                    }}{{ advice.prescribing_number_unit }}
+                  </td>
+                  <td v-else></td>
+                  <td v-if="advice.single_dose">
+                    {{ advice.single_dose }} {{ advice.single_dose_unit }}
+                  </td>
+                  <td v-else></td>
+                  <td>{{ advice.delivery_way }}</td>
+                  <td>{{ advice.execution_frequency }}</td>
+                </tr>
+                <tr
+                  v-for="(subdrug, subdrug_index) in advice.subdrugs"
+                  :key="advice_index + '_' + subdrug_index"
+                  @click="clickSubdrugAction(advice_index, subdrug_index)"
+                  :class="{
+                    'row-class-active':
+                      advice_index == selecting_advice_index &&
+                      subdrug_index == selecting_subdrug_index
+                  }"
+                >
+                  <td
+                    style="text-align: left; padding-right: 5px; padding-left: 25px;"
+                  >
+                    {{ subdrug.title }}
+                  </td>
+                  <td>
+                    {{ subdrug.advice_desc }} {{ subdrug.drug_spec_unit }}
+                  </td>
+                  <td>
+                    <span v-if="subdrug.prescribing_number"
+                      >{{ subdrug.prescribing_number
+                      }}{{ subdrug.prescribing_number_unit }}</span
+                    >
+                  </td>
+                  <td>
+                    <span v-if="subdrug.single_dose"
+                      >{{ subdrug.single_dose }}
+                      {{ subdrug.single_dose_unit }}</span
+                    >
+                  </td>
+                  <!--<td v-if="subdrug.single_dose">{{ subdrug.single_dose }} {{ subdrug.single_dose_unit }}</td>-->
+                  <td></td>
+                  <td></td>
+                </tr>
+              </template>
+            </table>
+          </div>
         </div>
       </div>
     </div>
@@ -490,7 +532,18 @@ export default {
 </script>
 
 <style style="stylesheet/scss" lang="scss" scoped>
-.table {
+#newDialogContent {
+  @media only screen and (max-width: 415px) {
+    height: 8.8rem !important;
+  }
+  @media only screen and (min-width: 768px) {
+    height: 7.8rem !important;
+  }
+}
+.backgroundColor {
+  background: #fff;
+}
+.newAddTable {
   width: 100%;
   // overflow: auto;
 }
@@ -523,7 +576,7 @@ export default {
       height: 0.6rem;
       line-height: 0.6rem;
       color: $pgh-color;
-      font-size: 0.32rem;
+      font-size: 0.45rem;
       margin-bottom: 0.2rem;
     }
     select {

src/pages/personal/ElectronicSignature.vue

@@ -504,6 +504,7 @@ export default {
     @media only screen and (min-width: 768px) {
       padding: 22px 42px;
       font-size: 0.45rem;
+      // height: 0;
     }
   }
 }