1.PAD端支持上传图片

Min
1 parent 57135eb8
Showing 2 changed files with 29 additions and 14 deletions
src/mobile/common/CommobilePadBill/index.js
src/mobile/common/CommobileToolBar.js
@@ -9,6 +9,7 @@ import { DownOutlined, UploadOutlined } from &quot;@ant-design/icons&quot;;
 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) =&gt; {
             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 (
+                  <CommobileToolBar
+                    key={item.key}
+                    {...props}
+                    buttonConfig={[item]}
+                  />
+                );
+              }else {
+                return <div>
+                  <Button
+                    type="primary"
+                    size="large"
+                    {...menuItemProps}
+                    onClick={() => {
+                      handleClick(menuItemProps);
+                    }}
+                  >
+                    {showName}
+                  </Button>
+                </div>
+              }
  
-              return <div>
-                <Button
-                  type="primary"
-                  size="large"
-                  {...menuItemProps}
-                  onClick={() => {
-                    handleClick(menuItemProps);
-                  }}
-                >
-                  {showName}
-                </Button>
-              </div>
             })
           }}
         />
@@ -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 (
                 <FileShowMobile {...this.props} btnConfig={item} selectedRow={selectedRow} />);
             }
-            return (<Button type={btnStyle.type} inline style={btnStyle} disabled={this.getMenuStatus(item)} onClick={this.handleClick.bind(this, item.sControlName)} >{item.showName}</Button>);
+            return (<Button type={btnStyle?.type} inline style={btnStyle} disabled={this.getMenuStatus(item)} onClick={this.handleClick.bind(this, item.sControlName)} >{item.showName}</Button>);
           })}
       </div>