From ebf0db91e09be33fcbfe97ed5b91965dc2e61dfd Mon Sep 17 00:00:00 2001
From: zyx <zyx123456>
Date: 星期四, 01 八月 2024 10:54:26 +0800
Subject: [PATCH] 1. 托盘管理 2. 入库通知档导入功能 3. 工作档明细 新增来源单据类型及单据编号 4. 库存明细统计表 增加一栏ERP数量(需跟ERP确认接口实现方式)。 5. 存货档案、单据管理、库存管理可以支持模糊搜索(各个单据界面)。

---
 zy-asrs-flow/src/pages/map/components/settings.jsx |   15 ++++++++++++---
 1 files changed, 12 insertions(+), 3 deletions(-)

diff --git a/zy-asrs-flow/src/pages/map/components/settings.jsx b/zy-asrs-flow/src/pages/map/components/settings.jsx
index 755f609..0a82de3 100644
--- a/zy-asrs-flow/src/pages/map/components/settings.jsx
+++ b/zy-asrs-flow/src/pages/map/components/settings.jsx
@@ -1,6 +1,10 @@
 import React, { useState, useRef, useEffect } from 'react';
 import { Col, Form, Input, Row, Checkbox, Slider, Select, Drawer, Space, Button, InputNumber, Card } from 'antd';
 import { FormattedMessage, useIntl, useModel } from '@umijs/max';
+import {
+    BranchesOutlined,
+    BorderOuterOutlined,
+} from '@ant-design/icons';
 import { createStyles } from 'antd-style';
 import * as Utils from '../utils'
 import Http from '@/utils/http';
@@ -15,6 +19,7 @@
     const intl = useIntl();
     const { styles } = useStyles();
     const [activeTabKey, setActiveTabKey] = useState('map');
+
     const [mapForm] = Form.useForm();
     const [configForm] = Form.useForm();
 
@@ -68,7 +73,7 @@
                         <Button onClick={handleCancel}>
                             <FormattedMessage id='common.cancel' defaultMessage='鍙栨秷' />
                         </Button>
-                        <Button onClick={handleOk} type="primary">
+                        <Button hidden={activeTabKey === 'map' || activeTabKey === 'config'} onClick={handleOk} type="primary">
                             <FormattedMessage id='common.submit' defaultMessage='淇濆瓨' />
                         </Button>
                     </Space>
@@ -77,14 +82,18 @@
                 <Card
                     hoverable
                     bordered={false}
+                    type='inner'
                     tabList={[
                         {
                             key: 'map',
-                            tab: intl.formatMessage({id: 'map.settings.map.param', defaultMessage: '鍦板浘鍙傛暟'})
+                            tab: intl.formatMessage({ id: 'map.settings.map.param', defaultMessage: '鍦板浘鍙傛暟' }),
+                            icon: <BorderOuterOutlined />
+
                         },
                         {
                             key: 'config',
-                            tab: intl.formatMessage({id: 'map.settings.config.param', defaultMessage: '绯荤粺鍙傛暟'})
+                            tab: intl.formatMessage({ id: 'map.settings.config.param', defaultMessage: '绯荤粺鍙傛暟' }),
+                            icon: <BranchesOutlined />
                         },
                     ]}
                     activeTabKey={activeTabKey}

--
Gitblit v1.9.1