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

src/pages/main/dialog/PrescriptionDialog.vue

@@ -1289,7 +1289,6 @@
               this.zhiShow = true
               this.totalShow = true
               this.huShow  = true 
-              console.log("a")
             }
           }
         }

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

@@ -110,11 +110,7 @@
 
             <div class="cell" v-show="order.parent_id == 0">
               <label>医嘱嘱托</label>
-              <input
-                class="inputBox"
-                style="width:100%"
-                v-model="order.remark"
-              />
+              <input class="inputBox" style="width:100%" v-model="order.remark" />
             </div>
             <!-- </div> -->
           </div>
@@ -252,7 +248,7 @@ export default {
   computed: {
     dialog_title: function() {
       if (this.mode == 1) {
-        return "修改医嘱";
+        return "修改子药";
       }
     }
   },
@@ -396,6 +392,7 @@ export default {
   .cell {
     float: left;
     width: 4.5rem;
+
     margin: 0.35rem 0.3rem 0.1rem 0.4rem;
     label {
       display: block;
@@ -443,20 +440,25 @@ export default {
 </style>
 <style lang="scss">
 .content {
-  .cell {
-    .inputBox {
-      @media only screen and (max-width: 767px) {
-        padding: 10.6px 0 !important;
-        padding-left: 5px !important;
-        font-size: 0.42rem !important;
+  .newContent {
+    .cell {
+      @media only screen and (max-width: 415px) {
+        height: 2.4rem;
+      }
+      .inputBox {
+        @media only screen and (max-width: 767px) {
+          padding: 10.6px 0 !important;
+          padding-left: 5px !important;
+          font-size: 0.42rem !important;
+        }
       }
-    }
-    .el-input__inner {
-      font-size: 0.42rem;
-    }
-    .is-disabled {
       .el-input__inner {
-        color: #999;
+        font-size: 0.42rem;
+      }
+      .is-disabled {
+        .el-input__inner {
+          color: #999;
+        }
       }
     }
   }

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

@@ -20,11 +20,7 @@
               <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="单位"
@@ -57,12 +53,7 @@
 
             <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="单位"
@@ -98,11 +89,7 @@
 
             <div class="cell" v-show="order.parent_id == 0">
               <label>医嘱嘱托</label>
-              <input
-                class="inputBox"
-                style="width:100%"
-                v-model="order.remark"
-              />
+              <input class="inputBox" style="width:100%" v-model="order.remark" />
             </div>
           </div>
         </div>
@@ -490,6 +477,9 @@ export default {
     overflow: hidden;
   }
   .cell {
+    @media only screen and (max-width: 415px) {
+      height: 2.4rem;
+    }
     .inputBox {
       @media only screen and (max-width: 767px) {
         padding: 0.34rem 0 !important;