From a5f054730dcce9709d70c23dc10062c6a2dbb55f Mon Sep 17 00:00:00 2001 From: pengm <674192343@qq.com> Date: Fri, 5 Dec 2025 16:45:22 +0800 Subject: [PATCH] 1.PAD端支持上传图片 --- src/mobile/common/CommobilePadBill/index.js | 36 ++++++++++++++++++++++++------------ src/mobile/common/CommobileToolBar.js | 7 +++++-- 2 files changed, 29 insertions(+), 14 deletions(-) diff --git a/src/mobile/common/CommobilePadBill/index.js b/src/mobile/common/CommobilePadBill/index.js index cdbe24a..2b4660f 100644 --- a/src/mobile/common/CommobilePadBill/index.js +++ b/src/mobile/common/CommobilePadBill/index.js @@ -9,6 +9,7 @@ import { DownOutlined, UploadOutlined } from "@ant-design/icons"; import CommonNewSales from "@/components/Common/CommonNewBillEvent"; /* 继承销售模块业务功能 */ import * as commonFunc from "@/components/Common/commonFunc"; /* 通用单据方法 */ /* 通用单据方法 */ import Toolbar from "@/components/Common/ToolBar/ToolBarNew"; +import CommobileToolBar from '../CommobileToolBar'; import StaticEditTable from "@/components/Common/CommonTable"; /* 可编辑表格 */ import styles from "@/index.less"; import stylesNew from "./index.less" @@ -3677,19 +3678,30 @@ const CommonNewBillComponent = (baseProps) => { return menuDataCopy.filter(item => commonUtils.isEmptyArr(item.child)).map(item => { const { showName } = item; const menuItemProps = getMenuProps(item, "key"); + // 如果child包含BtnUpdPic,使用CommobileToolBar + if (item?.sControlName.includes('BtnUpdPic')) { + return ( + + ); + }else { + return
+ +
+ } - return
- -
}) }} /> diff --git a/src/mobile/common/CommobileToolBar.js b/src/mobile/common/CommobileToolBar.js index 323e3b0..f0fce3c 100644 --- a/src/mobile/common/CommobileToolBar.js +++ b/src/mobile/common/CommobileToolBar.js @@ -31,7 +31,10 @@ class CommobileToolBar extends Component { } = nextProps; const { buttonConfig: buttonConfigOld } = this.state; if (commonUtils.isNotEmptyObject(masterConfig) && commonUtils.isEmptyArr(buttonConfigOld)) { - const buttonConfig = masterConfig.gdsconfigformslave.filter(item => item.sName === '' && item.showName !== '' && item.bVisible && item.sControlName.substring(0, 3) === 'Btn'); + let buttonConfig = masterConfig.gdsconfigformslave.filter(item => item.sName === '' && item.showName !== '' && item.bVisible && item.sControlName.substring(0, 3) === 'Btn'); + if(location.pathname.toLowerCase().includes('padbill')) { + buttonConfig = buttonConfig.filter(item => item.sControlName?.toLowerCase().includes('btnupdpic')) + } this.setState({ buttonConfig, btnStyle, divStyle }); } } @@ -527,7 +530,7 @@ class CommobileToolBar extends Component { return ( ); } - return (); + return (); })} -- libgit2 0.22.2