change 显示任务

client/actions/common.js

@@ -2,7 +2,7 @@ import fetch from 'isomorphic-fetch';
 import actionType from '../actiontype/common'
 import actionType from '../actiontype/common'
 import {addErrorInfo} from './uploadError'
 import {addErrorInfo} from './uploadError'
 let domain1 = ENV.domain;
 let domain1 = ENV.domain;
-let domain = 'http://192.168.10.37:8080/maxbox/web/'
+let domain = 'http://192.168.10.128:8080/web/'
 
 
 let myHeaders = new Headers({
 let myHeaders = new Headers({
     // 'Access-Control-Allow-Origin': '*',
     // 'Access-Control-Allow-Origin': '*',
@@ -152,12 +152,13 @@ const getTaskList = (data={})=>{
                         data.taskInfo = Object.assign({},json.data.flatCommonVo)
                         data.taskInfo = Object.assign({},json.data.flatCommonVo)
                         data.taskList = Object.assign({},json.data.skuFlatVo);
                         data.taskList = Object.assign({},json.data.skuFlatVo);
                         let childNum = 0;
                         let childNum = 0;
+                        let currentTaskType = json.data.flatCommonVo.currentTaskType;
                         let currentTaskNum = json.data.flatCommonVo.currentTaskNum;
                         let currentTaskNum = json.data.flatCommonVo.currentTaskNum;
                         if(currentTaskNum === 3){
                         if(currentTaskNum === 3){
                             //回收
                             //回收
                             childNum = json.data.skuFlatVo.whetherType ? 1 : 2
                             childNum = json.data.skuFlatVo.whetherType ? 1 : 2
                         }
                         }
-                        dispatch(getTaskName(currentTaskNum,childNum))
+                        dispatch(getTaskName(currentTaskType,childNum))
                     }
                     }
                     dispatch(saveCommonInfo(Object.assign({},data)))
                     dispatch(saveCommonInfo(Object.assign({},data)))
                 })
                 })
@@ -205,10 +206,10 @@ const logout = ()=>{
     }
     }
 };
 };
 
 
-const getTaskName = (currentTaskNum,childTaskNum=0)=>{
+const getTaskName = (currentTaskType,childTaskNum=0)=>{
     return {
     return {
         type : actionType.GETTASKNAME,
         type : actionType.GETTASKNAME,
-        data : {currentTaskNum,childTaskNum}
+        data : {currentTaskType,childTaskNum}
     }
     }
 }
 }
 
 

client/reducers/common.js

@@ -30,7 +30,7 @@ let testData={
 }
 }
 // 传入一个对象   对象中包含currentTaskNum表示大任务
 // 传入一个对象   对象中包含currentTaskNum表示大任务
 // childTaskNum 表示大任务下的小任务
 // childTaskNum 表示大任务下的小任务
-const NumChangeWord = (currentTaskNum,childTaskNum)=>{
+const NumChangeWord = (currentTaskType,childTaskNum)=>{
     let arr=[
     let arr=[
         {
         {
             title:'散落商品检查',
             title:'散落商品检查',
@@ -49,32 +49,44 @@ const NumChangeWord = (currentTaskNum,childTaskNum)=>{
             children:['']
             children:['']
         }
         }
     ]
     ]
-    let name = currentTaskNum;
+    let type = currentTaskType;
     let taskName = '';
     let taskName = '';
     let child = childTaskNum;
     let child = childTaskNum;
-    switch(name) {
-        case 1 :
-            taskName = arr[name - 1].title;
-            if (child) {
-                taskName = arr[name - 1].children[child - 1]
+    switch(type) {
+        case 'LR' :
+            {
+                let name=1;
+                taskName = arr[name - 1].title;
+                if (child) {
+                    taskName = arr[name - 1].children[child - 1]
+                }
             }
             }
             break;
             break;
-        case 2 :
-            taskName = arr[name - 1].title;
-            if (child) {
-                taskName = arr[name - 1].children[child - 1]
-            }
+        case 'CK' :
+           {
+                let name=2;
+                taskName = arr[name - 1].title;
+                if (child) {
+                    taskName = arr[name - 1].children[child - 1]
+                }
+           }
             break;
             break;
-        case 3 :
-            taskName = arr[name - 1].title;
-            if (child) {
-                taskName = arr[name - 1].children[child - 1]
+        case 'RE' :
+            {
+                let name=3;
+                taskName = arr[name - 1].title;
+                if (child) {
+                    taskName = arr[name - 1].children[child - 1]
+                }
             }
             }
             break;
             break;
-        case 4 :
-            taskName = arr[name - 1].title;
-            if (child) {
-                taskName = arr[name - 1].children[child - 1]
+        case 'ADDR' :
+            {
+                let name=4
+                taskName = arr[name - 1].title;
+                if (child) {
+                    taskName = arr[name - 1].children[child - 1]
+                }
             }
             }
             break;
             break;
     }
     }
@@ -84,8 +96,9 @@ const NumChangeWord = (currentTaskNum,childTaskNum)=>{
 };
 };
 
 
 const getTaskName = (content,data)=>{
 const getTaskName = (content,data)=>{
-    let {currentTaskNum,childTaskNum} = data;
-    let taskName = NumChangeWord(currentTaskNum,childTaskNum);
+    console.log(data,'这是打印改变任务名字的reducer')
+    let {currentTaskType,childTaskNum} = data;
+    let taskName = NumChangeWord(currentTaskType,childTaskNum);
     let taskInfo = Object.assign({},{taskName});
     let taskInfo = Object.assign({},{taskName});
     return saveCommonInfo(content,Object.assign({},{taskInfo}));
     return saveCommonInfo(content,Object.assign({},{taskInfo}));
 }
 }