Merge branch 'product' of http://git.mes123.com/zhouyx/mes-ui into product

pages/aps/stream/index.vue

@@ -161,7 +161,9 @@ export default {
       maxnum: 1,
       chaiModal: false,
       orderId: 0,
-      routingHeaderId: 0
+      quantity: 0,
+      routingHeaderId: 0,
+      detailId: 0
     };
   },
   created() {
@@ -215,6 +217,7 @@ export default {
             u.chai = false;
           });
           this.result = r.result;
+          this.quantity = r.result.quantity;
         }
       });
     },
@@ -300,7 +303,7 @@ export default {
     },
     //下发
     lowerHair() {
-      if (this.orderId) {
+      if (this.orderId || this.quantity) {
         var items = [];
         var obj = {};
         if (this.mode == 1) {
@@ -355,7 +358,7 @@ export default {
           });
         }
       } else {
-        this.$Message.info("请先选择排产订单设置工序");
+        this.$Message.info("请先选择排产订单并设置工序");
       }
     },
     closeOk() {

pages/technology/index.vue

@@ -41,7 +41,7 @@
           <Icon type="ios-undo-outline" />详情页面
       </a>-->
       <Card class="h100">
-        <DataGrid :columns="columns" ref="grid" :action="action">
+        <DataGrid :columns="columns" ref="grid" :action="action" class="card_box">
           <template slot="easySearch">
             <Form ref="formInline" :model="easySearch" inline>
               <FormItem prop="keys">

pages/technology/technolog.less

@@ -103,5 +103,16 @@
             left: 44%;
         }
     }
-    
+}
+
+.lay100 {
+    height: calc(100vh - 105px);
+    background-color: #F5F6FA;
+    .con{
+      padding: 5px 5px 0px 10px;
+      .h100{
+        overflow-y: auto;
+      }
+    }
+
 }
\ No newline at end of file