feat: 添加新增外卖权限

config/permission.config.js

@@ -5,6 +5,7 @@ export const GOOD_MANAGE = {
   EDITABLE: '020102', // 新增/修改
   ADD_SERVICE_GOODS: '020103', // 新增服务商品
   ADD_NORMAL_GOODS: '020104', // 新增实物商品
+  ADD_TAKEAWAY_GOODS: '020105', // 新增外卖商品
 };
 
 // 配送区域

src/pages/GoodsManage/Takeaway/components/ActionBar.jsx

@@ -64,9 +64,12 @@ const ActionBar = options => {
 
   return (
     <div className={styles['action-bar-box']}>
+      {(options.canAddTakeaway && (
         <Button type="primary" icon={<PlusOutlined />} onClick={options.newGoods}>
           该分组下新增商品
         </Button>
+      )) ||
+        ''}
       <Dropdown overlay={menus} className={styles['action-bar-box--down']} placement="bottomLeft">
         <Button type="primary">
           批量操作 <DownOutlined />

src/pages/GoodsManage/Takeaway/components/MinimumPurchase.jsx

@@ -32,6 +32,7 @@ const MinimumPurchase = options => {
         form={form}
         labelCol={{ span: 6 }}
         wrapperCol={{ span: 16 }}
+        initialValues={{ minPurchaseNum: 1 }}
         autoComplete="off"
       >
         <Form.Item

src/pages/GoodsManage/Takeaway/index.jsx

@@ -4,6 +4,7 @@ import { unstable_batchedUpdates } from 'react-dom';
 import { MenuOutlined, HolderOutlined, FormOutlined, CloseCircleOutlined } from '@ant-design/icons';
 import { SortableContainer, SortableElement, SortableHandle } from 'react-sortable-hoc';
 import { arrayMoveImmutable } from 'array-move';
+import { GOOD_MANAGE } from '@/../config/permission.config';
 import GoodsGroup from './components/GoodsGroup';
 import { apiTakeawayGoods, apiGoodsActionBatch, apiSortTakeawayGoods } from '../service';
 import styles from '../style.less';
@@ -174,6 +175,8 @@ const Takeaway = options => {
     shopId,
   };
 
+  const canAddTakeaway = options.permissions[GOOD_MANAGE.ADD_TAKEAWAY_GOODS];
+
   return (
     <div className={styles.takeawayBox}>
       <Spin spinning={loading}>
@@ -182,6 +185,7 @@ const Takeaway = options => {
           <ActionBar
             selectedRowKeys={selectedRowKeys}
             shopId={shopId}
+            canAddTakeaway={canAddTakeaway}
             handleSearch={getDataList}
             openModal={openModal}
             newGoods={onNew}

src/pages/GoodsManage/index.jsx

@@ -85,9 +85,9 @@ class goodsManage extends Component {
   }
 
   handleSearch = page => {
-    const searchValue = this.searchForm.getFieldsValue();
+    const searchValue = this.searchForm.getFieldsValue() || {};
     this.setState({ searchValue });
-    if (this.state.productType !== 5) {
+    if (searchValue.productType !== 5) {
       this.onSelectChange([]);
       const currentPage = this.state.pageNo;
       this.setState(
@@ -413,10 +413,11 @@ class goodsManage extends Component {
 
     const canAddService = permissions[GOOD_MANAGE.ADD_SERVICE_GOODS];
     const canAddNormal = permissions[GOOD_MANAGE.ADD_NORMAL_GOODS];
+    const canAddTakeaway = permissions[GOOD_MANAGE.ADD_TAKEAWAY_GOODS];
     this.canEditable = permissions[GOOD_MANAGE.EDITABLE];
     return (
       <PageHeaderWrapper>
-        {canAddNormal || canAddService
+        {canAddNormal || canAddService || canAddTakeaway
           ? [
               <Button
                 type="primary"
@@ -457,6 +458,7 @@ class goodsManage extends Component {
             <Takeaway
               handleEdit={this.handleTakeawayEdit}
               searchValue={this.state.searchValue}
+              permissions={permissions}
               refresh={this.state.refresh}
             />
           ) : (