Merge branch 'ou' of git.mjitech.com:zhangxin/max_android_panel into ou

client/actions/replenish.js

@@ -3,6 +3,7 @@ import actionType from '../actiontype/replenish'
 import {getTaskList} from "./common";
 import {saveProductInfo} from "./barcodeCommon";
 import {finishBoxRecovery} from "./recovery";
+import { message } from 'antd';
 const domain = ENV.domain;
 
 let myHeaders = new Headers({
@@ -50,7 +51,10 @@ const finishReplenish = (info,source)=>{
                 dispatch(getTaskList(info));
             }).catch(e=>{
             UTILPATH.myLogger.error(`trigger_ck_task_sku error ${e}`);
+            message.error(`操作失败，${JSON.stringify(e)}`);
             // dispatch(finishReplenish(info,source))
+        }).catch(e => {
+            message.error(`操作失败,${JSON.stringify(e)}`);
         })
     }
 }

client/components/ReplenishComponent/ReplenishSkuPage/ReplenishSkuPage.jsx

@@ -2,6 +2,7 @@ import React from 'react';
 import Button from '../../CommonComponent/ButtonComponent/ButtonComponent'
 import PopModel from '../../CommonComponent/PopupComponent/PopupChildComponent'
 import SkuInfoComponent from '../../CommonComponent/SkuInfoComponent/SkuInfoComponent'
+import { message } from 'antd';
 require('./index.css');
 
 const questionType = {
@@ -45,6 +46,8 @@ export default class ReplenishSkuPage extends React.Component{
             },()=>{
                 this.props.finishBoxRecovery().then(()=>{
                     this.continueScan()
+                }).catch(() => {
+                    message.error('操作失败，请重试');
                 });
 
             })