Commit ae50d2e4b2e16ecf16607ec9067d03109814fe6e
1 parent
54fce6cb
更新以下内容: MES生产工单号打印支持蓝色连接跳转打印
Showing
3 changed files
with
13 additions
and
7 deletions
src/components/Common/CommonComponent/index.js
| ... | ... | @@ -2755,6 +2755,7 @@ export default class CommonComponent extends Component { |
| 2755 | 2755 | // top: this.props.name === 'slaveInfo' ? '1px' : '', |
| 2756 | 2756 | // left: this.props.name === 'slaveInfo' ? '2px' : this.props.name === 'master' ? '1px' : '', |
| 2757 | 2757 | position: 'absolute', |
| 2758 | + width:'100%', | |
| 2758 | 2759 | height: '100%', |
| 2759 | 2760 | overflow: 'hidden', |
| 2760 | 2761 | }} | ... | ... |
src/components/Common/CommonHooks/useCommonBase.js
| ... | ... | @@ -3011,6 +3011,9 @@ const useCommonBase = props => { |
| 3011 | 3011 | }); |
| 3012 | 3012 | } |
| 3013 | 3013 | |
| 3014 | + console.log('111', sControlName); | |
| 3015 | + | |
| 3016 | + | |
| 3014 | 3017 | // 预览 |
| 3015 | 3018 | if (sControlName.toLowerCase().includes("preview")) { |
| 3016 | 3019 | const [, , targetField] = sControlName.split("."); | ... | ... |
src/default.less
| ... | ... | @@ -234,7 +234,7 @@ |
| 234 | 234 | background: #f1f2f8 !important; |
| 235 | 235 | } |
| 236 | 236 | } |
| 237 | - | |
| 237 | + | |
| 238 | 238 | } |
| 239 | 239 | input[disabled] { |
| 240 | 240 | color: #000 !important; |
| ... | ... | @@ -372,9 +372,9 @@ |
| 372 | 372 | margin-left: 6px; |
| 373 | 373 | margin-top: 6px; |
| 374 | 374 | } |
| 375 | - | |
| 375 | + | |
| 376 | 376 | } |
| 377 | - | |
| 377 | + | |
| 378 | 378 | .ant-modal { |
| 379 | 379 | max-width: unset; |
| 380 | 380 | } |
| ... | ... | @@ -949,17 +949,19 @@ |
| 949 | 949 | } |
| 950 | 950 | |
| 951 | 951 | .masterLinkSpan { |
| 952 | + font-size: 20px; | |
| 952 | 953 | width: auto; |
| 953 | 954 | height: 26px; |
| 954 | - line-height: 26px; | |
| 955 | + line-height: 37px; | |
| 955 | 956 | overflow: hidden; |
| 956 | 957 | color: #2f54eb; |
| 957 | 958 | position: absolute; |
| 958 | - padding-right: 2px; | |
| 959 | + padding-right: 3px; | |
| 959 | 960 | z-index: 10; |
| 960 | 961 | cursor: pointer; |
| 962 | + background: #fff; | |
| 963 | + left: 8px; | |
| 961 | 964 | } |
| 962 | - | |
| 963 | 965 | /* checkBill commonView区域 */ |
| 964 | 966 | .checkbillStyle .masterLinkSpan { |
| 965 | 967 | width: 100%; |
| ... | ... | @@ -1032,4 +1034,4 @@ |
| 1032 | 1034 | background: #f1f2f8 !important; |
| 1033 | 1035 | } |
| 1034 | 1036 | } |
| 1035 | -} | |
| 1036 | 1037 | \ No newline at end of file |
| 1038 | +} | ... | ... |