Skip to content

M
max_android_panel
Commit 0846eb2f by wujiabao
Options

报损和盘点基本完成联调

parent f9bea9e1
Showing with 52 additions and 7 deletions
client/actions/TokeStokeContainer.js
import fetch from 'isomorphic-fetch' import fetch from 'isomorphic-fetch'
import tokeActionType from '../actiontype/TokeStokeContainer' import tokeActionType from '../actiontype/TokeStokeContainer'
import {getTaskList} from './common'
console.log(tokeActionType,'dhakjshdjhasjhdjshj') console.log(tokeActionType,'dhakjshdjhasjhdjshj')
let domain1 = ENV.domain; let domain1 = ENV.domain;
let domain = 'http://192.168.10.128:8080/web/' let domain = 'http://192.168.10.128:8080/web/'
...@@ -23,6 +24,10 @@ const checkProductQuantity = (data)=>{ ...@@ -23,6 +24,10 @@ const checkProductQuantity = (data)=>{
body:JSON.stringify(bodyData) body:JSON.stringify(bodyData)
}).then(response=>response.json()) }).then(response=>response.json())
.then((json)=>{ .then((json)=>{
if(json.data===1){
console.log("执行了 json.data===1 的拉取工单的操作")
dispatch(getTaskList(commonInfo))
}
dispatch(checkQuantity({type:json.data})) dispatch(checkQuantity({type:json.data}))
}).catch(e=>{console.log('err'+e)}) }).catch(e=>{console.log('err'+e)})
......
client/components/BreakageComponent/BreakageProductDetail/BreakageProductDetail.jsx
...@@ -77,8 +77,8 @@ class BreakageProductDetail extends React.Component{ ...@@ -77,8 +77,8 @@ class BreakageProductDetail extends React.Component{
let {product}=this.props.breakageProductInfo; let {product}=this.props.breakageProductInfo;
let {statusColor}=this.state; let {statusColor}=this.state;
let productDetail={skuId:product.skuId,skuStatus:statusColor,skuPosition:0} let productDetail={skuId:product.skuId,skuStatus:statusColor,skuPosition:0}
this.props.submitBreakageProduct(productDetail) this.props.submitBreakageProduct(productDetail);
this.props.changePage(1) this.props.changePopShow(true)
} }
changeProductStatus(key){ changeProductStatus(key){
this.setState({statusColor:key}) this.setState({statusColor:key})
......
client/components/BreakageComponent/BreakageProductDetail/index.css
...@@ -73,3 +73,6 @@ ...@@ -73,3 +73,6 @@
.pagebox .ProductPosition ul li.active{ .pagebox .ProductPosition ul li.active{
border:6px solid #05bb09; border:6px solid #05bb09;
} }
.breakageInfo{
background:rgba(0,0,0.3);
}
\ No newline at end of file
client/components/BreakageComponent/defaultComponent/DefaultComponnet.jsx
...@@ -24,7 +24,8 @@ class DefaultComponent extends React.Component{ ...@@ -24,7 +24,8 @@ class DefaultComponent extends React.Component{
) )
} }
skipInputCode(){ skipInputCode(){
this.props.changeCodePage(false) this.props.changeCodePage(false);
this.props.changeSanCodePage('SanCode')
} }
} }
export default DefaultComponent; export default DefaultComponent;
\ No newline at end of file
client/components/CommonComponent/BarcodeComponent/index.css
...@@ -8,6 +8,7 @@ ...@@ -8,6 +8,7 @@
border:2px solid #9b9b9b ; border:2px solid #9b9b9b ;
border-radius: 10px; border-radius: 10px;
margin-top:20px; margin-top:20px;
text-align: center;
} }
.breakageCodeContent .barcodeScan{ .breakageCodeContent .barcodeScan{
margin-top:30px; margin-top:30px;
......
client/containers/BreakageContainer/BreakageConatiner.jsx
...@@ -6,6 +6,8 @@ import DefaultComponent from '../../components/BreakageComponent/defaultComponen ...@@ -6,6 +6,8 @@ import DefaultComponent from '../../components/BreakageComponent/defaultComponen
import BreakageProductDetail from '../../components/BreakageComponent/BreakageProductDetail/BreakageProductDetail' import BreakageProductDetail from '../../components/BreakageComponent/BreakageProductDetail/BreakageProductDetail'
import BreakageCode from '../../components/BreakageComponent/BreakageCode/BreakageCode' import BreakageCode from '../../components/BreakageComponent/BreakageCode/BreakageCode'
import SanCodeComponent from '../../components/BreakageComponent/SanCodeComponent/SanCodeComponent' import SanCodeComponent from '../../components/BreakageComponent/SanCodeComponent/SanCodeComponent'
import PopModel from '../../components/CommonComponent/PopupComponent/PopupChildComponent'
import Button from '../../components/CommonComponent/ButtonComponent/ButtonComponent'
require('./index.css') require('./index.css')
class BreakageContainer extends React.Component { class BreakageContainer extends React.Component {
constructor(props){ constructor(props){
...@@ -13,14 +15,15 @@ class BreakageContainer extends React.Component { ...@@ -13,14 +15,15 @@ class BreakageContainer extends React.Component {
this.state={ this.state={
showPage:1, showPage:1,
isShow:true, isShow:true,
SanCodePage:'SanCode' SanCodePage:'SanCode',
popShow:false
} }
this.changePage=this.changePage.bind(this); this.changePage=this.changePage.bind(this);
} }
render(){ render(){
let props=this.props; let props=this.props;
let {isShow}=this.state; let {isShow,popShow}=this.state;
return ( return (
<div className={"BreakageContainer"}> <div className={"BreakageContainer"}>
{ {
...@@ -34,12 +37,30 @@ class BreakageContainer extends React.Component { ...@@ -34,12 +37,30 @@ class BreakageContainer extends React.Component {
</RightContainer> </RightContainer>
</div>:this.getSanCodePgae() </div>:this.getSanCodePgae()
} }
{
popShow?<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-correct font150 col27ce61"} />
<div className={"text font40 col000"}>
<p>请将货品放入回收箱</p>
</div>
<div className={"btn"}>
<Button text={'已放入'} btnContainer={'font32 backff775c colfff'} option={this.changePopHide.bind(this)} />
</div>
</PopModel>
</div>:null
}
</div> </div>
) )
} }
componentDidMount(){ componentDidMount(){
} }
//控制弹框消失
changePopHide(){
this.changePopShow(false)
this.changePage(1)
}
//改变显示的组件 //改变显示的组件
changePage(page){ changePage(page){
this.setState({ this.setState({
...@@ -68,12 +89,14 @@ class BreakageContainer extends React.Component { ...@@ -68,12 +89,14 @@ class BreakageContainer extends React.Component {
case 1 : case 1 :
pages=<DefaultComponent pullTaskList={props.pullTaskList} pages=<DefaultComponent pullTaskList={props.pullTaskList}
changeCodePage={this.changeCodePage.bind(this)} changeCodePage={this.changeCodePage.bind(this)}
changeSanCodePage={this.changeSanCodePage.bind(this)}
/> />
break; break;
case 2 : case 2 :
pages=<BreakageProductDetail breakageProductInfo={props.breakageProductInfo} pages=<BreakageProductDetail breakageProductInfo={props.breakageProductInfo}
changePage={this.changePage} changePage={this.changePage}
submitBreakageProduct={this.transmitInfo.bind(this)} submitBreakageProduct={this.transmitInfo.bind(this)}
changePopShow={this.changePopShow.bind(this)}
/> />
break; break;
} }
...@@ -103,5 +126,8 @@ class BreakageContainer extends React.Component { ...@@ -103,5 +126,8 @@ class BreakageContainer extends React.Component {
transmitInfo(productDetail){ transmitInfo(productDetail){
this.props.submitBreakageProduct(productDetail) this.props.submitBreakageProduct(productDetail)
} }
changePopShow(bool){
this.setState({popShow:bool})
}
} }
export default BreakageContainer export default BreakageContainer
\ No newline at end of file
client/containers/TakeStokeContainer/TakeStokeContainer.jsx
...@@ -58,7 +58,7 @@ class TakeStokeContaniner extends React.Component { ...@@ -58,7 +58,7 @@ class TakeStokeContaniner extends React.Component {
</p> </p>
</div> </div>
<Button text={'提交'} btnContainer={'backff775c font32 colfff'} style={{marginTop:'80px'}} option={this.checkProductNum.bind(this)} /> <Button text={'提交'} btnContainer={'backff775c font32 colfff'} style={{marginTop:'80px'}} option={this.checkProductNum.bind(this)} />
</div>:<Button text={'已放入'} btnContainer={'backff775c font32 colfff'} style={{marginTop:'280px'}} /> </div>:<Button option={this.clickPutIn.bind(this)} text={'已放入'} btnContainer={'backff775c font32 colfff'} style={{marginTop:'280px'}} />
} }
</div> </div>
</div> </div>
...@@ -100,10 +100,10 @@ class TakeStokeContaniner extends React.Component { ...@@ -100,10 +100,10 @@ class TakeStokeContaniner extends React.Component {
} }
//根据后台返回的数据 判断显示的组件 //根据后台返回的数据 判断显示的组件
componentWillReceiveProps(nextProps){ componentWillReceiveProps(nextProps){
console.log("执行了盘点任务中的拉取工单")
let {type}=nextProps.TokeStokeState; let {type}=nextProps.TokeStokeState;
switch(type){ switch(type){
case 1 : case 1 :
this.props.getTaskList()
this.setState({number:1,showButton:true}) this.setState({number:1,showButton:true})
break; break;
case 2 : case 2 :
...@@ -114,6 +114,11 @@ class TakeStokeContaniner extends React.Component { ...@@ -114,6 +114,11 @@ class TakeStokeContaniner extends React.Component {
break; break;
} }
} }
//点击已放入 继续拉取工单
clickPutIn(){
this.props.getTaskList();
this.setState({number:1,showButton:true})
}
} }
export default TakeStokeContaniner export default TakeStokeContaniner
\ No newline at end of file
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