Skip to content

M
max_android_panel
Commit d27922d1 by Zhang Xin
Options

处理故障列表提交部分

parent 37a39bc8
Showing with 97 additions and 73 deletions
client/actions/getTroubles.js
...@@ -35,20 +35,7 @@ let json = { ...@@ -35,20 +35,7 @@ let json = {
"id": 1, "id": 1,
"errorCode": null, "errorCode": null,
"type": "OP", "type": "OP",
"files": [ "files": [],
{
"id": 16,
"filePath": "/tmp/2016-08-16/1471329685902.jpg"
},
{
"id": 17,
"filePath": "/sku/0/0/427/1471329704482.jpg"
},
{
"id": 18,
"filePath": "/sku/0/0/426/1471330380712.jpg"
}
],
"parentProblemName": "机械故障", "parentProblemName": "机械故障",
"subProblemName": "其他问题111" "subProblemName": "其他问题111"
} }
......
client/components/TroubleComponent/FinishTroubleComponent/FinishTroubleComponent.jsx 0 → 100644
import React from 'react';
import Button from '../../CommonComponent/ButtonComponent/ButtonComponent'
require('./index.css');
export default class FinishTroubleComponent extends React.Component{
constructor(props){
super(props);
}
haveNext(){
console.log("有")
}
haveNoNext(){
console.log("没有")
}
render(){
return(
<div className={"finishTroubleComponent "}>
<div className={"selectText font40 col333"} style={{"marginTop":"230px"}}>出货板传送区、机械手平台、轨道是否有未出货遗留的货品</div>
<div className={"selectButtons"}>
<Button text={"有"} option={this.haveNext.bind(this)} style={{"marginTop":"128px"}}/>
<Button text={"没有"} option={this.haveNoNext.bind(this)} style={{"marginTop":"49px"}}/>
</div>
</div>
)
}
}
\ No newline at end of file
client/components/TroubleComponent/FinishTroubleComponent/index.css 0 → 100644
.finishTroubleComponent{
text-align: center;
}
.finishTroubleComponent .selectButtons{
display: flex;
flex-direction: column;
align-items:center;
}
\ No newline at end of file
client/containers/PageContainer/PageContainer.jsx
...@@ -135,7 +135,8 @@ class PageContainer extends React.Component { ...@@ -135,7 +135,8 @@ class PageContainer extends React.Component {
userInfo={state.userInfo} userInfo={state.userInfo}
initTroubleList={()=>dispatch(getTroubleList())} initTroubleList={()=>dispatch(getTroubleList())}
showTextArea={(text)=>this.showTextArea(text)} showTextArea={(text)=>this.showTextArea(text)}
showPopup={(info)=>this.showPopup(info)}
hidePopup={()=>this.hidePopup()}
/>; />;
break; break;
case showPage[2]: case showPage[2]:
......
client/containers/TroubleContainer/TroubleContainer.jsx
...@@ -4,6 +4,7 @@ import TroubleItem from '../../components/TroubleComponent/TroubleItemComponent/ ...@@ -4,6 +4,7 @@ import TroubleItem from '../../components/TroubleComponent/TroubleItemComponent/
import Button from '../../components/CommonComponent/ButtonComponent/ButtonComponent' import Button from '../../components/CommonComponent/ButtonComponent/ButtonComponent'
import HeaderComponent from '../../components/CommonComponent/HeaderComponent/HeaderComponent' import HeaderComponent from '../../components/CommonComponent/HeaderComponent/HeaderComponent'
import TextArea from "../TextAreaContainer/TextAreaContainer"; import TextArea from "../TextAreaContainer/TextAreaContainer";
import FinishTrouble from '../../components/TroubleComponent/FinishTroubleComponent/FinishTroubleComponent'
require('./index.css') require('./index.css')
export default class TroubleContainer extends React.Component{ export default class TroubleContainer extends React.Component{
constructor(props){ constructor(props){
...@@ -21,17 +22,29 @@ export default class TroubleContainer extends React.Component{ ...@@ -21,17 +22,29 @@ export default class TroubleContainer extends React.Component{
this.saveText = this.saveText.bind(this); this.saveText = this.saveText.bind(this);
} }
dealTrouble(){ dealTrouble(){
let {showPopup,hidePopup} = this.props;
let troubleList = this.state.troubleList; let troubleList = this.state.troubleList;
let details = troubleList.details; let details = troubleList.details;
let arr = details.filter(d=>{ let arr = details.filter(d=>{
return ! d.isExistProblem || ! d.explanation
});
}) if(arr && arr.length > 0){
showPopup({
popupText:'请完成所有需要处理的故障的必填项',
this.setState({ popupButtons:[{text : '关闭',option:hidePopup}]
showTrouble : false })
}) }else{
details.forEach((d)=>{
d.imagesFileId = d.files.map(f=>f.id).join(',');
});
this.setState({
showTrouble : false
})
}
} }
...@@ -60,17 +73,6 @@ export default class TroubleContainer extends React.Component{ ...@@ -60,17 +73,6 @@ export default class TroubleContainer extends React.Component{
} }
haveNext(){
console.log("有")
}
haveNoNext(){
console.log("没有")
}
showText(errcode){ showText(errcode){
console.log("errcode ",errcode) console.log("errcode ",errcode)
let troubleList = this.state.troubleList; let troubleList = this.state.troubleList;
...@@ -128,7 +130,6 @@ export default class TroubleContainer extends React.Component{ ...@@ -128,7 +130,6 @@ export default class TroubleContainer extends React.Component{
return <TroubleItem key={k} item={i} num={k+1} setItem={this.setItem} showText={this.showText}/>; return <TroubleItem key={k} item={i} num={k+1} setItem={this.setItem} showText={this.showText}/>;
}); });
let swiperOptions = { let swiperOptions = {
width : 1396, width : 1396,
spaceBetween: 30, spaceBetween: 30,
freeMode:true, freeMode:true,
...@@ -136,42 +137,39 @@ export default class TroubleContainer extends React.Component{ ...@@ -136,42 +137,39 @@ export default class TroubleContainer extends React.Component{
let swiperContainer = CONFIG.swiperContainers.troubleSwiperContainer; let swiperContainer = CONFIG.swiperContainers.troubleSwiperContainer;
let swiperCount = details.length; let swiperCount = details.length;
return ( return (
<div> <div className={"troubleContainers "+(this.state.showTextArea ? 'backfff' : '')}>
{ {
this.state.showTextArea ? <TextArea this.state.showTextArea ? <TextArea
text={this.state.tmpText} text={this.state.tmpText}
goBack={this.goBack} goBack={this.goBack}
saveText={this.saveText} saveText={this.saveText}
></TextArea> : ></TextArea> :
<div className={"toubleContainers " + (showTrouble ? '' : 'hide')}> <div className={"toubleContainer " + (showTrouble ? '' : 'hide')}>
<HeaderComponent <HeaderComponent
showHeader={CONFIG.headerStatus[1]} showHeader={CONFIG.headerStatus[1]}
userinfo={userInfo} userinfo={userInfo}
storeInfo={storeInfo} storeInfo={storeInfo}
/> />
<div className={"troubleContainer " + ( this.state.showTrouble ? '' : 'hide')}>
<div className={"troubleText font32"}><span className={"colff7860"}>* </span>必填项</div> {
<div className={"troubleBox"}> this.state.showTrouble ?
<SwiperComponent <div className={"troubleContent " + ( this.state.showTrouble ? '' : 'hide')}>
swiperContainer={swiperContainer} swiperOptions={swiperOptions} swiperCount={swiperCount} <div className={"troubleText font32"}><span className={"colff7860"}>* </span>必填项</div>
> <div className={"troubleBox"}>
{dom} <SwiperComponent
</SwiperComponent> swiperContainer={swiperContainer} swiperOptions={swiperOptions} swiperCount={swiperCount}
</div> >
<div className={"troubleBtnBox"}> {dom}
<div className={"troubleBtn colfff font32"} onClick={()=>this.dealTrouble.bind(this)()}> </SwiperComponent>
处理完毕 </div>
</div> <div className={"troubleBtnBox"}>
</div> <div className={"troubleBtn colfff font32"} onClick={()=>this.dealTrouble.bind(this)()}>
处理完毕
</div> </div>
<div className={"selectContainer " + ( this.state.showTrouble ? 'hide' : '')}> </div>
<div className={"selectText font40 col333"} style={{"marginTop":"230px"}}>出货板传送区、机械手平台、轨道是否有未出货遗留的货品</div>
<div className={"selectButtons"}> </div> : <FinishTrouble />
<Button text={"有"} option={this.haveNext} style={{"marginTop":"128px"}}/> }
<Button text={"没有"} option={this.haveNoNext} style={{"marginTop":"49px"}}/>
</div>
</div>
</div> </div>
} }
</div> </div>
......
client/containers/TroubleContainer/index.css
.troubleContainer{ .troubleContainers{
width: 100%;
height: 100%;
}
.troubleContainers.backfff{
background-color: #ffffff;
}
.troubleContent{
padding-left: 30px; padding-left: 30px;
} }
.troubleContainer .troubleText{ .troubleContent .troubleText{
height: 100px; height: 100px;
display: table-cell; display: table-cell;
vertical-align: bottom; vertical-align: bottom;
} }
.troubleContainer .troubleBox{ .troubleContent .troubleBox{
margin: 20px 0; margin: 20px 0;
} }
.troubleContainer .troubleBtnBox{ .troubleContent .troubleBtnBox{
height: 80px; height: 80px;
width: 100%; width: 100%;
text-align: right; text-align: right;
padding-right: 30px; padding-right: 30px;
} }
.troubleContainer .troubleBtn{ .troubleContent .troubleBtn{
width: 413px; width: 413px;
height: 100%; height: 100%;
display: inline-block; display: inline-block;
...@@ -24,12 +31,3 @@ ...@@ -24,12 +31,3 @@
background-color: #ff7860; background-color: #ff7860;
border-radius: 10px; border-radius: 10px;
} }
.selectContainer{
text-align: center;
}
.selectButtons{
display: flex;
flex-direction: column;
align-items:center;
}
\ 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