补全功能

client/components/BreakageComponent/BreakageCode/BreakageCode.jsx

@@ -12,7 +12,7 @@ class BreakageCode extends React.Component{
                 <div className={"breakageCodeHeader font32  colfff "}>
                     <i className={"iconfont middle icon font50 icon-circle-left circleIcon fl"} onClick={this.changeSanCodePage.bind(this)} />
                     <span className={"font40"} style={{marginLeft:'1rem'}}>请输入遗留商品的条形码</span>
-                    <span className={'font30'}>条形码残缺?</span>
+                    <span className={'font30'} onClick={this.changePopStatus.bind(this)}>条形码残缺?</span>
                 </div>
                 <BarcodeComponent getBarCodeProductInfo={this.props.getBarCodeProductInfo}
                                   changePage={this.props.changePage}
@@ -25,5 +25,9 @@ class BreakageCode extends React.Component{
     changeSanCodePage(){
         this.props.changeSanCodePage('SanCode')
     }
+    //控制弹窗
+    changePopStatus(){
+        this.props.changeBreakPop(true)
+    }
 }
 export default BreakageCode;
\ No newline at end of file

client/components/BreakageComponent/SanCodeComponent/SanCodeComponent.jsx

@@ -10,7 +10,7 @@ class SanCodeComponent extends React.Component{
                     <div className={"breakageSanCodeHeader font32  colfff "}>
                         <i className={"iconfont middle icon font50 icon-circle-left circleIcon fl"} onClick={this.changCodePage.bind(this)}/>
                         <span className={"font40"}>请把遗留货品的条形码,对准前置摄像头进行扫描</span>
-                        <span className={'font30'}>条形码残缺?</span>
+                        <span onClick={this.changePopStatus.bind(this)} className={'font30'}>条形码残缺?</span>
                     </div>
                     <div className="SanCodeFrame">
 
@@ -30,6 +30,11 @@ class SanCodeComponent extends React.Component{
     changeSanCodePage(){
         this.props.changeSanCodePage('HandCode')
     }
+
+    //控制弹窗
+    changePopStatus(){
+        this.props.changeBreakPop(true)
+    }
 }
 
 export default SanCodeComponent
\ No newline at end of file

client/components/CommonComponent/BarcodeComponent/BarcodeComponent.jsx

@@ -23,7 +23,7 @@ class BarcodeComponent extends React.Component{
                    {
                        barcodeWord?<p className={'font30'} style={{color:'#d0021b',textAlign:'center',marginTop:'20px'}}>条形码输入错误，请重新输入</p>:null
                    }
-                   <input type="text" className={'font30'} value={barcode} onChange={(ev)=>{this.setState({barcode:ev.target.value})}}/>
+                   <input autoFocus="autofocus" type="text" className={'font30'} value={barcode} onChange={(ev)=>{this.setState({barcode:ev.target.value})}}/>
                    <p className={'barcodeScan font30 colfff'}>or<span className={'colff7860'}>条形码扫描</span></p>
                   <Button text={'确定'} option={this.getCodeProduct.bind(this)} btnContainer={'font30 backff775c colfff'} style={{border:'0',margin:'0 auto',marginTop:'120px'}} />
                </div>

client/containers/BreakageContainer/BreakageConatiner.jsx

@@ -17,14 +17,16 @@ class BreakageContainer extends React.Component {
             isShow:true,//控制扫码页的显示隐藏
             SanCodePage:'SanCode',//控制显示扫码或手动输入
             popShow:false, //控制弹框,
-            pop1Show:true  //控制异常弹窗显示
+            pop1Show:true,  //控制异常弹窗显示
+            pop2Show:false
          }
          this.changePage=this.changePage.bind(this);
+         this.changeBreakPop=this.changeBreakPop.bind(this)
     }
 
     render(){
         let props=this.props;
-        let {isShow,popShow,pop1Show}=this.state;
+        let {isShow,popShow,pop1Show,pop2Show}=this.state;
          return (
                   <div className={"BreakageContainer"}>
                      {
@@ -64,6 +66,16 @@ class BreakageContainer extends React.Component {
                     </PopModel>
                         </div>:null
                     }
+                    {
+                        pop2Show?<PopModel popupTitle={"提示"}>
+                                   <div className={"text font40 col000"}>
+                                <p style={{marginTop:'2rem'}}>敬请期待！</p>
+                            </div>
+                            <div className={"btn"}>
+                                <Button text={'关闭'} style={{marginLeft:'50%',transform:'translateX(-25%)',marginTop:'2rem'}} btnContainer={'font32 backff775c colfff'} option={this.changeBreakPop.bind(this,false)} />
+                            </div>
+                        </PopModel>:null
+                    }
                    </div>
          ) 
     }
@@ -106,6 +118,16 @@ class BreakageContainer extends React.Component {
             SanCodePage:CodePage
         })
     }
+    //判断条形码损坏的弹框显示隐藏
+    changeBreakPop(bool){
+        this.setState({
+            pop2Show:bool
+        })
+    }
+
+
+
+
 
     //根据判断显示应该显示的组件
     getPages(){
@@ -140,6 +162,7 @@ class BreakageContainer extends React.Component {
             case 'SanCode' :
                     SanPage=<SanCodeComponent changeSanCodePage={this.changeSanCodePage.bind(this)}
                                               changeCodePage={this.changeCodePage.bind(this)}
+                                              changeBreakPop={this.changeBreakPop}
                                           />
                 break;
             case 'HandCode' :
@@ -147,6 +170,7 @@ class BreakageContainer extends React.Component {
                                           changeSanCodePage={this.changeSanCodePage.bind(this)} 
                                           getBarCodeProductInfo={this.getproductCode.bind(this)} 
                                           breakageProductInfo={props.breakageProductInfo}
+                                          changeBreakPop={this.changeBreakPop}
                                           />
                                           
                 break;

client/containers/TakeStokeContainer/TakeStokeContainer.jsx

@@ -71,6 +71,8 @@ class TakeStokeContaniner extends React.Component {
     }
     //显示放大显示
     showImg(){
+        let props = this.props;
+        let tokeTaskProduct=props.tokeTaskProduct;
         let popupInfo={showPopup:true,popupChild:<img onClick={this.props.hidePopup} className={'defaultPopup'} src={tokeTaskProduct.skuImage} alt=""/>}
         this.props.showPopup(popupInfo)
     }

client/reducers/common.js

@@ -47,6 +47,10 @@ const NumChangeWord = (currentTaskType,childTaskNum)=>{
         {
             title:'补货',
             children:['']
+        },
+        {
+            title:'问题反馈',
+            children:['']
         }
     ]
     let type = currentTaskType;
@@ -97,6 +101,14 @@ const NumChangeWord = (currentTaskType,childTaskNum)=>{
                    taskName = arr[name - 1].children[child - 1]
                }
             }
+        case 'PF'  :
+        {
+            let name=5;
+            taskName = arr[name - 1].title;
+            if (child) {
+                taskName = arr[name - 1].children[child - 1]
+            }
+        }
             break;
     }