Merge branch 'v2' of https://e.coding.net/ctcdevteam/ehs/ehs_web into v2

src/views/wpm/worktask_form.vue

@@ -1126,15 +1126,6 @@ export default {
     };
   },
   mounted() {
-    console.log('brothersList')
-    console.log(this.brothersList)
-    this.getMaterial();
-    // this.getMgroupList();
-    this.getUserList();
-    this.getEquipment();
-    this.getShiftOptions();
-    this.getRouteOptions();
-    
     let date = new Date();
     let year = date.getFullYear();
     let month = date.getMonth() + 1;
@@ -1144,6 +1135,12 @@ export default {
     this.form.mtask = this.mtask;
     this.form.mgroup = this.mgroup;
     this.form.handle_date = year + "-" + month + "-" + day;
+    this.getMaterial();
+    // this.getMgroupList();
+    this.getUserList();
+    this.getEquipment();
+    this.getShiftOptions();
+    this.getRouteOptions();
     this.getWorkShopMaterial();
     if (this.activeType == "10车间") {
       let mlogb = [];
@@ -1265,13 +1262,6 @@ export default {
         });
       }
     },
-    //获取车间物料
-    //  getMaterial(){
-    //     let that = this;
-    // 	this.$API.wpm.wmaterial.list.req({belong_dept_name:'8车间',page:0}).then(res=>{
-    // 		that.materialOptions = res;
-    // 	});
-    // },
     getWorkShopMaterial() {
       let that = this;
       if(this.form.material_in){
@@ -1355,7 +1345,7 @@ export default {
             });
             this.form.count_ok = ok_number;
           } else if (this.activeType == "退火") {
-            this.form.mgroup = "3428194648706011136";
+            // this.form.mgroup = "3428194648706011136";
             this.form.count_notok =
               this.form.count_n_wq +
               this.form.count_n_tw +
@@ -1463,18 +1453,6 @@ export default {
         }
       }
     },
-    //选择
-    // wmaterialInChange(val) {
-    //   console.log(this.form)
-    //   console.log(this.wmaterialOptions);
-    //   debugger;
-    //   for(let i=0;i<this.wmaterialOptions.length;i++){
-    //     if(this.wmaterialOptions[i].id==val){
-    //       this.form.batch = data[0].batch;
-    //     }
-    //   }
-    //   console.log(this.form)
-    // },
   },
 };
 </script>