Commit 1d6e0e8dcc9af4ce1202e3bad0e4fd30032f6951
1 parent
f4047c8f
1.处理撤销上料,撤销提前下料 ,正常状态下,显示橘色,禁用状态下灰色
Showing
2 changed files
with
7 additions
and
2 deletions
src/mes/productionExec/productionExecMain/index.js
| @@ -1087,13 +1087,14 @@ const ProductionExecContent0 = props => { | @@ -1087,13 +1087,14 @@ const ProductionExecContent0 = props => { | ||
| 1087 | <Space className="leftPart"> | 1087 | <Space className="leftPart"> |
| 1088 | <Button | 1088 | <Button |
| 1089 | className="abnormalBtn" | 1089 | className="abnormalBtn" |
| 1090 | - style={{ "border-color": "#faad14", background: "#faad14" }} | 1090 | + // style={{ "border-color": "#faad14", background: "#faad14" }} |
| 1091 | {...btnProps} | 1091 | {...btnProps} |
| 1092 | {...getBtnConfigByControlName("BtnCancel")} | 1092 | {...getBtnConfigByControlName("BtnCancel")} |
| 1093 | > | 1093 | > |
| 1094 | { getBtnConfigByControlName("BtnCancel").showName } | 1094 | { getBtnConfigByControlName("BtnCancel").showName } |
| 1095 | </Button> | 1095 | </Button> |
| 1096 | <Button | 1096 | <Button |
| 1097 | + className="abnormalBtn" | ||
| 1097 | {...btnProps} | 1098 | {...btnProps} |
| 1098 | {...getBtnConfigByControlName("BtnEventBlanking3")} | 1099 | {...getBtnConfigByControlName("BtnEventBlanking3")} |
| 1099 | > | 1100 | > |
src/mes/productionExec/productionExecMain/index.less
| @@ -138,6 +138,10 @@ | @@ -138,6 +138,10 @@ | ||
| 138 | border-color: #faad14; | 138 | border-color: #faad14; |
| 139 | background: #faad14; | 139 | background: #faad14; |
| 140 | } | 140 | } |
| 141 | + .abnormalBtn:disabled { | ||
| 142 | + border-color: 'none'; | ||
| 143 | + background: #AAA; | ||
| 144 | + } | ||
| 141 | 145 | ||
| 142 | // margin-bottom: 5px; | 146 | // margin-bottom: 5px; |
| 143 | } | 147 | } |
| @@ -592,4 +596,4 @@ | @@ -592,4 +596,4 @@ | ||
| 592 | .flex(center, center); | 596 | .flex(center, center); |
| 593 | } | 597 | } |
| 594 | } | 598 | } |
| 595 | -} | ||
| 596 | \ No newline at end of file | 599 | \ No newline at end of file |
| 600 | +} |