From 12f1acb73697cf615c83c5f96460822d6dc5f699 Mon Sep 17 00:00:00 2001
From: wujiabao <jiabaowu@mjitech.com>
Date: Mon, 17 Sep 2018 10:29:50 +0800
Subject: [PATCH] 修改盘点
---
client/containers/PageContainer/PageContainer.jsx | 3 ++-
client/containers/TakeStokeContainer/TakeStokeContainer.jsx | 60 ++----------------------------------------------------------
client/containers/TakeStokeContainer/index.css | 109 -------------------------------------------------------------------------------------------------------------
3 files changed, 4 insertions(+), 168 deletions(-)
diff --git a/client/containers/PageContainer/PageContainer.jsx b/client/containers/PageContainer/PageContainer.jsx
index f4fb76a..f433d91 100755
--- a/client/containers/PageContainer/PageContainer.jsx
+++ b/client/containers/PageContainer/PageContainer.jsx
@@ -56,7 +56,7 @@ class PageContainer extends React.Component {
constructor(props) {
super(props);
this.state = {
- showPage : showPage[11],
+ showPage : showPage[6],
lastPage : '',
page : null,
popupInfo : defaultPopupInfo,
@@ -213,6 +213,7 @@ class PageContainer extends React.Component {
//有错误信息，弹出错误信息弹窗
this.showError(state.errMsg.errMsg)
}
+ //根据后台数据控制该显示的页面
if(nextProps.state.commonInfo.taskInfo){
let num=nextProps.state.commonInfo.taskInfo.currentTaskNum;
switch(num){
diff --git a/client/containers/TakeStokeContainer/TakeStokeContainer.jsx b/client/containers/TakeStokeContainer/TakeStokeContainer.jsx
index a8faa09..2c5356e 100644
--- a/client/containers/TakeStokeContainer/TakeStokeContainer.jsx
+++ b/client/containers/TakeStokeContainer/TakeStokeContainer.jsx
@@ -12,7 +12,6 @@ class TakeStokeContaniner extends React.Component {
}
}
-
render(){
let {initNum}=this.state;
let props = this.props;
@@ -22,67 +21,12 @@ class TakeStokeContaniner extends React.Component {
<LeftContainer leftInfo={props.headerInfo}/>
<RightContainer>
<div className={"TokeStokeContent"}>
- <div className={"TokeStokeTop"}>
- <h1 className={"TokeStokeTitle font30"}>请输入以下货道中的货品数量</h1>
- <div className={"TokeStokeCommodity"}>
- <h4>
- <p>所在区域: <span>A区</span></p>
- <p>货 柜: <span>1号柜</span></p>
- <p>货道位置: <span>第6行, 第三货道</span></p>
- <p>货道编号: <span>13-2-6-3</span></p>
- </h4>
- <div className={'numAdd'}>
- <p>数 量:</p>
- <p>
- <span onClick={this.reduceNum.bind(this,'dis')}>-</span>
- <span>{initNum}</span>
- <span onClick={this.reduceNum.bind(this,'add')}>+</span>
- </p>
- </div>
- </div>
- </div>
- <div className={"TokeStokeBottom"}>
- <div className={"TokeStokeLeft"}>
- <p className={"font24 clo333"}>货道信息详情</p>
- <p>
- <span>所在区域: <span>A区</span></span>
- <span>货道位置: <span>A区柜门; 从上往下数第六行</span></span>
- </p>
- <p>
- <span>区域照片: <img src="" alt=""/></span>
- <span>货品名称: <span>雪碧250ml</span></span>
- </p>
- </div>
- <div className={"TokeStokeRight"}>
- <img src="" alt=""/>
- </div>
- </div>
- <div className={"toknStokeSubmit"}><button onClick={this.submitNum}>提交</button></div>
+
</div>
</RightContainer>
</div>
)
}
- //控制货道内商品数量的加减
- reduceNum(str){
- let {initNum}=this.state;
- if(str==="add"){
- initNum++;
- this.setState({
- initNum
- })
- }else{
- if(initNum>0){
- initNum--;
- }
- this.setState({
- initNum
- })
- }
- }
- submitNum(){
-
- }
-
+
}
export default TakeStokeContaniner
\ No newline at end of file
diff --git a/client/containers/TakeStokeContainer/index.css b/client/containers/TakeStokeContainer/index.css
index 11d5064..67448ff 100644
--- a/client/containers/TakeStokeContainer/index.css
+++ b/client/containers/TakeStokeContainer/index.css
@@ -2,113 +2,4 @@
width:100%;
height:100%;
background:#fff;
-}
-.TokeStokeContainer .TokeStokeContent{
- width:100%;
- height: 100%;
- margin-left:50px;
-}
-.TokeStokeContainer .TokeStokeContent .TokeStokeTop{
- width:1422px;
- height:410px;
- background:#f2f2f2;
- margin-top:40px;
-}
-.TokeStokeContainer .TokeStokeContent .TokeStokeTop .TokeStokeTitle{
- text-align: center;
- color:#5c66ff;
- line-height: 1.4;
- margin-top:23px;
-}
-.TokeStokeContainer .TokeStokeContent .TokeStokeTop .TokeStokeCommodity{
- margin-left:517px;
- margin-top:24px;
-}
-.TokeStokeContainer .TokeStokeContent .TokeStokeTop .TokeStokeCommodity h4 p{
- color:#333;
- font-size: 28px;
- line-height: 40px;
- margin-top:14px;
-}
-.TokeStokeContainer .TokeStokeContent .TokeStokeTop .TokeStokeCommodity h4 p span{
- margin-left:5px;
-}
-.TokeStokeContainer .TokeStokeContent .TokeStokeTop .TokeStokeCommodity .numAdd{
- display: flex;
- margin-top:26px;
-}
-.TokeStokeContainer .TokeStokeContent .TokeStokeTop .TokeStokeCommodity .numAdd p{
- font-size: 28px;
- color: #333333;
- line-height: 1.4;
-}
-.TokeStokeContainer .TokeStokeContent .TokeStokeTop .TokeStokeCommodity .numAdd p:nth-of-type(1){
- padding-top:20px;
-}
-.TokeStokeContainer .TokeStokeContent .TokeStokeTop .TokeStokeCommodity .numAdd p:nth-of-type(2){
- margin-left:15px;
-}
-.TokeStokeContainer .TokeStokeContent .TokeStokeTop .TokeStokeCommodity .numAdd p:nth-of-type(2) span{
- width:80px;
- height:83px;
- background:#fff;
- border-radius: 10px;
- border:2px inside;
- display: inline-block;
- text-align: center;
- line-height: 83px;
- font-weight: 800;
-}
-.TokeStokeContainer .TokeStokeContent .TokeStokeTop .TokeStokeCommodity .numAdd p:nth-of-type(2) span:nth-of-type(2){
- border:0;
- background:#f2f2f2;
-}
-.TokeStokeContainer .TokeStokeContent .TokeStokeBottom{
- margin-top:24px;
- display: flex;
-}
-.TokeStokeContainer .TokeStokeContent .TokeStokeBottom .TokeStokeRight{
- width:116px;
- height:116px;
- border:2px solid #ccc;
- margin-top:50px;
- margin-left:400px;
-}
-.TokeStokeContainer .TokeStokeContent .TokeStokeBottom .TokeStokeLeft{
- width:900px;
-}
-.TokeStokeContainer .TokeStokeContent .TokeStokeBottom .TokeStokeLeft p{
- color:#333;
- font-size: 24px;
- display: flex;
- justify-content: space-between
-}
-.TokeStokeContainer .TokeStokeContent .TokeStokeBottom .TokeStokeLeft p span{
- width:350px;
-}
-.TokeStokeContainer .TokeStokeContent .TokeStokeBottom .TokeStokeLeft p>span:nth-of-type(2){
- line-height: 33px;
-}
-.TokeStokeContainer .TokeStokeContent .TokeStokeBottom .TokeStokeLeft p:nth-of-type(2){
- margin-top:40px;
-}
-.TokeStokeContainer .TokeStokeContent .TokeStokeBottom .TokeStokeLeft p:nth-of-type(3){
- margin-top:25px;
-}
-.TokeStokeContainer .TokeStokeContent .TokeStokeBottom .TokeStokeLeft p:nth-of-type(3) img{
- width:160px;
- height:60px;
- border-radius: 10px;
-}
-.TokeStokeContainer .toknStokeSubmit button{
- margin-left:1000px;
- width:410px;
- height:80px;
- background:#ff775c;
- text-align: center;
- color:#fff;
- font-size: 32px;
- border-radius:10px;
- border:0;
- margin-top:50px;
}
\ No newline at end of file
--
libgit2 0.26.0