Commit 5ca739505d1f42bf8a86a9437b5b883f3618109e
1 parent
c17b33ca
刷脸按钮
Showing
2 changed files
with
3 additions
and
5 deletions
src/mes/common/commonOperationBarComponent/MesToolbar.js
| @@ -6,21 +6,20 @@ const ToolbarFun = (props) => { | @@ -6,21 +6,20 @@ const ToolbarFun = (props) => { | ||
| 6 | const { btnConfig, bMesBill } = props; | 6 | const { btnConfig, bMesBill } = props; |
| 7 | const currentMesPane = commonUtils.getAppData("currentMesPane"); | 7 | const currentMesPane = commonUtils.getAppData("currentMesPane"); |
| 8 | const { sModelType } = currentMesPane; | 8 | const { sModelType } = currentMesPane; |
| 9 | - if (!["/indexPage/commonList", "/indexPage/commonBill"].includes(sModelType) && !bMesBill) { | 9 | + |
| 10 | + if (!["/indexPage/commonList", "/indexPage/commonBill", "/indexMes/processReport"].includes(sModelType) && !bMesBill) { | ||
| 10 | return false; | 11 | return false; |
| 11 | } | 12 | } |
| 12 | 13 | ||
| 13 | const { sControlName } = btnConfig; | 14 | const { sControlName } = btnConfig; |
| 14 | const btnName = sControlName.replace('BtnLeft.', '').replace('BtnRight.', '').toLowerCase(); | 15 | const btnName = sControlName.replace('BtnLeft.', '').replace('BtnRight.', '').toLowerCase(); |
| 15 | - console.log("🚀 ~ ToolbarFun ~ btnName:", btnName) | ||
| 16 | - | ||
| 17 | if (btnName === 'btnadd') { | 16 | if (btnName === 'btnadd') { |
| 18 | handleAdd(props); | 17 | handleAdd(props); |
| 19 | } else if (btnName === 'btnsave') { | 18 | } else if (btnName === 'btnsave') { |
| 20 | handleSave(props); | 19 | handleSave(props); |
| 21 | } else if (btnName === 'btnupd') { | 20 | } else if (btnName === 'btnupd') { |
| 22 | props.onSaveState({ enabled: true }); | 21 | props.onSaveState({ enabled: true }); |
| 23 | - } else if (btnName === 'btnscanface') { | 22 | + } else if (btnName === 'btnscanface' || btnName === 'btnscanface1') { |
| 24 | handleScanFace(props); | 23 | handleScanFace(props); |
| 25 | } else if (btnName === 'btncancel') { | 24 | } else if (btnName === 'btncancel') { |
| 26 | props.onCancel() | 25 | props.onCancel() |
src/mes/common/commonOperationBarComponent/index.js
| @@ -92,7 +92,6 @@ const useCommonOperationBarComponentEvent = props => { | @@ -92,7 +92,6 @@ const useCommonOperationBarComponentEvent = props => { | ||
| 92 | 92 | ||
| 93 | const delayedOvertime = commonFunc.showLocalMessage(props, 'delayedOvertime', '延迟加班'); | 93 | const delayedOvertime = commonFunc.showLocalMessage(props, 'delayedOvertime', '延迟加班'); |
| 94 | const cancelDelayedOvertime = commonFunc.showLocalMessage(props, 'cancelDelayedOvertime', '取消延迟加班'); | 94 | const cancelDelayedOvertime = commonFunc.showLocalMessage(props, 'cancelDelayedOvertime', '取消延迟加班'); |
| 95 | - | ||
| 96 | // 走工具栏功能逻辑 | 95 | // 走工具栏功能逻辑 |
| 97 | if (MesToolbar({ ...props, btnConfig: config })) { | 96 | if (MesToolbar({ ...props, btnConfig: config })) { |
| 98 | return; | 97 | return; |