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

pages/aps/aps/components/excute.vue

@@ -35,7 +35,7 @@
 <script>
 import Api from "../api";
 import Edit from "./edit";
-import Add from "../add";
+import Add from "../options";
 export default {
   name: "list",
   components: {

pages/aps/aps/index.vue

@@ -94,7 +94,7 @@
 </template>
 <script>
 import Api from "./api";
-import Add from "./add";
+import Add from "./options";
 import Temp from "./temp";
 import Duration from "./duration";
 import Expand from "./components/excute";

pages/aps/aps/add.vue → pages/aps/aps/options.vue

@@ -171,8 +171,7 @@ export default {
         overTime: "不加班", //"六日加班", 不加班 加班
         efficiencyValue: 11, // 效率系数, 必须大于 0
         shopId: null,
-        isDiscrete: true,
-        isDiscrete: "否",
+        isDiscrete: true,//是否离散 是否
         discrete: 1, //离散数值  必须大于 1
         multiple: true,
         multipleEquip: "是", //"是否多台安排设备", 否  是
@@ -349,24 +348,25 @@ export default {
     },
     opTaskPk(v, n) {
       this.entity.opTaskPk = v;
-      if(v>0){
+      if(v>0){        
+        console.log("detail",this.row);
+        
         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,
+          planState: this.row.plan_method=="平行",
           planMethod: this.row.plan_method, // 平行 重叠
-          over: false,
+          over: this.row.over_time=="加班",
           overTime: this.row.over_time, //"六日加班", 不加班 加班
-          efficiencyValue:this.row.efficiency_value, // 效率系数, 必须大于 0
+          efficiencyValue:this.row.efficiency_value|1, // 效率系数, 必须大于 0
           shopId: null,
-          isDiscrete: this.row.isdiscrete,
-          isDiscrete: "否",
-          discrete: this.row.discrete_value, //离散数值  必须大于 1
-          multiple: true,
-          multipleEquip: this.row.multi_machine, //"是否多台安排设备", 否  是
+          isDiscrete: this.row.isdiscrete=="是",
+          discrete: this.row.discrete_value|1, //离散数值  必须大于 1
+          multiple: this.row.multi_machine=="是",
+          multipleEquip: this.row.multi_machine|"否", //"是否多台安排设备", 否  是
           multipleCount: 1, //多台数量
           multipleEquipPks: [],
           multipleEquipIds: "", //"设备id", 用英文逗号分隔