Skip to content

M
max_android_panel
Commit 38ba5926 by wujiabao
Options

fix bug add pop

parent 916df3fc
Showing with 137 additions and 29 deletions
client/actions/barcodeCommon.js
...@@ -3,7 +3,6 @@ import {saveCommonInfo} from './common' ...@@ -3,7 +3,6 @@ import {saveCommonInfo} from './common'
import barcodeActionType from '../actiontype/barcodeCommon' import barcodeActionType from '../actiontype/barcodeCommon'
import replenishAction from './replenish' import replenishAction from './replenish'
let domain = ENV.domain; let domain = ENV.domain;
let domain1='http://192.168.10.176:8080/web/'
//test 输入条形码获取商品信息 //test 输入条形码获取商品信息
const getBarCodeProductInfo = (data)=>{ const getBarCodeProductInfo = (data)=>{
...@@ -21,6 +20,9 @@ const getBarCodeProductInfo = (data)=>{ ...@@ -21,6 +20,9 @@ const getBarCodeProductInfo = (data)=>{
mode : 'cors' mode : 'cors'
}).then((response)=>response.json()) }).then((response)=>response.json())
.then((json)=>{ .then((json)=>{
if(!json.meta.success&&!json.data){
dispatch(saveProductInfo(json.meta))
}else{
if(json.meta.success&&json.data){ if(json.meta.success&&json.data){
dispatch(replenishAction.emptyErrorInfo()); //补货清空错误数据 dispatch(replenishAction.emptyErrorInfo()); //补货清空错误数据
let info = Object.assign({},{taskList:json.data}); let info = Object.assign({},{taskList:json.data});
...@@ -58,6 +60,8 @@ const getBarCodeProductInfo = (data)=>{ ...@@ -58,6 +60,8 @@ const getBarCodeProductInfo = (data)=>{
break; break;
} }
} }
}
}) })
} }
...@@ -70,6 +74,11 @@ const saveProductInfo = (data)=>{ ...@@ -70,6 +74,11 @@ const saveProductInfo = (data)=>{
data data
} }
} }
const saveStatus = (data)=>{
return {
type : barcodeActionType.GETSTATUS,
data
}
}
export {getBarCodeProductInfo,saveProductInfo} export {getBarCodeProductInfo,saveProductInfo}
\ No newline at end of file
client/actions/breakaegContainer.js
import fetch from 'isomorphic-fetch' import fetch from 'isomorphic-fetch'
import {getTaskList} from "./common"; import {getTaskList} from "./common";
import breakageActionType from '../actiontype/breakageContainer'
let domain = ENV.domain; let domain = ENV.domain;
let domain1='http://192.168.10.176:8080/web/'
//提交遗留上报的商品 //提交遗留上报的商品
let myHeaders = new Headers({ let myHeaders = new Headers({
// 'Access-Control-Allow-Origin': '*', // 'Access-Control-Allow-Origin': '*',
...@@ -11,7 +11,6 @@ let myHeaders = new Headers({ ...@@ -11,7 +11,6 @@ let myHeaders = new Headers({
}); });
const submitBreakageProduct = (data)=>{ const submitBreakageProduct = (data)=>{
console.log(data,"执行了提交遗留上报")
let {productDetail,commonInfo}=data; let {productDetail,commonInfo}=data;
let userId=commonInfo.userInfo.id; let userId=commonInfo.userInfo.id;
let {taskId}=commonInfo.taskInfo; let {taskId}=commonInfo.taskInfo;
...@@ -19,7 +18,7 @@ const submitBreakageProduct = (data)=>{ ...@@ -19,7 +18,7 @@ const submitBreakageProduct = (data)=>{
let {skuPosition,skuId,skuStatus}=productDetail; let {skuPosition,skuId,skuStatus}=productDetail;
let bodyData={skuPosition,skuId,skuStatus,machineId,taskId} let bodyData={skuPosition,skuId,skuStatus,machineId,taskId}
let url=domain+`machine_pad/lr/${userId}` let url=domain+`machine_pad/lr/${userId}`
return ()=>{ return (dispatch)=>{
fetch(url,{ fetch(url,{
// credentials : 'include', // credentials : 'include',
method : 'POST', method : 'POST',
...@@ -31,7 +30,8 @@ const submitBreakageProduct = (data)=>{ ...@@ -31,7 +30,8 @@ const submitBreakageProduct = (data)=>{
body:JSON.stringify(bodyData) body:JSON.stringify(bodyData)
}).then((response)=>response.json()) }).then((response)=>response.json())
.then((json)=>{ .then((json)=>{
console.log(json) console.log(json,'breakageContainerjs')
dispatch(getSubmitStatus(json.meta))
}) })
} }
} }
...@@ -55,4 +55,10 @@ const hasNoSku = (commonInfo)=>{ ...@@ -55,4 +55,10 @@ const hasNoSku = (commonInfo)=>{
} }
} }
const getSubmitStatus = (data)=>{
return {
type:breakageActionType.SUBMITSTATUS,
data
}
}
export {submitBreakageProduct,hasNoSku} export {submitBreakageProduct,hasNoSku}
\ No newline at end of file
client/actions/common.js
...@@ -67,7 +67,6 @@ const getUserinfo = (employeeId,storeId)=>{ ...@@ -67,7 +67,6 @@ const getUserinfo = (employeeId,storeId)=>{
//拉取工单 //拉取工单
const getTaskList = (data={})=>{ const getTaskList = (data={})=>{
let {storeInfo={},userInfo={},taskInfo={}} = data; let {storeInfo={},userInfo={},taskInfo={}} = data;
console.log("getTaskList ",data)
let taskId=taskInfo.taskId || 0; let taskId=taskInfo.taskId || 0;
let url =`${domain}machine_pad/work/list/${storeInfo.id}/${taskInfo.area}/${taskId}/${userInfo.id}`; let url =`${domain}machine_pad/work/list/${storeInfo.id}/${taskInfo.area}/${taskId}/${userInfo.id}`;
return (dispatch)=>{ return (dispatch)=>{
...@@ -84,7 +83,6 @@ const getTaskList = (data={})=>{ ...@@ -84,7 +83,6 @@ const getTaskList = (data={})=>{
}).then(response=>response.json()) }).then(response=>response.json())
.then((json)=>{ .then((json)=>{
let data =Object.assign({}); let data =Object.assign({});
console.log("拉取工单 ",json)
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);
// if(json.data.flatCommonVo.currentTaskType !== 'ADDR'){ // if(json.data.flatCommonVo.currentTaskType !== 'ADDR'){
......
client/actiontype/barcodeCommon.js
const breakActionType={ const breakActionType={
GETPRODUCTINFO:'GETPRODUCTINFO' GETPRODUCTINFO:'GETPRODUCTINFO',
GETSTATUS:'GETSTATUS'
} }
export default breakActionType export default breakActionType
\ No newline at end of file
client/actiontype/breakageContainer.js 0 → 100644
const breakageActionType={
SUBMITSTATUS:'SUBMITSTATUS'
}
export default breakageActionType
\ No newline at end of file
client/components/BreakageComponent/BreakageCode/BreakageCode.jsx
...@@ -16,6 +16,7 @@ class BreakageCode extends React.Component{ ...@@ -16,6 +16,7 @@ class BreakageCode extends React.Component{
</div> </div>
<BarcodeComponent getBarCodeProductInfo={this.props.getBarCodeProductInfo} <BarcodeComponent getBarCodeProductInfo={this.props.getBarCodeProductInfo}
changePage={this.props.changePage} changePage={this.props.changePage}
breakageProductInfo={this.props.breakageProductInfo}
/> />
</div> </div>
) )
......
client/components/BreakageComponent/BreakageProductDetail/BreakageProductDetail.jsx
...@@ -29,7 +29,8 @@ class BreakageProductDetail extends React.Component{ ...@@ -29,7 +29,8 @@ class BreakageProductDetail extends React.Component{
{ {
Object.keys(breakageProductInfo).length>0? Object.keys(breakageProductInfo).length>0?
<div className={'breakageContent'}> <div className={'breakageContent'}>
<div className={'commonPage'}> {
breakageProductInfo.product?<div className={'commonPage'}>
<div className={'pageTitle clo333 font40'} style={{marginBottom:UTILPATH.getRemByPx(20)}}> <div className={'pageTitle clo333 font40'} style={{marginBottom:UTILPATH.getRemByPx(20)}}>
<span>上报遗留货品信息</span> <span>上报遗留货品信息</span>
</div> </div>
...@@ -37,10 +38,20 @@ class BreakageProductDetail extends React.Component{ ...@@ -37,10 +38,20 @@ class BreakageProductDetail extends React.Component{
<div className={'breakProduct'}> <div className={'breakProduct'}>
<div className={'breakProductInfo'}> <div className={'breakProductInfo'}>
<div className={'breakProductImg'}> <div className={'breakProductImg'}>
<img src={breakageProductInfo.product.skuImage} alt=""/> <img src={breakageProductInfo.product&&breakageProductInfo.product.skuImage} alt=""/>
</div> </div>
<div style={{marginTop:UTILPATH.getRemByPx(30),textAlign:'left',marginLeft:UTILPATH.getRemByPx(10)}}> <div style={{marginTop:UTILPATH.getRemByPx(30),textAlign:'left',marginLeft:UTILPATH.getRemByPx(10)}}>
<h2 className={'col333 font40'} style={{fontWeight:'800',width:'4.5rem',overflow:'hidden',textOverflow:'ellipsis',whiteSpace:'nowrap'}}>{breakageProductInfo.product.skuName}啊士大夫艰苦就</h2> <h2 className={'col333 font40'} style={
{
fontWeight:'800',
width:'4.5rem',
overflow:'hidden',
textOverflow:'ellipsis',
whiteSpace:'nowrap',
position:'relative',
zIndex:99
}
}>{breakageProductInfo.product.skuName}</h2>
<p className={'col333 font28'} style={{marginTop:UTILPATH.getRemByPx(20)}}><span>条形码:</span>{breakageProductInfo.product.barcode}</p> <p className={'col333 font28'} style={{marginTop:UTILPATH.getRemByPx(20)}}><span>条形码:</span>{breakageProductInfo.product.barcode}</p>
</div> </div>
</div> </div>
...@@ -72,7 +83,7 @@ class BreakageProductDetail extends React.Component{ ...@@ -72,7 +83,7 @@ class BreakageProductDetail extends React.Component{
<img src={UTILPATH.localImg.defaultImg} alt=""/> <img src={UTILPATH.localImg.defaultImg} alt=""/>
<span className={'font28 col333'}>{item}</span> <span className={'font28 col333'}>{item}</span>
</li> </li>
}):breakageProductInfo.product.skuPositionList.map((item,key)=>{ }):breakageProductInfo.product.skuPositionList&&breakageProductInfo.product.skuPositionList.map((item,key)=>{
return <li return <li
key={key} key={key}
className={positionColor===key?'active':''} className={positionColor===key?'active':''}
...@@ -87,11 +98,12 @@ class BreakageProductDetail extends React.Component{ ...@@ -87,11 +98,12 @@ class BreakageProductDetail extends React.Component{
</div> </div>
</div> </div>
<div className={'breakProductPosition'}> <div className={'breakProductPosition'}>
{breakageProductInfo.product.skuPositionList[positionColor]?<img src={breakageProductInfo.product.skuPositionList[positionColor].filePath} alt=""/>:<img src={UTILPATH.localImg.defaultImg} alt="" />} {breakageProductInfo.product.skuPositionList&&breakageProductInfo.product.skuPositionList[positionColor]?<img src={breakageProductInfo.product.skuPositionList[positionColor].filePath} alt=""/>:<img src={UTILPATH.localImg.defaultImg} alt="" />}
<span className={'font28 col333'} style={{marginTop:'0.2rem',display:'inline-block'}}>{breakageProductInfo.product.skuPositionList[positionColor]?breakageProductInfo.product.skuPositionList[positionColor].name:123}</span> <span className={'font28 col333'} style={{marginTop:'0.2rem',display:'inline-block'}}>{breakageProductInfo.product.skuPositionList&&breakageProductInfo.product.skuPositionList[positionColor]?breakageProductInfo.product.skuPositionList[positionColor].name:123}</span>
</div>
</div> </div>
</div> </div>
</div> :null
}
<Button btnContainer={'colfff font30 backff775c'} text={'提交'} style={{position:'absolute',bottom:UTILPATH.getRemByPx(120),left:'50%',transform:'translate(-50%)'}} option={this.changePageDefault.bind(this)} /> <Button btnContainer={'colfff font30 backff775c'} text={'提交'} style={{position:'absolute',bottom:UTILPATH.getRemByPx(120),left:'50%',transform:'translate(-50%)'}} option={this.changePageDefault.bind(this)} />
</div>:null </div>:null
} }
......
client/components/CommonComponent/BarcodeComponent/BarcodeComponent.jsx
...@@ -35,11 +35,18 @@ class BarcodeComponent extends React.Component{ ...@@ -35,11 +35,18 @@ class BarcodeComponent extends React.Component{
//验证输入的条形码是否为空 //验证输入的条形码是否为空
if(barcode){ if(barcode){
props.getBarCodeProductInfo(barcode); props.getBarCodeProductInfo(barcode);
props.changePage&&props.changePage(2) // props.changePage&&props.changePage(2)
this.setState({barcodeWord:false}) this.setState({barcodeWord:false,barcode:''});
}else{ }else{
this.setState({barcodeWord:true}) this.setState({barcodeWord:true})
} }
}
componentWillReceiveProps(nextProps){
let props=this.props;
if(nextProps.breakageProductInfo.product&&nextProps.breakageProductInfo.product.success!==false){
props.changePage&&props.changePage(2)
}
} }
} }
export default BarcodeComponent; export default BarcodeComponent;
\ No newline at end of file
client/containers/BreakageContainer/BreakageConatiner.jsx
...@@ -16,14 +16,15 @@ class BreakageContainer extends React.Component { ...@@ -16,14 +16,15 @@ class BreakageContainer extends React.Component {
showPage:1,//初始显示的页面 showPage:1,//初始显示的页面
isShow:true,//控制扫码页的显示隐藏 isShow:true,//控制扫码页的显示隐藏
SanCodePage:'SanCode',//控制显示扫码或手动输入 SanCodePage:'SanCode',//控制显示扫码或手动输入
popShow:false //控制弹框 popShow:false, //控制弹框,
pop1Show:true //控制异常弹窗显示
} }
this.changePage=this.changePage.bind(this); this.changePage=this.changePage.bind(this);
} }
render(){ render(){
let props=this.props; let props=this.props;
let {isShow,popShow}=this.state; let {isShow,popShow,pop1Show}=this.state;
return ( return (
<div className={"BreakageContainer"}> <div className={"BreakageContainer"}>
{ {
...@@ -39,13 +40,26 @@ class BreakageContainer extends React.Component { ...@@ -39,13 +40,26 @@ class BreakageContainer extends React.Component {
} }
{ {
popShow?<div style={{width:'100%',height:'100%',background:'rgba(0,0,0,.8)',position:'absolute',top:'0',left:'0'}}> popShow?<div style={{width:'100%',height:'100%',background:'rgba(0,0,0,.8)',position:'absolute',top:'0',left:'0'}}>
<PopModel popupTitle={"货品匹配成功"} classContainer={"recoveryPopInfo"}> <PopModel popupTitle={props.breakageContainer.status&&props.breakageContainer.status.success?"货品匹配成功":'货品匹配失败'} classContainer={"recoveryPopInfo"}>
<div className={"icon iconfont icon-correct font150 col27ce61"} /> <div className={props.breakageContainer.status&&props.breakageContainer.status.success?"icon iconfont icon-correct font150 col27ce61":"icon iconfont icon-exclamation font150 colfffd00"} />
<div className={"text font40 col000"}> <div className={"text font40 col000"}>
<p>请将货品放入回收箱</p> <p>{props.breakageContainer.status&&props.breakageContainer.status.message}</p>
</div> </div>
<div className={"btn"}> <div className={"btn"}>
<Button text={'已放入'} btnContainer={'font32 backff775c colfff'} option={this.changePopHide.bind(this)} /> <Button text={props.breakageContainer.status&&props.breakageContainer.status.success?"已放入":'关闭'} btnContainer={'font32 backff775c colfff'} option={this.changePopHide.bind(this,props.breakageContainer.status&&props.breakageContainer.status.success)} />
</div>
</PopModel>
</div>:null
}
{
!pop1Show?<div style={{width:'100%',height:'100%',background:'rgba(0,0,0,.8)',position:'absolute',top:'0',left:'0'}}>
<PopModel popupTitle={"货品异常"} classContainer={"recoveryPopInfo"}>
<div className={"icon iconfont icon-exclamation font150 colfffd00"} />
<div className={"text font40 col000"}>
<p>{props.breakageProductInfo.product.message}</p>
</div>
<div className={"btn"}>
<Button text={'关闭'} btnContainer={'font32 backff775c colfff'} option={this.changePopHideReturn.bind(this)} />
</div> </div>
</PopModel> </PopModel>
</div>:null </div>:null
...@@ -55,11 +69,22 @@ class BreakageContainer extends React.Component { ...@@ -55,11 +69,22 @@ class BreakageContainer extends React.Component {
} }
//控制弹框消失 //控制弹框消失
changePopHide(){ changePopHide(bool){
this.changePopShow(false) this.changePopShow(false);
if(bool){
this.changePage(1) this.changePage(1)
}else{
this.changeCodePage(false);
this.changeSanCodePage('HandCode');
}
}
//控制弹框消失返回输入条形码页
changePopHideReturn(){
this.setState({
pop1Show:true
})
this.changeSanCodePage('HandCode')
} }
//改变显示的组件 //改变显示的组件
changePage(page){ changePage(page){
this.setState({ this.setState({
...@@ -109,6 +134,7 @@ class BreakageContainer extends React.Component { ...@@ -109,6 +134,7 @@ class BreakageContainer extends React.Component {
getSanCodePgae(){ getSanCodePgae(){
let {SanCodePage}=this.state; let {SanCodePage}=this.state;
let SanPage=null; let SanPage=null;
let props=this.props;
switch(SanCodePage){ switch(SanCodePage){
case 'SanCode' : case 'SanCode' :
SanPage=<SanCodeComponent changeSanCodePage={this.changeSanCodePage.bind(this)} SanPage=<SanCodeComponent changeSanCodePage={this.changeSanCodePage.bind(this)}
...@@ -116,7 +142,12 @@ class BreakageContainer extends React.Component { ...@@ -116,7 +142,12 @@ class BreakageContainer extends React.Component {
/> />
break; break;
case 'HandCode' : case 'HandCode' :
SanPage=<BreakageCode changePage={this.changePage.bind(this)} changeSanCodePage={this.changeSanCodePage.bind(this)} getBarCodeProductInfo={this.getproductCode.bind(this)} /> SanPage=<BreakageCode changePage={this.changePage.bind(this)}
changeSanCodePage={this.changeSanCodePage.bind(this)}
getBarCodeProductInfo={this.getproductCode.bind(this)}
breakageProductInfo={props.breakageProductInfo}
/>
break; break;
} }
return SanPage; return SanPage;
...@@ -136,5 +167,12 @@ class BreakageContainer extends React.Component { ...@@ -136,5 +167,12 @@ class BreakageContainer extends React.Component {
changePopShow(bool){ changePopShow(bool){
this.setState({popShow:bool}) this.setState({popShow:bool})
} }
componentWillReceiveProps(nextProps){
if(nextProps.breakageProductInfo.product&&nextProps.breakageProductInfo.product.success===false){
this.setState({pop1Show:nextProps.breakageProductInfo.product.success})
}else{
this.setState({pop1Show:true})
}
}
} }
export default BreakageContainer export default BreakageContainer
\ No newline at end of file
client/containers/PageContainer/PageContainer.jsx
...@@ -617,6 +617,7 @@ class PageContainer extends React.Component { ...@@ -617,6 +617,7 @@ class PageContainer extends React.Component {
headerInfo={commonInfo} headerInfo={commonInfo}
getBarCodeProductInfo={(barcode)=>{dispatch(getBarCodeProductInfo({barcode,commonInfo}))}} getBarCodeProductInfo={(barcode)=>{dispatch(getBarCodeProductInfo({barcode,commonInfo}))}}
breakageProductInfo={state.barcodeCommon} breakageProductInfo={state.barcodeCommon}
breakageContainer ={state.breakageContainer}
submitBreakageProduct={(productDetail)=>{dispatch(submitBreakageProduct({commonInfo,productDetail}))}} submitBreakageProduct={(productDetail)=>{dispatch(submitBreakageProduct({commonInfo,productDetail}))}}
/>; />;
break; break;
......
client/reducers/barcodeCommon.js
...@@ -6,10 +6,16 @@ const saveProductInfo = (data,content)=>{ ...@@ -6,10 +6,16 @@ const saveProductInfo = (data,content)=>{
let newState = JSON.parse(JSON.stringify(data)); let newState = JSON.parse(JSON.stringify(data));
return Object.assign({},newState,{product:content}) return Object.assign({},newState,{product:content})
} }
const saveStatus = (data,content)=>{
let newState = JSON.parse(JSON.stringify(data));
return Object.assign({},newState,{status:content})
}
export default function(state={}, action) { export default function(state={}, action) {
switch (action.type) { switch (action.type) {
case barcodeActionType.GETPRODUCTINFO: case barcodeActionType.GETPRODUCTINFO:
return saveProductInfo(state,action.data); return saveProductInfo(state,action.data);
case barcodeActionType.GETSTATUS :
return saveStatus(state,action.data)
default: default:
return state; return state;
} }
......
client/reducers/breakageContainer.js 0 → 100644
import breakageActionType from '../actiontype/breakageContainer'
//扫码商品的信息
const saveStatus = (data,content)=>{
let newState = JSON.parse(JSON.stringify(data));
return Object.assign({},newState,{status:content})
}
export default function(state={}, action) {
switch (action.type) {
case breakageActionType.SUBMITSTATUS :
return saveStatus(state,action.data)
default:
return state;
}
}
\ No newline at end of file
client/reducers/index.js
...@@ -13,6 +13,7 @@ import barcodeCommon from './barcodeCommon' ...@@ -13,6 +13,7 @@ import barcodeCommon from './barcodeCommon'
import replenishInfo from './replenish' import replenishInfo from './replenish'
import recoveryInfo from './recovery' import recoveryInfo from './recovery'
import TokeStokeContainer from './TokeStokeContainer' import TokeStokeContainer from './TokeStokeContainer'
import breakageContainer from './breakageContainer'
export default combineReducers({ export default combineReducers({
troubleList, troubleList,
storeInfo, storeInfo,
...@@ -27,7 +28,8 @@ export default combineReducers({ ...@@ -27,7 +28,8 @@ export default combineReducers({
barcodeCommon, barcodeCommon,
replenishInfo, replenishInfo,
recoveryInfo, recoveryInfo,
TokeStokeContainer TokeStokeContainer,
breakageContainer
}) })
......
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