Commit 2a0fd22f4a6efb14713239b98d221b3de6b2b71c
1 parent
e0ae125d
1.分离一号机也同样增加callmaterial，emptytray
Showing
1 changed file
with
6 additions
and
2 deletions
src/mes/productionExec/productionExecMain/index.js
| @@ -768,6 +768,7 @@ const ProductionExecContent0 = props => { | @@ -768,6 +768,7 @@ const ProductionExecContent0 = props => { | ||
| 768 | const formDataNew = props.formData.filter( | 768 | const formDataNew = props.formData.filter( |
| 769 | item => item.sGrd && btnTableList.includes(item.sGrd) | 769 | item => item.sGrd && btnTableList.includes(item.sGrd) |
| 770 | ); | 770 | ); |
| 771 | + console.log('formDataNew1', formDataNew); | ||
| 771 | 772 | ||
| 772 | const { workOrderInfoData = [] } = props; | 773 | const { workOrderInfoData = [] } = props; |
| 773 | const commonModelProps = { | 774 | const commonModelProps = { |
| @@ -1034,12 +1035,15 @@ const ProductionExecContent10 = props => { | @@ -1034,12 +1035,15 @@ const ProductionExecContent10 = props => { | ||
| 1034 | const btnTableList = [ | 1035 | const btnTableList = [ |
| 1035 | "palletBatchMaterial", | 1036 | "palletBatchMaterial", |
| 1036 | "workerOrderBatchMaterial", | 1037 | "workerOrderBatchMaterial", |
| 1037 | - "assembletray" | 1038 | + "assembletray", |
| 1039 | + 'callmaterial', | ||
| 1040 | + 'emptytray' | ||
| 1041 | + | ||
| 1038 | ]; | 1042 | ]; |
| 1039 | const formDataNew = props.formData.filter( | 1043 | const formDataNew = props.formData.filter( |
| 1040 | item => item.sGrd && btnTableList.includes(item.sGrd) | 1044 | item => item.sGrd && btnTableList.includes(item.sGrd) |
| 1041 | ); | 1045 | ); |
| 1042 | - | 1046 | + console.log('formDataNew2', formDataNew); |
| 1043 | const { workOrderInfoData = [] } = props; | 1047 | const { workOrderInfoData = [] } = props; |
| 1044 | const commonModelProps = { | 1048 | const commonModelProps = { |
| 1045 | ...props, | 1049 | ...props, |