Skip to content

M
max_android_panel
Commit 0f14bb2e by Zhang Xin
Options

fix bug

parent 717b81d3
Showing with 23 additions and 19 deletions
client/components/RecoveryComponent/RecoveryScanPage/RecoveryScanPage.jsx
...@@ -71,7 +71,7 @@ export default class RecoveryScanPage extends React.Component{ ...@@ -71,7 +71,7 @@ export default class RecoveryScanPage extends React.Component{
<div className={"colfff font30 scanText"} style={{marginBottom:'0.5rem'}}>目标回收数量：<span className={"font40 colff775c"}>{taskList.targetNum || 0}</span> 已回收数量：<span className={"font40 colff775c"}>{taskList.recoverNum || 0}</span></div> <div className={"colfff font30 scanText"} style={{marginBottom:'0.5rem'}}>目标回收数量：<span className={"font40 colff775c"}>{taskList.targetNum || 0}</span> 已回收数量：<span className={"font40 colff775c"}>{taskList.recoverNum || 0}</span></div>
<div className={"barcodeInputText font30"}>{this.state.barcodeErrorText}</div> <div className={"barcodeInputText font30"}>{this.state.barcodeErrorText}</div>
<input value={this.state.barcodeText} autoFocus={true} className={"barcodeInput font30 col000"} type="text" onChange={this.handleInputChange.bind(this)}/> <input value={this.state.barcodeText} autoFocus={true} className={"barcodeInput font30 col000"} type="text" onChange={this.handleInputChange.bind(this)}/>
<div className={"barcodeInputTip font30 colff775c"} onClick={()=>this.changeShowInput()}><span className={"colfff"}>or</span>条形码扫描</div> {/*<div className={"barcodeInputTip font30 colff775c"} onClick={()=>this.changeShowInput()}><span className={"colfff"}>or</span>条形码扫描</div>*/}
<Button btnContainer={"barcodeInputBarcode font32 backff775c colfff"} key={"barcodeInputBarcode"} text={"确定"} option={this.submitBarcode}/> <Button btnContainer={"barcodeInputBarcode font32 backff775c colfff"} key={"barcodeInputBarcode"} text={"确定"} option={this.submitBarcode}/>
<div className={"colfff scanInfo font30"} style={{marginTop:'1.5rem'}}> <div className={"colfff scanInfo font30"} style={{marginTop:'1.5rem'}}>
<span style={{marginRight:"0.1rem"}}> 货道信息：{taskList.position || ''} </span> <span style={{marginRight:"0.1rem"}}> 货道信息：{taskList.position || ''} </span>
......
client/components/ReplenishComponent/ReplenishScanPage/ReplenishScanPage.jsx
...@@ -202,7 +202,7 @@ export default class ReplenishScanPage extends React.Component{ ...@@ -202,7 +202,7 @@ export default class ReplenishScanPage extends React.Component{
<div className={"replenishScanBarcodeInputDom"}> <div className={"replenishScanBarcodeInputDom"}>
<div className={"barcodeInputText font30"}>{this.state.barcodeErrorText}</div> <div className={"barcodeInputText font30"}>{this.state.barcodeErrorText}</div>
<input value={this.state.barcodeText} autoFocus={true} className={"barcodeInput font30 col000"} onFocus={this.handleFocus.bind(this)} type="text" onChange={this.handleInputChange.bind(this)}/> <input value={this.state.barcodeText} autoFocus={true} className={"barcodeInput font30 col000"} onFocus={this.handleFocus.bind(this)} type="text" onChange={this.handleInputChange.bind(this)}/>
<div className={"barcodeInputTip font30 colff775c"} onClick={()=>this.changeShowInput()}><span className={"colfff"}>or</span>条形码扫描</div> {/*<div className={"barcodeInputTip font30 colff775c"} onClick={()=>this.changeShowInput()}><span className={"colfff"}>or</span>条形码扫描</div>*/}
<Button btnContainer={"barcodeInputBarcode font32 backff775c colfff"} key={"barcodeInputBarcode"} text={"确定"} option={this.submitBarcode}/> <Button btnContainer={"barcodeInputBarcode font32 backff775c colfff"} key={"barcodeInputBarcode"} text={"确定"} option={this.submitBarcode}/>
</div> </div>
) )
......
client/containers/PageContainer/PageContainer.jsx
...@@ -284,6 +284,10 @@ class PageContainer extends React.Component { ...@@ -284,6 +284,10 @@ class PageContainer extends React.Component {
} }
} }
}else if(!nextUserInfo.employeeId && this.state.showPage !== showPage[initPage]){
this.setState({
showPage : showPage[initPage]
})
} }
if(state.errMsg && state.errMsg.errMsg){ if(state.errMsg && state.errMsg.errMsg){
...@@ -332,9 +336,9 @@ class PageContainer extends React.Component { ...@@ -332,9 +336,9 @@ class PageContainer extends React.Component {
} }
showSecondTroubelPage(info){ showSecondTroubelPage(info){
// let {dispatch} =this.props; // let {dispatch} =this.props;
this.setState({ this.setState({
showPage : showPage[13] showPage : showPage[13]
}) })
} }
changePages(page){ changePages(page){
this.setState({ this.setState({
...@@ -486,7 +490,7 @@ class PageContainer extends React.Component { ...@@ -486,7 +490,7 @@ class PageContainer extends React.Component {
this.failCloseDoor(); this.failCloseDoor();
} }
//写死的数据 //写死的数据
this.tempLogout(); // this.tempLogout();
} }
...@@ -536,9 +540,9 @@ class PageContainer extends React.Component { ...@@ -536,9 +540,9 @@ class PageContainer extends React.Component {
let {commonInfo={}} = state; let {commonInfo={}} = state;
dispatch(willCloseDoor(commonInfo)); dispatch(willCloseDoor(commonInfo));
this.hidePopup(); this.hidePopup();
this.setState({ // this.setState({
showPage : showPage[initPage], // showPage : showPage[initPage],
}); // });
} }
/** /**
...@@ -686,8 +690,8 @@ class PageContainer extends React.Component { ...@@ -686,8 +690,8 @@ class PageContainer extends React.Component {
showPopup={(info)=>this.showPopup(info)} showPopup={(info)=>this.showPopup(info)}
hidePopup={()=>this.hidePopup()} hidePopup={()=>this.hidePopup()}
tempLogout={()=>this.tempLogout.bind(this)()} tempLogout={()=>this.tempLogout.bind(this)()}
willCloseDoor={()=>{dispatch(willCloseDoor(commonInfo))}} willCloseDoor={()=>{dispatch(willCloseDoor(commonInfo))}}
changeIsSend ={this.changeIsSend.bind(this)} changeIsSend ={this.changeIsSend.bind(this)}
/>; />;
break; break;
/*以下是二期页面 start*/ /*以下是二期页面 start*/
...@@ -699,14 +703,6 @@ class PageContainer extends React.Component { ...@@ -699,14 +703,6 @@ class PageContainer extends React.Component {
hidePopup={()=>this.hidePopup()} hidePopup={()=>this.hidePopup()}
/>; />;
break; break;
case showPage[12]:
pages =<TroubleContainer
headerInfo={commonInfo}
showPopup={(info)=>this.showPopup(info)}
hidePopup={()=>this.hidePopup()}
updateTroubleList={(info)=>dispatch(updateTroubleList(info,commonInfo))}
/>
break;
case showPage[131]: case showPage[131]:
pages = <HomePage headerInfo={commonInfo} pages = <HomePage headerInfo={commonInfo}
getTaskList={()=>{dispatch(getTaskList(commonInfo))}} getTaskList={()=>{dispatch(getTaskList(commonInfo))}}
...@@ -718,6 +714,14 @@ class PageContainer extends React.Component { ...@@ -718,6 +714,14 @@ class PageContainer extends React.Component {
tempLogout={()=>this.tempLogout.bind(this)()} tempLogout={()=>this.tempLogout.bind(this)()}
/>; />;
break; break;
case showPage[12]:
pages =<TroubleContainer
headerInfo={commonInfo}
showPopup={(info)=>this.showPopup(info)}
hidePopup={()=>this.hidePopup()}
updateTroubleList={(info)=>dispatch(updateTroubleList(info,commonInfo))}
/>
break;
case showPage[6]: case showPage[6]:
pages = <TakeStokeContainer headerInfo = {commonInfo} pages = <TakeStokeContainer headerInfo = {commonInfo}
showPopup={(info)=>this.showPopup(info)} showPopup={(info)=>this.showPopup(info)}
......
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