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

i18n/locale/zh-CN.js

@@ -927,6 +927,7 @@ export default {
   mes_part_task_plan_simulate: {
     id: '',
     part_task_pk: '计划编号',
+    mes_code: '计划编号',
     priority: '优先级',
     plan_qty: '排产数量',
     spare_qty: '备件数量',

layouts/basic-layout/product.vue

@@ -30,8 +30,7 @@
               </tr>
               <tr v-for="(item,i) in filterSider">
                 <td class="t_title">
-                  <b class="title"
-                  >{{item.title}}</b>
+                  <b class="title">{{item.title}}</b>
                 </td>
                 <td>
                   <ul class="table_row_ul">
@@ -42,7 +41,6 @@
                 </td>
               </tr>
             </table>
-
           </div>
       </span>
         </a>
@@ -76,7 +74,7 @@
         <i-header-notice v-if="showNotice" />
         <i-header-user />
         <!-- <i-header-i18n v-if="showI18n" />
-        <i-header-setting v-if="enableSetting && !isMobile" /> -->
+        <i-header-setting v-if="enableSetting && !isMobile" />-->
       </div>
     </Header>
     <Content class="i-layout-content">
@@ -131,7 +129,7 @@ export default {
   },
   data() {
     return {
-      isActive:0,
+      isActive: 0,
       showDrawer: false,
       ticking: false,
       headerVisible: true,
@@ -361,6 +359,9 @@ export default {
   // }
 }
 .product-layout {
+  .i-layout-content {
+    padding: 5px 10px;
+  }
   .ivu-layout-header {
     height: 50px;
     line-height: 50px;
@@ -384,7 +385,8 @@ export default {
         -webkit-transition: width 0.5s, height 0.5s, -webkit-transform 0.5s; /* Safari */
         transition: width 0.5s, height 0.5s, transform 0.5s;
         i {
-          -webkit-transition: font-size 0.5s, margin 0.5s, -webkit-transform 0.5s; /* Safari */
+          -webkit-transition: font-size 0.5s, margin 0.5s,
+            -webkit-transform 0.5s; /* Safari */
           transition: font-size 0.5s, margin 0.5s, transform 0.5s;
         }
       }
@@ -397,10 +399,10 @@ export default {
         top: 57%;
         min-width: 1084px;
         min-height: 300px;
-        box-shadow: 0px 5px 17px 5px rgba(0,0,0,0.28);
+        box-shadow: 0px 5px 17px 5px rgba(0, 0, 0, 0.28);
         background: #f5f6fa;
-        .t_table_box{
-          border-collapse:collapse;
+        .t_table_box {
+          border-collapse: collapse;
           border-radius: 5px;
           tr:first-of-type {
             border-top-right-radius: 5px;
@@ -414,15 +416,15 @@ export default {
               border-bottom-left-radius: 5px;
             }
           }
-          tr{
+          tr {
             // line-height: 35px;
-            td{
+            td {
               padding: 9px 10px 0px;
-              .table_row_ul{
+              .table_row_ul {
                 list-style: none;
-                border-bottom: 1px solid #E0E0E0;
+                border-bottom: 1px solid #e0e0e0;
                 text-align: left;
-                li{
+                li {
                   list-style: none;
                   display: inline-block;
                   a {
@@ -432,15 +434,15 @@ export default {
                     margin: 0px 6px;
                     border-radius: 4px;
                   }
-                  a:hover{
+                  a:hover {
                     background: #2680eb;
                     color: white;
                   }
-                  a:visited{
+                  a:visited {
                     background: #2680eb;
                     color: white;
                   }
-                  a.active{
+                  a.active {
                     background: #2680eb;
                     color: white;
                   }
@@ -448,32 +450,32 @@ export default {
               }
             }
           }
-          .t_title{
+          .t_title {
             min-width: 120px;
             background: #515a6e;
-            .a_goIndex{
+            .a_goIndex {
               color: #fff;
             }
-            .title{
+            .title {
               padding: 5px 10px;
             }
           }
         }
       }
     }
-      .menu:hover .home {
-        margin-top: 10px;
-        height: 60px;
-        width: 60px;
-        z-index: 88888;
-      }
-      .menu:hover .home .top_menu_box {
-        display: block;
-      }
-      .menu:hover .home i {
-        font-size: 33px;
-        margin: 13px 0 0;
-      }
+    .menu:hover .home {
+      margin-top: 10px;
+      height: 60px;
+      width: 60px;
+      z-index: 88888;
+    }
+    .menu:hover .home .top_menu_box {
+      display: block;
+    }
+    .menu:hover .home i {
+      font-size: 33px;
+      margin: 13px 0 0;
+    }
     .ivu-breadcrumb {
       height: 50px;
       line-height: 50px;

pages/aps/aps/add.vue

@@ -118,16 +118,16 @@
                   <InputNumber v-model="entity.efficiencyValue" :step="0.01"></InputNumber>
                 </FormItem>
               </Col>
-              <Col :span="12">
-              <FormItem :label="l('run_time')" prop="run_time">
-             <span v-text="run_time"></span>
-            </FormItem>
+              <Col :span="12" v-if="opTaskPk>0">
+                <FormItem :label="l('run_time')" prop="run_time">
+                  <span v-text="row.run_time"></span>
+                </FormItem>
               </Col>
             </Row>
 
             <Divider />
-            <FormItem :label="l('isDiscrete')" prop="lisan">
-              <i-switch v-model="entity.lisan" size="large">
+            <FormItem :label="l('isDiscrete')" prop="isDiscrete">
+              <i-switch v-model="entity.isDiscrete" size="large">
                 <span slot="open">是</span>
                 <span slot="close">否</span>
               </i-switch>
@@ -171,7 +171,7 @@ export default {
         overTime: "不加班", //"六日加班", 不加班 加班
         efficiencyValue: 11, // 效率系数, 必须大于 0
         shopId: null,
-        lisan: true,
+        isDiscrete: true,
         isDiscrete: "否",
         discrete: 1, //离散数值  必须大于 1
         multiple: true,
@@ -231,9 +231,15 @@ export default {
       type: Number,
       default: 0
     },
-    run_time:{
+    run_time: {
       type: Number,
-      default:0
+      default: 0
+    },
+    row: {
+      type: Object,
+      default: () => {
+        return null;
+      }
     }
   },
   created() {
@@ -272,7 +278,7 @@ export default {
           this.entity.over = u.OverTime == "不加班";
           this.entity.overTime = u.parameterValue;
         } else if (u.parametersCode == "Discrete") {
-          this.entity.lisan = u.parameterValue == "是";
+          this.entity.isDiscrete = u.parameterValue == "是";
           this.entity.isDiscrete = u.parameterValue;
         }
       });
@@ -280,15 +286,22 @@ export default {
     handleSubmit() {
       this.$refs.form.validate(valid => {
         if (valid) {
-          if(this.opTaskPk==0&&this.partTaskPk>0&&this.entity.flog<1){
-            this.$Message.error("计划参数调整参数应用范围不能是工序级的")
-            this.entity.flog=1;
+          if (
+            this.opTaskPk == 0 &&
+            this.partTaskPk > 0 &&
+            this.entity.flog < 1
+          ) {
+            this.$Message.error("计划参数调整参数应用范围不能是工序级的");
+            this.entity.flog = 1;
             return;
           }
-          this.entity.multipleEquipIds = this.entity.multipleEquipPks.join();
+          if(this.entity.multipleEquipPks){
+            this.entity.multipleEquipIds = this.entity.multipleEquipPks.join();
+          }
+          // 
           this.entity.planMethod = this.entity.planState ? "重叠" : "平行";
           this.entity.overTime = this.entity.over ? "不加班" : "加班";
-          this.entity.isDiscrete = this.entity.lisan ? "是" : "否";
+          this.entity.isDiscrete = this.entity.isDiscrete ? "是" : "否";
           this.entity.multipleEquip = this.entity.multiple ? "是" : "否";
           Api.apsschedulupdateparameter(this.entity)
             .then(res => {
@@ -336,11 +349,35 @@ export default {
     },
     opTaskPk(v, n) {
       this.entity.opTaskPk = v;
+      if(v>0){
+        let entity={
+          partTaskPk: this.row.part_task_pk,
+          opTaskPk: this.row.op_task_pk,
+          taskSeq: this.row.task_seq,
+          flog: 5, //参数应用范围
+          calId: null,
+          planState: true,
+          planMethod: this.row.plan_method, // 平行 重叠
+          over: false,
+          overTime: this.row.over_time, //"六日加班", 不加班 加班
+          efficiencyValue:this.row.efficiency_value, // 效率系数, 必须大于 0
+          shopId: null,
+          isDiscrete: this.row.isdiscrete,
+          isDiscrete: "否",
+          discrete: this.row.discrete_value, //离散数值  必须大于 1
+          multiple: true,
+          multipleEquip: this.row.multi_machine, //"是否多台安排设备", 否  是
+          multipleCount: 1, //多台数量
+          multipleEquipPks: [],
+          multipleEquipIds: "", //"设备id", 用英文逗号分隔
+        }
+        this.entity=entity
+      }
       this.entity.taskSeq = this.taskSeq;
     },
     count(v, n) {
       this.entity.discrete = 1;
-    }
+    },
   }
 };
 </script>
@@ -375,7 +412,7 @@ export default {
       }
     }
   }
-  .h50{
+  .h50 {
     height: 115px;
   }
   .click-btn {

pages/aps/aps/components/excute.vue

@@ -27,6 +27,7 @@
         :partTaskPk="setParams.partTaskPk"
         :taskSeq="setParams.taskSeq"
         :count="setParams.count"
+        :row="rowData"
       />
     </Modal>
   </div>
@@ -429,6 +430,7 @@ export default {
         taskSeq: row.task_seq,
         count: row.put_into_qty
       };
+      this.rowData=row
       this.setParsModal = true;
     },
     //单个工序进行参数设置end----

pages/aps/aps/index.vue

@@ -146,8 +146,8 @@ export default {
           category: "icon"
         },
         {
-          key: "part_task_pk",
-          title: this.l("part_task_pk"),
+          key: "mes_code",
+          title: this.l("mes_code"),
           align: "left",
           high: true
         },

pages/aps/results/index.vue

@@ -240,7 +240,6 @@ export default {
     line-height: 38px;
     border-bottom: 1px solid #e4e6ed;
     margin-bottom: 15px;
-    margin-right: 15px;
   }
   .left-body:hover {
     cursor: pointer;
@@ -269,7 +268,6 @@ export default {
     .btn {
       float: right;
       margin-top: -52px;
-      margin-right: 15px;
     }
   }
 }

pages/order/quotation/components/treeType.vue

 <template>
-  <div class="tree-type">
+  <div class="zh-tree">
     <h3 class="zh-title">产品结构</h3>
     <div class="zh-box">
       <Input placeholder="输入内容" style="width: auto" v-model="treeInputSearch">
@@ -81,7 +81,5 @@ export default {
 </script>
 
 <style lang="less" scoped>
-.tree-content {
-  margin-top: 15px;
-}
+
 </style>

pages/order/quotation/index.vue

@@ -2,9 +2,7 @@
   <Layout class="quotation">
     <!-- 左侧树 -->
     <Sider hide-trigger :style="{background: '#fff'}" width="260">
-      <div class="zh-tree" :style="{ height: treeHeight + 'px' }">
-        <Tree-Type @func="getMsgFormSon"></Tree-Type>
-      </div>
+      <Tree-Type @func="getMsgFormSon" :style="{ height: treeHeight + 'px' }"></Tree-Type>
     </Sider>
     <!-- 右侧内容 -->
     <Content class="content">
@@ -364,8 +362,8 @@ export default {
     };
   },
   created() {
-    this.treeHeight = window.innerHeight - 150;
-    this.tableHeight = window.innerHeight - 280;
+    this.treeHeight = window.innerHeight - 140;
+    this.tableHeight = window.innerHeight - 210;
     this.newColumn = this.column;
     this.tableTata(this.selectName);
   },
@@ -377,8 +375,8 @@ export default {
       ///浏览器窗口大小变化
       return (() => {
         window.screenHeight = window.innerHeight;
-        this.treeHeight = window.screenHeight - 150;
-        this.tableHeight = window.innerHeight - 280;
+        this.treeHeight = window.screenHeight - 140;
+        this.tableHeight = window.innerHeight - 210;
       })();
     };
   },
@@ -816,17 +814,5 @@ export default {
   }
 };
 </script>
-<style lang="less" scoped>
-.table {
-  margin-top: 15px;
-}
-.seach {
-  margin-top: 15px;
-}
-</style>
-<style>
-.ivu-layout.ivu-layout-has-sider > .ivu-layout {
-  overflow-y: hidden !important;
-}
-</style>
+