Skip to content

M
max_android_panel
Commit 062fac6b by wujiabao
Options

change

parent d251c994
Showing with 14 additions and 13 deletions
client/actions/TokeStokeContainer.js
...@@ -11,7 +11,7 @@ const checkProductQuantity = (data)=>{ ...@@ -11,7 +11,7 @@ const checkProductQuantity = (data)=>{
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,currentTaskType} let bodyData={storeId,taskId,area,quantity,skuPassId,workListId,employeeId,currentTaskType}
let url=domain+`flat/work/ck`; let url=domain+`machine_pad/work/ck`;
return (dispatch)=>{ return (dispatch)=>{
fetch(url,{ fetch(url,{
credentials : 'include', credentials : 'include',
......
client/actions/barcodeCommon.js
...@@ -13,7 +13,7 @@ const getBarCodeProductInfo = (data)=>{ ...@@ -13,7 +13,7 @@ const getBarCodeProductInfo = (data)=>{
let currentTaskType = taskInfo.currentTaskType || ''; let currentTaskType = taskInfo.currentTaskType || '';
let area = taskInfo.area || '' let area = taskInfo.area || ''
let taskId = taskInfo.taskId || 0 let taskId = taskInfo.taskId || 0
let url=`${domain}flat/barcode/${storeId}/${taskId}/${area}/${currentTaskType}/${barcode}` let url=`${domain}machine_pad/barcode/${storeId}/${taskId}/${area}/${currentTaskType}/${barcode}`
return (dispatch)=>{ return (dispatch)=>{
fetch(url,{ fetch(url,{
// credentials : 'include', // credentials : 'include',
......
client/actions/breakaegContainer.js
...@@ -17,7 +17,7 @@ const submitBreakageProduct = (data)=>{ ...@@ -17,7 +17,7 @@ const submitBreakageProduct = (data)=>{
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} let bodyData={skuPosition,skuId,skuStatus,machineId,taskId}
let url=domain+`flat/lr/${userId}` let url=domain+`machine_pad/lr/${userId}`
return ()=>{ return ()=>{
fetch(url,{ fetch(url,{
// credentials : 'include', // credentials : 'include',
...@@ -41,7 +41,7 @@ const hasNoSku = (commonInfo)=>{ ...@@ -41,7 +41,7 @@ const hasNoSku = (commonInfo)=>{
let {storeInfo={},userInfo={},taskInfo={}} = commonInfo; let {storeInfo={},userInfo={},taskInfo={}} = commonInfo;
console.log("执行了没有散落商品的接口") console.log("执行了没有散落商品的接口")
return (dispatch)=>{ return (dispatch)=>{
let url = `${domain}flat/work/lr/status/${taskInfo.taskId}/${taskInfo.area}/${taskInfo.currentTaskType}`; let url = `${domain}machine_pad/work/lr/status/${taskInfo.taskId}/${taskInfo.area}/${taskInfo.currentTaskType}`;
fetch(url,{ fetch(url,{
// credentials : 'include', // credentials : 'include',
method : 'PUT', method : 'PUT',
......
client/actions/common.js
...@@ -71,7 +71,7 @@ const getTaskList = (data={})=>{ ...@@ -71,7 +71,7 @@ const getTaskList = (data={})=>{
let {storeInfo={},userInfo={},taskInfo={}} = data; let {storeInfo={},userInfo={},taskInfo={}} = data;
console.log("getTaskList ",data) console.log("getTaskList ",data)
let taskId=taskInfo.taskId || 0; let taskId=taskInfo.taskId || 0;
let url =`${domain}flat/work/list/${storeInfo.id}/${taskInfo.area}/${taskId}/${userInfo.id}`; let url =`${domain}machine_pad/work/list/${storeInfo.id}/${taskInfo.area}/${taskId}/${userInfo.id}`;
return (dispatch)=>{ return (dispatch)=>{
if(!userInfo.id){ if(!userInfo.id){
dispatch(addErrorInfo('没有获取用户信息')) dispatch(addErrorInfo('没有获取用户信息'))
...@@ -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.flatCommonVo); data.taskInfo = Object.assign({},json.data.machine_padCommonVo);
// if(json.data.flatCommonVo.currentTaskType !== 'ADDR'){ // if(json.data.machine_padCommonVo.currentTaskType !== 'ADDR'){
// data.taskList = Object.assign({},json.data.skuFlatVo); // data.taskList = Object.assign({},json.data.skumachine_padVo);
// } // }
data.taskList = Object.assign({},json.data.skuFlatVo); data.taskList = Object.assign({},json.data.skumachine_padVo);
let childNum = 0; let childNum = 0;
let currentTaskType = json.data.flatCommonVo.currentTaskType; let currentTaskType = json.data.machine_padCommonVo.currentTaskType;
let currentTaskNum = json.data.flatCommonVo.currentTaskNum; let currentTaskNum = json.data.machine_padCommonVo.currentTaskNum;
if(currentTaskType === 'RE'){ if(currentTaskType === 'RE'){
//回收 //回收
if(taskInfo.currentTaskType !== "RE"){ if(taskInfo.currentTaskType !== "RE"){
childNum = json.data.skuFlatVo.whetherType ? 1 : 2 childNum = json.data.skumachine_padVo.whetherType ? 1 : 2
}else{ }else{
childNum = 2 childNum = 2
} }
......
client/env/development.js
...@@ -2,6 +2,6 @@ ...@@ -2,6 +2,6 @@
* Created by ruibing on 16/11/2. * Created by ruibing on 16/11/2.
*/ */
module.exports = { module.exports = {
domain: 'http://192.168.10.88:8080/maxbox/web/', domain: 'http://192.168.10.128:8082/web/',
uploadImg : 'https://preprod.mjitech.com/static/uploadTrouble' uploadImg : 'https://preprod.mjitech.com/static/uploadTrouble'
} }
\ No newline at end of file
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