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

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

@@ -3,6 +3,7 @@ import { Modal, Form, InputNumber, Checkbox, Switch } from 'antd';
 import { deepClone } from '@/utils/utils';
 import styles from '../../style.less';
 import { apiProductStock } from '../../service';
+import { isIntegerNotZero } from '@/utils/validator';
 
 const StockModal = options => {
   const [stockType, setStockType] = useState(0);
@@ -81,7 +82,7 @@ const StockModal = options => {
     }
   }, [options.visible]);
 
-  const maxStockRule = [];
+  const maxStockRule = [{ validator: isIntegerNotZero, message: '请输入大于0的整数' }];
   if (isChecked) {
     maxStockRule.push({ required: true, message: '请输入最大库存!' });
   }
@@ -111,7 +112,10 @@ const StockModal = options => {
           name="productStock"
           labelCol={{ span: 6 }}
           wrapperCol={{ span: 8 }}
-          rules={[{ required: true, message: '请输入剩余库存!' }]}
+          rules={[
+            { required: true, message: '请输入剩余库存!' },
+            { validator: isIntegerNotZero, message: '请输入大于0的整数' },
+          ]}
         >
           <InputNumber
             min={0}

src/pages/GoodsManage/Takeaway/index.jsx

@@ -109,6 +109,7 @@ const Takeaway = options => {
     };
     setActionLoading(true);
     const res = await apiGoodsActionBatch(Object.assign({}, json, params));
+    setActionLoading(false);
     if (res.businessCode === '0000' && res.code === '0000') {
       message.success('处理成功！');
       unstable_batchedUpdates(() => {