Skip to content

M
max_android_panel
Commit c384db3a by Zhang Xin
Options

完善补货盘点点击查看区域照片，最后一部跳转到页面7

parent 70c53577
Showing with 66 additions and 62 deletions
client/components/CommonComponent/HeaderComponent/HeaderComponent.jsx
......@@ -97,7 +97,7 @@ export default class HeaderComponent extends React.Component{
userInfo && userInfo.id ? <div className={"userinfos"}>
<img className={"userheadImg"} src={ userInfo.headImageUrl || UTILPATH.localImg.defaultImg} alt=""/>
<div className={"userinfo font24 colfff"}>
<div className={"userinfo font30 colfff"}>
<p>{userInfo.employeeName || ''}</p>
<p>ID:{userInfo.id || 0}</p>
</div>
......
client/components/CommonComponent/HeaderComponent/index.css
......@@ -79,8 +79,9 @@
margin-right: 24px;
}
.headerComponent .homeHeader .rightContent .userinfo{
line-height: 34px;
padding-top: 18px;
/*line-height: 34px;*/
/*padding-top: 18px;*/
line-height: 40px;
}
.otherHeader{
/*line-height: 97px;*/
......
client/components/CommonComponent/SkuInfoComponent/SkuInfoComponent.jsx
......@@ -2,7 +2,8 @@ import React from 'react';
require('./index.css')
export default class SkuInfoComponent extends React.Component{
constructor(props){
super(props)
super(props);
this.showImg = this.showImg.bind(this)
this.state={
style : {
width:"100%",
......@@ -25,6 +26,17 @@ export default class SkuInfoComponent extends React.Component{
})
}
showImg(imgSrc){
let {showPopup,hidePopup} = this.props;
let showImgDom = <div onClick={()=>hidePopup()} className={"showBigImg"}>
<img src={imgSrc || UTILPATH.localImg.defaultImg} alt=""/>
</div>;
showPopup({
popupChild : showImgDom
});
}
render(){
let props = this.props;
let {classNames='',style={},skuInfo={},taskType=""} = props;
......@@ -44,7 +56,7 @@ export default class SkuInfoComponent extends React.Component{
<li className={""}>
<span className={""}>所在区域：{skuInfo.shortPosition || ''}
{
skuInfo.areaImage ? <span className={"areaBtn colff775c"}>位置照片</span> : null
skuInfo.areaImage ? <span className={"areaBtn colff775c"} onClick={()=>this.showImg(skuInfo.areaImage)}>位置照片</span> : null
}
</span>
{
......
client/components/RecoveryComponent/RecoverySecondPage/RecoverySecondPage.jsx
......@@ -85,7 +85,7 @@ export default class RecoverySecondPage extends React.Component{
<div className={"RecoverySecondPage commonPage"}>
<div className={"title font40 col333 pageTitle"}>任务目标：请将该货道货品进行扫码回收</div>
<div className={"box pagebox"}>
<SkuInfoComponent style={{'display':'flex'}} skuInfo={taskList} taskType={taskInfo.currentTaskType || ""}/>
<SkuInfoComponent showPopup={props.showPopup} hidePopup={props.hidePopup} style={{'display':'flex'}} skuInfo={taskList} taskType={taskInfo.currentTaskType || ""}/>
<div className={"btn"}>
<Button btnContainer={"recoverySecondPageBtn font32 colfff"} key={"RecoverySecondPageBtn"} text={'扫码回收'} option={this.scanQrcode}/>
<div className={"text colff775c font28"} onClick={()=>this.wrongSku()}>货品不符？</div>
......
client/components/ReplenishComponent/ReplenishSkuPage/ReplenishSkuPage.jsx
......@@ -30,6 +30,7 @@ export default class ReplenishSkuPage extends React.Component{
this.putInBox = this.putInBox.bind(this); // 放回
this.continueScan = this.continueScan.bind(this); // 继续扫描
this.scanOver = this.scanOver.bind(this); // 全部补货完毕
this.showImg = this.showImg.bind(this); // 全部补货完毕
this.state={
pageType : 1,
......@@ -111,6 +112,16 @@ export default class ReplenishSkuPage extends React.Component{
}
}
showImg(imgSrc){
let {showPopup,hidePopup} = this.props;
let showImgDom = <div onClick={()=>hidePopup()} className={"showBigImg"}>
<img src={imgSrc || UTILPATH.localImg.defaultImg} alt=""/>
</div>;
showPopup({
popupChild : showImgDom
});
}
getSkuInfo(){
let {headerInfo} = this.props;
let {taskList={}} = headerInfo
......@@ -126,7 +137,7 @@ export default class ReplenishSkuPage extends React.Component{
</div>
<div className={"skuPos col333 font30"}>
<ul>
<li><span className={"skuPosTitle fl"}>所在区域：</span>{taskList.area}区域<span className={"colff775c showAreaImg"}>区域照片</span></li>
<li><span className={"skuPosTitle fl"}>所在区域：</span>{taskList.area}区域<span className={"colff775c showAreaImg"} onClick={()=>this.showImg(taskList.areaImage)}>区域照片</span></li>
<li className={""}>
<span className={"skuPosTitle"}>货道信息：</span>
<span className={""}>{taskList.position}</span>
......@@ -166,7 +177,7 @@ export default class ReplenishSkuPage extends React.Component{
}
getWrongSku(){
let {headerInfo} = this.props;
let {headerInfo,showPopup,hidePopup} = this.props;
let {taskList={},taskInfo={}} = headerInfo;
return(
<div className={"replenishWrongSkuPage commonPage"}>
......@@ -181,7 +192,7 @@ export default class ReplenishSkuPage extends React.Component{
<div className={"tips col000 font40"}>请再次仔细确认货道中的货品是否相符？</div>
<div className={"skuInfo"}>
<div className={"text font28 col333"}>待补货品信息：</div>
<SkuInfoComponent style={{display:"flex",marginTop:"20px",padding:"0"}} skuInfo={taskList} />
<SkuInfoComponent showPopup={showPopup} hidePopup={hidePopup} style={{display:"flex",marginTop:"20px",padding:"0"}} skuInfo={taskList} />
</div>
<div className={"btn pageBtn"}>
<Button btnContainer={"replenishWrongSkuBtn backff775c colfff font32"} key={"replenishWrongSkuBtn"} text={'货品不符'} option={this.handleWrongSkuQuestion}/>
......@@ -192,7 +203,7 @@ export default class ReplenishSkuPage extends React.Component{
}
overflowShelf(){
let {headerInfo} = this.props;
let {headerInfo,showPopup,hidePopup} = this.props;
let {taskList={}} = headerInfo;
return(
<div className={"replenishOverflowShelfPage replenishWrongSkuPage commonPage"}>
......@@ -207,7 +218,7 @@ export default class ReplenishSkuPage extends React.Component{
<div className={"tips col000 font40"}>请再次仔细确认货道中是否已放满货品</div>
<div className={"skuInfo"}>
<div className={"text font28 col333"}>待补货品信息：</div>
<SkuInfoComponent style={{display:"flex",marginTop:"20px",padding:"0"}} skuInfo={taskList}/>
<SkuInfoComponent showPopup={showPopup} hidePopup={hidePopup} style={{display:"flex",marginTop:"20px",padding:"0"}} skuInfo={taskList}/>
</div>
<div className={"btn pageBtn"}>
<Button btnContainer={"replenishWrongSkuBtn backff775c colfff font32"} key={"replenishWrongSkuBtn"} text={'货道已满'} option={this.handleOverflowShelfQuestion}/>
......@@ -233,7 +244,7 @@ export default class ReplenishSkuPage extends React.Component{
<div className={"tips col000 font40"}>此货品是否已经损坏，不能进行售卖</div>
<div className={"skuInfo"}>
<div className={"text font28 col333"}>待补货品信息：</div>
<SkuInfoComponent style={{display:"flex",marginTop:"20px",padding:"0"}} skuInfo={taskList}/>
<SkuInfoComponent style={{display:"flex",marginTop:"20px",padding:"0"}} skuInfo={taskList}/>
</div>
<div className={"btn pageBtn"}>
<Button btnContainer={"replenishWrongSkuBtn backff775c colfff font32"} key={"replenishWrongSkuBtn"} text={'是的'} option={this.handleBadSkuQuestion}/>
......
client/containers/ChooseTaskContainer/ChooseTaskContainer.jsx
......@@ -27,13 +27,13 @@ export default class ChooseTaskContainer extends React.Component{
render(){
let {userInfo,storeInfo} = this.props;
let props = this.props;
let {headerInfo} = props;
return(
<div>
<HeaderComponent
showHeader={CONFIG.headerStatus[1]}
userinfo={userInfo}
storeInfo={storeInfo}
headerInfo={headerInfo}
/>
<div className={"chooseTaskContainer"}>
<div className={"chooseTaskText font32"}>
......
client/containers/HomePageContainer/index.css
/*.homeContainer{*/
/*text-align: center;*/
/*position: relative;*/
/*}*/
/*.homeContainer .homeIcon{*/
/*margin: 134px 0 40px 0;*/
/*}*/
/*.homeContainer .homeText{*/
/*}*/
/*.homeContainer .closeDoorContent{*/
/*margin-top: 140px;*/
/*}*/
/*.homeContainer .closeDoorContent .closeDoorText{*/
/*margin-bottom: 20px;*/
/*line-height: 40px;*/
/*}*/
.homeContainer .homeIcon{
width:213px;
height:240px;
......
client/containers/PageContainer/PageContainer.jsx
......@@ -238,7 +238,7 @@ class PageContainer extends React.Component {
this.changePages(CONFIG.showPage[11]);
break;
case 'PF' :
this.changePages(CONFIG.showPage[initPage]);
this.changePages(CONFIG.showPage[9]);
break;
}
}
......@@ -503,12 +503,13 @@ class PageContainer extends React.Component {
getPages(){
let pages = null;
let{state,dispatch} = this.props;
let {commonInfo} = state;
switch (this.state.showPage){
case showPage[1]:
pages = <TroubleContainer
troubleList={state.troubleList}
refreshImg = {state.refreshImg}
storeInfo={state.commonInfo.storeInfo}
storeInfo={commonInfo.storeInfo}
userInfo={state.userInfo}
initTroubleList={(info)=>dispatch(getTroubleList(info))}
showTextArea={(text)=>this.showTextArea(text)}
......@@ -523,7 +524,7 @@ class PageContainer extends React.Component {
break;
case showPage[2]:
pages = <ScanBarCodeContainer
headerInfo = {state.commonInfo}
headerInfo = {commonInfo}
storeInfo={state.storeInfo}
userInfo={state.userInfo}
getProductInfo = {(postData)=>dispatch(scanBarCodeGetProductInfo(postData))}
......@@ -542,7 +543,7 @@ class PageContainer extends React.Component {
getReportDamageList = {(postData)=>dispatch(getReportDamageList(postData))}
deleteDamageItem = {(postData)=>{dispatch(deleteDamageItem(postData))}}
changePages={(data)=>this.changePages(data)}
headerInfo = {state.commonInfo}
headerInfo = {commonInfo}
storeInfo={state.storeInfo}
userInfo={state.userInfo}
state = {state}
......@@ -560,7 +561,7 @@ class PageContainer extends React.Component {
getRefreshImg={(errorId,type)=>dispatch(getRefreshImg(errorId,type))}
deleteImg={(errorId,type,fileId)=>dispatch(deleteImg(errorId,type,fileId))}
changePages={(data)=>this.changePages(data)}
headerInfo = {state.commonInfo}
headerInfo = {commonInfo}
storeInfo={state.storeInfo}
userInfo={state.userInfo}
state = {state}
......@@ -586,8 +587,7 @@ class PageContainer extends React.Component {
/>;
break;
case showPage[9]:
pages = <ChooseTaskContainer storeInfo={state.storeInfo}
userInfo={state.userInfo}
pages = <ChooseTaskContainer headerInfo={commonInfo}
changePages={(data)=>this.changePages(data)}
showOpenDoorPage={()=>this.showOpenDoorPage.bind(this)()}
hidePopup={()=>this.hidePopup()}
......@@ -595,54 +595,54 @@ class PageContainer extends React.Component {
break;
/*以下是二期页面 start*/
case showPage[13]:
pages = <HomePage headerInfo={state.commonInfo}
getTaskList={()=>{dispatch(getTaskList(state.commonInfo))}}
pages = <HomePage headerInfo={commonInfo}
getTaskList={()=>{dispatch(getTaskList(commonInfo))}}
changePages={(data)=>this.changePages(data)}
/>;
break;
case showPage[6]:
pages = <TakeStokeContainer headerInfo = {state.commonInfo}
pages = <TakeStokeContainer headerInfo = {commonInfo}
showPopup={(info)=>this.showPopup(info)}
hidePopup={()=>this.hidePopup()}
tokeTaskProduct={state.commonInfo.taskList}
checkProductQuantity={(tokeProductInfo)=>{dispatch(checkProductQuantity({commonInfo:state.commonInfo,tokeProductInfo}))}}
tokeTaskProduct={commonInfo.taskList}
checkProductQuantity={(tokeProductInfo)=>{dispatch(checkProductQuantity({commonInfo,tokeProductInfo}))}}
TokeStokeState={state.TokeStokeContainer}
getTaskList={()=>{dispatch(getTaskList(state.commonInfo))}}
getTaskList={()=>{dispatch(getTaskList(commonInfo))}}
/>;
break;
case showPage[5]:
pages = <BreakageContainer
pullTaskList={()=>{dispatch(hasNoSku(state.commonInfo))}}
headerInfo={state.commonInfo}
getBarCodeProductInfo={(barcode)=>{dispatch(getBarCodeProductInfo({barcode,commonInfo:state.commonInfo}))}}
pullTaskList={()=>{dispatch(hasNoSku(commonInfo))}}
headerInfo={commonInfo}
getBarCodeProductInfo={(barcode)=>{dispatch(getBarCodeProductInfo({barcode,commonInfo}))}}
breakageProductInfo={state.barcodeCommon}
submitBreakageProduct={(productDetail)=>{dispatch(submitBreakageProduct({commonInfo:state.commonInfo,productDetail}))}}
submitBreakageProduct={(productDetail)=>{dispatch(submitBreakageProduct({commonInfo,productDetail}))}}
/>;
break;
case showPage[10]:
pages = <RecoveryPage
headerInfo = {state.commonInfo}
headerInfo = {commonInfo}
recoveryInfo = {state.recoveryInfo}
showPopup={(info)=>this.showPopup(info)}
hidePopup={()=>this.hidePopup()}
getTaskName={()=>dispatch(getTaskName(state.commonInfo.taskInfo.currentTaskType,2))}
finishBoxRecovery={()=>dispatch(finishBoxRecovery(state.commonInfo))}
uploadError={(exceptionType)=>dispatch(uploadError(state.commonInfo,exceptionType))}
getBarCodeProductInfo={(barcode)=>{dispatch(getBarCodeProductInfo({barcode,commonInfo:state.commonInfo}))}}
getTaskName={()=>dispatch(getTaskName(commonInfo.taskInfo.currentTaskType,2))}
finishBoxRecovery={()=>dispatch(finishBoxRecovery(commonInfo))}
uploadError={(exceptionType)=>dispatch(uploadError(commonInfo,exceptionType))}
getBarCodeProductInfo={(barcode)=>{dispatch(getBarCodeProductInfo({barcode,commonInfo}))}}
/>;
break;
case showPage[11]:
pages = <ReplenishContainer
headerInfo = {state.commonInfo}
headerInfo = {commonInfo}
showPopup={(info)=>this.showPopup(info)}
hidePopup={()=>this.hidePopup()}
barcodeInfo={state.barcodeCommon}
replenishInfo={state.replenishInfo}
getBarCodeProductInfo={(barcode)=>{dispatch(getBarCodeProductInfo({barcode,commonInfo:state.commonInfo}))}}
finishBoxRecovery={()=>dispatch(finishBoxRecovery(state.commonInfo))}
getBarCodeProductInfo={(barcode)=>{dispatch(getBarCodeProductInfo({barcode,commonInfo}))}}
finishBoxRecovery={()=>dispatch(finishBoxRecovery(commonInfo))}
emptyErrorInfo={()=>dispatch(replenishAction.emptyErrorInfo())}
uploadError={(exceptionType)=>dispatch(uploadError(state.commonInfo,exceptionType))}
finishReplenish={(source)=>dispatch(replenishAction.finishReplenish(state.commonInfo,source))}
uploadError={(exceptionType)=>dispatch(uploadError(commonInfo,exceptionType))}
finishReplenish={(source)=>dispatch(replenishAction.finishReplenish(commonInfo,source))}
/>
/*以下是二期页面 end*/
}
......
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