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

pages/aps/aps/options.vue

@@ -161,8 +161,8 @@ export default {
         taskSeq: "",
         flog: 5, //参数应用范围
         calId:"",
-        planState: false,
-        planMethod: "重叠", // 平行 重叠
+        planState: true,
+        planMethod: "平行", // 平行 重叠
         over: false,
         overTime: "不加班", //"六日加班", 不加班 加班
         efficiencyValue: 11, // 效率系数, 必须大于 0
@@ -387,6 +387,30 @@ export default {
     },
     count(v, n) {
       this.entity.discrete = 1;
+    },
+    "entity.multiple"(v){
+     
+        /*
+        planState: false,
+        planMethod: "重叠", // 平行 重叠
+        */
+       if(v){
+          this.entity.planState=v;
+       }
+      
+    },
+    "entity.planState"(v){
+     
+        /*
+        planState: false,
+        planMethod: "重叠", // 平行 重叠
+        */
+       if(!v){
+          this.entity.multiple=v;
+       }
+      
+      //  this.planMethod=!v?"重叠":"平行"
+     
     }
   }
 };