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

layouts/basic-layout/product.vue

@@ -7,6 +7,13 @@
           <Icon type="ios-keypad" />
           <div class="top_menu_box">
             <table class="t_table_box">
+              <tr>
+                <td class="t_title">
+                  <a class="a_goIndex" @click="goIndex">
+                    <b class="title">首页</b>
+                  </a>
+                </td>
+              </tr>
               <tr v-for="(item,i) in filterSider">
                 <td class="t_title">
                   <b class="title"
@@ -277,6 +284,9 @@ export default {
       this.$router.push(u.path)
       this.isActive = u.id
     },
+    goIndex(){
+      this.$router.push("/")
+    },
   },
   mounted() {
     document.addEventListener("scroll", this.handleScroll, { passive: true });
@@ -382,6 +392,9 @@ export default {
           .t_title{
             min-width: 120px;
             background: #515a6e;
+            .a_goIndex{
+              color: #fff;
+            }
             .title{
               padding: 5px 10px;
             }

pages/aps/aps/add.vue

@@ -3,12 +3,12 @@
     <Form ref="form" :model="entity" :rules="rules" :label-width="100">
       <Row :gutter="20">
         <Col span="12">
-          <div class="left-up">
-            <p class="title-c">参数设置</p>
-            <FormItem :label="l('plan_method')" prop="plan_method">
-              <i-switch v-model="entity.plan_method" size="large">
-                <span slot="open">On</span>
-                <span slot="close">Off</span>
+          <div class="filedset">
+            <p class="title">参数设置</p>
+            <FormItem :label="l('plan_method')" prop="planMethod">
+              <i-switch v-model="entity.planMethod" size="large">
+                <span slot="open">平行</span>
+                <span slot="close">重叠</span>
               </i-switch>
             </FormItem>
             <FormItem :label="l('calId')" prop="calId">
@@ -21,22 +21,21 @@
                 ></Option>
               </Select>
             </FormItem>
+              <Divider />
             <FormItem :label="l('overTime')" prop="overTime">
               <i-switch v-model="entity.overTime" size="large">
-                <span slot="open">On</span>
-                <span slot="close">Off</span>
+                <span slot="open">加班</span>
+                <span slot="close">不加班</span>
               </i-switch>
             </FormItem>
             <FormItem :label="l('efficiencyValue')" prop="efficiencyValue">
-              <Input v-model="entity.efficiencyValue" style="width:150px"></Input>
-            </FormItem>
-            <FormItem :label="l('run_time')" prop="run_time">
-              <InputNumber v-model="entity.run_time"></InputNumber>
+              <InputNumber  v-model="entity.efficiencyValue" :step="0.1"></InputNumber >
             </FormItem>           
+             <Divider />
             <FormItem :label="l('isDiscrete')" prop="isDiscrete">
               <i-switch v-model="entity.isDiscrete" size="large">
-                <span slot="open">On</span>
-                <span slot="close">Off</span>
+                <span slot="open">是</span>
+                <span slot="close">否</span>
               </i-switch>
             </FormItem>
             <FormItem :label="l('discrete')" prop="discrete">
@@ -46,10 +45,10 @@
               <InputNumber v-model="entity.discrete_percent"></InputNumber>
             </FormItem>
           </div>
-          <div class="left-donw">
-            <p class="title-c">参数级别</p>
+          <div class="filedset">
+            <p class="title">参数级别</p>
             <div class="icon">
-              <Dropdown trigger="custom" :visible="visible" style="width:150px">
+              <Dropdown trigger="click" >
                 <a href="javascript:void(0)" @click="handleOpen">
                   <Icon type="md-git-compare" />
                 </a>
@@ -86,44 +85,33 @@
               </Dropdown>
             </div>
             <div class="slider">
-              <Slider v-model="entity.level" :step="20" show-stops></Slider>
-              <div class="slow">慢</div>
-              <div class="fast">快</div>
+              <Slider v-model="entity.level" :step="1" :min="1" :max="5" :marks="{1:'慢',5:'块'}" show-stops></Slider>
             </div>
           </div>
         </Col>
         <Col span="12">
-          <div class="right-up">
-            <p class="title-d">多台分配设置</p>
+          <div class="filedset">
+            <p class="title">多台分配设置</p>
             <div class="duo">
               <Row>
                 <Col :span="12">
-                  <FormItem :label="l('multi_machine')" prop="multi_machine">
-                    <i-switch v-model="entity.switch4" size="large">
-                      <span slot="open">On</span>
-                      <span slot="close">Off</span>
+                  <FormItem :label="l('multi_machine')" prop="multipleEquip">
+                    <i-switch v-model="entity.multipleEquip" size="large">
+                      <span slot="open">是</span>
+                      <span slot="close">否</span>
                     </i-switch>
                   </FormItem>
                 </Col>
                 <Col :span="12">
-                  <FormItem label="多台数量" prop="abbre">
-                    <InputNumber v-model="entity.abbre"></InputNumber>
+                  <FormItem label="多台数量" prop="multipleCount">
+                    <InputNumber v-model="entity.multipleCount"></InputNumber>
                   </FormItem>
                 </Col>
               </Row>
-              <FormItem label="班组结构">
-                <Select v-model="entity.shopId" placeholder="请选择" style="width:150px" prop="shopId">
-                  <Option
-                    v-for="(item,index) in list"
-                    :key="index"
-                    :value="item.value"
-                    :label="item.title"
-                    style="display:none"
-                  ></Option>
-                  <Tree key="mytree" :data="data1" ref="mytree" :render="renderContent"></Tree>
-                </Select>
+              <FormItem label="生产设备">               
+                <EquipSelect v-model="entity.multipleEquipIds"> </EquipSelect>
               </FormItem>
-              <div class="check-box">
+              <!-- <div class="check-box">
                 <CheckboxGroup v-model="entity.fruit">
                   <Checkbox label="10985553333（数控车床 车工班）"></Checkbox>
                   <br />
@@ -134,17 +122,13 @@
                   <Checkbox label="10985553333（数控车床 车工班）"></Checkbox>
                   <br />
                 </CheckboxGroup>
+              </div> -->
             </div>
           </div>
-          </div>
-          <div class="left-donw right-down">
-            <p class="title-c">参数应用</p>
+          <div class="filedset">
+            <p class="title">参数应用</p>
             <div class="slider">
-              <Slider v-model="entity.value2" :step="33.3" show-stops></Slider>
-              <div class="slow">工序</div>
-              <div class="ding">订单</div>
-              <div class="ling">零件</div>
-              <div class="fast">所有</div>
+              <Slider v-model="entity.flog" :step="1" :min="1" :max="5" :marks="marks" size="large"></Slider>             
             </div>
           </div>
         </Col>
@@ -165,13 +149,19 @@ export default {
         flog: 0, //参数应用
         planMethod: "转序规则", // 平行 重叠
         shopId: null,
-        level: 100,
+        level: 1,
         value2: 100,
         fruit: []
       },
       list: [],
       data1: [],
-
+      marks:{
+        1:'工序',
+        2:'计划',
+        3:'零件',
+        4:'批次',
+        5:'所有',
+      },
       listCal: [],
       visible: false,
       rules: {
@@ -256,9 +246,6 @@ export default {
     handleClose() {
       this.$emit("on-close");
     },
-    handleOpen() {
-      this.visible = true;
-    },
     handle() {
       this.visible = false;
     },
@@ -274,28 +261,13 @@ export default {
 <style lang="less" scoped>
 .parameter {
   margin: 10px;
-  .left-up {
-    position: relative;
-    border: 1px solid #e0e0e0;
-    padding: 25px 0;
-    .title-c {
-      width: 68px;
-      padding-left: 5px;
-      background: #fff;
-      position: absolute;
-      top: -9px;
-      left: 25px;
-      color: #2680eb;
-    }
-  }
-  .left-donw {
-    margin-top: 15px;
+  .filedset {
     position: relative;
     border: 1px solid #e0e0e0;
     padding: 25px 0;
-
-    .title-c {
-      width: 68px;
+    margin-bottom: 20px;
+    .title {
+      display: inline-block;
       padding-left: 5px;
       background: #fff;
       position: absolute;
@@ -303,61 +275,14 @@ export default {
       left: 25px;
       color: #2680eb;
     }
-    .slider {
-      margin: 0 50px 0 50px;
-      position: relative;
-      .slow {
-        position: absolute;
-        top: 7px;
-        left: -5px;
-      }
-      .fast {
+    .icon{
       position: absolute;
-        top: 7px;
       right: -10px;
+      top:10px;
     }
-      .ding {
-        position: absolute;
-        top: 7px;
-        left: 30%;
-      }
-      .ling {
-        position: absolute;
-        top: 7px;
-        right: 30%;
-      }
-    }
-    .icon {
-      text-align: right;
-      padding-right: 15px;
-      margin-top: -15px;
-    }
-  }
-  .right-up {
-    position: relative;
-    border: 1px solid #e0e0e0;
-    padding: 25px 0;
-    .title-d {
-      width: 95px;
-      padding-left: 5px;
-      margin-left: 10px;
-      background: #fff;
-      position: absolute;
-      top: -9px;
-      left: 25px;
-      color: #2680eb;
-    }
-    .check-box {
-      height: 348px;
-      border-top: 1px solid #e0e0e0;
-      padding: 15px;
-      padding-left: 0;
-      margin-left: 25px;
-      overflow: auto;
-    }
+    .slider{
+      padding: 0 20px;
     }
-  .right-down {
-    height: 92px;
   }
   .click-btn {
     text-align: right;

pages/processManage/Process/processMain.vue

@@ -406,8 +406,7 @@ export default {
       var url =
         `${designUrl}/routingheader/GetListSmall?approvalstatus=1&product_id=` +
         productid +
-        '&routingType=' +
-        this.formValidate.routingType
+        '&routingType=0';
       service.get(`${url}`).then((response) => {
         this.RoutingList = response.result
       })

pages/processManage/setProcess/index.vue

@@ -526,7 +526,7 @@ export default {
 
 
         {
-          title: '主工艺',
+          title: '工艺规程',
           key: 'mainRoutingID',
           width: 120,
           render: (h, params) => {
@@ -610,7 +610,7 @@ export default {
           key: 'materialbillID',
           width: 120,
           render: (h, params) => {
-            if (this.tabstatus == '1') {
+            if (params.row.mainRoutingID == 0) {
               h('div', '')
             } else {
               let id = params.row.id
@@ -1660,6 +1660,8 @@ export default {
 
       ld.orderids = orderids.toString(',')
 
+ld.formValidate.routingHeaderId = params.row.mainRoutingID
+
       ld.formValidate.id = params.row.materialbillID
 
       ld.loaddata()

pages/processManage/setProcess/processMain.vue

@@ -540,8 +540,7 @@ export default {
       var url =
         `${designUrl}/routingheader/GetListSmall?approvalstatus=1&product_id=` +
         productid +
-        "&routingType=" +
-        this.formValidate.routingType;
+        "&routingType=0";
       service.get(`${url}`).then(response => {
         this.RoutingList = response.result;
       });