Skip to content

M
max_android_panel
Commit 53b49060 by Zhang Xin
Options

完å–完善回收部分的数据逻辑

parent 550d188e
Showing with 62 additions and 38 deletions
client/actions/common.js
...@@ -13,8 +13,6 @@ let myHeaders = new Headers({ ...@@ -13,8 +13,6 @@ let myHeaders = new Headers({
}); });
let test='http://192.168.10.128:8080/'
//开始工作 //开始工作
const getTaskInfo = (data)=>{ const getTaskInfo = (data)=>{
let {userInfo,storeInfo} = data; let {userInfo,storeInfo} = data;
...@@ -28,7 +26,6 @@ const getTaskInfo = (data)=>{ ...@@ -28,7 +26,6 @@ const getTaskInfo = (data)=>{
}).then((response)=>response.json()) }).then((response)=>response.json())
.then(json=>{ .then(json=>{
let taskInfo=Object.assign({}); let taskInfo=Object.assign({});
console.log(json,'开始工作')
if(json.meta.success && json.data){ if(json.meta.success && json.data){
taskInfo = Object.assign({},json.data); taskInfo = Object.assign({},json.data);
dispatch(getTaskName(json.data.currentTaskNum)) dispatch(getTaskName(json.data.currentTaskNum))
...@@ -78,7 +75,6 @@ const getInfoByBarcode = (data)=>{ ...@@ -78,7 +75,6 @@ const getInfoByBarcode = (data)=>{
headers: { 'Content-Type': 'application/json' } headers: { 'Content-Type': 'application/json' }
}).then(response=>response.json()) }).then(response=>response.json())
.then(json=>{ .then(json=>{
console.log(json);
if(json.meta.success){ if(json.meta.success){
//扫码成功 //扫码成功
}else{ }else{
...@@ -127,7 +123,6 @@ const hasNoSku = (storeInfo)=>{ ...@@ -127,7 +123,6 @@ const hasNoSku = (storeInfo)=>{
headers: myHeaders headers: myHeaders
}).then(response=>response.json()) }).then(response=>response.json())
.then((json)=>{ .then((json)=>{
console.log(json,'没有散落货品')
dispatch(getTaskList()) dispatch(getTaskList())
}) })
} }
...@@ -145,7 +140,6 @@ const getTaskList = (data={})=>{ ...@@ -145,7 +140,6 @@ const getTaskList = (data={})=>{
headers: myHeaders headers: myHeaders
}).then(response=>response.json()) }).then(response=>response.json())
.then((json)=>{ .then((json)=>{
console.log(json,'拉取工单')
let data =Object.assign({}); let data =Object.assign({});
if(json.meta.success && json.data){ if(json.meta.success && json.data){
data.taskInfo = Object.assign({},json.data.flatCommonVo) data.taskInfo = Object.assign({},json.data.flatCommonVo)
......
client/actions/recovery.js
import fetch from 'isomorphic-fetch'; import fetch from 'isomorphic-fetch';
import actionType from '../actiontype/recovery' import actionType from '../actiontype/recovery'
import {getTaskList} from "./common";
const domain = ENV.domain; const domain = ENV.domain;
const initRecoveryInfo = (data)=>{ let myHeaders = new Headers({
return{ // 'Access-Control-Allow-Origin': '*',
type : actionType.INITRECOVERYINFO, // 'Content-Type': 'text/plain;charset=UTF-8',
data // 'Content-Type': 'application/x-www-form-urlencoded; charset=UTF-8',
} 'Content-Type': 'application/json; charset=UTF-8',
}; });
const finishBoxRecovery = ()=>{ const finishBoxRecovery = ()=>{
//将 //完成
let url=`${ENV.domain}/machine_pad/update_machine_recovery_sku.action`
return (dispatch)=>{
fetch(url,{
// credentials : 'include',
method : 'POST',
mode : 'cors',
headers: myHeaders
}).then(response=>response.json())
.then((json)=>{
dispatch(getTaskList());
})
}
}; };
const wrongShelf = ()=>{
//货道不符
let url=`${ENV.domain}/machine_pad/wrong_machine_recovery_sku.action`
return (dispatch)=>{
fetch(url,{
// credentials : 'include',
method : 'POST',
mode : 'cors',
headers: myHeaders
}).then(response=>response.json())
.then((json)=>{
dispatch(getTaskList());
})
}
}
export {initRecoveryInfo} export {finishBoxRecovery,wrongShelf}
client/components/CommonComponent/SkuInfoComponent/SkuInfoComponent.jsx
...@@ -27,22 +27,22 @@ export default class SkuInfoComponent extends React.Component{ ...@@ -27,22 +27,22 @@ export default class SkuInfoComponent extends React.Component{
render(){ render(){
let props = this.props; let props = this.props;
let {classNames='',style={}} = props; let {classNames='',style={},skuInfo={}} = props;
return ( return (
<div className={"skuInfoComponent " + classNames} style={style}> <div className={"skuInfoComponent " + classNames} style={style}>
<div className={"img"}> <div className={"img"}>
<img style={this.state.style} ref={"secondPageImg"} onLoad={()=>this.handleLoadImg.bind(this)("secondPageImg")} onError={()=>this.handleErrorImg.bind(this)("secondPageImg")} src={UTILPATH.localImg.defaultImg} alt=""/> <img style={this.state.style} ref={"secondPageImg"} onLoad={()=>this.handleLoadImg.bind(this)("secondPageImg")} onError={()=>this.handleErrorImg.bind(this)("secondPageImg")} src={skuInfo.skuImage} alt=""/>
</div> </div>
<ul className={"shelfInfo font30 col333"}> <ul className={"shelfInfo font30 col333"}>
<li className={""}> <li className={""}>
<span className={""}>货品名称：雪碧</span> <span className={""}>货品名称：{skuInfo.skuName || ''}</span>
<span className={"totalNum "}>需回收数量：<span className={"font40 colff775c"}>5</span></span> <span className={"totalNum "}>需回收数量：<span className={"font40 colff775c"}>{skuInfo.targetNum || 0}</span></span>
</li> </li>
<li className={""}> <li className={""}>
<span className={""}>所在区域：A区1号柜 <span className={"areaBtn colff775c"}>位置照片</span></span> <span className={""}>所在区域：{skuInfo.shortPosition || ''} <span className={"areaBtn colff775c"}>位置照片</span></span>
<span className={"currentNum"}>已回收数量：<span className={"font40 colff775c"}>5</span></span> <span className={"currentNum"}>已回收数量：<span className={"font40 colff775c"}>{skuInfo.recoverNum || 0}</span></span>
</li> </li>
<li className={""}>货到信息：第6行 第3活到 13-6-6-6</li> <li className={""}>货到信息：{skuInfo.position || ''}</li>
</ul> </ul>
</div> </div>
) )
......
client/components/RecoveryComponent/RecoverySecondPage/RecoverySecondPage.jsx
...@@ -53,7 +53,6 @@ export default class RecoverySecondPage extends React.Component{ ...@@ -53,7 +53,6 @@ export default class RecoverySecondPage extends React.Component{
wrongSku(){ wrongSku(){
//货道商品不符 //货道商品不符
console.log("货道商品不符 ",this.props)
let {showPopup,hidePopup} = this.props; let {showPopup,hidePopup} = this.props;
let marginTop = '40px'; let marginTop = '40px';
let btnDom1 = <Button key={"recoveryContainerShelfWrong1"} style={{'width':"100%"}} text={"货品不符"} option={this.uploadWrongSku}/> let btnDom1 = <Button key={"recoveryContainerShelfWrong1"} style={{'width':"100%"}} text={"货品不符"} option={this.uploadWrongSku}/>
...@@ -84,13 +83,13 @@ export default class RecoverySecondPage extends React.Component{ ...@@ -84,13 +83,13 @@ export default class RecoverySecondPage extends React.Component{
uploadWrongSku(){ uploadWrongSku(){
//货品不符上报 //货品不符上报
this.props.wrongShelf();
} }
scanQrcode(){ scanQrcode(){
//扫码回收 //扫码回收
console.log("scan") this.props.finishBoxRecovery();
} }
...@@ -101,12 +100,13 @@ export default class RecoverySecondPage extends React.Component{ ...@@ -101,12 +100,13 @@ export default class RecoverySecondPage extends React.Component{
let classInfo = { let classInfo = {
colorInfo : "colfff", colorInfo : "colfff",
className : '' className : ''
} };
let {headerInfo} = props;
return( return(
<div className={"RecoverySecondPage"}> <div className={"RecoverySecondPage"}>
<div className={"title font40 col333"}>任务目标：请将该货道货品进行扫码回收</div> <div className={"title font40 col333"}>任务目标：请将该货道货品进行扫码回收</div>
<div className={"box"}> <div className={"box"}>
<SkuInfoComponent style={{'display':'flex'}}/> <SkuInfoComponent style={{'display':'flex'}} skuInfo={headerInfo.taskList || {}}/>
<div className={"btn"}> <div className={"btn"}>
<Button key={"RecoverySecondPageBtn"} classInfo={classInfo} style={style} text={'扫码回收'} option={this.scanQrcode}/> <Button key={"RecoverySecondPageBtn"} classInfo={classInfo} style={style} text={'扫码回收'} option={this.scanQrcode}/>
<div className={"text colff775c font28"} onClick={()=>this.wrongSku()}>货品不符？</div> <div className={"text colff775c font28"} onClick={()=>this.wrongSku()}>货品不符？</div>
......
client/containers/PageContainer/PageContainer.jsx
...@@ -3,6 +3,7 @@ import React from 'react' ...@@ -3,6 +3,7 @@ import React from 'react'
import { connect } from 'react-redux'; import { connect } from 'react-redux';
import {getStoreInfo,saveCommonInfo,getUserinfo,logout,hasNoSku,getTaskName} from "../../actions/common"; import {getStoreInfo,saveCommonInfo,getUserinfo,logout,hasNoSku,getTaskName} from "../../actions/common";
import {finishBoxRecovery,wrongShelf} from "../../actions/recovery";
import {getTroubleList,updateTroubleList} from "../../actions/getTroubles"; import {getTroubleList,updateTroubleList} from "../../actions/getTroubles";
import {initGetOtherProblem,addNewProbem,deleteProblem,editProblemItem,submitProblemList} from "../../actions/otherQuestion" import {initGetOtherProblem,addNewProbem,deleteProblem,editProblemItem,submitProblemList} from "../../actions/otherQuestion"
import {scanBarCodeGetProductInfo,submitProductInfo,saveEditProductInfo,submitProductSuccess,clearProductSuccess} from "../../actions/ScanBarCode" import {scanBarCodeGetProductInfo,submitProductInfo,saveEditProductInfo,submitProductSuccess,clearProductSuccess} from "../../actions/ScanBarCode"
...@@ -312,7 +313,6 @@ class PageContainer extends React.Component { ...@@ -312,7 +313,6 @@ class PageContainer extends React.Component {
console.log("countbackTimer ",this.countbackTimer,) console.log("countbackTimer ",this.countbackTimer,)
if(!this.countbackTimer && this.countBackTime >= 0){ if(!this.countbackTimer && this.countBackTime >= 0){
this.countBackTime--; this.countBackTime--;
console.log(this.countBackTime)
this.countbackTimer = window.setTimeout(()=>{ this.countbackTimer = window.setTimeout(()=>{
if(this.countBackTime > 0){ if(this.countBackTime > 0){
clearTimeout(this.countbackTimer); clearTimeout(this.countbackTimer);
...@@ -485,7 +485,6 @@ class PageContainer extends React.Component { ...@@ -485,7 +485,6 @@ class PageContainer extends React.Component {
getPages(){ getPages(){
let pages = null; let pages = null;
let{state,dispatch} = this.props; let{state,dispatch} = this.props;
console.log(state);
switch (this.state.showPage){ switch (this.state.showPage){
case showPage[1]: case showPage[1]:
pages = <TroubleContainer pages = <TroubleContainer
...@@ -598,6 +597,8 @@ class PageContainer extends React.Component { ...@@ -598,6 +597,8 @@ class PageContainer extends React.Component {
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())}
wrongShelf={()=>dispatch(wrongShelf())}
/>; />;
break; break;
/*以下是二期页面 end*/ /*以下是二期页面 end*/
...@@ -611,7 +612,6 @@ class PageContainer extends React.Component { ...@@ -611,7 +612,6 @@ class PageContainer extends React.Component {
} }
render() { render() {
console.log("render ");
let {state} = this.props; let {state} = this.props;
let headerInfo = state.commonInfo; let headerInfo = state.commonInfo;
let ip = headerInfo ? headerInfo.ip : ''; let ip = headerInfo ? headerInfo.ip : '';
......
client/containers/RecoveryContainer/RecoveryContainer.jsx
...@@ -25,15 +25,17 @@ export default class RecoveryContainer extends React.Component{ ...@@ -25,15 +25,17 @@ export default class RecoveryContainer extends React.Component{
componentWillMount() { componentWillMount() {
let props = this.props; let props = this.props;
console.log("props ",this.props) console.log("props ",this.props);
// if(!props.whetherType){ let {headerInfo = {}} = props;
// console.log("没有回收箱物品") let {taskList = {}} = headerInfo;
// //没有回收箱物品 if(taskList && !taskList.whetherType){
// this.setState({ console.log("没有回收箱物品")
// showPage : recoveryPageIndex[2] //没有回收箱物品
// }) this.setState({
// showPage : recoveryPageIndex[2]
// } })
}
} }
componentWillReceiveProps(nextProps){ componentWillReceiveProps(nextProps){
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment