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

components/customTable/mutiSearch.vue

 <template>
-    <div>
+    <div class="heigh_search">
         <div style="display:inline-flex;">
-            <Input search enter-button  placeholder="订单编号、产品编码..." @on-search="easySearch" v-model="value" />&nbsp;&nbsp;
-             <Button  @click="open" type="text"><Icon type="md-search" />高级</Button>
+            <Input class="mr5" search enter-button  placeholder="订单编号、产品编码..." @on-search="easySearch" v-model="value" />
                <!-- <Input  v-model="value" placeholder="关键字"  style="width:300px;" :clearable='true'>
                 <Button @click="easySearch" icon="ios-search-outline" slot="append" style="width:40px;background-color:#249E91;color:#FFF;"></Button>
             </Input> -->             
         </div>
+        <Button  @click="open" class="mt_btn" type="primary">高级搜索</Button>       
         <!-- 右侧按钮 -->
         <slot name="button"></slot>
         <!-- 弹出高级搜索框 -->
         <Modal v-model="modalShow" title="高级搜索" :mask-closable="false" width="800"> 
             <Form :model="orderSearchForm" ref="orderSearchForm" :label-width="100" inline>
                 <slot name="search"></slot>
-            </Form>
+            </Form> 
             <div slot="footer" >
                 <Button  @click="close" style="margin-left:20px;">取消</Button>
                  <!-- <Button  @click="formReset" style="margin-left:20px;">重置</Button> -->
@@ -50,9 +50,13 @@ export default {
             this.close();     
         },
          formReset(){
-
               this.$emit('formReset');
         }
     }
 }
 </script>
+<style scoped>
+.heigh_search .mt_btn{
+    margin: -23px 0 0 0;
+}
+</style>

pages/aps/dispatch/index.vue

@@ -99,14 +99,14 @@
               <!-- {{peploeId}} @on-change="setpepoleid" @on-change="setpepoleids"-->
               <Row :gutter="15">
                 <Col span="8" class="dispatch_card02" v-for="(item,index) in listMan" :key="index">
-                  <!-- <Tooltip :content="item.userName"> -->
                     <CheckboxGroup class="man_body">
                       <Checkbox v-model="item.checked" border  class='checkUser'>
+                  <!-- <Tooltip :content="item.userName" placement="top-start"> -->
                         <span class="svg_name" :title='item.userName'>{{item.userName}}</span>
                         <!-- <span class="svg">{{item.id}}</span> -->
+                  <!-- </Tooltip> -->
                       </Checkbox>
                     </CheckboxGroup>
-                  <!-- </Tooltip> -->
                 </Col>
               </Row>
             </div>

pages/mainProcess/index.vue

@@ -26,6 +26,7 @@
             </Col>
             <Col span="5">
               <FormItem label>
+                 <!-- :disabled="disableFlagbao" -->
                 <Button class="mr10" @click="saveCase">保存方案</Button>
                 <Button type="primary" :disabled="disableFlag" @click="setPaiCase">确认派工</Button>
               </FormItem>
@@ -183,6 +184,7 @@ export default {
       chaiNum: 1, //拆分数量
       quantityold: 0 ,//存投产数量
       disableFlag:false,//确认派工按钮是否禁用
+      disableFlagbao:false,//保存方案按钮是否禁用
     }
   },
   created() {
@@ -418,8 +420,12 @@ export default {
         var start = ''
         var end = ''
         if(u.times.length==2){         
+          if(u.times[0] == undefined||u.times[1] == undefined){
+            return
+          }else{
             start=new Date(u.times[0])
             end=new Date(u.times[1])
+          }  
         }
         var detail = {
           detailId: u.detailId, //工序id--后端接收
@@ -439,6 +445,7 @@ export default {
         items.push(detail)
       })
       // console.log(items)
+      // this.disableFlagbao = false
       let url = `${PlanUrl}/dispatch/schememain` //保存方案接口new
       service.post(url, {
           orderId: this.data.row[0].order_id,
@@ -449,8 +456,10 @@ export default {
           // console.log(r)
           if (r.statusText == "OK") {
             this.$Message.success('已保存。')
+            // this.disableFlagbao = true
           } else {
             this.$Message.error('保存失败')
+            // this.disableFlagbao = false
           }
         })
     },
@@ -491,6 +500,7 @@ export default {
           return
         }
       }
+      this.disableFlag = false
       let urlPai = `${PlanUrl}/dispatch/dispatchmain` //派工接口
       service.post(urlPai, {
           orderId: this.data.row[0].order_id, //订单ID

pages/produce/orderscheduling.vue

@@ -445,8 +445,7 @@ export default {
     pageChange(pageNum) {
       let pageData = this.search;
       pageData.SkipCount = (pageNum - 1) * this.orderSearchForm.MaxResultCount;
-      pageData.MaxResultCount =
-        (pageNum - 1) * this.orderSearchForm.MaxResultCount;
+      pageData.MaxResultCount = this.orderSearchForm.MaxResultCount;
       this.laoedPage(pageData);
     },
     pageSizeChange(val) {