diff --git a/client/actions/common.js b/client/actions/common.js index 22c18d4..88acba9 100644 --- a/client/actions/common.js +++ b/client/actions/common.js @@ -63,41 +63,6 @@ const getUserinfo = (employeeId,storeId)=>{ }; -let mock = { - data : { - flatCommonVo : { - currentTaskName: "故障上报", - currentTaskNum: 1, - currentTaskType: "ER", - taskId: 1040, - totalTaskNum: 3, - }, - skuFlatVo : { - detailList : [{ - "id": 660, - "storeId": 7, - "errorCode": "ER00021", - "type": "KN", - "description": "1:回零故障,2:直流电机回位错误或步进电机初始化错误(根据前一条故障代码判断)", - "taskId": 0, - "isExistProblem": 0, - "imagesFileId": "3879,3878,3846,3843", - "superType": 1, - "subType": 2, - "parentProblemType": 0, - "subProblemType": 0, - "explanation": null, - "handler": 0, - "parentProblemName": null, - "subProblemName": null, - "sellOrderNumber": "0" - }] - - } - } -} - - //拉取工单 const getTaskList = (data={})=>{ let {storeInfo={},userInfo={},taskInfo={}} = data; diff --git a/client/containers/PageContainer/PageContainer.jsx b/client/containers/PageContainer/PageContainer.jsx index 1cfdb18..36493e1 100755 --- a/client/containers/PageContainer/PageContainer.jsx +++ b/client/containers/PageContainer/PageContainer.jsx @@ -194,7 +194,7 @@ class PageContainer extends React.Component { } if(info.area){ //区域信息 - dispatch(saveCommonInfo(Object.assign({},{taskInfo:{area:info.area}}))) + dispatch(saveCommonInfo(Object.assign({},{taskInfo:{area:info.area,taskId:0,currentTaskType:''}}))) } this.setState({ @@ -299,6 +299,9 @@ class PageContainer extends React.Component { case 'REA' : this.changePages(CONFIG.showPage[15]); break; + default: + this.changePages(CONFIG.showPage[13]); + break; } } @@ -611,6 +614,9 @@ class PageContainer extends React.Component { case 'REA' : this.changePages(CONFIG.showPage[15]); break; + default: + this.changePages(CONFIG.showPage[13]); + break; } }else{ this.changePages(CONFIG.showPage[13]);