Merge branch 'feature/goods-list' of git.quantgroup.cn:ui/merchant-manage-ui...

Merge branch 'feature/goods-list' of git.quantgroup.cn:ui/merchant-manage-ui into feature/20230327_public_takeaway

package-lock.json

@@ -20969,6 +20969,11 @@
         }
       }
     },
+    "pubsub-js": {
+      "version": "1.9.4",
+      "resolved": "http://npmprivate.quantgroups.com/pubsub-js/-/pubsub-js-1.9.4.tgz",
+      "integrity": "sha512-hJYpaDvPH4w8ZX/0Fdf9ma1AwRgU353GfbaVfPjfJQf1KxZ2iHaHl3fAUw1qlJIR5dr4F3RzjGaWohYUEyoh7A=="
+    },
     "pump": {
       "version": "3.0.0",
       "resolved": "http://npmprivate.quantgroups.com/pump/-/pump-3.0.0.tgz",

package.json

@@ -68,6 +68,7 @@
 		"moment": "^2.24.0",
 		"omit.js": "^1.0.2",
 		"path-to-regexp": "^3.1.0",
+		"pubsub-js": "^1.9.4",
 		"qs": "^6.9.0",
 		"react": "^16.8.6",
 		"react-amap": "^1.2.8",

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

@@ -49,6 +49,7 @@ const StockModal = options => {
         productStock: info.stock,
         autoStock: info.autoStock === 1,
       });
+      setMaxStock(info.autoStockStep);
       setIsChecked(info.autoStock === 1);
     }
   };
@@ -83,7 +84,7 @@ const StockModal = options => {
   }, [options.visible]);
 
   const maxStockRule = [{ validator: isIntegerNotZero, message: '请输入大于0的整数' }];
-  if (isChecked) {
+  if (isChecked || stockType === 2) {
     maxStockRule.push({ required: true, message: '请输入最大库存!' });
   }
 

src/pages/GoodsManage/Takeaway/index.jsx

 import React, { useState, useEffect, useCallback, useMemo } from 'react';
 import { Spin, Table, Pagination, message, notification } from 'antd';
 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 PubSub from 'pubsub-js';
 import GoodsGroup from './components/GoodsGroup';
 import {
   apiTakeawayGoods,
@@ -37,19 +37,20 @@ const Takeaway = options => {
   const [visibleBuy, setVisibleBuy] = useState(false);
   const [visibleSend, setVisibleSend] = useState(false);
   const [visibleSwitchGroup, setVisibleSwitchGroup] = useState(false);
+  const [scribeToken, setScribeToken] = useState('');
 
   const rowSelection = {
     selectedRowKeys,
     onChange: setSelectedRowKeys,
   };
 
-  const getDataList = async (page = pageNo, size = pageSize) => {
+  const getDataList = async (page = pageNo, size = pageSize, storageRackId = groupId) => {
     setLoading(true);
     const params = Object.assign({}, options.searchValue, {
       pageNo: page || pageNo,
       productType: 5,
       pageSize: size || pageSize,
-      storageRackId: groupId,
+      storageRackId,
     });
     const productCategoryId = options.searchValue?.productCategoryId || [];
     params.productCategoryId =
@@ -181,6 +182,18 @@ const Takeaway = options => {
     }
   }, [groupId, options.refresh]);
 
+  useEffect(() => {
+    const stoken = PubSub.subscribe('refreshTakeAway', (_, data) => {
+      setShopId(data.shopId);
+      setGroupId(data.groupId);
+      getDataList(0, pageSize, data.groupId);
+    });
+    setScribeToken(stoken);
+    return () => {
+      PubSub.unsubscribe(scribeToken);
+    };
+  }, []);
+
   const actions = {
     onShowStockModal,
     toTop,