改动 breakageContainer

bbf3c769 · wujiabao · 84418fae · bbf3c769 · bbf3c769 · bbf3c769
Commit bbf3c769 authored Sep 18, 2018 by wujiabao
9 changed files
--- a/client/actions/BreakageContainer.js
+++ b/client/actions/BreakageContainer.js
 import fetch from 'isomorphic-fetch'
 import getTaskList from './common'
+import breakActionType from '../actiontype/breakageContainer'
+// const changeStatus = (data)=>{
-const changeStatus = (data)=>{
-      let {taskId,currentTaskType}=data.taskInfo;
+//       let {taskId,currentTaskType}=data.taskInfo;
-      let url = `http://192.168.10.128:8080/web/flat/work/lr/status/${taskId}/${currentTaskType}`
+//       let url = `http://192.168.10.128:8080/web/flat/work/lr/status/${taskId}/${currentTaskType}`
-      return (dispatch)=>{
+//       return (dispatch)=>{
-            fetch(url,{
+//             fetch(url,{
-                credentials : 'include',
+//                 credentials : 'include',
-                method : 'PUT',
+//                 method : 'PUT',
-                mode : 'cors',
+//                 mode : 'cors',
-                body : {}
+//                 body : {}
-            }).then((response)=>response.json())
+//             }).then((response)=>response.json())
-             .then((json)=>{
+//              .then((json)=>{
-                  if(json.data){
+//                   if(json.data){
-                        getTaskList(data)
+//                         getTaskList(data)
-                  }
+//                   }
-             })
+//              })
-      }
+//       }
-}
+// }
 const changeTaskStatus = (data)=>{
      return {
      }
 }
\ No newline at end of file
+//test 输入条形码获取商品信息
+const getProductInfo = (data)=>{
+      let {barcode}=data;
+      let url=`http://192.168.10.128:8080/web/flat/barcode/1/A/LR/${barcode}`
+      return (dispatch)=>{
+            fetch(url,{
+                method : 'GET',
+                mode : 'cors'
+            }).then((response)=>response.json())
+            .then((json)=>{
+                if(json.meta.success&&json.data){
+                    dispatch(saveProductInfo(json.data))
+                }
+            })
+      }
+}
+const saveProductInfo = (data)=>{
+      return{
+          type : breakActionType.GETPRODUCTINFO,
+          data
+      }
+  }
+  export {getProductInfo}
\ No newline at end of file
--- a/client/actions/common.js
+++ b/client/actions/common.js
@@ -15,11 +15,11 @@ let myHeaders = new Headers({
 //开始工作
 const getTaskInfo = (data)=>{
-    console.log(data,'吴加宝 打印')
+    // let {userInfo,storeInfo} = data;
-    let {userInfo,storeInfo} = data;
        return(dispatch)=>{
-            if(userInfo && userInfo.id && storeInfo && storeInfo.id) {
+            // if(userInfo && userInfo.id && storeInfo && storeInfo.id) {
-                let url = `${ENV.domain}flat/ready/${storeInfo.id}/${userInfo.id}`;
+                let url ='http://192.168.10.128:8080/web/flat/ready/1/A/28';
+                // let url = `${ENV.domain}flat/ready/${storeInfo.id}/${userInfo.id}`;
                fetch(url,{
                    // credentials : 'include',
                    method : 'GET',
@@ -33,9 +33,9 @@ const getTaskInfo = (data)=>{
                        }
                        dispatch(saveCommonInfo(Object.assign({},{taskInfo})))
                    }).catch(e=>{console.error(e)})
-            }else {
+            // }else {
-                dispatch(addErrorInfo("用户或门店不对"))
+                // dispatch(addErrorInfo("用户或门店不对"))
-            }
+            // }
        }
 };
@@ -116,7 +116,8 @@ const getUserinfo = (employeeId,storeId)=>{
 //test 没有散落货品
 const hasNoSku = (storeInfo)=>{
    return (dispatch)=>{
-        let url=`${ENV.domain}/flat/work/status/1`
+        // let url=`${ENV.domain}/flat/work/status/1`;
+        let url ='http://192.168.10.128:8080/web/flat/work/status/1/A/LR';
        fetch(url,{
            // credentials : 'include',
            method : 'PUT',
@@ -132,7 +133,8 @@ const hasNoSku = (storeInfo)=>{
 //拉取工单
 const getTaskList = (data={})=>{
-   let url=`${ENV.domain}/flat/work/list/13`
+//    let url=`${ENV.domain}/flat/work/list/13`;
+   let url ='http://192.168.10.128:8080/web/flat/work/list/1/A/28';
    return (dispatch)=>{
         fetch(url,{
            // credentials : 'include',

--- a/client/actiontype/breakageContainer.js
+++ b/client/actiontype/breakageContainer.js
+const breakActionType={
+    GETPRODUCTINFO:'GETPRODUCTINFO'
+}
+export default breakActionType
\ No newline at end of file
--- a/client/components/BreakageComponent/BreakageCode/BreakageCode.jsx
+++ b/client/components/BreakageComponent/BreakageCode/BreakageCode.jsx
 import React from 'react'
+import Button from '../../CommonComponent/ButtonComponent/ButtonComponent'
 class BreakageCode extends React.Component{
    constructor(props){
         super(props)
+         this.state={
+             barcode:''
+         }
    }
    render(){
+        let {barcode}=this.state;
       return (
-           <div className={'breakageContent'}>
+           <div className={'breakageContent'} style={{width:'100%',height:'100%',background:'rgba(0,0,0,1)',position:'absolute'}}>
               <div className={'breakageHeader'}>
+                    <span>返回</span>
+                    <span>请输入遗留货品的条形码</span>
+                    <span>条形码残缺？</span>
+               </div>
+               <div className={'breakageCodeContent'}>
+                   <p>条形码输入错误，请重新输入</p>
+                   <input type="text" vlaue={barcode} onChange={(ev)=>{this.setState({barcode:ev.target.value})}}/>
+                   <p>or<span>条形码扫描</span></p>
               </div>
+               <Button text={'确定'} option={this.getCodeProduct.bind(this)} btnContainer={'font30 backff775c colfff'} style={{border:'0'}} />
           </div>
       )
    }
+    getCodeProduct(){
+        let {barcode}=this.state;
+        this.props.getProductInfo(barcode)
+    }
 }
 export default BreakageCode;
\ No newline at end of file
--- a/client/components/BreakageComponent/BreakageCode/index.css
+++ b/client/components/BreakageComponent/BreakageCode/index.css
--- a/client/components/BreakageComponent/defaultComponent/DefaultComponnet.jsx
+++ b/client/components/BreakageComponent/defaultComponent/DefaultComponnet.jsx
@@ -12,14 +12,19 @@ class DefaultComponent extends React.Component{
                 text={'有,扫码上报'} 
                 btnContainer={'col333 font30'} 
                 style={{marginTop:'150px',marginLeft:'50%',transform:'translate(-50%)'}} 
+                 option={this.skipInputCode.bind(this)}
            />
            <Button 
                 text={'没有'} 
                 btnContainer={'col333 font30'} 
                 style={{marginTop:'30px',marginLeft:'50%',transform:'translate(-50%)'}} 
+                 option={this.props.pullTaskList}
            />
         </div>
        )
    }
+    skipInputCode(){
+        this.props.changeCodePage(false)
+    }
 }
 export default DefaultComponent;
\ No newline at end of file
--- a/client/containers/BreakageContainer/BreakageConatiner.jsx
+++ b/client/containers/BreakageContainer/BreakageConatiner.jsx
@@ -10,22 +10,28 @@ class BreakageContainer extends React.Component {
    constructor(props){
         super(props)
         this.state={
-            showPage:1
+            showPage:1,
+            isShow:true
         }
+         this.changePage=this.changePage.bind(this);
    }
    render(){
        let props=this.props;
+        let {isShow}=this.state;
         return (
             <div className={"BreakageContainer"}>
-                    <HeaderComponent headerInfo={props.headerInfo} />
+                  {
-                    <LeftContainer leftInfo={props.headerInfo}/>
+                       isShow?<div>
-                    <RightContainer>
+                       <HeaderComponent headerInfo={props.headerInfo} />
-                          {
+                        <LeftContainer leftInfo={props.headerInfo}/>
-                             this.getPages() 
+                        <RightContainer>
-                          }
+                              {
-                    </RightContainer>
+                                 this.getPages() 
+                              }
+                        </RightContainer>
+                       </div>:<BreakageCode changePage={this.changePage} getProductInfo={this.getproductCode.bind(this)} />
+                  }
             </div>
         ) 
    }
@@ -38,21 +44,30 @@ class BreakageContainer extends React.Component {
             showPage:page
         })
    }
+    //切换到扫码的页面
+    changeCodePage(bool){
+        this.setState({
+            isShow:bool
+        })
+    }
    getPages(){
        let pages=null;
+        let props=this.props;
        let {showPage}=this.state;
        switch(showPage){
            case  1 :
-                 pages=<DefaultComponent />
+                 pages=<DefaultComponent pullTaskList={props.pullTaskList} 
+                                         changeCodePage={this.changeCodePage.bind(this)}
+                 />
                 break;
            case  2 :
                 pages=<BreakageProductDetail />
                 break;
-            case  3 :
-                 pages=<BreakageCode />
-                 break;
        }
        return pages;
    }
+    getproductCode(barcode){
+        this.props.getProductInfo(barcode)
+    }
 }
 export default BreakageContainer
\ No newline at end of file
--- a/client/containers/PageContainer/PageContainer.jsx
+++ b/client/containers/PageContainer/PageContainer.jsx
@@ -10,7 +10,6 @@ import {scanBarCodeGetProductInfo,submitProductInfo,saveEditProductInfo,submitPr
 import {getReportDamageList,deleteDamageItem} from '../../actions/reportDamageList'
 import {getRefreshImg,deleteImg,emptyImg} from "../../actions/refreshImg"
 import {uploadError,addErrorInfo} from '../../actions/uploadError'
-import {getTaskInfo,getTaskList} from '../../actions/common'
 import PopupComponent from '../../components/CommonComponent/PopupComponent/PopupComponent'
 import TroubleContainer from '../TroubleContainer/TroubleContainer'
 import ScanBarCodeContainer from '../ScanBarCodeContainer/ScanBarCodeContaienr'
@@ -28,6 +27,8 @@ import TakeStokeContainer from '../TakeStokeContainer/TakeStokeContainer'
 import BreakageContainer from '../BreakageContainer/BreakageConatiner'
 import RecoveryPage from '../RecoveryContainer/RecoveryContainer'
 import ReplenishContainer from '../ReplenishContainer/ReplenishContainer'
+import {getProductInfo} from '../../actions/BreakageContainer'
+import {getTaskInfo,getTaskList} from '../../actions/common'
 /*二期引用 end*/
 import {on,remove} from '../../util/event';
@@ -482,7 +483,6 @@ class PageContainer extends React.Component {
        })
    }
    getPages(){
        let pages = null;
        let{state,dispatch} = this.props;
@@ -593,16 +593,17 @@ class PageContainer extends React.Component {
                pages = <BreakageContainer
                                 pullTaskList={()=>{dispatch(hasNoSku(state.commonInfo.storeInfo))}}
                                 headerInfo={state.commonInfo}
+                                 getProductInfo={(barcode)=>{dispatch(getProductInfo({barcode}))}}
                                 />;
                break;
            case showPage[10]:
                pages = <RecoveryPage
-                    headerInfo = {state.commonInfo}
+                        headerInfo = {state.commonInfo}
-                    showPopup={(info)=>this.showPopup(info)}
+                        showPopup={(info)=>this.showPopup(info)}
-                    hidePopup={()=>this.hidePopup()}
+                        hidePopup={()=>this.hidePopup()}
-                    getTaskName={()=>dispatch(getTaskName(3,2))}
+                        getTaskName={()=>dispatch(getTaskName(3,2))}
-                    finishBoxRecovery={()=>dispatch(finishBoxRecovery())}
+                        finishBoxRecovery={()=>dispatch(finishBoxRecovery())}
-                    wrongShelf={()=>dispatch(wrongShelf())}
+                        wrongShelf={()=>dispatch(wrongShelf())}
                />;
                break;
            case showPage[11]:
@@ -615,6 +616,8 @@ class PageContainer extends React.Component {
        }
        return pages;
    }
    handleTouch(){
        console.log("handleTouch");

--- a/client/reducers/index.js
+++ b/client/reducers/index.js
@@ -9,7 +9,7 @@ import headerInfo from './initHeader' //获取头部信息
 import reportDamageList from './reportDamge' //一期商铺报损
 import errMsg from './error' //上报异常
 import commonInfo from './common' //上报异常
+import breakageContainer from './breakageContainer'
 export default combineReducers({
    troubleList,
    storeInfo,
@@ -20,7 +20,8 @@ export default combineReducers({
    headerInfo,
    reportDamageList,
    errMsg,
-    commonInfo
+    commonInfo,
+    breakageContainer
 })