Merge branch 'fix418' into 'v2-220418'

src/pages/transaction/purchaseOrder/orderCollectSrm/index.tsx

@@ -249,7 +249,9 @@ const PurchaseOrderDetail:React.FC<PurchaseOrderDetailProps> = (props) => {
       }
     } catch (error) {
       setBtnLoading(false)
-      error?.message && message.error(error.message)
+      if(error?.code !== 1102) {
+        error?.message && message.error(error.message)
+      }
       console.log(error)
     }
   }

src/pages/transaction/purchaseRequisition/increaseRequisition/components/materialTableCell/index.tsx

@@ -4,6 +4,7 @@ import { EnvironmentOutlined } from '@ant-design/icons';
 import { FormDetailContext } from '@/formSchema/context';
 import { getLogisticsSelectListMemberShipperAddress } from '@/services/LogisticsV2Api';
 import { useIntl } from 'umi';
+import { validatorByte } from '@/utils/regExp';
 
 export interface MaterialTableCellProps {
   title: React.ReactNode;
@@ -148,52 +149,50 @@ export const MaterialTableCell: React.FC<MaterialTableCellProps> = ({
     }
   }
 
-  const switchValidator = () => {
-    switch (dataIndex) {
-      case 'quantity': {
-        return [
-          {
-            required: true,
-            message: `${title}${intl.formatMessage({ id: 'purchaseRequisition.bixutianxie', defaultMessage: '必须填写' })}`,
-          },
-          {
-            pattern: /^\d+(\.\d{1,3})?$/,
-            message: intl.formatMessage({ id: 'purchaseRequisition.caigoushuliangjin', defaultMessage: '采购数量仅限三位小数' }),
-          },
-          {
-            validator: validatorNumber
-          },
-        ]
-      }
-
-      case 'price' : {
-        return [
-          {
-            pattern: /^\d+(\.\d{1,4})?$/,
-            message: intl.formatMessage({ id: 'purchaseRequisition.danjiajinxiansi', defaultMessage: '单价仅限四位小数' }),
-          },
-          {
-            validator: validatorNumber
-          }
-        ]
-      }
-
-      default : {
-        return []
-      }
-    }
-  }
   let childNode = children;
 
 
   if (editable) {
+    console.log(dataIndex)
     childNode =
       <>
         <Form.Item
           style={{ margin: 0 }}
           name={dataIndex}
           initialValue={record[dataIndex] || ''}
-          rules={switchValidator()}
+          rules={dataIndex === 'quantity' ? [
+            {
+              required: true,
+              message: `${title}${intl.formatMessage({ id: 'purchaseRequisition.bixutianxie', defaultMessage: '必须填写' })}`,
+            },
+            {
+              pattern: /^\d+(\.\d{1,3})?$/,
+              message: intl.formatMessage({ id: 'purchaseRequisition.caigoushuliangjin', defaultMessage: '采购数量仅限三位小数' }),
+            },
+            {
+              validator: validatorNumber
+            },
+          ] : (dataIndex === 'remark' ?
+            [
+              {
+                required: true,
+                message: intl.formatMessage({ id: 'purchaseRequisition.neirongbuneng1weikong', defaultMessage: '内容不能为空' }),
+              },
+              {
+                validator: (r, v, c) => validatorByte(r, v, c, 200)
+              }
+            ]
+            :
+            [
+              {
+                pattern: /^\d+(\.\d{1,4})?$/,
+                message: intl.formatMessage({ id: 'purchaseRequisition.danjiajinxiansi', defaultMessage: '单价仅限四位小数' }),
+              },
+              {
+                validator: validatorNumber
+              }
+            ])
+          }
         >
           {chooseFormItem(formItem, record[dataIndex] || '')}
         </Form.Item>