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

package-lock.json

@@ -285,6 +285,11 @@
         }
       }
     },
+    "@types/better-scroll": {
+      "version": "1.12.1",
+      "resolved": "https://registry.npmjs.org/@types/better-scroll/-/better-scroll-1.12.1.tgz",
+      "integrity": "sha512-jI/nmYl6+RbGsVIhJpqpoh09hC5Kf/OZiwYKCcfmoihpxxTPkeuNdz9DyRhdXf09Wgl1l9n/bOXXo9ucwgp4Lg=="
+    },
     "@types/commander": {
       "version": "2.12.2",
       "resolved": "https://registry.npmjs.org/@types/commander/-/commander-2.12.2.tgz",

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

@@ -110,7 +110,11 @@
 
             <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>
@@ -394,6 +398,9 @@ export default {
 <style style="stylesheet/scss" lang="scss" scoped>
 .content {
   .cell {
+    @media only screen and (max-width: 415px) {
+      height: 2.4rem;
+    }
     float: left;
     width: 4.5rem;
 
@@ -446,9 +453,6 @@ export default {
 .content {
   .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;

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

@@ -20,7 +20,11 @@
               <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="单位"
@@ -53,7 +57,12 @@
 
             <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="单位"
@@ -89,7 +98,11 @@
 
             <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>
@@ -427,6 +440,9 @@ export default {
 <style style="stylesheet/scss" lang="scss" scoped>
 .content {
   .cell {
+    @media only screen and (max-width: 415px) {
+      height: 2.4rem;
+    }
     float: left;
     width: 4.5rem;
     margin: 0.35rem 0.3rem 0.1rem 0.4rem;
@@ -477,9 +493,6 @@ 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;