提修复不bug

7b38ac04 · yaxiLiuu · 09f43fa8 · 7b38ac04 · 7b38ac04 · 7b38ac04
Commit 7b38ac04 authored Aug 03, 2018 by yaxiLiuu
11 changed files
--- a/client/actions/ScanBarCode.js
+++ b/client/actions/ScanBarCode.js
@@ -4,7 +4,7 @@ import actionTypes_error  from '../actiontype/error'
 let domain = ENV.domain;
 export function scanBarCodeGetProductInfo(postData) {
    return (dispatch) => {
-        let url = String(domain+'/machine_pad/scanning_sku_barcode_for_add_loss_task');
+        let url = String(domain+'machine_pad/scanning_sku_barcode_for_add_loss_task');
        fetch(url,{
            credentials : 'include',
            method : 'POST',
@@ -77,6 +77,12 @@ export function submitProductSuccess(data) {
        data
    }
 }
+export function clearProductSuccess() {
+    return{
+        type:actionTypes.ClEAR_PRODUCT_SUCCESS,
+        data:{}
+    }
+}
 function saveEditProductInfoSuccess(data){
    return {
        type:actionTypes.SAVE_PRODUCTEDITINFO_SUCCESS,

--- a/client/actiontype/ScanBarCode.js
+++ b/client/actiontype/ScanBarCode.js
 const INIT_SCANBARCODEGETPRODUCTINFO_SUCCESS  = 'INIT_SCANBARCODEGETPRODUCTINFO_SUCCESS';
 const SUBMIT_PRODUCT_SUCCESS = 'SUBMIT_PRODUCT_SUCCESS';
-const SAVE_PRODUCTEDITINFO_SUCCESS = 'SAVE_PRODUCTEDITINFO_SUCCESS'
+const SAVE_PRODUCTEDITINFO_SUCCESS = 'SAVE_PRODUCTEDITINFO_SUCCESS';
+const ClEAR_PRODUCT_SUCCESS = "ClEAR_PRODUCT_SUCCESS";
-module.exports = {INIT_SCANBARCODEGETPRODUCTINFO_SUCCESS,SUBMIT_PRODUCT_SUCCESS,SAVE_PRODUCTEDITINFO_SUCCESS}
+module.exports = {INIT_SCANBARCODEGETPRODUCTINFO_SUCCESS,SUBMIT_PRODUCT_SUCCESS,SAVE_PRODUCTEDITINFO_SUCCESS,ClEAR_PRODUCT_SUCCESS}
--- a/client/components/ReportDamageListComponent/DamageItemComponent/index.css
+++ b/client/components/ReportDamageListComponent/DamageItemComponent/index.css
@@ -30,6 +30,7 @@
    width: 198px;
    height: 198px;
    border: 2px solid #e5e5e5;
+    box-sizing: border-box;
    /*background-color: darkgoldenrod;*/
    float: left;
 }
@@ -61,11 +62,9 @@
 }
  .damageProductItem .productBaseInfo .productCount{
    display: inline-block;
-    /*padding-top: 140px;*/
    float: left;
-    /*margin:0 20px 0 220px;*/
    box-sizing: border-box;
-    line-height: 198px;
+    line-height: 188px;
 }
  .damageProductItem .productBaseInfo .productCount .multipleIcon{
    font-size: 32px;

--- a/client/components/ScanBarCodeComponent/ProductDetailComponent/ProductDetailItem.jsx
+++ b/client/components/ScanBarCodeComponent/ProductDetailComponent/ProductDetailItem.jsx
 import React from 'react';
+import SwiperComponent from '../../../components/CommonComponent/SwiperComponent/SwiperComponent';
 require('./index.css');
 import ImgToolComponent from '../../../components/CommonComponent/ImgToolComponent/CommonSmalContainer';
 export default class ProductDetailItem extends React.Component{
@@ -66,8 +67,9 @@ export default class ProductDetailItem extends React.Component{
    }
    handleSubmit(){
-        let {inventorylossId,skuBaseInfoVo,handleSubmitProductInfo,data_currentProblemObj,changePages} = this.props;
+        let {inventorylossId,skuBaseInfoVo,handleSubmitProductInfo,data_currentProblemObj,changePages,clearProductSuccess} = this.props;
        handleSubmitProductInfo(data_currentProblemObj);
+        clearProductSuccess()
    }
@@ -76,13 +78,21 @@ export default class ProductDetailItem extends React.Component{
        let {skuBaseInfoVo,packingList,positionList,refreshImg} = this.props;
        let imgFileList = refreshImg.files?refreshImg.files:[];
        let productContent = '';
+        let swiperContainer = CONFIG.swiperContainers.productPostionContainer;
+        let swiperOptions = {
+            width : 260,
+            spaceBetween: 30,
+            freeMode:true
+        };
+        let swiperCount = positionList.length;
        let positonUi = positionList.map((item,index)=>{
-            return <li
+                return <li key={"position"+index}
-                key={"position"+index}
+                        date-value = {index}
-                date-value = {index}
+                        className={index == this.state.currentPosition?"checkLi":""}
-                className={index == this.state.currentPosition?"checkLi":""}
+                        onClick={this.handleSelectPosition.bind(this)}>
-                onClick={this.handleSelectPosition.bind(this)}
+                        {item}
-            >{item}</li>
+                </li>
        })
        let statusUi = packingList.map((item,index)=>{
            return <li
@@ -120,9 +130,13 @@ export default class ProductDetailItem extends React.Component{
                <div className={"locationInfo clearfix"}>
                    <div className={"infoTitle"}>商品位置</div>
                    <ul className={"detailContainer clearfix"}>
-                        {positonUi}
+                        {
-                       {/* <li className={"checkLi"}>出货传送区</li>
+                            <SwiperComponent   swiperContainer={swiperContainer}
-                        <li>轨道</li>*/}
+                                               swiperOptions={swiperOptions}
+                                               swiperCount={swiperCount}>{positonUi}
+                            </SwiperComponent>
+                       }
                    </ul>
                </div>
@@ -137,17 +151,17 @@ export default class ProductDetailItem extends React.Component{
                        {imgListUi}
                    </div>
                    {
-                        this.state.currentPakageStatus == 2?(
+                        this.state.currentPakageStatus == 1?(
                            <div className={"operationLeft"}>
                                <ImgToolComponent
-                                    type={"refresh"}
+                                    type={"add"}
                                    noCloseBtn = {true}
-                                    handleClikImgFunc = {props.handleRefreshImg}
+                                    handleClikImgFunc = {props.handleAddImg}
                                ></ImgToolComponent>
                                <ImgToolComponent
-                                    type={"add"}
+                                    type={"refresh"}
                                    noCloseBtn = {true}
-                                    handleClikImgFunc = {props.handleAddImg}
+                                    handleClikImgFunc = {props.handleRefreshImg}
                                ></ImgToolComponent>
                            </div>
                        ):""

--- a/client/components/ScanBarCodeComponent/ProductDetailComponent/index.css
+++ b/client/components/ScanBarCodeComponent/ProductDetailComponent/index.css
@@ -59,6 +59,10 @@
 .productContainer  .detailContainer{
    overflow: auto;
 }
+.productPostionContainer{
+    width: 1070px;
+    margin: 0;
+}
 .productContainer .detailContainer li{
    box-sizing: border-box;
    float: left;

--- a/client/config/swiperContainer.js
+++ b/client/config/swiperContainer.js
 module.exports = {
    troubleSwiperContainer : 'troubleSwiperContainer',
    damageSwiperContainer : 'damageSwiperContainer',
-    editProblemSwiperContainer:'editProblemSwiperContainer'
+    editProblemSwiperContainer:'editProblemSwiperContainer',
+    productPostionContainer:"productPostionContainer"
 }
\ No newline at end of file
--- a/client/containers/PageContainer/PageContainer.jsx
+++ b/client/containers/PageContainer/PageContainer.jsx
@@ -5,7 +5,7 @@ import { connect }  from 'react-redux';
 import {getStoreInfo} from "../../actions/getStore";
 import {getTroubleList,updateTroubleList} from "../../actions/getTroubles";
 import {initGetOtherProblem,addNewProbem,deleteProblem,editProblemItem,submitProblemList} from "../../actions/otherQuestion"
-import {scanBarCodeGetProductInfo,submitProductInfo,saveEditProductInfo,submitProductSuccess} from "../../actions/ScanBarCode"
+import {scanBarCodeGetProductInfo,submitProductInfo,saveEditProductInfo,submitProductSuccess,clearProductSuccess} from "../../actions/ScanBarCode"
 import {getReportDamageList,deleteDamageItem} from '../../actions/reportDamageList'
 import {getRefreshImg,deleteImg} from "../../actions/refreshImg"
 import {uploadError,addErrorInfo} from '../../actions/uploadError'
@@ -424,6 +424,7 @@ class PageContainer extends React.Component {
                            saveEditProductInfo = {(postData)=>dispatch(saveEditProductInfo(postData))}
                            changePages={(data)=>this.changePages(data)}
                            submitProductSuccess = {(postData)=>dispatch(submitProductSuccess(postData))}
+                            clearProductSuccess = {()=>dispatch(clearProductSuccess())}
                            state = {state}
                />;
                break;

--- a/client/containers/ReportDamagesListContainer/ReportDamagesListContainer.jsx
+++ b/client/containers/ReportDamagesListContainer/ReportDamagesListContainer.jsx
@@ -57,27 +57,32 @@ export default class ReportDamagesListContainer extends React.Component{
        let swiperContainer = CONFIG.swiperContainers.damageSwiperContainer;
        let swiperCount = reportDamageListUi.length;
        return (
-            reportDamageList && reportDamageList.length>0?(
+            <div className={"ReportDamagesListContainer"}>
-                <div className={"ReportDamagesListContainer"}>
+                <HeaderComponent
-                    <HeaderComponent
+                    showHeader={CONFIG.headerStatus[1]}
-                        showHeader={CONFIG.headerStatus[1]}
+                    userinfo={userInfo}
-                        userinfo={userInfo}
+                    storeInfo={storeInfo}
-                        storeInfo={storeInfo}
+                />
-                    />
+                <div className={"damageTitleContainer"}>故障相关报损商品(非货架区)</div>
-                    <div className={"damageTitleContainer"}>故障相关报损商品(非货架区)</div>
+                <div className={"damageProductList"}>
-                    <div className={"damageProductList"}>
+                    {
-                        <SwiperComponent
+                        reportDamageList && reportDamageList.length>0?(
-                            swiperContainer={swiperContainer} swiperOptions={swiperOptions} swiperCount={swiperCount}
+                            <SwiperComponent
-                        >
+                                swiperContainer={swiperContainer} swiperOptions={swiperOptions} swiperCount={swiperCount}
-                            {reportDamageListUi}
+                            >
-                        </SwiperComponent>
+                                {reportDamageListUi}
-                    </div>
+                            </SwiperComponent>
-                    <div className={"opeationContainer clearfix"}>
+                        ):("请点击录入更多添加报损商品")
-                        <button onClick={this.hanleAddMoreClick.bind(this)} className={"addMoreBtn"}><span>+</span>录入更多</button>
+                    }
-                        <button onClick={this.handleNoMoreClick.bind(this)} className={"noMoreBtn"}>没有更多</button>
-                    </div>
+                </div>
+                <div className={"opeationContainer clearfix"}>
+                    <button onClick={this.hanleAddMoreClick.bind(this)} className={"addMoreBtn"}><span>+</span>录入更多</button>
+                    <button onClick={this.handleNoMoreClick.bind(this)} className={"noMoreBtn"}>没有更多</button>
                </div>
-            ):null
+            </div>
        )
    }
 }

--- a/client/containers/ScanBarCodeContainer/ScanBarCodeContaienr.jsx
+++ b/client/containers/ScanBarCodeContainer/ScanBarCodeContaienr.jsx
@@ -32,9 +32,10 @@ export default class ScanBarCodeContainer extends React.Component{
    componentWillReceiveProps(nextProps){
        //显示查询到的商品的数据
        let {state,changePages} = nextProps;
-        let {scanBarCode,userInfo,storeInfo,refreshImg} = state;
+        let {scanBarCode,userInfo,storeInfo,refreshImg,errMsg} = state;
        let productInfo = state.scanBarCode;
        let {inventorylossId,skuBaseInfoVo,packingList,positionList,data_currentProblemObj,submit} = productInfo;
+        let {clearProductSuccess} = this.props
        if(submit){
            changePages(CONFIG.showPage[3])
        }
@@ -51,18 +52,25 @@ export default class ScanBarCodeContainer extends React.Component{
                                    handleSaveEditProductInfo = {this.handleSaveEditProductInfo.bind(this)}
                                    refreshImg = {refreshImg}
                                    changePages = {changePages}
+                                    clearProductSuccess = {clearProductSuccess}
                                />
-        if(scanBarCode.skuBaseInfoVo && scanBarCode.skuBaseInfoVo.skuId && this.state.showProductInfo){
+        if(scanBarCode.skuBaseInfoVo && scanBarCode.skuBaseInfoVo.skuId && (!errMsg.errMsg || errMsg.errMsg=="") ){
            this.setState({
                popupInfo:{
                    showPopup:true,
                    popupChild:productDetailUi
-                }
+                },
+                showProductInfo:true
            })
        }
+        if(errMsg.errMsg){
+            showProductInfo:false
+        }
    }
    componentWillUnmount() {
-        console.log("===============submitProductSuccess===============");
        let {submitProductSuccess} = this.props;
        submitProductSuccess({"submit":false})
    }
@@ -97,14 +105,7 @@ export default class ScanBarCodeContainer extends React.Component{
        postData.taskId = headerInfo.taskId?Number(headerInfo.taskId):Number("1");
        postData.sellOrderId = headerInfo.sellOrderId?Number(headerInfo.sellOrderId):Number(21);
        postData.skuBarcode = String(this.state.barCodeValue);
-        //设置弹窗显示:
+        getProductInfo(postData)
-        this.setState({
-            showProductInfo:true
-        },()=>{
-            //发送查询action
-            getProductInfo(postData)
-        })
    }
    // 点击再次再次尝试
@@ -138,8 +139,6 @@ export default class ScanBarCodeContainer extends React.Component{
    handleAddImg(){
        let {state} = this.props;
        let {storeInfo,scanBarCode} = state;
-        console.log(scanBarCode);
-        console.log("+===================scanBarcode==============")
        let tmpUrl = "";
        tmpUrl =  `${ENV.uploadImg}/${scanBarCode.inventorylossId}/${this.state.taskTy}`
        this.setState({
@@ -171,15 +170,6 @@ export default class ScanBarCodeContainer extends React.Component{
        let packingStatusImageIds = data.data_currentProblemObj;
        data.taskId = headerInfo.taskId?Number(headerInfo.taskId):Number(500)
        submitProductInfo(data);
-       /* changePages(CONFIG.showPage[3])*/
-        //让弹窗消失
-        //让弹窗消失
-        /*this.setState({
-            showProductInfo:false,
-            popupInfo:{
-                "showPopup":false,
-            }
-        })*/
    }
    render() {
        let {state} = this.props;
@@ -197,11 +187,6 @@ export default class ScanBarCodeContainer extends React.Component{
                            userinfo={userInfo}
                            storeInfo={storeInfo}
                        />
-                        {
-                            this.state.showPopup?(
-                                <PopupComponent popupInfo = {this.state.popupInfo} />
-                            ):""
-                        }
                        <div className={"container"}>
                            <div className={"inputContaienr"}>
                                <input

--- a/client/containers/ScanBarCodeContainer/index.css
+++ b/client/containers/ScanBarCodeContainer/index.css
@@ -61,9 +61,11 @@ input:-ms-input-placeholder, textarea:-ms-input-placeholder {
 /*商品弹窗样式start*/
 .scanBarCodeContainer .productContainer {
    position: absolute;
-    left: 75px;
+    left: 50%;
-    top: 8px;
+    top: 50%;
    background-color: #fff;
+    transform:translate(-50%, -50%);
 }
 /*.scanBarCodeContainer .productContainer{

--- a/client/reducers/scanBarCode.js
+++ b/client/reducers/scanBarCode.js
@@ -14,6 +14,11 @@ function submitSuccess(state,data) {
    return newInfo;
 }
+function clearSuccess(state,data) {
+    let newInfo = Object.assign({},state);
+    newInfo = data;
+    return newInfo;
+}
 function saveInfoSuccess(state,data) {
    if(data.type == "productPosition"){
        currentProductInfo.lossPostion = data.data;
@@ -37,6 +42,8 @@ export default function(state={}, action) {
            return submitSuccess(state,action.data)
        case actionTypes.SAVE_PRODUCTEDITINFO_SUCCESS:
            return saveInfoSuccess(state,action.data)
+        case actionTypes.ClEAR_PRODUCT_SUCCESS:
+            return clearSuccess(state,action.data)
        default:
            return state;
    }