Quellcode durchsuchen

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

csx vor 4 Jahren
Ursprung
Commit
3c4a033079

+ 0 - 1
src/pages/main/dialog/PrescriptionDialog.vue Datei anzeigen

@@ -1289,7 +1289,6 @@
1289 1289
               this.zhiShow = true
1290 1290
               this.totalShow = true
1291 1291
               this.huShow  = true 
1292
-              console.log("a")
1293 1292
             }
1294 1293
           }
1295 1294
         }

+ 20 - 18
src/pages/main/dialog/modify_order/modify_order_form.vue Datei anzeigen

@@ -110,11 +110,7 @@
110 110
 
111 111
             <div class="cell" v-show="order.parent_id == 0">
112 112
               <label>医嘱嘱托</label>
113
-              <input
114
-                class="inputBox"
115
-                style="width:100%"
116
-                v-model="order.remark"
117
-              />
113
+              <input class="inputBox" style="width:100%" v-model="order.remark" />
118 114
             </div>
119 115
             <!-- </div> -->
120 116
           </div>
@@ -252,7 +248,7 @@ export default {
252 248
   computed: {
253 249
     dialog_title: function() {
254 250
       if (this.mode == 1) {
255
-        return "修改医嘱";
251
+        return "修改子药";
256 252
       }
257 253
     }
258 254
   },
@@ -396,6 +392,7 @@ export default {
396 392
   .cell {
397 393
     float: left;
398 394
     width: 4.5rem;
395
+
399 396
     margin: 0.35rem 0.3rem 0.1rem 0.4rem;
400 397
     label {
401 398
       display: block;
@@ -443,20 +440,25 @@ export default {
443 440
 </style>
444 441
 <style lang="scss">
445 442
 .content {
446
-  .cell {
447
-    .inputBox {
448
-      @media only screen and (max-width: 767px) {
449
-        padding: 10.6px 0 !important;
450
-        padding-left: 5px !important;
451
-        font-size: 0.42rem !important;
443
+  .newContent {
444
+    .cell {
445
+      @media only screen and (max-width: 415px) {
446
+        height: 2.4rem;
447
+      }
448
+      .inputBox {
449
+        @media only screen and (max-width: 767px) {
450
+          padding: 10.6px 0 !important;
451
+          padding-left: 5px !important;
452
+          font-size: 0.42rem !important;
453
+        }
452 454
       }
453
-    }
454
-    .el-input__inner {
455
-      font-size: 0.42rem;
456
-    }
457
-    .is-disabled {
458 455
       .el-input__inner {
459
-        color: #999;
456
+        font-size: 0.42rem;
457
+      }
458
+      .is-disabled {
459
+        .el-input__inner {
460
+          color: #999;
461
+        }
460 462
       }
461 463
     }
462 464
   }

+ 6 - 16
src/pages/main/dialog/new_order/order_form.vue Datei anzeigen

@@ -20,11 +20,7 @@
20 20
               <label>药品规格</label>
21 21
               <!--<input class="inputBox" style="width:62.5%" v-model="order.advice_desc">-->
22 22
 
23
-              <input
24
-                class="inputBox"
25
-                style="width:60%"
26
-                v-model="order.advice_desc"
27
-              />
23
+              <input class="inputBox" style="width:60%" v-model="order.advice_desc" />
28 24
               <input
29 25
                 type="text"
30 26
                 placeholder="单位"
@@ -57,12 +53,7 @@
57 53
 
58 54
             <div class="cell">
59 55
               <label>单次用量</label>
60
-              <input
61
-                type="number"
62
-                class="inputBox"
63
-                style="width:62.5%"
64
-                v-model="order.single_dose"
65
-              />
56
+              <input type="number" class="inputBox" style="width:62.5%" v-model="order.single_dose" />
66 57
               <input
67 58
                 type="text"
68 59
                 placeholder="单位"
@@ -98,11 +89,7 @@
98 89
 
99 90
             <div class="cell" v-show="order.parent_id == 0">
100 91
               <label>医嘱嘱托</label>
101
-              <input
102
-                class="inputBox"
103
-                style="width:100%"
104
-                v-model="order.remark"
105
-              />
92
+              <input class="inputBox" style="width:100%" v-model="order.remark" />
106 93
             </div>
107 94
           </div>
108 95
         </div>
@@ -490,6 +477,9 @@ export default {
490 477
     overflow: hidden;
491 478
   }
492 479
   .cell {
480
+    @media only screen and (max-width: 415px) {
481
+      height: 2.4rem;
482
+    }
493 483
     .inputBox {
494 484
       @media only screen and (max-width: 767px) {
495 485
         padding: 0.34rem 0 !important;