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

src/pages/main/DetailsPage.vue

     right: 0;
     z-index: 100;
     background: #258ffc;
-    -webkit-transform:translateZ(1px);
--moz-transform:translateZ(1px);
--o-transform:translateZ(1px);
-transform:translateZ(1px);
+    -webkit-transform: translateZ(1px);
+    -moz-transform: translateZ(1px);
+    -o-transform: translateZ(1px);
+    transform: translateZ(1px);
     @media only screen and (max-width: 320px) {
       display: -webkit-box;
     }
     }
     .nav {
       margin-right: 2.4rem;
+      @media only screen and (min-width: 416px) {
+        margin-right: 4rem;
+      }
       @media only screen and (min-width: 768px) {
         margin-right: 4rem;
       }

src/pages/main/PatientBox.vue

   background-color: #f56c6c;
   color: #fff;
   border-radius: 15px;
-  font-size: 14px;
+  font-size: 0.32rem;
   @media only screen and (max-width: 415px) {
     font-size: 0.34rem !important;
   }

src/pages/main/dialog/OrdersDialog.vue

         <span
           v-if="currentSubAdvices.length <= 0"
           @click="modifyAdviceAction"
-          :class="{ forbid: current_group_index < 0 ||  currentAdvices.length != 1 || (this.$store.getters.user.user.user_type == 3 && !isPremission) }"
+          :class="{ forbid: current_group_index < 0 ||  currentAdvices.length != 1  || current_select_object== 2 || (this.$store.getters.user.user.user_type == 3 && !isPremission) }"
         >修改</span>
         <span
           v-if="currentSubAdvices.length <= 0"
 
       },
       modifyAdviceAction: function () {
+        if (this.currentAdvices.length != 1 || this.current_select_object == 2){
+          return
+        }
         if (this.$store.getters.user.user.user_type == 3 && !this.isPremission){
           return
         }
       }, selectGroupAdviceAction: function (group_index, advice_index, advice, group) {
 
         if (this.current_group_index != -1 && this.current_group_index != group_index) { //选择其他组，将原来的组选择状态清除
-          console.log("111111111")
           this.currentAdvices = []
           this.currentSubAdvices = []
           for (let i = 0; i < this.advice_groups.length; i++) {

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

       </div>
       <div class="DialogContent choose">
         <div class="content clearfix">
-          <div class="yzNav" style="width:90%;">
-            <span @click="newAdviceAction">新增医嘱</span>
+          <div class="yzNav newYzNav" style="width:100%;overflow-x:hidden">
+            <span @click="newAdviceAction">新增内容</span>
             <span
               @click="modifyAction"
               :class="{ forbid: current_advice_index < 0 }"
-              >修改医嘱</span
+              >修改内容</span
             >
           </div>
-          <div style="overflow: hidden;">
+          <div class="newBox" 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 readonly :value="record_date_str"></el-input>
-            </div>
+
             <div class="cell" style="margin-top: 0;">
               <label>开始时间</label>
               <el-input
                 @focus="selectStartTimeAction"
               ></el-input>
             </div>
+            <div class="cell" style="margin-top: 0;">
+              <label>开嘱时间</label>
+              <!-- <el-input readonly :value="record_date_str"></el-input> -->
+              <span class="newSpan">{{ record_date_str }}</span>
+            </div>
             <div class="cell" style="margin-top: 0;">
               <label>开嘱医生</label>
               <span class="newdoctorName">{{
               }}</span>
             </div>
           </div>
-          <table class="table">
-            <tr @click="cancelSelectAdvice">
-              <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>
-            <tr
-              v-for="(advice, index) in advices"
-              :key="index"
-              :class="{ 'row-class-active': index == current_advice_index }"
-              @click="selectAdviceAction(index, advice)"
-            >
-              <td
-                :class="{
-                  advice_name: advice.parent_id == 0,
-                  subdrug_name: advice.parent_id > 0
-                }"
+          <div class="newModifyTable">
+            <table class="table">
+              <tr @click="cancelSelectAdvice">
+                <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>
+              <tr
+                v-for="(advice, index) in advices"
+                :key="index"
+                :class="{ 'row-class-active': index == current_advice_index }"
+                @click="selectAdviceAction(index, advice)"
               >
-                {{ advice.advice_name }}
-              </td>
-              <td>{{ advice.advice_desc }}{{ advice.drug_spec_unit }}</td>
-              <td>
-                {{ advice.prescribing_number
-                }}{{ advice.prescribing_number_unit }}
-              </td>
-              <td>{{ advice.single_dose }} {{ advice.single_dose_unit }}</td>
-              <td>{{ advice.parent_id == 0 ? advice.delivery_way : "" }}</td>
-              <td>
-                {{ advice.parent_id == 0 ? advice.execution_frequency : "" }}
-              </td>
-            </tr>
-          </table>
+                <td
+                  :class="{
+                    advice_name: advice.parent_id == 0,
+                    subdrug_name: advice.parent_id > 0
+                  }"
+                >
+                  {{ advice.advice_name }}
+                </td>
+                <td>{{ advice.advice_desc }}{{ advice.drug_spec_unit }}</td>
+                <td>
+                  {{ advice.prescribing_number
+                  }}{{ advice.prescribing_number_unit }}
+                </td>
+                <td>{{ advice.single_dose }} {{ advice.single_dose_unit }}</td>
+                <td>{{ advice.parent_id == 0 ? advice.delivery_way : "" }}</td>
+                <td>
+                  {{ advice.parent_id == 0 ? advice.execution_frequency : "" }}
+                </td>
+              </tr>
+            </table>
+          </div>
         </div>
       </div>
     </div>
 </script>
 
 <style style="stylesheet/scss" lang="scss" scoped>
-.table {
+.newYzNav {
+  position: fixed;
+  top: 1.5rem;
+}
+.newBox {
+  position: fixed;
+  top: 3.2rem;
+}
+.newModifyTable {
   width: 100%;
+  margin-top: 5.2rem;
+  @media only screen and (max-width: 767px) {
+    margin-top: 5.8rem;
+  }
+}
+.newSpan {
+  font-size: 0.45rem;
+}
+.table {
+  width: 1000px;
   margin-top: 0.2rem;
   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.8rem;
     }
 
     .advice_name {
 .content {
   .cell {
     float: left;
-    width: 3.5rem;
-    margin: 0.35rem 0.3rem 0 0.4rem;
+    width: 5rem;
+    margin: 0.35rem 0.3rem 0.2rem 0.4rem;
     label {
       display: block;
       height: 0.6rem;
       line-height: 0.6rem;
       color: $pgh-color;
       font-size: 0.45rem;
+      margin-bottom: 0.2rem;
     }
     .newdoctorName {
       font-size: 0.45rem;

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

   .cell {
     float: left;
     width: 4.5rem;
-    margin: 0.35rem 0.3rem 0rem 0.4rem;
+    margin: 0.35rem 0.3rem 0.1rem 0.4rem;
     overflow: hidden;
     label {
       display: block;
     .el-input__inner {
       font-size: 0.42rem;
     }
+    .is-disabled {
+      .el-input__inner {
+        color: #999;
+      }
+    }
   }
 }
 </style>

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

   .cell {
     float: left;
     width: 4.5rem;
-    margin: 0.35rem 0.3rem 0 0.4rem;
+    margin: 0.35rem 0.3rem 0.1rem 0.4rem;
     label {
       display: block;
       height: 0.9rem;