Skip to content

M
max_android_panel
Commit 6ae09059 by wujiabao
Options

Merge branch 'dev' of git.mjitech.com:zhangxin/max_android_panel into dev

parents dd08b5db 7bc27027
Showing with 34 additions and 19 deletions
client/actions/breakaegContainer.js
...@@ -42,7 +42,7 @@ const submitBreakageProduct = (data)=>{ ...@@ -42,7 +42,7 @@ const submitBreakageProduct = (data)=>{
} }
//test 没有散落货品 // 没有散落货品
const hasNoSku = (commonInfo)=>{ const hasNoSku = (commonInfo)=>{
let {storeInfo={},userInfo={},taskInfo={}} = commonInfo; let {storeInfo={},userInfo={},taskInfo={}} = commonInfo;
let url = `${domain}machine_pad/work/lr/status/${taskInfo.taskId}/${taskInfo.area}/${taskInfo.currentTaskType}`; let url = `${domain}machine_pad/work/lr/status/${taskInfo.taskId}/${taskInfo.area}/${taskInfo.currentTaskType}`;
......
client/actions/chooseTaskContainer.js
...@@ -2,6 +2,7 @@ import fetch from 'isomorphic-fetch' ...@@ -2,6 +2,7 @@ import fetch from 'isomorphic-fetch'
import {logout, getTaskList, saveCommonInfo,emptyStoreInfo} from "./common"; import {logout, getTaskList, saveCommonInfo,emptyStoreInfo} from "./common";
import {emit} from "../util/event"; import {emit} from "../util/event";
let domain = ENV.domain; let domain = ENV.domain;
// 回收箱替换，flag为true,任务完成，flag为false
const willCloseDoor=(data,flag=false)=>{ const willCloseDoor=(data,flag=false)=>{
let url=domain+`machine_pad/finish_task.action`; let url=domain+`machine_pad/finish_task.action`;
let {userInfo,taskInfo,storeInfo}=data; let {userInfo,taskInfo,storeInfo}=data;
......
client/actions/common.js
...@@ -127,12 +127,15 @@ const getTaskList = (data={},callback=null)=>{ ...@@ -127,12 +127,15 @@ const getTaskList = (data={},callback=null)=>{
} }
} }
//本地存储公共信息
const saveCommonInfo = (data)=>{ const saveCommonInfo = (data)=>{
return { return {
type : actionType.SAVECOMMONINFO, type : actionType.SAVECOMMONINFO,
data data
} }
}; };
// 退出时清空用户信息，工单信息
const logout = ()=>{ const logout = ()=>{
let data = Object.assign({},{userInfo:{},taskInfo:{},taskList:{}}); let data = Object.assign({},{userInfo:{},taskInfo:{},taskList:{}});
return { return {
...@@ -141,6 +144,7 @@ const logout = ()=>{ ...@@ -141,6 +144,7 @@ const logout = ()=>{
} }
}; };
// 清空门店信息（用于断电断网退出时）
const emptyStoreInfo = ()=>{ const emptyStoreInfo = ()=>{
let data = Object.assign({},{storeInfo:{}}); let data = Object.assign({},{storeInfo:{}});
return { return {
...@@ -149,6 +153,7 @@ const emptyStoreInfo = ()=>{ ...@@ -149,6 +153,7 @@ const emptyStoreInfo = ()=>{
} }
} }
// 获取页面左边部分展示当前任务名
const getTaskName = (currentTaskType,childTaskNum=0)=>{ const getTaskName = (currentTaskType,childTaskNum=0)=>{
return { return {
type : actionType.GETTASKNAME, type : actionType.GETTASKNAME,
......
client/actions/getTroubles.js
...@@ -26,7 +26,7 @@ var myHeaders = new Headers({ ...@@ -26,7 +26,7 @@ var myHeaders = new Headers({
'Content-Type': 'application/json; charset=UTF-8', 'Content-Type': 'application/json; charset=UTF-8',
}); });
// 获取故障列表
const getTroubleList = (info) => { const getTroubleList = (info) => {
let {storeInfo={},userInfo={},taskInfo={}} = info; let {storeInfo={},userInfo={},taskInfo={}} = info;
return (dispatch) => { return (dispatch) => {
...@@ -54,6 +54,7 @@ const getTroubleList = (info) => { ...@@ -54,6 +54,7 @@ const getTroubleList = (info) => {
} }
}; };
// 提交故障信息
const updateTroubleList = (info, headerInfo) => { const updateTroubleList = (info, headerInfo) => {
let {taskInfo={},userInfo={},storeInfo={}} = headerInfo; let {taskInfo={},userInfo={},storeInfo={}} = headerInfo;
let bodyData = Object.assign({}, {details: info}, {taskId:taskInfo.taskId,employeeId:userInfo.employeeId,storeId:storeInfo.id}); let bodyData = Object.assign({}, {details: info}, {taskId:taskInfo.taskId,employeeId:userInfo.employeeId,storeId:storeInfo.id});
......
client/actions/replenish.js
...@@ -11,13 +11,14 @@ let myHeaders = new Headers({ ...@@ -11,13 +11,14 @@ let myHeaders = new Headers({
// 'Content-Type': 'application/x-www-form-urlencoded; charset=UTF-8', // 'Content-Type': 'application/x-www-form-urlencoded; charset=UTF-8',
'Content-Type': 'application/json; charset=UTF-8', 'Content-Type': 'application/json; charset=UTF-8',
}); });
// 条形码错误
const wrongQrcode = (errorInfo)=>{ const wrongQrcode = (errorInfo)=>{
return { return {
type : actionType.SETREPLENISHERRORINFO, type : actionType.SETREPLENISHERRORINFO,
errorInfo errorInfo
} }
} }
// 清空当前补货商品信息
const emptyErrorInfo = ()=>{ const emptyErrorInfo = ()=>{
return { return {
type : actionType.EMPTYREPLENISHERRORINFO, type : actionType.EMPTYREPLENISHERRORINFO,
...@@ -26,7 +27,6 @@ const emptyErrorInfo = ()=>{ ...@@ -26,7 +27,6 @@ const emptyErrorInfo = ()=>{
const finishReplenish = (info,source)=>{ const finishReplenish = (info,source)=>{
//source 1 : 商品页 ， 2 : 扫码页 //source 1 : 商品页 ， 2 : 扫码页
//已放入回收箱
let {userInfo,taskInfo,storeInfo,taskList} = info; let {userInfo,taskInfo,storeInfo,taskList} = info;
let bodyData = Object.assign({},{ let bodyData = Object.assign({},{
storeId : storeInfo.id, storeId : storeInfo.id,
......
client/actions/userinfo.js
...@@ -53,6 +53,7 @@ const logoutUser = ()=>{ ...@@ -53,6 +53,7 @@ const logoutUser = ()=>{
let timer = null; let timer = null;
// 断电断网 轮询获取用户登录状态
const pollingGetUserinfoAgain = (storeId)=>{ const pollingGetUserinfoAgain = (storeId)=>{
return (dispatch)=>{ return (dispatch)=>{
if(!timer){ if(!timer){
...@@ -66,7 +67,7 @@ const pollingGetUserinfoAgain = (storeId)=>{ ...@@ -66,7 +67,7 @@ const pollingGetUserinfoAgain = (storeId)=>{
} }
} }
// 断电断网获取用户登录信息
const pollingGetUserinfo = (storeId)=>{ const pollingGetUserinfo = (storeId)=>{
UTILPATH.myLogger.info("power_cut_find_user storeId ",storeId) UTILPATH.myLogger.info("power_cut_find_user storeId ",storeId)
return(dispatch)=>{ return(dispatch)=>{
......
client/components/ReplenishComponent/ReplenishSkuPage/ReplenishSkuPage.jsx
...@@ -130,6 +130,7 @@ export default class ReplenishSkuPage extends React.Component{ ...@@ -130,6 +130,7 @@ export default class ReplenishSkuPage extends React.Component{
getSkuInfo(){ getSkuInfo(){
let {headerInfo} = this.props; let {headerInfo} = this.props;
let {taskList={}} = headerInfo; let {taskList={}} = headerInfo;
UTILPATH.myLogger.info("replenishSkuPage getSkuInfo ",taskList);
let skuImg = taskList.skuImage ? UTILPATH.getPic(taskList.skuImage,"middle") : ''; let skuImg = taskList.skuImage ? UTILPATH.getPic(taskList.skuImage,"middle") : '';
let areaImage = taskList.areaImage ? UTILPATH.getPic(taskList.areaImage,"middle") : ''; let areaImage = taskList.areaImage ? UTILPATH.getPic(taskList.areaImage,"middle") : '';
return( return(
......
client/config/showPage.js
const showPage = { const showPage = {
1 : 'Trouble', //一期故障 //一期的界面基本已废
1 : 'Trouble', //一期故障（已废）
2 : 'Scan', //一期扫描二维码 2 : 'Scan', //一期扫描二维码
3 : 'DamageProductList', //一期上报损耗商品 3 : 'DamageProductList', //一期上报损耗商品
4 : 'OtherQuestionUpload', //一期上报其它问题 4 : 'OtherQuestionUpload', //一期上报其它问题
5 : 'ReportLeftSkus', // 二期遗留商品上报 5 : 'ReportLeftSkus', // 二期遗留商品上报，获取工单进入
51 : 'ReportLeftSkus1', // 二期遗留商品上报 51 : 'ReportLeftSkus1', // 二期遗留商品上报，右上角菜单进入，组件用的一个，只是参数不同
6 : 'CheckSkus', //二期盘点 6 : 'CheckSkus', //二期盘点
7 : 'Home', //一期首页和关门页 7 : 'Home', //一期首页和关门页
8 : 'FinishAsk', //一期询问是否完成页 8 : 'FinishAsk', //一期询问是否完成页
9 : 'ChooseTask', //一期选择故障问题页 9 : 'ChooseTask', //一期选择故障问题页
10 : 'RecoverySkus', //二期回收 10 : 'RecoverySkus', //二期回收
11 : 'Replenishment', //二期补货 11 : 'Replenishment', //二期补货
12 : 'Feedback', //二期问题反馈和关门 12 : 'Feedback', //二期故障页面
13 : 'HomePage', //二期首页 13 : 'HomePage', //二期首页，开门展示
131 : 'HomePage1', //二期首页 131 : 'HomePage1', //二期首页，关门展示
14 : 'Question', //二期问题反馈页面 14 : 'Question', //二期问题反馈页面，获取工单进入
141 : 'Question1', //二期问题反馈页面 141 : 'Question1', //二期问题反馈页面，右上角菜单栏进入
15 : 'BoxRecoverySkus', //二期回收箱回收 15 : 'BoxRecoverySkus', //二期回收箱回收
'DevPage' : 'DevPage' 'DevPage' : 'DevPage'
}; };
...@@ -35,6 +36,7 @@ const headerStatus = { //首页状态栏 ...@@ -35,6 +36,7 @@ const headerStatus = { //首页状态栏
}; };
const normalMenuList = [ const normalMenuList = [
// 菜单栏展示内容（目前菜单栏禁止使用和展示）
{ {
text : '货品报损', text : '货品报损',
type : 'HPBS', type : 'HPBS',
......
client/containers/HomePageContainer/HomePageContainer.jsx
...@@ -45,12 +45,14 @@ export default class HomePageContainer extends React.Component{ ...@@ -45,12 +45,14 @@ export default class HomePageContainer extends React.Component{
},()=>{ },()=>{
UTILPATH.myLogger.info("logout startStopServer ",this.props.startStopServer); UTILPATH.myLogger.info("logout startStopServer ",this.props.startStopServer);
if(this.props.startStopServer){ if(this.props.startStopServer){
// 断网调用
this.props.willCloseDoor().then(()=>{ this.props.willCloseDoor().then(()=>{
this.props.endCountBack(); this.props.endCountBack();
this.props.tempLogout() this.props.tempLogout()
}); });
}else{ }else{
//正常调用
this.props.willCloseDoor().then(()=>{ this.props.willCloseDoor().then(()=>{
this.props.endCountBack(); this.props.endCountBack();
let msg={type:'WILL_CLOSEDOOR'}; let msg={type:'WILL_CLOSEDOOR'};
......
client/containers/TakeStokeContainer/TakeStokeContainer.jsx
...@@ -20,7 +20,6 @@ class TakeStokeContaniner extends React.Component { ...@@ -20,7 +20,6 @@ class TakeStokeContaniner extends React.Component {
let {showButton,number,initNum}=this.state; let {showButton,number,initNum}=this.state;
let props = this.props; let props = this.props;
let tokeTaskProduct=props.tokeTaskProduct; let tokeTaskProduct=props.tokeTaskProduct;
console.log(tokeTaskProduct)
return ( return (
<div className={'TokeStokeContainer'}> <div className={'TokeStokeContainer'}>
<HeaderComponent headerStatus={headerStatus[1]} headerInfo={props.headerInfo}/> <HeaderComponent headerStatus={headerStatus[1]} headerInfo={props.headerInfo}/>
......
client/env/development.js
...@@ -3,5 +3,5 @@ ...@@ -3,5 +3,5 @@
*/ */
module.exports = { module.exports = {
domain: 'https://test.mjitech.com/web/', domain: 'https://test.mjitech.com/web/',
uploadImg : 'https://test.mjitech.com/static/uploadTrouble' uploadImg : 'https://test.mjitech.com/static/uploadTrouble' // 小程序上传图片的二维码连接（已作废）
} }
\ No newline at end of file
package.json
...@@ -5,12 +5,14 @@ ...@@ -5,12 +5,14 @@
"description": "max_android_panel", "description": "max_android_panel",
"main": "index.js", "main": "index.js",
"scripts": { "scripts": {
"pretest": "npm run clean",
"test": "cross-env NODE_ENV=production PAD_ENV=test webpack --env=test --version=2.0.4 --progress --color", "test": "cross-env NODE_ENV=production PAD_ENV=test webpack --env=test --version=2.0.4 --progress --color",
"clean": "rm -rf static/*", "clean": "rm -rf static/*",
"start": "cross-env NODE_ENV=development PAD_ENV=development webpack-dev-server --version=2.0.4 --env=dev -d --history-api-fallback --hot --inline --progress --colors --port 6999 --host 0.0.0.0", "start": "cross-env NODE_ENV=development PAD_ENV=development webpack-dev-server --version=2.0.4 --env=dev -d --history-api-fallback --hot --inline --progress --colors --port 6999 --host 0.0.0.0",
"prebuild": "npm run clean",
"build": "cross-env NODE_ENV=production PAD_ENV=production webpack --env=build --version=2.0.4 --progress --color", "build": "cross-env NODE_ENV=production PAD_ENV=production webpack --env=build --version=2.0.4 --progress --color",
"preprod": "cross-env NODE_ENV=production PAD_ENV=preprod webpack --env=preprod --version=2.0.4 --progress --color", "prepreprod": "npm run clean",
"build:prod": "cross-env NODE_ENV=development webpack --env=build --progress --color" "preprod": "cross-env NODE_ENV=production PAD_ENV=preprod webpack --env=preprod --version=2.0.4 --progress --color"
}, },
"author": "", "author": "",
"license": "MIT", "license": "MIT",
......
webpack.config.js
...@@ -189,8 +189,8 @@ let envConfig = { ...@@ -189,8 +189,8 @@ let envConfig = {
}), //分割共有模块和代码模块 }), //分割共有模块和代码模块
new webpack.DefinePlugin({ new webpack.DefinePlugin({
'process.env': { 'process.env': {
NODE_ENV: JSON.stringify(process.env.NODE_ENV || 'development'), NODE_ENV: JSON.stringify('development'),
PAD_ENV: JSON.stringify(process.env.PAD_ENV || 'production') PAD_ENV: JSON.stringify('development')
}, },
'BASEREM' : 120, 'BASEREM' : 120,
'CURVERSION' : JSON.stringify(curversion) 'CURVERSION' : JSON.stringify(curversion)
......
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