修改样式

src/pages/main/DetailsPage.vue

@@ -17,7 +17,9 @@
               :key="i"
               :class="index == i ? 'active' : ''"
               @click="ClickTab(i)"
-            >{{ item }}</li>
+            >
+              {{ item }}
+            </li>
           </ul>
         </div>
 
@@ -28,13 +30,23 @@
                   <span class="iconfont">2018-01-01&#xe74a;</span>
         </div>-->
         <div class="print" style="float: right; display:none">
-          <el-button size="mini" type="primary" @click="print" icon="el-icon-printer">打印</el-button>
+          <el-button
+            size="mini"
+            type="primary"
+            @click="print"
+            icon="el-icon-printer"
+            >打印</el-button
+          >
         </div>
       </div>
       <div class="Tab">
         <CaseHistory v-show="index == 0" title="病历"></CaseHistory>
         <!--<check-tab v-show="index==1" title="化验单"></check-tab>-->
-        <dialysis-tab v-show="index == 1" title="透析" v-on:records="jump(val)"></dialysis-tab>
+        <dialysis-tab
+          v-show="index == 1"
+          title="透析"
+          v-on:records="jump(val)"
+        ></dialysis-tab>
         <today-tab ref="today" v-show="index == 2" title="今日"></today-tab>
       </div>
     </div>
@@ -214,17 +226,19 @@ export default {
   }
 }
 .add {
-  width: 1.8rem;
-  height: 1.8rem;
+  width: 1.6rem;
+  height: 1.6rem;
   background: #f18f68;
   // box-shadow: 0px 3px 9px 0px rgba(7, 30, 102, 0.15);
   border-radius: 50%;
   position: fixed;
   right: 0.6rem;
   bottom: 2.25rem;
-  font-size: 0.45rem;
+  font-size: 0.4rem;
   text-align: center;
-
+  @media only screen and (max-width: 767px) {
+    display: none;
+  }
   p {
     width: 30px;
     text-align: center;

src/pages/main/PatientBox.vue

@@ -11,25 +11,38 @@
       <div class="kehu">
         <div style="position: relative;flex:2;" class="tx">
           <img
-            :src="patient.patient.avatar.length > 0 ? patient.patient.avatar : '../../assets/product/test.jpg'"
+            :src="
+              patient.patient.avatar.length > 0
+                ? patient.patient.avatar
+                : '../../assets/product/test.jpg'
+            "
             alt
           />
-          <span
-            class="redpoint"
-            v-if="getStatus(patient)"
-          >{{getUnReadNum(patient) > 99?getUnReadNum(patient)+"+":getUnReadNum(patient)}}</span>
+          <span class="redpoint" v-if="getStatus(patient)">{{
+            getUnReadNum(patient) > 99
+              ? getUnReadNum(patient) + "+"
+              : getUnReadNum(patient)
+          }}</span>
           <div class="right">
             <h3 class="name">
-              {{patient.patient.name}}
-              <span class="el-icon-bell yztx" v-if="getStatus(patient)">医嘱</span>
+              {{ patient.patient.name }}
+              <span class="el-icon-bell yztx" v-if="getStatus(patient)"
+                >医嘱</span
+              >
               <span class="yc" v-show="isAbnormal(patient)">异常</span>
             </h3>
-            <span class="num">{{ genderText(patient) }} | {{ age(patient) }}岁</span>
+            <span class="num"
+              >{{ genderText(patient) }} | {{ age(patient) }}岁</span
+            >
             <!-- 性别、年龄 -->
           </div>
         </div>
-        <div class="online" style="flex:1.3;" v-show="computeState(patient) != 4">
-          <p :class="stateColor(patient)">{{stateText(patient)}}</p>
+        <div
+          class="online"
+          style="flex:1.3;"
+          v-show="computeState(patient) != 4"
+        >
+          <p :class="stateColor(patient)">{{ stateText(patient) }}</p>
           <!-- <span class="time">剩余时间 : 90:08</span>     -->
         </div>
       </div>
@@ -38,15 +51,22 @@
         <ul>
           <li>
             <span class="iconfont">&#xe6f7;</span>
-            班次 : {{timeTypeText(patient)}}
+            班次 : {{ timeTypeText(patient) }}
           </li>
           <li>
             <span class="iconfont">&#xe6de;</span>
-            床位号 : {{patient.dialysis_order&&patient.dialysis_order.device_number&&patient.dialysis_order.device_number.number.length > 0 ? patient.dialysis_order.device_number.number:patient.device_number.number}}
+            床位号 :
+            {{
+              patient.dialysis_order &&
+              patient.dialysis_order.device_number &&
+              patient.dialysis_order.device_number.number.length > 0
+                ? patient.dialysis_order.device_number.number
+                : patient.device_number.number
+            }}
           </li>
           <li>
             <span class="iconfont">&#xe6f6;</span>
-            透析模式 : {{$store.getters.treatment_mode[patient.mode_id].name}}
+            透析模式 : {{ $store.getters.treatment_mode[patient.mode_id].name }}
           </li>
         </ul>
       </div>
@@ -291,6 +311,9 @@ export default {
         font-size: 0.3rem;
         @include display-flex;
         @include align-items-center;
+        @media only screen and (max-width: 415px) {
+          font-size: 0.36rem;
+        }
         .iconfont {
           margin: 0 0.1rem 0 0;
           font-size: 0.4rem;
@@ -330,6 +353,9 @@ export default {
           color: $title-color;
           font-weight: 600;
           margin-bottom: 0.1rem;
+          @media only screen and (max-width: 415px) {
+            font-size: 0.45rem;
+          }
           .yc {
             background: #ff7979;
             color: #fff;
@@ -345,6 +371,9 @@ export default {
         }
         .num {
           font-size: 0.3rem;
+          @media only screen and (max-width: 415px) {
+            font-size: 0.36rem;
+          }
         }
       }
     }
@@ -362,6 +391,10 @@ export default {
         border-radius: 4px;
         margin: 0 auto;
         font-size: 0.32rem;
+        @media only screen and (max-width: 767px) {
+          font-size: 0.36rem;
+          width: 1.7rem;
+        }
       }
       .blue {
         background: $main-color;
@@ -396,9 +429,9 @@ export default {
 }
 .redpoint {
   display: inline-block;
-  height: 30px;
-  width: 30px;
-  line-height: 26px;
+  height: 26px;
+  width: 26px;
+  line-height: 23px;
   text-align: center;
   font-size: 0.8em;
   border-radius: 20px;

src/pages/main/WaitingArea.vue

@@ -101,7 +101,7 @@ export default {
       menuList: [
         { value: "1", label: "全部", count: 0 },
         { value: "3", label: "待开处方", count: 0 },
-        { value: "2", label: "待称量", count: 0 }
+        { value: "2", label: "待称重", count: 0 }
       ],
 
       select_index: 0,

src/pages/main/dialog/DoubleDialog.vue

@@ -7,46 +7,88 @@
         <span @click="commitInfo" class="success">保存</span>
       </div>
       <div style="height: 8rem" class="DialogContent choose">
-        <el-form :inline="true" class="demo-form-inline" :model="doubleReview" label-width="160px">
+        <el-form
+          :inline="true"
+          class="demo-form-inline"
+          :model="doubleReview"
+          label-width="150px"
+        >
           <el-form-item label="透析物品核查 : ">
-            <el-radio v-model="doubleReview.dialysis_item_check" label="1">正确</el-radio>
-            <el-radio v-model="doubleReview.dialysis_item_check" label="2">错误</el-radio>
+            <el-radio v-model="doubleReview.dialysis_item_check" label="1"
+              >正确</el-radio
+            >
+            <el-radio v-model="doubleReview.dialysis_item_check" label="2"
+              >错误</el-radio
+            >
           </el-form-item>
-          <el-form-item label="差错描述 : " label-width="160px">
+          <el-form-item label="差错描述 : " label-width="150px">
             <el-input v-model="doubleReview.dialysis_item_desc"></el-input>
           </el-form-item>
         </el-form>
-        <el-form :inline="true" class="demo-form-inline" :model="doubleReview" label-width="160px">
+        <el-form
+          :inline="true"
+          class="demo-form-inline"
+          :model="doubleReview"
+          label-width="150px"
+        >
           <el-form-item label="透析参数核查 : ">
-            <el-radio v-model="doubleReview.dialysis_parameter_check" label="1">正确</el-radio>
-            <el-radio v-model="doubleReview.dialysis_parameter_check" label="2">错误</el-radio>
+            <el-radio v-model="doubleReview.dialysis_parameter_check" label="1"
+              >正确</el-radio
+            >
+            <el-radio v-model="doubleReview.dialysis_parameter_check" label="2"
+              >错误</el-radio
+            >
           </el-form-item>
-          <el-form-item label="差错描述 : " label-width="160px">
+          <el-form-item label="差错描述 : " label-width="150px">
             <el-input v-model="doubleReview.dialysis_parameter_desc"></el-input>
           </el-form-item>
         </el-form>
-        <el-form :inline="true" class="demo-form-inline" :model="doubleReview" label-width="160px">
+        <el-form
+          :inline="true"
+          class="demo-form-inline"
+          :model="doubleReview"
+          label-width="150px"
+        >
           <el-form-item label="血管通路核查 : ">
             <!--<el-radio-group v-model="form.appetite">-->
             <!--<el-radio label="正确"></el-radio>-->
             <!--<el-radio label="整改"></el-radio>-->
             <!--</el-radio-group>-->
-            <el-radio v-model="doubleReview.vascular_access_verification" label="1">正确</el-radio>
-            <el-radio v-model="doubleReview.vascular_access_verification" label="2">错误</el-radio>
+            <el-radio
+              v-model="doubleReview.vascular_access_verification"
+              label="1"
+              >正确</el-radio
+            >
+            <el-radio
+              v-model="doubleReview.vascular_access_verification"
+              label="2"
+              >错误</el-radio
+            >
           </el-form-item>
-          <el-form-item label="差错描述 : " label-width="160px">
+          <el-form-item label="差错描述 : " label-width="150px">
             <el-input v-model="doubleReview.vascular_access_desc"></el-input>
           </el-form-item>
         </el-form>
-        <el-form :inline="true" class="demo-form-inline" :model="doubleReview" label-width="160px">
+        <el-form
+          :inline="true"
+          class="demo-form-inline"
+          :model="doubleReview"
+          label-width="150px"
+        >
           <el-form-item label="管道连接核查 : ">
             <!--<el-radio-group v-model="form.condition">-->
-            <el-radio v-model="doubleReview.pipeline_connection_check" label="1">正确</el-radio>
-            <el-radio v-model="doubleReview.pipeline_connection_check" label="2">错误</el-radio>
+            <el-radio v-model="doubleReview.pipeline_connection_check" label="1"
+              >正确</el-radio
+            >
+            <el-radio v-model="doubleReview.pipeline_connection_check" label="2"
+              >错误</el-radio
+            >
             <!--</el-radio-group>-->
           </el-form-item>
-          <el-form-item label="差错描述 : " label-width="160px">
-            <el-input v-model="doubleReview.pipeline_connection_desc"></el-input>
+          <el-form-item label="差错描述 : " label-width="150px">
+            <el-input
+              v-model="doubleReview.pipeline_connection_desc"
+            ></el-input>
           </el-form-item>
         </el-form>
 
@@ -57,20 +99,27 @@
               class="text"
               style="width: 160px"
               @click="selectCheckTimeAction"
-            >{{ check_time_str }}</span>
+              >{{ check_time_str }}</span
+            >
             <span class="iconfont">&#xe6f9;</span>
           </div>
         </div>
 
-        <el-form :inline="true" class="demo-form-inline" :model="doubleReview" label-width="160px">
-          <p
-            style="margin: 10px 0 10px 13px;"
-            v-if="doubleReview.creater != 0"
-          >{{getFirstCheckDesc()}}</p>
+        <el-form
+          :inline="true"
+          class="demo-form-inline"
+          :model="doubleReview"
+          label-width="160px"
+        >
+          <p style="margin: 10px 0 10px 13px;" v-if="doubleReview.creater != 0">
+            {{ getFirstCheckDesc() }}
+          </p>
           <p
             style="margin: 10px 0 10px 13px;"
             v-if="doubleReview.modifier != 0"
-          >{{getScondCheckDesc()}}</p>
+          >
+            {{ getScondCheckDesc() }}
+          </p>
         </el-form>
 
         <!-- <div class="button">
@@ -505,4 +554,3 @@ export default {
   }
 }
 </style>
-

src/pages/main/dialog/MonitDialog.vue

@@ -15,7 +15,7 @@
           </div>
         </div>
         <div class="DialogContent choose" id="dialogTop">
-          <!-- <div style="width:100%;overflow:hildden;">
+          <div style="width:100%;overflow:hildden;">
             <table class="table" style="">
               <tr @click="selectRow(-1, null)">
                 <th v-if="isShow('监测时间')" width="124px">时间</th>
@@ -67,8 +67,8 @@
                 <td v-if="isShow('结果')">{{item.result}}</td>
               </tr>
             </table>
-          </div>-->
-          <el-table :data="monitorRecords" border style="width: 100%">
+          </div>
+          <!-- <el-table :data="monitorRecords" border style="width: 100%">
               <span v-if="isShow('监测时间')" >
                 <el-table-column fixed prop="date" label="时间" width="100" align="center">
                   <template slot-scope="scope">
@@ -210,7 +210,7 @@
                      </el-table-column>
                  </span>
 
-          </el-table>
+          </el-table> -->
         </div>
       </div>
       <div class="Dialog" v-show="formPanel">

src/pages/main/dialog/OrdersDialog.vue

@@ -6,7 +6,7 @@
         <h1 class="name">临时医嘱</h1>
         <span class="success">&nbsp;</span>
       </div>
-      <div class="yzNav" style="width:100%;">
+       <div class="yzNav" style="width:100%;">
         <span
           @click="openNewAdvice"
           :class="{ forbid: this.$store.getters.user.user.user_type == 3 }"
@@ -45,77 +45,80 @@
         <span v-if="currentSubAdvices.length > 0" @click="deleteSubAdviceAction">删除子医嘱</span>
       </div>
       <div class="DialogContent choose" id="dialogTop" style="height:6.5rem;">
+       
         <div class="content clearfix">
-          <table class="table">
-            <tr @click="cancelAdviceSelect">
-              <th width="11%">开嘱医生</th>
-              <th width="14%">开始时间</th>
-              <th width="40%">医嘱内容</th>
-              <th width="14%">执行时间</th>
-              <th width="11%">执行护士</th>
-              <th v-if="template_id != 6" width="10%">核对人员</th>
-            </tr>
-            <template v-for="(group, group_index) in advice_groups">
-              <tr
-                v-for="(advice, advice_index) in group.advices"
-                :key="advice.id"
-                :class="{ 'row-class-active': current_group_index == group_index && current_advice_index < 0 }"
-              >
-                <td
-                  v-if="advice_index == 0"
-                  :rowspan="group.advices.length"
-                  @click="selectGroupAdviceAction(group_index, -1, null,group)"
-                >
-                  <span v-if="advice.parent_id==0">{{getXuserName(advice.advice_doctor)}}</span>
-                  <span v-else></span>
-                </td>
-
-                <td
-                  v-if="advice_index == 0"
-                  :rowspan="group.advices.length"
-                  @click="selectGroupAdviceAction(group_index, -1, null,group)"
-                >
-                  <span>{{uParseTime(advice.start_time, '{m}-{d} {h}:{i}')}}</span>
-                </td>
-
-                <td
-                  :class="{ 'advice_content': advice.parent_id == 0, 'subadvice_content': advice.parent_id > 0, 'td-active':current_group_index == group_index  && advice.is_selected == 1 }"
-                  @click="selectAdviceAction(group_index, advice_index, advice)"
-                >
-                  <div class="txt">
-                    <span>{{advice.advice_name }}</span>
-                    <span v-if="advice.advice_desc">({{ advice.advice_desc }}{{advice.drug_spec_unit}})</span>
-                    <span v-if="advice.prescribing_number">&nbsp;&nbsp;{{advice.prescribing_number}}{{advice.prescribing_number_unit}}</span>
-                    <span v-if="advice.single_dose && template_id == 6" >{{advice.single_dose}}{{advice.single_dose_unit}}</span>
-                    <span v-if="advice.single_dose && template_id != 6" >单次用量{{advice.single_dose}}{{advice.single_dose_unit}}</span>
-
-                    <span v-if="advice.parent_id == 0">{{advice.delivery_way}}</span>
-                    <span v-if="advice.parent_id == 0">{{advice.execution_frequency}}</span>
-                    <span
-                      v-if="advice.parent_id == 0 && advice.remark.length > 0"
-                    >({{advice.remark}})</span>
-                  </div>
-                </td>
-
-                <td
-                  :class="{'td-active':current_group_index == group_index  && advice.is_selected == 1}"
-                  @click="selectAdviceAction(group_index,advice_index, advice)"
-                >{{uParseTime(advice.execution_time, '{m}-{d} {h}:{i}')}}</td>
-
-                <td
-                  :class="{'td-active':current_group_index == group_index  && advice.is_selected == 1}"
-                  @click="selectAdviceAction(group_index,advice_index, advice)"
-
-                > {{getXuserName(advice.execution_staff)}}
-                </td>
-                <td v-if="template_id != 6"
-                  :class="{'td-active':current_group_index == group_index  && advice.is_selected == 1}"
-                  @click="selectAdviceAction(group_index,advice_index, advice)"
-                >{{getXuserName(advice.checker)}}</td>
+          <div class="orderTable">
+
+            <table class="table">
+              <tr @click="cancelAdviceSelect">
+                <th width="12%">开嘱医生</th>
+                <th width="20%">开始时间</th>
+                <th width="36%">医嘱内容</th>
+                <th width="20%">执行时间</th>
+                <th width="12%">执行护士</th>
+                <th v-if="template_id != 6" width="10%">核对人员</th>
               </tr>
-            </template>
-          </table>
-
+              <template v-for="(group, group_index) in advice_groups">
+                <tr
+                  v-for="(advice, advice_index) in group.advices"
+                  :key="advice.id"
+                  :class="{ 'row-class-active': current_group_index == group_index && current_advice_index < 0 }"
+                >
+                  <td
+                    v-if="advice_index == 0"
+                    :rowspan="group.advices.length"
+                    @click="selectGroupAdviceAction(group_index, -1, null,group)"
+                  >
+                    <span v-if="advice.parent_id==0">{{getXuserName(advice.advice_doctor)}}</span>
+                    <span v-else></span>
+                  </td>
+
+                  <td
+                    v-if="advice_index == 0"
+                    :rowspan="group.advices.length"
+                    @click="selectGroupAdviceAction(group_index, -1, null,group)"
+                  >
+                    <span>{{uParseTime(advice.start_time, '{m}-{d} {h}:{i}')}}</span>
+                  </td>
+
+                  <td
+                    :class="{ 'advice_content': advice.parent_id == 0, 'subadvice_content': advice.parent_id > 0, 'td-active':current_group_index == group_index  && advice.is_selected == 1 }"
+                    @click="selectAdviceAction(group_index, advice_index, advice)"
+                  >
+                    <div class="txt">
+                      <span>{{advice.advice_name }}</span>
+                      <span v-if="advice.advice_desc">({{ advice.advice_desc }}{{advice.drug_spec_unit}})</span>
+                      <span v-if="advice.prescribing_number">&nbsp;&nbsp;{{advice.prescribing_number}}{{advice.prescribing_number_unit}}</span>
+                      <span v-if="advice.single_dose && template_id == 6" >{{advice.single_dose}}{{advice.single_dose_unit}}</span>
+                      <span v-if="advice.single_dose && template_id != 6" >单次用量{{advice.single_dose}}{{advice.single_dose_unit}}</span>
+
+                      <span v-if="advice.parent_id == 0">{{advice.delivery_way}}</span>
+                      <span v-if="advice.parent_id == 0">{{advice.execution_frequency}}</span>
+                      <span
+                        v-if="advice.parent_id == 0 && advice.remark.length > 0"
+                      >({{advice.remark}})</span>
+                    </div>
+                  </td>
+
+                  <td
+                    :class="{'td-active':current_group_index == group_index  && advice.is_selected == 1}"
+                    @click="selectAdviceAction(group_index,advice_index, advice)"
+                  >{{uParseTime(advice.execution_time, '{m}-{d} {h}:{i}')}}</td>
+
+                  <td
+                    :class="{'td-active':current_group_index == group_index  && advice.is_selected == 1}"
+                    @click="selectAdviceAction(group_index,advice_index, advice)"
+
+                  > {{getXuserName(advice.execution_staff)}}
+                  </td>
+                  <td v-if="template_id != 6"
+                    :class="{'td-active':current_group_index == group_index  && advice.is_selected == 1}"
+                    @click="selectAdviceAction(group_index,advice_index, advice)"
+                  >{{getXuserName(advice.checker)}}</td>
+                </tr>
+              </template>
+            </table>
+          </div>
           <!-- <el-table
               :data="tableData"
               border
@@ -1364,6 +1367,11 @@
 
 
 <style style="stylesheet/scss" lang="scss" scoped>
+#dialogTop{
+  @media only screen and (max-width: 415px){
+    height: 13.8rem !important;
+  }
+}
 .DialogContent {
   .content {
     .yzNav {
@@ -1372,17 +1380,20 @@
     }
   }
 }
-.table {
+.orderTable{
   width: 100%;
+}
+.table {
+  width: 768px;
   tr {
     th {
       background: $main-color;
       color: #fff;
-      height: 0.88rem;
-      line-height: 0.88rem;
+      height: 1.2rem;
+      line-height: 1.2rem;
     }
     td {
-      line-height: 0.4rem;
+      line-height: 0.6rem;
       .txt {
         // float: left;
         padding: 0 10px 0 10px;

src/pages/main/dialog/TreatmentDialog.vue

@@ -29,9 +29,6 @@
             ></el-input>
           </el-form-item>
           <el-form-item label="透析小结 : ">
-
-              <el-input readonly v-model="dialysisSummary.summaryContentSelect" placeholder="请选择" @focus="showSubMenu('summary')" ></el-input>
-
             <el-input
               readonly
               v-model="dialysisSummary.summaryContentSelect"
@@ -57,8 +54,12 @@
       </div>
     </div>
 
-    <check-box-sub-menu :visibility="visibility" v-on:menu-cancle="menuCancle" v-on:menu-comfirm="menuComfirm" :propsForm="propForm"></check-box-sub-menu>
-
+    <check-box-sub-menu
+      :visibility="visibility"
+      v-on:menu-cancle="menuCancle"
+      v-on:menu-comfirm="menuComfirm"
+      :propsForm="propForm"
+    ></check-box-sub-menu>
   </div>
 </template>
 
@@ -72,7 +73,7 @@ export default {
   name: "TreatmentDialog",
   data() {
     return {
-      isShowDialog:true,
+      isShowDialog: true,
       visibility: false,
       propForm: {
         title: "",
@@ -155,18 +156,17 @@ export default {
       y + "-" + (m < 10 ? "0" + m : m) + "-" + (d < 10 ? "0" + d : d);
     // this.patient.id = this.patient_prop.id
 
-    if (this.record != null && this.record.id != '') {
+    if (this.record != null && this.record.id != "") {
       for (const key in this.record) {
         this.dialysisSummary[key] = this.record[key];
       }
-      if(this.record.mission != 'undefined'){
-        this.dialysisSummary.propagandaAndEducationContent = this.record.mission
+      if (this.record.mission != "undefined") {
+        this.dialysisSummary.propagandaAndEducationContent = this.record.mission;
       }
-      if(this.record.dialysis_summary != 'undefined'){
-        this.dialysisSummary.summaryContent = this.record.dialysis_summary
+      if (this.record.dialysis_summary != "undefined") {
+        this.dialysisSummary.summaryContent = this.record.dialysis_summary;
       }
     }
-
   },
   methods: {
     lastInputFocus: function(event) {
@@ -206,14 +206,13 @@ export default {
           break;
       }
     },
-    menuCancle: function () {
-        this.visibility = false
-        this.isShowDialog = true
+    menuCancle: function() {
+      this.visibility = false;
+      this.isShowDialog = true;
     },
-    menuComfirm: function (val) {
-
-      this.visibility = false
-      this.isShowDialog = true
+    menuComfirm: function(val) {
+      this.visibility = false;
+      this.isShowDialog = true;
 
       switch (val.type) {
         case 1:
@@ -354,4 +353,3 @@ export default {
   font-size: 0.45rem;
 }
 </style>
-

src/pages/main/dialog/modify_order/modify_order_form.vue

@@ -101,7 +101,7 @@
               <el-input
                 placeholder="选择执行频率"
                 readonly
-                style="width:96%"
+                style="width:100%"
                 :disabled="mode == 3"
                 v-model="order.execution_frequency"
                 @focus="selectExecFrequencyAction"
@@ -112,7 +112,7 @@
               <label>医嘱嘱托</label>
               <input
                 class="inputBox"
-                style="width:96%"
+                style="width:100%"
                 v-model="order.remark"
               />
             </div>
@@ -399,10 +399,10 @@ export default {
     margin: 0.35rem 0.3rem 0 0.4rem;
     label {
       display: block;
-      height: 0.7rem;
-      line-height: 0.7rem;
+      height: 0.9rem;
+      line-height: 0.9rem;
       color: $title-color;
-      font-size: 0.36rem;
+      font-size: 0.45rem;
     }
     .el-input__inner {
       font-size: 0.32rem;
@@ -420,9 +420,9 @@ export default {
       border-radius: 2px;
       padding: 0.14rem 0;
       padding-left: 5px;
-      @media only screen and (max-width: 767px) {
-        padding: 0.38rem 0;
-      }
+      // @media only screen and (max-width: 767px) {
+      //   padding: 0.38rem 0;
+      // }
     }
 
     .textarea {
@@ -441,3 +441,19 @@ export default {
   }
 }
 </style>
+<style lang="scss">
+.content {
+  .cell {
+    .inputBox {
+      @media only screen and (max-width: 767px) {
+        padding: 0.32rem 0 !important;
+        padding-left: 5px !important;
+        font-size: 0.45rem !important;
+      }
+    }
+    .el-input__inner {
+      font-size: 0.45rem;
+    }
+  }
+}
+</style>

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

@@ -14,26 +14,69 @@
         <span @click="modifyOrderAction">修改医嘱内容</span>
         <span @click="deleteOrderAction">删除医嘱内容</span>
       </div>
-      <div class="DialogContent choose" style="height: 6.2rem;">
-        <div class="content clearfix">
-          <div style="overflow: hidden;">
-            <div class="cell" style="margin-top: 0;">
-              <label>医嘱类型</label>
-              <el-input ref="advice_type" value="临时" disabled></el-input>
-            </div>
-            <div class="cell" style="margin-top: 0;">
-              <label>开始时间</label>
-              <el-input :value="start_time_str" readonly @focus="selectStartTimeAction"></el-input>
-            </div>
+      <div class="content clearfix backgroundColor">
+        <div style="overflow: hidden;">
+          <div class="cell" style="margin-top: 0;">
+            <label>医嘱类型</label>
+            <el-input ref="advice_type" value="临时" disabled></el-input>
           </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 class="cell" style="margin-top: 0;">
+            <label>开始时间</label>
+            <el-input
+              :value="start_time_str"
+              readonly
+              @focus="selectStartTimeAction"
+            ></el-input>
           </div>
+        </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>
+
+        <!-- <el-table :data="advices" border style="width: 100%" :row-class-name="tableRowClassName" @row-click="clickAdviceAction">
+            <el-table-column fixed prop="date" label="医嘱内容" width="150">
+              <template slot-scope="scope">
+                   {{ scope.row.title }}
+              </template>
+            </el-table-column>
+            <el-table-column prop="name" label="药品规格" width="120">
+              <template slot-scope="scope">
+              {{ scope.row.prescribing_number }}{{ scope.row.prescribing_number_unit }}
+              </template>
+            </el-table-column>
+            <el-table-column prop="province" label="开药数量" width="120">
+              <template slot-scope="scope">
+              {{ scope.row.prescribing_number }}{{ scope.row.prescribing_number_unit }}
+              </template>
+            </el-table-column>
+            <el-table-column prop="city" label="单次用量" width="120">
+              <template slot-scope="scope">
+
+              </template>
+            </el-table-column>
+            <el-table-column prop="address" label="给药途径" width="300">
+               <template slot-scope="scope">
+                   {{ scope.row.delivery_way }}
+               </template>
+            </el-table-column>
+            <el-table-column prop="zip" label="执行频率" width="120">
+              <template slot-scope="scope">
+                  {{ scope.row.execution_frequency }}
+              </template>
+            </el-table-column>
+          </el-table>-->
+      </div>
+      <div
+        id="newDialogContent"
+        class="DialogContent choose"
+        style="height: 6.2rem;"
+      >
+        <div class="newAddTable">
           <table class="table">
             <tr>
               <th width="26%">医嘱内容</th>
@@ -47,19 +90,30 @@
               <tr
                 :key="advice_index"
                 @click="clickAdviceAction(advice_index)"
-                :class="{ 'row-class-active': (advice_index == selecting_advice_index && selecting_subdrug_index < 0) }"
+                :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>
+                >
+                  {{ advice.title }}
+                </td>
 
-                <td v-if="advice.advice_desc">{{ advice.advice_desc }}{{advice.drug_spec_unit}}</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-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-if="advice.single_dose">
+                  {{ advice.single_dose }} {{ advice.single_dose_unit }}
+                </td>
                 <td v-else></td>
 
                 <td>{{ advice.delivery_way }}</td>
@@ -70,21 +124,29 @@
                 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) }"
+                :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>
+                >
+                  {{ 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>
+                  <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>
+                  <span v-if="subdrug.single_dose"
+                    >{{ subdrug.single_dose }}
+                    {{ subdrug.single_dose_unit }}</span
+                  >
                 </td>
 
                 <td></td>
@@ -92,38 +154,6 @@
               </tr>
             </template>
           </table>
-          <!-- <el-table :data="advices" border style="width: 100%" :row-class-name="tableRowClassName" @row-click="clickAdviceAction">
-            <el-table-column fixed prop="date" label="医嘱内容" width="150">
-              <template slot-scope="scope">
-                   {{ scope.row.title }}
-              </template>
-            </el-table-column>
-            <el-table-column prop="name" label="药品规格" width="120">
-              <template slot-scope="scope">
-              {{ scope.row.prescribing_number }}{{ scope.row.prescribing_number_unit }}
-              </template>
-            </el-table-column>
-            <el-table-column prop="province" label="开药数量" width="120">
-              <template slot-scope="scope">
-              {{ scope.row.prescribing_number }}{{ scope.row.prescribing_number_unit }}
-              </template>
-            </el-table-column>
-            <el-table-column prop="city" label="单次用量" width="120">
-              <template slot-scope="scope">
-
-              </template>
-            </el-table-column>
-            <el-table-column prop="address" label="给药途径" width="300">
-               <template slot-scope="scope">
-                   {{ scope.row.delivery_way }}
-               </template>
-            </el-table-column>
-            <el-table-column prop="zip" label="执行频率" width="120">
-              <template slot-scope="scope">
-                  {{ scope.row.execution_frequency }}
-              </template>
-            </el-table-column>
-          </el-table>-->
         </div>
       </div>
     </div>
@@ -548,8 +578,24 @@ export default {
 </script>
 
 <style style="stylesheet/scss" lang="scss" scoped>
-.table {
+#newDialogContent {
+  @media only screen and (max-width: 415px) {
+    height: 10.8rem !important;
+  }
+  @media only screen and (min-width: 768px) {
+    height: 7.8rem !important;
+  }
+}
+.backgroundColor {
+  background: #fff;
+}
+.newAddTable {
   width: 100%;
+  // overflow: auto;
+}
+.table {
+  width: 768px;
+  overflow-x: scroll;
   // margin-top: 0rem;
   tr {
     th {
@@ -573,7 +619,7 @@ export default {
       height: 0.6rem;
       line-height: 0.6rem;
       color: $pgh-color;
-      font-size: 0.32rem;
+      font-size: 0.45rem;
     }
     select {
       width: 100%;

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

@@ -1,6 +1,6 @@
 <template>
   <div v-if="visibility">
-    <div v-if="sub_dialog_key == 0" class="Dialog" >
+    <div v-if="sub_dialog_key == 0" class="Dialog">
       <div class="DialogTit">
         <div class="back" @click="backAction">
           <span class="iconfont">&#xe720;</span>返回
@@ -11,18 +11,20 @@
       <div class="DialogContent choose advice-top">
         <div class="content clearfix">
           <div>
-
-
             <div class="cell">
               <label>医嘱名称</label>
-              <input class="inputBox"  v-model="order.title">
+              <input class="inputBox" style="width:96%" v-model="order.title" />
               <!-- <el-input v-model="order.title"></el-input> -->
             </div>
             <div class="cell">
               <label>药品规格</label>
               <!--<input class="inputBox" style="width:62.5%" v-model="order.advice_desc">-->
 
-              <input class="inputBox" style="width:60%" v-model="order.advice_desc">
+              <input
+                class="inputBox"
+                style="width:60%"
+                v-model="order.advice_desc"
+              />
               <input
                 type="text"
                 placeholder="单位"
@@ -31,11 +33,9 @@
                 style="width:35%"
                 v-model="order.drug_spec_unit"
                 @focus="selectDrugSpecUnitAction"
-              >
+              />
             </div>
 
-
-
             <div class="cell">
               <label>开药数量</label>
               <input
@@ -43,7 +43,7 @@
                 class="inputBox"
                 style="width:60%"
                 v-model="order.prescribing_number"
-              >
+              />
               <input
                 type="text"
                 placeholder="单位"
@@ -52,14 +52,17 @@
                 style="width:35%"
                 v-model="order.prescribing_number_unit"
                 @focus="selectPrescribingNumUnitAction"
-              >
+              />
             </div>
 
-
-
             <div class="cell">
               <label>单次用量</label>
-              <input type="number" class="inputBox" style="width:62.5%" v-model="order.single_dose">
+              <input
+                type="number"
+                class="inputBox"
+                style="width:62.5%"
+                v-model="order.single_dose"
+              />
               <input
                 type="text"
                 placeholder="单位"
@@ -68,10 +71,9 @@
                 style="width:35%"
                 v-model="order.single_dose_unit"
                 @focus="selectSingleDoseAction"
-              >
+              />
             </div>
 
-
             <div class="cell" v-show="order.parent_id == 0">
               <label>给药途径</label>
               <el-input
@@ -94,17 +96,14 @@
               ></el-input>
             </div>
 
-
             <div class="cell" v-show="order.parent_id == 0">
               <label>医嘱嘱托</label>
               <input
                 class="inputBox"
                 style="width:100%"
                 v-model="order.remark"
-              >
+              />
             </div>
-
-
           </div>
         </div>
       </div>
@@ -220,7 +219,7 @@ export default {
         single_dose_unit: "",
         prescribing_number: "",
         prescribing_number_unit: "",
-        remark:"",
+        remark: "",
 
         // 在新增子药才用到的字段
         parent_id: 0, // 父医嘱ID
@@ -256,7 +255,6 @@ export default {
       this.order.prescribing_number = "";
       this.order.prescribing_number_unit = "";
       this.order.remark = "";
-
     },
     showWithEdit: function(order) {
       this.mode = 2;
@@ -273,7 +271,6 @@ export default {
       this.order.prescribing_number = order.prescribing_number;
       this.order.prescribing_number_unit = order.prescribing_number_unit;
       this.order.remark = order.remark;
-
     },
     showWithNewSubDrug: function(
       parent_id,
@@ -336,12 +333,10 @@ export default {
           remark: this.order.remark,
           drug_spec: this.order.drug_spec,
 
-          drug_spec_unit: this.order.drug_spec_unit,
-
+          drug_spec_unit: this.order.drug_spec_unit
         });
       } else if (this.mode == 2) {
         this.$emit("did-modify", {
-
           title: this.order.title,
           advice_desc: this.order.advice_desc,
           drug_spec: this.order.drug_spec,
@@ -353,7 +348,6 @@ export default {
           prescribing_number: this.order.prescribing_number,
           prescribing_number_unit: this.order.prescribing_number_unit,
           remark: this.order.remark
-
         });
       } else if (this.mode == 3) {
         this.$emit("did-create-subdrug", {
@@ -379,22 +373,19 @@ export default {
     },
     didSelectSingleDoseUnit: function(index) {
       this.didCloseSingleOptionDialog();
-      if(index == -1){
-        this.order.single_dose_unit = '';
-
-      }else{
+      if (index == -1) {
+        this.order.single_dose_unit = "";
+      } else {
         this.order.single_dose_unit = this.single_dose_unit_options[index].name;
       }
-
     },
     selectDrugSpecUnitAction: function() {
       this.sub_dialog_key = 5;
     },
     didSelectDrugSpecUnit: function(index) {
-      if(index == -1){
-        this.order.drug_spec_unit = '';
-
-      }else{
+      if (index == -1) {
+        this.order.drug_spec_unit = "";
+      } else {
         this.order.drug_spec_unit = this.drug_spec_unit_options[index].name;
       }
 
@@ -406,22 +397,22 @@ export default {
     didSelectPrescribingNumUnit: function(index) {
       this.didCloseSingleOptionDialog();
 
-      if(index == -1){
-        this.order.prescribing_number_unit = '';
-
-      }else{
-        this.order.prescribing_number_unit = this.prescribing_number_unit_options[index].name;
+      if (index == -1) {
+        this.order.prescribing_number_unit = "";
+      } else {
+        this.order.prescribing_number_unit = this.prescribing_number_unit_options[
+          index
+        ].name;
       }
-
     },
     selectDeliveryWayAction: function() {
       this.sub_dialog_key = 3;
     },
     didSelectDeliveryWay: function(index) {
       this.didCloseSingleOptionDialog();
-      if(index == -1){
-        this.order.delivery_way = ""
-        return
+      if (index == -1) {
+        this.order.delivery_way = "";
+        return;
       }
       this.order.delivery_way = this.delivery_way_options[index].name;
     },
@@ -430,9 +421,9 @@ export default {
     },
     didSelectExecFrequency: function(index) {
       this.didCloseSingleOptionDialog();
-      if(index == -1){
-        this.order.execution_frequency = ""
-        return
+      if (index == -1) {
+        this.order.execution_frequency = "";
+        return;
       }
       this.order.execution_frequency = this.execution_frequency_options[
         index
@@ -454,10 +445,10 @@ export default {
     margin: 0.35rem 0.3rem 0 0.4rem;
     label {
       display: block;
-      height: 0.7rem;
-      line-height: 0.7rem;
+      height: 0.9rem;
+      line-height: 0.9rem;
       color: $title-color;
-      font-size: 0.36rem;
+      font-size: 0.45rem;
     }
     .el-input__inner {
       font-size: 0.32rem;
@@ -493,5 +484,19 @@ export default {
   }
 }
 </style>
-
-
+<style lang="scss">
+.content {
+  .cell {
+    .inputBox {
+      @media only screen and (max-width: 767px) {
+        padding: 0.38rem 0 !important;
+        padding-left: 5px !important;
+        font-size: 0.45rem !important;
+      }
+    }
+    .el-input__inner {
+      font-size: 0.45rem;
+    }
+  }
+}
+</style>

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

@@ -20,18 +20,24 @@
                 "
                 class="select_all_btn"
                 @click="selectTemplateAllAdviceAction(template)"
-              >全选</div>
+              >
+                全选
+              </div>
               <div
                 v-show="
                   isFold(template.id) && isTemplateSelectingAllAdvices(template)
                 "
                 class="select_all_btn"
                 @click="cancelSelectTemplateAllAdviceAction(template)"
-              >取消全选</div>
+              >
+                取消全选
+              </div>
 
               <span v-if="isFold(template.id)" class="iconfont">&#xe749;</span>
               <span v-if="!isFold(template.id)" class="iconfont">&#xe74a;</span>
-              <div @click="foldTemplateAction(template.id)" class="name">{{ template.name }}</div>
+              <div @click="foldTemplateAction(template.id)" class="name">
+                {{ template.name }}
+              </div>
             </div>
             <div
               v-show="isFold(template.id)"
@@ -46,9 +52,10 @@
                   {{ advice.prescribing_number }}
                   {{ advice.prescribing_number_unit }}
                 </span>
-                <span
-                  v-if="advice.single_dose"
-                >单次用量{{ advice.single_dose }}{{ advice.single_dose_unit }}</span>
+                <span v-if="advice.single_dose"
+                  >单次用量{{ advice.single_dose
+                  }}{{ advice.single_dose_unit }}</span
+                >
               </span>
               <van-checkbox
                 v-else
@@ -62,9 +69,10 @@
                   {{ advice.prescribing_number }}
                   {{ advice.prescribing_number_unit }}
                 </span>
-                <span
-                  v-if="advice.single_dose"
-                >单次用量{{ advice.single_dose }}{{ advice.single_dose_unit }}</span>
+                <span v-if="advice.single_dose"
+                  >单次用量{{ advice.single_dose
+                  }}{{ advice.single_dose_unit }}</span
+                >
                 <span>{{ advice.delivery_way }}</span>
                 <span>{{ advice.execution_frequency }}</span>
                 <!--{{ advice.advice_name }} {{ advice.advice_desc }} {{ advice.prescribing_number }}{{ advice.prescribing_number_unit }} 单次用量{{ advice.single_dose }}{{ advice.single_dose_unit }} {{ advice.delivery_way }} {{ advice.execution_frequency }}-->
@@ -251,7 +259,7 @@ export default {
   min-height: 5rem;
   overflow-y: scroll;
   @media only screen and (max-width: 811px) {
-    max-height: 15.8rem !important;
+    max-height: 11.8rem !important;
   }
   ul {
     li {

src/pages/main/dialog/subMenu/checkBoxSubMenu.vue

@@ -5,8 +5,14 @@
         <span class="iconfont">&#xe720;</span>返回
       </div>
       <h1 class="name">{{ propsForm.title }}</h1>
-      <span v-if="propsForm.isMultiple == 1" @click="comfirm" class="success"></span>
-      <span v-if="propsForm.isMultiple == 2" @click="comfirm" class="success">确定</span>
+      <span
+        v-if="propsForm.isMultiple == 1"
+        @click="comfirm"
+        class="success"
+      ></span>
+      <span v-if="propsForm.isMultiple == 2" @click="comfirm" class="success"
+        >确定</span
+      >
     </div>
 
     <div v-if="propsForm.isMultiple == 1" class="optionsBox">
@@ -19,7 +25,9 @@
             :key="item.id"
             value="item"
             :class="propsForm.selectId == item.id ? 'tick' : ''"
-          >{{ item.name }}</li>
+          >
+            {{ item.name }}
+          </li>
           <!--<li v-if="propsForm.isHasOther == 1 && this.$store.getters.user.template_info.template_id == 2" @click="itemClick(-1)"  :key="-1" value="-1" :class="propsForm.selectId == -1? 'tick':'' ">其他</li>-->
         </ul>
       </div>
@@ -34,92 +42,89 @@
               v-for="(item, index) in propsForm.list"
               :key="index"
               :name="item.name"
-            >{{ item.name }}</van-checkbox>
+              >{{ item.name }}</van-checkbox
+            >
           </van-checkbox-group>
         </li>
-
       </ul>
       <!--<div style="margin-top: 10px" v-if="propsForm.isShowOther == 2">-->
-        <!--<el-form>-->
-          <!--<el-form-item label-width="90px" label="其他"  >-->
-            <!--<el-input clearable v-model="other" ></el-input>-->
-          <!--</el-form-item>-->
-        <!--</el-form>-->
+      <!--<el-form>-->
+      <!--<el-form-item label-width="90px" label="其他"  >-->
+      <!--<el-input clearable v-model="other" ></el-input>-->
+      <!--</el-form-item>-->
+      <!--</el-form>-->
       <!--</div>-->
-
     </div>
   </div>
 </template>
 
 <script>
-  export default {
-    name: 'checkBoxSubMenu',
-    created () {
+export default {
+  name: "checkBoxSubMenu",
+  created() {},
+  data() {
+    return {
+      result: [],
+      id: 0,
+      selectName: "",
+      other: ""
+    };
+  },
+  props: {
+    propsForm: {
+      type: Object
     },
-    data () {
-      return {
-        result: [],
-        id: 0,
-        selectName: '',
-        other: ''
-      }
+    visibility: {
+      type: Boolean,
+      default: false
+    }
+  },
+  methods: {
+    cancle: function() {
+      this.$emit("menu-cancle");
     },
-    props: {
-      propsForm: {
-        type: Object
-      },
-      visibility: {
-        type: Boolean,
-        default: false
-      }
+    comfirm: function() {
+      this.$emit("menu-comfirm", this.getValue());
+      // this.other = ""
     },
-    methods: {
-      cancle: function () {
-        this.$emit('menu-cancle')
-      },
-      comfirm: function () {
-        this.$emit('menu-comfirm', this.getValue())
-        // this.other = ""
-      },
-      getValue: function () {
-        let form = {}
-        if (this.propsForm.isMultiple == 2) {
-          form['type'] = this.propsForm.type
-          form['result'] = this.propsForm.result
-          // form['other'] = this.other
+    getValue: function() {
+      let form = {};
+      if (this.propsForm.isMultiple == 2) {
+        form["type"] = this.propsForm.type;
+        form["result"] = this.propsForm.result;
+        // form['other'] = this.other
 
-          // form["click_ref"] = this.propsForm.click_ref
-        } else {
-          form['type'] = this.propsForm.type
-          form['selectId'] = this.propsForm.selectId
-          // form["click_ref"] = this.propsForm.click_ref
-        }
-        return form
-      },
-      itemClick: function (id) {
-        if (id == -2) {
-          this.$emit('menu-empty', this.getValue())
-        }
-        this.propsForm.selectId = id
-        this.$emit('menu-comfirm', this.getValue())
+        // form["click_ref"] = this.propsForm.click_ref
+      } else {
+        form["type"] = this.propsForm.type;
+        form["selectId"] = this.propsForm.selectId;
+        // form["click_ref"] = this.propsForm.click_ref
       }
+      return form;
     },
-    watch: {
-      visibility (val) {
-        //初始化数据操作
-
+    itemClick: function(id) {
+      if (id == -2) {
+        this.$emit("menu-empty", this.getValue());
       }
+      this.propsForm.selectId = id;
+      this.$emit("menu-comfirm", this.getValue());
+    }
+  },
+  watch: {
+    visibility(val) {
+      //初始化数据操作
     }
   }
+};
 </script>
 
 <style style="stylesheet/scss" lang="scss" scoped>
-  .optionsBox {
+.optionsBox {
   background: #fff;
   max-height: 10rem;
   min-height: 5rem;
   @media only screen and (max-width: 812px) {
-  min-height: 8rem !important;
+    min-height: 8rem !important;
   }
   @media only screen and (max-width: 415px) {
     height: 16.8rem !important;
@@ -128,9 +133,12 @@
     max-height: 8rem;
     min-height: 7rem !important;
   }
-  @media only screen and (max-width: 768px) {
+  @media only screen and (max-width: 767px) {
     max-height: 16rem !important;
   }
+  @media only screen and (max-width: 768px) {
+    max-height: 11.8rem !important;
+  }
   @media only screen and (min-width: 666px) and (max-width: 737px) {
     max-height: 8rem;
     min-height: 7rem !important;
@@ -141,9 +149,12 @@
     @media only screen and (min-width: 666px) and (max-width: 737px) {
       max-height: 8rem;
     }
-    @media only screen and (max-width: 768px) {
+    @media only screen and (max-width: 767px) {
       max-height: 16rem;
     }
+    @media only screen and (max-width: 768px) {
+      max-height: 11.8rem !important;
+    }
     li {
       height: 1.2rem;
       line-height: 1.2rem;
@@ -169,20 +180,24 @@
       }
     }
   }
-  }
-  .CheckBox {
+}
+.CheckBox {
   background: #fff;
   max-height: 6.8rem;
   min-height: 5rem;
   overflow-y: scroll;
   @media only screen and (max-width: 812px) {
-  max-height: 8rem !important;
-  min-height: 8rem !important;
+    max-height: 8rem !important;
+    min-height: 8rem !important;
   }
-  @media only screen and (max-width: 768px) {
+  @media only screen and (max-width: 767px) {
     max-height: 16rem !important;
     min-height: 8rem !important;
   }
+  @media only screen and (min-width: 768px) {
+    max-height: 11.8rem !important;
+    min-height: 8rem !important;
+  }
   @media only screen and (min-width: 813px) and (max-width: 1024px) {
     max-height: 10.8rem !important;
   }
@@ -191,5 +206,5 @@
       line-height: 1.2rem;
     }
   }
-  }
+}
 </style>

src/pages/main/today/statOrder.vue

@@ -2,7 +2,7 @@
   <div class="plate-box">
     <h2 class="title border">
       <span class="line"></span>
-      <p>{{title}}</p>
+      <p>{{ title }}</p>
       <span class="line"></span>
     </h2>
 
@@ -17,163 +17,201 @@
           <th v-if="template_id != 6" width="9.4%">核对护士</th>
         </tr>
 
-        <template v-for="(group) in advice_groups">
+        <template v-for="group in advice_groups">
           <tr v-for="(advice, i) in group.advices" :key="advice.id">
-            <td
-              v-if="i == 0"
-              :rowspan="group.advices.length"
-            >{{doctor_map[advice.advice_doctor] != undefined ? doctor_map[advice.advice_doctor].name : ""}}</td>
+            <td v-if="i == 0" :rowspan="group.advices.length">
+              {{
+                doctor_map[advice.advice_doctor] != undefined
+                  ? doctor_map[advice.advice_doctor].name
+                  : ""
+              }}
+            </td>
 
-            <td
-              v-if="i == 0"
-              :rowspan="group.advices.length"
-            >{{parseTime(advice.start_time, "{m}-{d} {h}:{i}")}}</td>
+            <td v-if="i == 0" :rowspan="group.advices.length">
+              {{ parseTime(advice.start_time, "{m}-{d} {h}:{i}") }}
+            </td>
 
-            <td :class="advice.parent_id == 0 ? 'advice_content' : 'subadvice_content'">
-              <span>{{advice.advice_name }}</span>
+            <td
+              :class="
+                advice.parent_id == 0 ? 'advice_content' : 'subadvice_content'
+              "
+            >
+              <span>{{ advice.advice_name }}</span>
 
-              <span>{{advice.drug_spec}}{{advice.drug_spec_unit}} * {{advice.prescribing_number}}{{advice.prescribing_number_unit}}</span>
-              <span v-if="advice.advice_desc">{{advice.advice_desc}}{{advice.drug_spec_unit}}</span>
               <span
-                v-if="advice.prescribing_number"
-              >{{advice.prescribing_number}}{{advice.prescribing_number_unit}}</span>
-              <span v-if="advice.single_dose">单次用量{{advice.single_dose}}{{advice.single_dose_unit}}</span>
+                >{{ advice.drug_spec }}{{ advice.drug_spec_unit }} *
+                {{ advice.prescribing_number
+                }}{{ advice.prescribing_number_unit }}</span
+              >
+              <span v-if="advice.advice_desc"
+                >{{ advice.advice_desc }}{{ advice.drug_spec_unit }}</span
+              >
+              <span v-if="advice.prescribing_number"
+                >{{ advice.prescribing_number
+                }}{{ advice.prescribing_number_unit }}</span
+              >
+              <span v-if="advice.single_dose"
+                >单次用量{{ advice.single_dose
+                }}{{ advice.single_dose_unit }}</span
+              >
 
-              <span v-if="advice.parent_id == 0">{{advice.delivery_way}}</span>
-              <span v-if="advice.parent_id == 0">{{advice.execution_frequency}}</span>
-              <span v-if="advice.parent_id == 0&&advice.remark.length > 0">({{advice.remark}})</span>
+              <span v-if="advice.parent_id == 0">{{
+                advice.delivery_way
+              }}</span>
+              <span v-if="advice.parent_id == 0">{{
+                advice.execution_frequency
+              }}</span>
+              <span v-if="advice.parent_id == 0 && advice.remark.length > 0"
+                >({{ advice.remark }})</span
+              >
             </td>
 
-            <td>{{parseTime(advice.execution_time, "{m}-{d} {h}:{i}")}}</td>
+            <td>{{ parseTime(advice.execution_time, "{m}-{d} {h}:{i}") }}</td>
 
-            <td>{{advice.execution_staff != 0 ? (doctor_map[advice.execution_staff] != undefined ? doctor_map[advice.execution_staff].name : "") : ""}}</td>
+            <td>
+              {{
+                advice.execution_staff != 0
+                  ? doctor_map[advice.execution_staff] != undefined
+                    ? doctor_map[advice.execution_staff].name
+                    : ""
+                  : ""
+              }}
+            </td>
 
-            <td
-              v-if="template_id != 6"
-            >{{advice.checker != 0 ? (doctor_map[advice.checker] != undefined ? doctor_map[advice.checker].name : "") : ""}}</td>
+            <td v-if="template_id != 6">
+              {{
+                advice.checker != 0
+                  ? doctor_map[advice.checker] != undefined
+                    ? doctor_map[advice.checker].name
+                    : ""
+                  : ""
+              }}
+            </td>
           </tr>
         </template>
       </table>
 
       <div class="NoData" v-show="advice_groups.length == 0">
-        <img style="margin-top: 50px; margin-bottom: 50px" src="@/assets/login/data.jpg" alt />
+        <img
+          style="margin-top: 50px; margin-bottom: 50px"
+          src="@/assets/login/data.jpg"
+          alt
+        />
       </div>
     </div>
   </div>
 </template>
 <script>
-  import { parseTime } from '@/utils';
+import { parseTime } from "@/utils";
 
-  export default {
-    name: 'statOrder',
-    data () {
-      return {
-        title: '临时医嘱 ',
-        template_id: 0,
-        tableDate: []
-      }
+export default {
+  name: "statOrder",
+  data() {
+    return {
+      title: "临时医嘱 ",
+      template_id: 0,
+      tableDate: []
+    };
+  },
+  props: {
+    doctor_map: {
+      type: Object
     },
-    props: {
-      doctor_map: {
-        type: Object
-      },
-      advice_groups: {
-        type: Array,
-        default: () => {
-          return []
-        }
+    advice_groups: {
+      type: Array,
+      default: () => {
+        return [];
       }
+    }
+  },
+  created() {
+    this.template_id = this.$store.getters.user.template_info.template_id;
+  },
+  methods: {
+    setAdvices(advices) {
+      if (advices == null) {
+        advices = [];
+      }
+      this.tableDate.splice(0, this.tableDate.length);
+      this.tableDate.push(...advices);
     },
-    created () {
-      this.template_id = this.$store.getters.user.template_info.template_id
+    parseTime(time, layout) {
+      if (time == 0) {
+        return "";
+      }
+      return parseTime(time, layout);
     },
-    methods: {
-      setAdvices (advices) {
-        if (advices == null) {
-          advices = []
-        }
-        this.tableDate.splice(0, this.tableDate.length)
-        this.tableDate.push(...advices)
-      },
-      parseTime (time, layout) {
-        if (time == 0) {
-          return '';
-        }
-        return parseTime(time, layout)
-      },
-      createMedicalOrder (row) {
-        if (row.parent_id > 0) {
-          var spliceIndex = -1
-          for (let index = this.tableDate.length - 1; ; index--) {
-            if (this.tableDate[index].parent_id === row.parent_id) {
-              spliceIndex = index
-              break;
-            } else if (this.tableDate[index].id === row.parent_id) {
-              spliceIndex = index
-              break;
-            }
-          }
-          if (spliceIndex > -1) {
-            spliceIndex += 1
-            if (spliceIndex === this.tableDate.length) {
-              this.tableDate.push(row)
-            } else {
-              var swapData = this.tableDate.splice(spliceIndex)
-              this.tableDate.push(row)
-              this.tableDate = this.tableDate.concat(swapData)
-            }
+    createMedicalOrder(row) {
+      if (row.parent_id > 0) {
+        var spliceIndex = -1;
+        for (let index = this.tableDate.length - 1; ; index--) {
+          if (this.tableDate[index].parent_id === row.parent_id) {
+            spliceIndex = index;
+            break;
+          } else if (this.tableDate[index].id === row.parent_id) {
+            spliceIndex = index;
+            break;
           }
-        } else {
-          this.tableDate.unshift(row)
         }
-      },
-      delMedicalOrder (row) {
-        if (row.parent_id > 0) {
-          var rslen = this.tableDate.length
-          for (let i = 0; i < rslen; i++) {
-            if (this.tableDate[i].id == row.id) {
-              this.tableDate.splice(i, 1)
-              break;
-            }
-          }
-        } else {
-          var resetTableData = this.tableDate
-          this.tableDate = []
-          var that = this
-          var rslen = resetTableData.length
-          for (let i = 0; i < rslen; i++) {
-            if (
-              resetTableData[i].id != row.id &&
-              resetTableData[i].parent_id != row.id
-            ) {
-              that.tableDate.push(resetTableData[i])
-            }
+        if (spliceIndex > -1) {
+          spliceIndex += 1;
+          if (spliceIndex === this.tableDate.length) {
+            this.tableDate.push(row);
+          } else {
+            var swapData = this.tableDate.splice(spliceIndex);
+            this.tableDate.push(row);
+            this.tableDate = this.tableDate.concat(swapData);
           }
         }
-      },
-      executionMedicalOrder (row) {
-        var alen = this.tableDate.length
-        for (let index = 0; index < alen; index++) {
-          if (this.tableDate[index].id == row.id) {
-            this.tableDate[index].execution_state = 1
-            this.tableDate[index].execution_staff = row.execution_staff
-            this.tableDate[index].execution_time = row.execution_time
-            this.tableDate[index].checker = row.checker
+      } else {
+        this.tableDate.unshift(row);
+      }
+    },
+    delMedicalOrder(row) {
+      if (row.parent_id > 0) {
+        var rslen = this.tableDate.length;
+        for (let i = 0; i < rslen; i++) {
+          if (this.tableDate[i].id == row.id) {
+            this.tableDate.splice(i, 1);
             break;
           }
         }
+      } else {
+        var resetTableData = this.tableDate;
+        this.tableDate = [];
+        var that = this;
+        var rslen = resetTableData.length;
+        for (let i = 0; i < rslen; i++) {
+          if (
+            resetTableData[i].id != row.id &&
+            resetTableData[i].parent_id != row.id
+          ) {
+            that.tableDate.push(resetTableData[i]);
+          }
+        }
+      }
+    },
+    executionMedicalOrder(row) {
+      var alen = this.tableDate.length;
+      for (let index = 0; index < alen; index++) {
+        if (this.tableDate[index].id == row.id) {
+          this.tableDate[index].execution_state = 1;
+          this.tableDate[index].execution_staff = row.execution_staff;
+          this.tableDate[index].execution_time = row.execution_time;
+          this.tableDate[index].checker = row.checker;
+          break;
+        }
       }
     }
   }
+};
 </script>
 
-
-
 <style rel="stylesheet/scss" lang="scss" scoped>
 .table {
   width: 1000px;
   overflow: hidden;
-  font-size: 0.34rem;
+  font-size: 0.45rem;
   text-align: center;
   border: $border-color;
   tr {
@@ -186,8 +224,8 @@
       color: #fff;
       padding: 0;
       margin: 0;
-      height: 0.88rem;
-      line-height: 0.88rem;
+      height: 1.2rem;
+      line-height: 1.2rem;
       font-weight: normal;
     }
 

src/styles/style.scss

@@ -31,6 +31,10 @@ body {
   @include align-items-center;
   width: 100%;
   @include justify-content-center;
+  @media only screen and (max-width: 767px) {
+    line-height: 1.2rem;
+    font-size: 0.45rem;
+  }
   .line {
     width: 0.2rem;
     height: 0.04rem;
@@ -63,6 +67,10 @@ body {
     @include align-items-center;
     width: 100%;
     @include justify-content-center;
+    @media only screen and (max-width: 767px) {
+      line-height: 1.2rem;
+      font-size: 0.45rem;
+    }
   }
   .line {
     width: 0.2rem;
@@ -211,8 +219,8 @@ body {
   @include justify-content-around;
   background: #fff;
   span {
-    height: 0.8rem;
-    line-height: 0.8rem;
+    height: 1.2rem;
+    line-height: 1.2rem;
     background: #fff;
     border-radius: 5px;
     border: 1px $border-color solid;
@@ -220,8 +228,8 @@ body {
     @include text-align;
     margin: 0.25rem 0;
     color: #34495e;
-    font-size: 0.32rem;
-    padding: 0 0.3rem;
+    font-size: 0.4rem;
+    padding: 0 0.16rem;
   }
   .forbid {
     color: $forbid-color;
@@ -473,13 +481,13 @@ body {
       @media only screen and (max-width: 415px) {
         height: 14.8rem !important;
       }
-      @media only screen and (min-width: 666px) and (max-width: 737px) {
-        height: 8.8rem !important;
-      }
-      @media only screen and (min-width: 737px) and (max-width: 768px) {
-        height: 14.8rem !important;
-      }
-      @media only screen and (min-width: 813px) and (max-width: 1024px) {
+      // @media only screen and (min-width: 666px) and (max-width: 737px) {
+      //   height: 8.8rem !important;
+      // }
+      // @media only screen and (min-width: 737px) and (max-width: 768px) {
+      //   height: 14.8rem !important;
+      // }
+      @media only screen and (min-width: 768px) {
         height: 11.8rem !important;
       }
       .item {
@@ -613,6 +621,20 @@ body {
     height: 30px !important;
   }
 }
+.van-checkbox__icon {
+  @media only screen and (min-width: 768px) {
+    line-height: 30px !important;
+    height: 30px !important;
+  }
+}
+.van-checkbox__icon .van-icon {
+  @media only screen and (min-width: 768px) {
+    font-size: 20px !important;
+    line-height: 30px !important;
+    width: 30px !important;
+    height: 30px !important;
+  }
+}
 
 // .van-checkbox__icon .van-icon {
 //   @media only screen and (max-width: 812px) {