Skip to content

M
max_android_panel
Commit cce395ed by wujiabao
Options

change commonjs

parent 6e5b1edc
Showing with 7 additions and 7 deletions
client/actions/common.js
...@@ -88,18 +88,18 @@ const getTaskList = (data={})=>{ ...@@ -88,18 +88,18 @@ const getTaskList = (data={})=>{
let data =Object.assign({}); let data =Object.assign({});
console.log("拉取工单 ",json) console.log("拉取工单 ",json)
if(json.meta.success && json.data){ if(json.meta.success && json.data){
data.taskInfo = Object.assign({},json.data.machine_padCommonVo); data.taskInfo = Object.assign({},json.data.flatCommonVo);
// if(json.data.machine_padCommonVo.currentTaskType !== 'ADDR'){ // if(json.data.flatCommonVo.currentTaskType !== 'ADDR'){
// data.taskList = Object.assign({},json.data.skumachine_padVo); // data.taskList = Object.assign({},json.data.skuFlatVo);
// } // }
data.taskList = Object.assign({},json.data.skumachine_padVo); data.taskList = Object.assign({},json.data.skuFlatVo);
let childNum = 0; let childNum = 0;
let currentTaskType = json.data.machine_padCommonVo.currentTaskType; let currentTaskType = json.data.flatCommonVo.currentTaskType;
let currentTaskNum = json.data.machine_padCommonVo.currentTaskNum; let currentTaskNum = json.data.flatCommonVo.currentTaskNum;
if(currentTaskType === 'RE'){ if(currentTaskType === 'RE'){
//回收 //回收
if(taskInfo.currentTaskType !== "RE"){ if(taskInfo.currentTaskType !== "RE"){
childNum = json.data.skumachine_padVo.whetherType ? 1 : 2 childNum = json.data.skuFlatVo.whetherType ? 1 : 2
}else{ }else{
childNum = 2 childNum = 2
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment