完善补货逻辑

client/components/ReplenishComponent/ReplenishSkuPage/ReplenishSkuPage.jsx

@@ -28,7 +28,8 @@ export default class ReplenishSkuPage extends React.Component{
         this.getWrongSku = this.getWrongSku.bind(this); // 商品不符
         this.getWrongSku = this.getWrongSku.bind(this); // 商品不符
         this.overflowShelf = this.overflowShelf.bind(this); // 货道已满页面
         this.overflowShelf = this.overflowShelf.bind(this); // 货道已满页面
         this.putInBox = this.putInBox.bind(this); // 放回
         this.putInBox = this.putInBox.bind(this); // 放回
-        this.continueScan = this.continueScan.bind(this); // 放回
+        this.continueScan = this.continueScan.bind(this); // 继续扫描
+        this.scanOver = this.scanOver.bind(this); // 全部补货完毕
 
 
         this.state={
         this.state={
             pageType : 1,
             pageType : 1,
@@ -80,9 +81,9 @@ export default class ReplenishSkuPage extends React.Component{
     handleScanOver(){
     handleScanOver(){
         console.log("扫描结束")
         console.log("扫描结束")
         //货道商品不符
         //货道商品不符
-        let {showPopup,hidePopup} = this.props;
+        let {showPopup} = this.props;
         let btnDom1 = <Button btnContainer={"replenishHandleScanOverBtn1 font32"} key={"replenishHandleScanOverBtn1"} text={"继续扫描"} option={this.continueScan}/>
         let btnDom1 = <Button btnContainer={"replenishHandleScanOverBtn1 font32"} key={"replenishHandleScanOverBtn1"} text={"继续扫描"} option={this.continueScan}/>
-        let btnDom2 = <Button btnContainer={"replenishHandleScanOverBtn2 backff775c colfff font32"} key={"replenishHandleScanOverBtn2"} text={"确认扫描完毕"} option={hidePopup}/>
+        let btnDom2 = <Button btnContainer={"replenishHandleScanOverBtn2 backff775c colfff font32"} key={"replenishHandleScanOverBtn2"} text={"确认扫描完毕"} option={this.scanOver}/>
         let popDom =
         let popDom =
             <PopModel popupTitle={"补货结束确认"} classContainer={"replenishPopInfo"}>
             <PopModel popupTitle={"补货结束确认"} classContainer={"replenishPopInfo"}>
                 <div className={"icon iconfont icon-exclamation font150 colf5a623"} />
                 <div className={"icon iconfont icon-exclamation font150 colf5a623"} />
@@ -97,6 +98,19 @@ export default class ReplenishSkuPage extends React.Component{
         showPopup({popupChild:popDom});
         showPopup({popupChild:popDom});
     }
     }
 
 
+    //确认扫描完毕
+    scanOver(){
+        let props = this.props;
+        if(!this.state.btnClock){
+            this.setState({
+                btnClock : true
+            },()=>{
+                props.hidePopup()
+                props.finishReplenish();
+            })
+        }
+    }
+
     getSkuInfo(){
     getSkuInfo(){
         let {headerInfo} = this.props;
         let {headerInfo} = this.props;
         let {taskList={}} = headerInfo
         let {taskList={}} = headerInfo
@@ -290,8 +304,7 @@ export default class ReplenishSkuPage extends React.Component{
             },()=>{
             },()=>{
                 uploadError(type);
                 uploadError(type);
                 hidePopup();
                 hidePopup();
-                this.getPage(1)
-                // beginScan();
+                beginScan();
             })
             })
         }
         }
 
 

client/containers/PageContainer/PageContainer.jsx

@@ -638,6 +638,7 @@ class PageContainer extends React.Component {
                     finishBoxRecovery={()=>dispatch(finishBoxRecovery(state.commonInfo))}
                     finishBoxRecovery={()=>dispatch(finishBoxRecovery(state.commonInfo))}
                     emptyErrorInfo={()=>dispatch(replenishAction.emptyErrorInfo())}
                     emptyErrorInfo={()=>dispatch(replenishAction.emptyErrorInfo())}
                     uploadError={(exceptionType)=>dispatch(uploadError(state.commonInfo,exceptionType))}
                     uploadError={(exceptionType)=>dispatch(uploadError(state.commonInfo,exceptionType))}
+                    finishReplenish={()=>dispatch(replenishAction.finishReplenish(state.commonInfo))}
                 />
                 />
             /*以下是二期页面 end*/
             /*以下是二期页面 end*/
         }
         }