Commit e42c0662d4288c27911337f27033d681c718e85f
1 parent
2a0fd22f
1.增加运送,取消
Showing
2 changed files
with
27 additions
and
1 deletions
src/mes/productionExec/productionExecMain/index.js
| @@ -809,6 +809,14 @@ const ProductionExecContent0 = props => { | @@ -809,6 +809,14 @@ const ProductionExecContent0 = props => { | ||
| 809 | > | 809 | > |
| 810 | 下料 | 810 | 下料 |
| 811 | </Button> | 811 | </Button> |
| 812 | + <Button | ||
| 813 | + className="yunBtn yun" | ||
| 814 | + style={{ "border-color": "#faad14", background: "#FF0000" }} | ||
| 815 | + {...btnProps} | ||
| 816 | + {...getBtnConfigByControlName("BtnEventTrans")} | ||
| 817 | + > | ||
| 818 | + 运送 | ||
| 819 | + </Button> | ||
| 812 | </Space> | 820 | </Space> |
| 813 | <Space> | 821 | <Space> |
| 814 | <Button | 822 | <Button |
| @@ -826,6 +834,7 @@ const ProductionExecContent0 = props => { | @@ -826,6 +834,7 @@ const ProductionExecContent0 = props => { | ||
| 826 | > | 834 | > |
| 827 | 下料 | 835 | 下料 |
| 828 | </Button> | 836 | </Button> |
| 837 | + | ||
| 829 | {/* <Button {...btnProps}>产品②</Button> */} | 838 | {/* <Button {...btnProps}>产品②</Button> */} |
| 830 | </Space> | 839 | </Space> |
| 831 | </div> | 840 | </div> |
| @@ -839,7 +848,16 @@ const ProductionExecContent0 = props => { | @@ -839,7 +848,16 @@ const ProductionExecContent0 = props => { | ||
| 839 | > | 848 | > |
| 840 | 撤销 | 849 | 撤销 |
| 841 | </Button> | 850 | </Button> |
| 851 | + | ||
| 852 | + <Button | ||
| 853 | + className="yunBtnCancel" | ||
| 854 | + {...btnProps} | ||
| 855 | + {...getBtnConfigByControlName("BtnEventTransCancel")} | ||
| 856 | + > | ||
| 857 | + 取消 | ||
| 858 | + </Button> | ||
| 842 | </Space> | 859 | </Space> |
| 860 | + | ||
| 843 | <Space className="rightPart"> | 861 | <Space className="rightPart"> |
| 844 | <Button | 862 | <Button |
| 845 | {...btnProps} | 863 | {...btnProps} |
src/mes/productionExec/productionExecMain/index.less
| @@ -138,6 +138,14 @@ | @@ -138,6 +138,14 @@ | ||
| 138 | border-color: #faad14; | 138 | border-color: #faad14; |
| 139 | background: #faad14; | 139 | background: #faad14; |
| 140 | } | 140 | } |
| 141 | + .yunBtn{ | ||
| 142 | + border-color: #f0f0f0; | ||
| 143 | + background: #0db237; | ||
| 144 | + } | ||
| 145 | + .yunBtnCancel{ | ||
| 146 | + border-color: #f0f0f0; | ||
| 147 | + background: rgba(13, 178, 55, 0.72); | ||
| 148 | + } | ||
| 141 | 149 | ||
| 142 | // margin-bottom: 5px; | 150 | // margin-bottom: 5px; |
| 143 | } | 151 | } |
| @@ -597,4 +605,4 @@ | @@ -597,4 +605,4 @@ | ||
| 597 | .flex(center, center); | 605 | .flex(center, center); |
| 598 | } | 606 | } |
| 599 | } | 607 | } |
| 600 | -} | ||
| 601 | \ No newline at end of file | 608 | \ No newline at end of file |
| 609 | +} |