|
|
@@ -334,7 +334,7 @@ export default {
|
|
|
});
|
|
|
}
|
|
|
|
|
|
- if (this.taskObj.type == 6 && obj.singleReport != 0&&this.clientEnvironmentId==3) {
|
|
|
+ if (this.taskObj.type == 6 && obj.singleReport ==1 ) {
|
|
|
obj.semiProductList = obj.pickOutInList;
|
|
|
obj.pickOutInList=[]
|
|
|
}
|
|
|
@@ -485,7 +485,7 @@ export default {
|
|
|
}
|
|
|
|
|
|
if(this.taskObj.type !=6){
|
|
|
- if(this.reportNeedFeed==1&&!(this.List[0].semiProductList.length==0||this.List[0].pickoutInList.length==0)){
|
|
|
+ if(this.reportNeedFeed==1&&!(this.List[0].semiProductList.length==0||this.List[0].pickOutInList.length==0)){
|
|
|
this.loading.close();
|
|
|
return this.$message.warning('请先投料再报工');
|
|
|
}
|