add breakageContainer reducer

52496141 · wujiabao · bbf3c769 · 52496141 · 52496141 · 52496141
Commit 52496141 authored Sep 19, 2018 by wujiabao
6 changed files
--- a/client/actions/common.js
+++ b/client/actions/common.js
@@ -18,7 +18,7 @@ const getTaskInfo = (data)=>{
    // let {userInfo,storeInfo} = data;
        return(dispatch)=>{
            // if(userInfo && userInfo.id && storeInfo && storeInfo.id) {
-                let url ='http://192.168.10.128:8080/web/flat/ready/1/A/28';
+                let url ='http://192.168.10.128:8080/web/flat/ready/13/A/28';
                // let url = `${ENV.domain}flat/ready/${storeInfo.id}/${userInfo.id}`;
                fetch(url,{
                    // credentials : 'include',
@@ -114,10 +114,11 @@ const getUserinfo = (employeeId,storeId)=>{
 };
 //test 没有散落货品
-const hasNoSku = (storeInfo)=>{
+const hasNoSku = (commonInfo)=>{
+    // console.log(commonInfo,'没有散落物品')
    return (dispatch)=>{
        // let url=`${ENV.domain}/flat/work/status/1`;
-        let url ='http://192.168.10.128:8080/web/flat/work/status/1/A/LR';
+        let url ='http://192.168.10.128:8080/web/flat/work/status/13/A/LR';
        fetch(url,{
            // credentials : 'include',
            method : 'PUT',
@@ -134,7 +135,7 @@ const hasNoSku = (storeInfo)=>{
 //拉取工单
 const getTaskList = (data={})=>{
 //    let url=`${ENV.domain}/flat/work/list/13`;
-   let url ='http://192.168.10.128:8080/web/flat/work/list/1/A/28';
+   let url ='http://192.168.10.128:8080/web/flat/work/list/13/A/336/28';
    return (dispatch)=>{
         fetch(url,{
            // credentials : 'include',

--- a/client/components/BreakageComponent/BreakageProductDetail/BreakageProductDetail.jsx
+++ b/client/components/BreakageComponent/BreakageProductDetail/BreakageProductDetail.jsx
@@ -10,7 +10,7 @@ class BreakageProductDetail extends React.Component{
        return (
            <div className={'breakageContent'}>
                  <div className={'commonPage'}>
-                    <div className={'pageTitle clo333 font40'}>
+                    <div className={'pageTitle clo333 font40'} style={{marginBottom:'20px'}}>
                            <span>上报遗留货品信息</span>
                    </div>
                    <div className={'pagebox'}> 
@@ -33,7 +33,7 @@ class BreakageProductDetail extends React.Component{
                             </div>
                             <div className={'ProductPosition'}>
                                    <h4 className={'col333 font32'}>请选择货品的位置:</h4>
-                                    <ul>
+                                    <ul className={'imgList'}>
                                        <li><img src={UTILPATH.localImg.defaultImg} alt=""/><span className={'font28 col333'}>上</span></li>
                                        <li className={'active'}><img src={UTILPATH.localImg.defaultImg} alt=""/><span className={'font28 col333'}>下</span></li>
                                        <li><img src={UTILPATH.localImg.defaultImg} alt=""/><span className={'font28 col333'}>左</span></li>

--- a/client/components/BreakageComponent/BreakageProductDetail/index.css
+++ b/client/components/BreakageComponent/BreakageProductDetail/index.css
@@ -39,9 +39,10 @@
 .pagebox .breakProductStatus p span:nth-of-type(2){
    margin-left:20px;
 }
-.pagebox .ProductPosition ul{
+.pagebox .ProductPosition .imgList{
    display: flex;
    margin-top:20px;
+    height:190px;
 }
 .pagebox .ProductPosition ul li{
    width:146px;
@@ -52,6 +53,7 @@
 .pagebox .ProductPosition ul li span{
    text-align: center;
    display: block;
+    margin-top:10px;
 }
 .pagebox .ProductPosition ul li img{

--- a/client/containers/BreakageContainer/BreakageConatiner.jsx
+++ b/client/containers/BreakageContainer/BreakageConatiner.jsx
@@ -22,7 +22,7 @@ class BreakageContainer extends React.Component {
         return (
             <div className={"BreakageContainer"}>
                  {
-                       isShow?<div>
+                       isShow?<div style={{width:'100%',height:'100%'}}>
                       <HeaderComponent headerInfo={props.headerInfo} />
                        <LeftContainer leftInfo={props.headerInfo}/>
                        <RightContainer>

--- a/client/containers/PageContainer/PageContainer.jsx
+++ b/client/containers/PageContainer/PageContainer.jsx
@@ -57,7 +57,7 @@ class PageContainer extends React.Component {
    constructor(props) {
        super(props);
        this.state = {
-            showPage : showPage[13],
+            showPage : showPage[11],
            lastPage : '',
            page : null,
            popupInfo : defaultPopupInfo,
@@ -591,7 +591,7 @@ class PageContainer extends React.Component {
                break;
            case showPage[5]:
                pages = <BreakageContainer
-                                 pullTaskList={()=>{dispatch(hasNoSku(state.commonInfo.storeInfo))}}
+                                 pullTaskList={()=>{dispatch(hasNoSku(state.commonInfo))}}
                                 headerInfo={state.commonInfo}
                                 getProductInfo={(barcode)=>{dispatch(getProductInfo({barcode}))}}
                                 />;

--- a/client/containers/TakeStokeContainer/index.css
+++ b/client/containers/TakeStokeContainer/index.css
@@ -3,45 +3,45 @@
    width:100%;
    height:100%;
 }
-.commonPage .pageTitle span:nth-of-type(2){
+.TokeStokeContent .commonPage .pageTitle span:nth-of-type(2){
    margin-left:10px;
 }
-.pagebox{
+.TokeStokeContent .pagebox{
    display: flex;
    margin-left:300px;
    box-sizing: border-box;
 }
-.pagebox .productImg{
+.TokeStokeContent .pagebox .productImg{
    width:200px;
    height:200px;
    border:2px solid #e5e5e5;
 }
-.pagebox .productDetail{
+.TokeStokeContent .pagebox .productDetail{
    margin-left:40px;
 }
-.pagebox .productDetail p{
+.TokeStokeContent .pagebox .productDetail p{
    text-align: left;
    margin-top:36px;
 }
-.pagebox .productDetail p:nth-of-type(1){
+.TokeStokeContent .pagebox .productDetail p:nth-of-type(1){
    margin-top:14px;
 }
-.pagebox .productDetail p:nth-of-type(2) span:nth-of-type(2){
+.TokeStokeContent .pagebox .productDetail p:nth-of-type(2) span:nth-of-type(2){
    margin-left:15px;
 }
-.pagebox .productDetail p span:nth-of-type(1){
+.TokeStokeContent .pagebox .productDetail p span:nth-of-type(1){
    margin-right:15px;
 }
-.commonPage .productNum{
+.TokeStokeContent .commonPage .productNum{
    width:auto;
    margin-top:100px;
 }
-.commonPage .productNum p{
+.TokeStokeContent .commonPage .productNum p{
    text-align: left;
    padding-left:540px;
    box-sizing: border-box;
 }
-.commonPage .productNum p span:nth-of-type(2),.commonPage .productNum p span:nth-of-type(4){
+.TokeStokeContent .commonPage .productNum p span:nth-of-type(2),.commonPage .productNum p span:nth-of-type(4){
   width:80px;
   height:80px;
   border:2px solid #e5e5e5;
@@ -51,14 +51,14 @@
   text-align: center;
   font-weight: 800;
 }
-.commonPage .productNum p span:nth-of-type(2){
+.TokeStokeContent .commonPage .productNum p span:nth-of-type(2){
    margin-left:10px;
 }
-.commonPage .productNum p span:nth-of-type(3){
+.TokeStokeContent .commonPage .productNum p span:nth-of-type(3){
   font-weight: 600;
   padding:20px 33px;
 }
-.commonPage .buttonComponent{
+.TokeStokeContent .commonPage .buttonComponent{
    /* position: absolute; */
    margin-left:600px;
    /* bottom:100px; */