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

assets/css/base.less

@@ -866,7 +866,7 @@ html [type=button] {
 }
 
 .waitTask {/*flex 布局*/    
-    display: flex;
+    display: flex!important;
     align-items: center;
     width: 200px;
     height: 100px;

pages/implement/components/processRecord.vue

@@ -4,10 +4,10 @@
     <Form
       ref="cardModeldata"
       :model="cardModeldata"
-      :rules="ruleValidate"
       :label-width="120"
       inline
     >
+    <!-- :rules="ruleValidate" -->
       <Row>
         <Col span="12">
           <FormItem label="设备编号">

pages/implement/components/sendCheck.vue

@@ -73,7 +73,7 @@ export default {
         checker: 0,
         check_time: null
       },
-
+      isall:[],
       isMain: 1,
       productisabled: false,
       product_ID: [],

pages/implement/index.vue

@@ -48,6 +48,10 @@
             </div>
           </div>
         </div>
+        <div class="dd" v-if="!entryData">
+          <!-- .length=0 -->
+          暂无数据
+        </div>
         <div
           @click="groupClick(item,index)"
           :class="item.id==currentID?'hover':'card_box'"
@@ -369,6 +373,7 @@ export default {
       this.currententry = null
       var url = `${PlanUrl}/orderexecute/getentrylist?ExecuteId=` + ExecuteId
       service.get(`${url}`).then((response) => {
+        console.log("数据",response)
         this.entryData = response.result.entryList
         this.entryHistoryData = this.entryData
         let data = []
@@ -450,7 +455,9 @@ export default {
         }
       })
     },
-
+    detailOk(){
+      console.log("配套")
+    },
     loadBill() {
       var url =
         `${designUrl}/orderbillrel/getorderbilllistbyorders?orderids=` +

pages/implement/table.less

@@ -24,7 +24,8 @@
     float       : left;
     width       : 310px;
     margin-right: 15px;
-    height      : calc(100% - 16px);
+    // height      : calc(100% - 16px);
+    height: 500px;
     border      : 1px solid #e4e6ed;
     overflow-y  : auto;
     overflow-x  : hidden;