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

src/pages/main/PatientBox.vue

@@ -296,6 +296,7 @@ export default {
   width: 47%;
   margin: 0 3% 0.5rem 0;
   float: left;
+  border-radius: 5px;
   @media only screen and (max-width: 415px) {
     width: 96% !important;
   }

src/pages/main/dialog/AcceptsDialog.vue

@@ -7,7 +7,11 @@
         <span class="success" @click="commitInfo">保存</span>
       </div>
       <div class="DialogContent choose">
-        <el-form :model="receiveTreatmentAsses" label-width="130px">
+        <el-form
+          class="acceptsForm"
+          :model="receiveTreatmentAsses"
+          label-width="130px"
+        >
           <el-form-item label="入室方式: " v-if="isShow('入室方式')">
             <el-radio v-model="receiveTreatmentAsses.way" label="1"
               >步行</el-radio
@@ -467,16 +471,25 @@ export default {
 }
 </style>
 <style lang="scss">
-.el-radio {
-  margin-right: 26px;
-  width: 2.4rem;
+.acceptsForm {
+  .el-radio {
+    margin-right: 20px;
+    width: 2.4rem;
+  }
 }
+
 .el-radio__inner {
   width: 20px;
   height: 20px;
+  @media only screen and (min-width: 768px) {
+    width: 26px;
+    height: 26px;
+    margin-bottom: 4px;
+  }
 }
 .illnessInput {
   .el-input__inner {
+    font-size: 0.45rem;
     @media only screen and (min-width: 768px) {
       height: 60px;
       line-height: 60px;

src/pages/main/dialog/DoubleDialog.vue

@@ -9,9 +9,9 @@
       <div style="height: 8rem" class="DialogContent choose">
         <el-form
           :inline="true"
-          class="demo-form-inline"
+          class="demo-form-inline doubleForm"
           :model="doubleReview"
-          label-width="140px"
+          label-width="3.4rem"
         >
           <el-form-item label="透析物品核查 : ">
             <el-radio v-model="doubleReview.dialysis_item_check" label="1"
@@ -21,15 +21,18 @@
               >错误</el-radio
             >
           </el-form-item>
-          <el-form-item label="差错描述 : " label-width="140px">
-            <el-input v-model="doubleReview.dialysis_item_desc"></el-input>
+          <el-form-item label="差错描述 : " label-width="3.4rem">
+            <el-input
+              class="doubleInput"
+              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="140px"
+          label-width="3.4rem"
         >
           <el-form-item label="透析参数核查 : ">
             <el-radio v-model="doubleReview.dialysis_parameter_check" label="1"
@@ -39,15 +42,18 @@
               >错误</el-radio
             >
           </el-form-item>
-          <el-form-item label="差错描述 : " label-width="140px">
-            <el-input v-model="doubleReview.dialysis_parameter_desc"></el-input>
+          <el-form-item label="差错描述 : " label-width="3.4rem">
+            <el-input
+              class="doubleInput"
+              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="140px"
+          label-width="3.4rem"
         >
           <el-form-item label="血管通路核查 : ">
             <!--<el-radio-group v-model="form.appetite">-->
@@ -65,15 +71,18 @@
               >错误</el-radio
             >
           </el-form-item>
-          <el-form-item label="差错描述 : " label-width="140px">
-            <el-input v-model="doubleReview.vascular_access_desc"></el-input>
+          <el-form-item label="差错描述 : " label-width="3.4rem">
+            <el-input
+              class="doubleInput"
+              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="140px"
+          label-width="3.4rem"
         >
           <el-form-item label="管道连接核查 : ">
             <!--<el-radio-group v-model="form.condition">-->
@@ -85,8 +94,9 @@
             >
             <!--</el-radio-group>-->
           </el-form-item>
-          <el-form-item label="差错描述 : " label-width="140px">
+          <el-form-item label="差错描述 : " label-width="3.4rem">
             <el-input
+              class="doubleInput"
               v-model="doubleReview.pipeline_connection_desc"
             ></el-input>
           </el-form-item>
@@ -97,7 +107,7 @@
           <div class="content">
             <span
               class="text"
-              style="width: 160px"
+              style="width: 3.4rem"
               @click="selectCheckTimeAction"
               >{{ check_time_str }}</span
             >
@@ -109,7 +119,7 @@
           :inline="true"
           class="demo-form-inline"
           :model="doubleReview"
-          label-width="160px"
+          label-width="3.4rem"
         >
           <p style="margin: 10px 0 10px 13px;" v-if="doubleReview.creater != 0">
             {{ getFirstCheckDesc() }}
@@ -542,12 +552,16 @@ export default {
 }
 </style>
 <style lang="scss">
-.el-radio__inner {
-  @media only screen and (min-width: 768px) {
-    width: 20px;
-    height: 20px;
+.doubleForm {
+  .el-radio__inner {
+    @media only screen and (min-width: 768px) {
+      width: 26px;
+      height: 26px;
+      margin-bottom: 4px;
+    }
   }
 }
+
 .el-radio__input {
   @media only screen and (min-width: 768px) {
     margin-top: -6px;
@@ -558,4 +572,9 @@ export default {
     font-size: 0.45rem;
   }
 }
+.doubleInput {
+  .el-input__inner {
+    font-size: 0.45rem;
+  }
+}
 </style>

src/pages/main/dialog/OrdersDialog.vue

@@ -1,8 +1,8 @@
 <template>
   <div>
     <div class="Dialog" v-show="index==0" style="width: 11.8rem;">
-      <div class="DialogTit" @click="$emit('orderDialog')">
-        <span class="iconfont">&#xe6e9;</span>
+      <div class="DialogTit">
+        <span class="iconfont" @click="$emit('orderDialog')">&#xe6e9;</span>
         <h1 class="name">临时医嘱</h1>
         <span class="success">&nbsp;</span>
       </div>
@@ -20,7 +20,7 @@
           v-if="isShowMofifyExce"
           @click="modifyExecAdvice"
           :class="{ forbid: (current_advice&& current_advice.parent_id > 0) }"
-        >修改</span>
+        >执行</span>
         <span
           v-if="template_id != 6"
           @click="checkAdvice"
@@ -53,9 +53,9 @@
             <table class="table">
               <tr @click="cancelAdviceSelect">
                 <th width="8%">开嘱医生</th>
-                <th width="16%">开始时间</th>
-                <th width="44%">医嘱内容</th>
-                <th width="16%">执行时间</th>
+                <th width="12%">开始时间</th>
+                <th width="52%">医嘱内容</th>
+                <th width="12%">执行时间</th>
                 <th width="8%">执行护士</th>
                 <th v-if="template_id != 6" width="8%">核对人员</th>
               </tr>
@@ -1398,6 +1398,9 @@
 }
 .table {
   width: 1200px;
+  @media only screen and (max-width: 767px) {
+      width: 800px;
+    }
   tr {
     th {
       background: $main-color;