Merge branch 'dev-srm' of http://10.0.0.22:3000/lingxi/lingxi-business-paltform into dev-srm

src/pages/priceManage/priceStrategy/component/ProductModal.tsx

@@ -51,6 +51,7 @@ const ProductModal:React.FC<ProductModalProps> = (props) => {
       ...params,
       type: shopInfo[0]["type"],
       environment: shopInfo[0].environment,
+      shopId,
       // priceTypeList: [1, 2],
     })
     return res.data

src/pages/procurement/callForBids/readySubmitReport/components/remarkTableCell/index.tsx

@@ -74,7 +74,7 @@ export const EditableCell: React.FC<EditableCellProps> = ({
         onPressEnter={save}
         onBlur={save}
         type="number"
-        disabled={!record['editable']}
+        // disabled={!record['editable']}
       />
     </Form.Item>
   }

src/pages/repositories/index.tsx

@@ -171,8 +171,8 @@ const Repositories: React.FC<{}> = () => {
                 message: '请填写仓位库存',
               },
               {
-                pattern: PATTERN_MAPS.weight,
-                message: '请填写正数，最多保留3位小数',
+                pattern: /^[+-]?\d*(\.\d{0,3})?$/,
+                message: '请填写数值，最多保留3位小数',
               },
             ],
           },

src/pages/transaction/purchaseOrder/orderCollect/constant/index.tsx

@@ -542,7 +542,7 @@ export const materialInfoColumns: any[] = [
     dataIndex: 'relevanceProductId',
     align: 'center',
     key: 'relevanceProductId',
-    render: (t, r) => `${t}/${r.relevanceProductName}/${r.relevanceProductCategory}/${r.relevanceProductBrand}`
+    render: (t, r) => `${t}/${r.relevanceProductName || ''}/${r.relevanceProductCategory || ''}/${r.relevanceProductBrand || ''}`
   },
   {
     title: '单价（元）',