Merge branch 'feature-sku-2' into feature-tm

.eslintrc.js

@@ -16,5 +16,6 @@ module.exports = {
     'import/extensions': 0,
     'no-unused-expressions': ['off'],
     'template-curly-spacing': 'off',
+    'no-shadow': 'off',
   },
 };

src/components/MessageReminder/Complex/index.jsx

@@ -19,7 +19,7 @@ const INIT_QUERY_PARAMS = {
 const MessageItem = props => {
   const { item, onMark, viewDetail } = props;
   /**
-   * type: 0订单消息，1售后消息
+   * type: 0订单消息，1售后消息，7提示补货，8竞价成功
    * readStatus: 0未读，1已读
    */
   const { readStatus, type } = item;
@@ -30,17 +30,43 @@ const MessageItem = props => {
     console.error('消息数据格式错误');
   }
 
-  const goodList = message.items.map((good, index) => (
+  const goodList = message.items?.map((good, index) => (
     <div className={styles.good} key={String(index)}>
       <span className={styles.good__name}>{good.skuName}</span>
       <span className={styles.good__count}>x{good.quantity}</span>
     </div>
   ));
+
+  const renderMessageHeader = message => {
+    switch (message.type) {
+      case 7:
+        return (
+          <>
+            <span className={styles['order-number']}>库存预警</span>
+            <span className={styles.time}>{message.time}</span>
+          </>
+        );
+      case 8:
+        return (
+          <>
+            <span className={styles['order-number']}>竞价成功</span>
+            <span className={styles.time}>{message.time}</span>
+          </>
+        );
+      default:
+        return (
+          <>
+            <span className={styles['order-number']}>订单编号：{message.orderNo}</span>
+            <span className={styles.time}>订单时间：{message.time}</span>
+          </>
+        );
+    }
+  };
+
   return (
     <div className={styles['complex-list__item']}>
       <div className={styles['complex-list__item--header']}>
-        <span className={styles['order-number']}> 订单编号：{message.orderNo}</span>
-        <span className={styles.time}>订单时间：{message.time}</span>
+        {renderMessageHeader(message)}
         <span className={styles['read-status']}>
           {readStatus === 0 ? (
             <a className={styles['read-status--un-read']} onClick={() => onMark([item.id])}>
@@ -189,6 +215,12 @@ const Complex = props => {
         query: { orderNo },
       });
     }
+    if ([7, 8].includes(type)) {
+      history.push({
+        pathname: '/goodsManage',
+        query: { orderNo },
+      });
+    }
     close();
   };
 

src/components/MessageReminder/Simple/index.jsx

@@ -50,10 +50,25 @@ const Message = props => {
       console.error('消息数据格式错误');
     }
 
+    const renderMessageHeader = message => {
+      switch (message.type) {
+        case 7:
+          return <span className={styles['order-number']}>库存预警</span>;
+        case 8:
+          return <span className={styles['order-number']}>竞价成功</span>;
+        default:
+          return (
+            <>
+              <span className={styles['order-number']}>{message.orderNo}</span>
+            </>
+          );
+      }
+    };
+
     return (
       <div className={styles.item}>
         <div className={styles.info}>
-          <span className={styles['order-number']}>{message.orderNo}</span>
+          {renderMessageHeader(message)}
           <span className={styles['mark-read']} onClick={() => onMark([item.id])}>
             标记为已读
           </span>
@@ -182,6 +197,13 @@ const Simple = props => {
         query: { orderNo },
       });
     }
+
+    if ([7, 8].includes(type)) {
+      history.push({
+        pathname: '/goodsManage',
+        query: { orderNo },
+      });
+    }
     toggle();
   };
 

src/pages/GoodsManage/SupplyPriceUpdate/components/SearchForm.jsx

@@ -144,7 +144,7 @@ class goodsManage extends Component {
           className={styles.searchForm}
         >
           <FormItem label="SKU编码" name="skuId">
-            <InputNumber placeholder="请输入SKU编码" max={99999999999999999} style={selectW} />
+            <Input maxLength={18} showCount placeholder="请输入SKU编码" style={selectW} />
           </FormItem>
           <FormItem label="商品名称" name="skuName">
             <Input placeholder="请输入商品名称" allowClear style={selectW} />

src/pages/GoodsManage/staticdata.js

@@ -145,6 +145,7 @@ export function column() {
       dataIndex: 'stock',
       align: 'center',
       sorter: (a, b) => a.stock - b.stock,
+      defaultSortOrder: 'ascend',
       render: (_, row) => {
         // const stockView = row.productStock;
         const stockView = (
@@ -155,7 +156,9 @@ export function column() {
         return (
           <>
             <p>当前库存：{stockView}</p>
-            <p>可售库存：{_}</p>
+            <p>
+              可售库存：<span style={{ color: row.stock <= 10 ? 'red' : '' }}>{_}</span>
+            </p>
             {row.type === 1 && row.productStockWarning > 0 && (
               <p>预警值：{row.productStockWarning}</p>
             )}