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

pages/aps/results/compare.vue

@@ -28,7 +28,7 @@
         <div v-if="items.length>0" class="fg list_box" v-for="(li,a) in items" :class="a%2 == 1?'dip_bg':''" :key="a">
           <ul class="right_ul">
             <li class="right_ul_title">
-              <span class="case">方案一{{a}}</span>
+              <span class="case">{{li.scheduleId}}</span>
               <span class="case_time">2020-03-22 13:26:35</span>
             </li>
             <li>{{li.deferNum}}&nbsp;</li>
@@ -101,7 +101,7 @@ export default {
     items(){
       var items=[];
       this.schemas.map(p=>{
-        var info=this.list.filter(u=>u.schedule_Id==p.scheduleId)[0];
+        var info=this.list.filter(u=>u.scheduleId==p.schedule_Id)[0];
         items.push(info);
       })
       return items;

pages/order/quotation/components/searchBox.vue

@@ -2,7 +2,7 @@
   <div class="search-box">
     <!-- 弹出高级搜索框 -->
     <Modal v-model="modalShow" title="高级搜索" :mask-closable="false" width="800">
-      <Form :model="orderSearchForm" :label-width="100" style="margin:10px;">
+      <Form :model="orderSearchForm" :label-width="180" style="margin:10px;">
         <Row>
           <Col span="12">
             <FormItem label="产品名称">