change reducer-common

client/actions/TokeStokeContainer.js

@@ -8,10 +8,10 @@ let domain = 'http://192.168.10.128:8080/web/'
 const checkProductQuantity = (data)=>{
 const checkProductQuantity = (data)=>{
       let {commonInfo,tokeProductInfo}=data;
       let {commonInfo,tokeProductInfo}=data;
       let storeId=commonInfo.storeInfo.id;
       let storeId=commonInfo.storeInfo.id;
-      let {taskId,area}=commonInfo.taskInfo;
+      let {taskId,area,currentTaskType}=commonInfo.taskInfo;
       let employeeId=commonInfo.userInfo.id;
       let employeeId=commonInfo.userInfo.id;
       let {quantity,skuPassId,workListId}=tokeProductInfo;
       let {quantity,skuPassId,workListId}=tokeProductInfo;
-      let bodyData={storeId,taskId,area,quantity,skuPassId,workListId,employeeId}
+      let bodyData={storeId,taskId,area,quantity,skuPassId,workListId,employeeId,currentTaskType}
       let url=domain+`flat/work/ck`;
       let url=domain+`flat/work/ck`;
       return (dispatch)=>{
       return (dispatch)=>{
                 fetch(url,{
                 fetch(url,{

client/actions/breakaegContainer.js

@@ -13,10 +13,10 @@ const  submitBreakageProduct = (data)=>{
     console.log(data,"执行了提交遗留上报")
     console.log(data,"执行了提交遗留上报")
     let {productDetail,commonInfo}=data;
     let {productDetail,commonInfo}=data;
     let userId=commonInfo.userInfo.id;
     let userId=commonInfo.userInfo.id;
-    let {currentTaskType,taskId}=commonInfo.taskInfo;
+    let {taskId}=commonInfo.taskInfo;
     let machineId=commonInfo.storeInfo.id;
     let machineId=commonInfo.storeInfo.id;
     let {skuPosition,skuId,skuStatus}=productDetail;
     let {skuPosition,skuId,skuStatus}=productDetail;
-    let bodyData={skuPosition,skuId,skuStatus,machineId,taskId,currentTaskType}
+    let bodyData={skuPosition,skuId,skuStatus,machineId,taskId}
     let url=domain+`flat/lr/${userId}`
     let url=domain+`flat/lr/${userId}`
     return ()=>{
     return ()=>{
         fetch(url,{
         fetch(url,{

client/components/BreakageComponent/defaultComponent/DefaultComponnet.jsx

@@ -27,7 +27,7 @@ class DefaultComponent extends React.Component{
     //控制显示扫码页面并且显示扫码页
     //控制显示扫码页面并且显示扫码页
     skipInputCode(){
     skipInputCode(){
         this.props.changeCodePage(false);
         this.props.changeCodePage(false);
-        this.props.changeSanCodePage('SanCode')
+        this.props.changeSanCodePage('HandCode')
     }
     }
 }
 }
 export default DefaultComponent;
 export default DefaultComponent;
\ No newline at end of file

client/reducers/common.js

@@ -89,6 +89,15 @@ const NumChangeWord = (currentTaskType,childTaskNum)=>{
                 }
                 }
             }
             }
             break;
             break;
+        case 'CR'  :
+            {
+               let name=2;
+               taskName = arr[name - 1].title;
+               if (child) {
+                   taskName = arr[name - 1].children[child - 1]
+               }
+            }
+            break;
     }
     }
 
 
     return taskName;
     return taskName;