Skip to content

M
max_android_panel
Commit bb140945 by yaxiLiuu
Options

修复bug

parent f24d78c8
Showing with 168 additions and 264 deletions
client/actions/reportDamageList.js
...@@ -2,219 +2,9 @@ import fetch from 'isomorphic-fetch'; ...@@ -2,219 +2,9 @@ import fetch from 'isomorphic-fetch';
import * as actionTypes from '../actiontype/reportDamage'; import * as actionTypes from '../actiontype/reportDamage';
import actionTypes_error from "../actiontype/error"; import actionTypes_error from "../actiontype/error";
let domain = ENV.domain; let domain = ENV.domain;
const fakeJson = {
"meta": {
"code": "200",
"message": "成功",
"success": true
},
"data": [
{
"warehouseId": 21,
"skuId": 972,
"inventoryId": 5519,
"outBatchSkuId": 0,
"outBatchSkuStatus": 0,
"count": 1,
"lossDatetime": 1531449705000,
"type": "故障检查任务，新发现非已知损耗",
"dealType": "未处理",
"packingStatus": "包装完整",
"lossPosition": "机械手平台",
"lossImagePaths": [
],
"taskId": 111,
"skuPassId": 0,
"skuBaseInfoVo": {
"skuId": 972,
"skuNumber": "UB000972",
"skuName": "怡宝饮用纯净水",
"skuImagePath": "http://static.mjitech.com/static/sku/0/0/972/1503296770206.jpg",
"barcode": "6901285991219",
"skuAttributesVoList": [
{
"name": "净含量",
"value": "555",
"unit": "ml"
}
]
}
},
{
"warehouseId": 21,
"skuId": 972,
"inventoryId": 5519,
"outBatchSkuId": 0,
"outBatchSkuStatus": 0,
"count": 1,
"lossDatetime": 1531449705000,
"type": "故障检查任务，新发现非已知损耗",
"dealType": "未处理",
"packingStatus": "包装完整",
"lossPosition": "机械手平台",
"lossImagePaths": [
],
"taskId": 111,
"skuPassId": 0,
"skuBaseInfoVo": {
"skuId": 972,
"skuNumber": "UB000972",
"skuName": "怡宝饮用纯净水",
"skuImagePath": "http://static.mjitech.com/static/sku/0/0/972/1503296770206.jpg",
"barcode": "6901285991219",
"skuAttributesVoList": [
{
"name": "净含量",
"value": "555",
"unit": "ml"
}
]
}
},
{
"warehouseId": 21,
"skuId": 972,
"inventoryId": 5519,
"outBatchSkuId": 0,
"outBatchSkuStatus": 0,
"count": 1,
"lossDatetime": 1531449705000,
"type": "故障检查任务，新发现非已知损耗",
"dealType": "未处理",
"packingStatus": "包装完整",
"lossPosition": "机械手平台",
"lossImagePaths": [
],
"taskId": 111,
"skuPassId": 0,
"skuBaseInfoVo": {
"skuId": 972,
"skuNumber": "UB000972",
"skuName": "怡宝饮用纯净水",
"skuImagePath": "http://static.mjitech.com/static/sku/0/0/972/1503296770206.jpg",
"barcode": "6901285991219",
"skuAttributesVoList": [
{
"name": "净含量",
"value": "555",
"unit": "ml"
}
]
}
},
{
"warehouseId": 21,
"skuId": 972,
"inventoryId": 5519,
"outBatchSkuId": 0,
"outBatchSkuStatus": 0,
"count": 1,
"lossDatetime": 1531449705000,
"type": "故障检查任务，新发现非已知损耗",
"dealType": "未处理",
"packingStatus": "包装完整",
"lossPosition": "机械手平台",
"lossImagePaths": [
],
"taskId": 111,
"skuPassId": 0,
"skuBaseInfoVo": {
"skuId": 972,
"skuNumber": "UB000972",
"skuName": "怡宝饮用纯净水",
"skuImagePath": "http://static.mjitech.com/static/sku/0/0/972/1503296770206.jpg",
"barcode": "6901285991219",
"skuAttributesVoList": [
{
"name": "净含量",
"value": "555",
"unit": "ml"
}
]
}
},
{
"warehouseId": 21,
"skuId": 972,
"inventoryId": 5519,
"outBatchSkuId": 0,
"outBatchSkuStatus": 0,
"count": 1,
"lossDatetime": 1531449705000,
"type": "故障检查任务，新发现非已知损耗",
"dealType": "未处理",
"packingStatus": "包装完整",
"lossPosition": "机械手平台",
"lossImagePaths": [
],
"taskId": 111,
"skuPassId": 0,
"skuBaseInfoVo": {
"skuId": 972,
"skuNumber": "UB000972",
"skuName": "怡宝饮用纯净水",
"skuImagePath": "http://static.mjitech.com/static/sku/0/0/972/1503296770206.jpg",
"barcode": "6901285991219",
"skuAttributesVoList": [
{
"name": "净含量",
"value": "555",
"unit": "ml"
}
]
}
}
]
}
const fakeJson2 = {
"meta": {
"code": "200",
"message": "成功",
"success": true
},
"data": [
{
"warehouseId": 21,
"skuId": 972,
"inventoryId": 5519,
"outBatchSkuId": 0,
"outBatchSkuStatus": 0,
"count": 1,
"lossDatetime": 1531449705000,
"type": "故障检查任务，新发现非已知损耗",
"dealType": "未处理",
"packingStatus": "包装完整",
"lossPosition": "机械手平台",
"lossImagePaths": [
],
"taskId": 111,
"skuPassId": 0,
"skuBaseInfoVo": {
"skuId": 972,
"skuNumber": "UB000972",
"skuName": "怡宝饮用纯净水",
"skuImagePath": "http://static.mjitech.com/static/sku/0/0/972/1503296770206.jpg",
"barcode": "6901285991219",
"skuAttributesVoList": [
{
"name": "净含量",
"value": "555",
"unit": "ml"
}
]
}
}
]
}
export function getReportDamageList (postData) { export function getReportDamageList (postData) {
return (dispatch) => { return (dispatch) => {
let url = String(domain+'/machine_pad/list_all_dealed_invetory_loss/'+postData.taskId+'.json'); let url = String(domain+'machine_pad/list_all_dealed_invetory_loss/'+postData.taskId+'/'+postData.storeId);
console.log(url) console.log(url)
fetch(url,{ fetch(url,{
credentials : 'include', credentials : 'include',
...@@ -237,11 +27,10 @@ export function getReportDamageList (postData) { ...@@ -237,11 +27,10 @@ export function getReportDamageList (postData) {
}).catch(e=>{console.error(e)} }).catch(e=>{console.error(e)}
) )
} }
} }
export function deleteDamageItem(postaData,taskId) { export function deleteDamageItem(postaData) {
return (dispatch) => { return (dispatch) => {
let url = String(domain+'/machine_pad/delete_invetory_loss_by_saas'); let url = String(domain+'machine_pad/delete_invetory_loss_by_saas');
console.log(url) console.log(url)
fetch(url,{ fetch(url,{
credentials : 'include', credentials : 'include',
...@@ -250,7 +39,7 @@ export function deleteDamageItem(postaData,taskId) { ...@@ -250,7 +39,7 @@ export function deleteDamageItem(postaData,taskId) {
headers: { headers: {
'content-type':'application/json;charset=UTF-8', 'content-type':'application/json;charset=UTF-8',
}, },
body : JSON.stringify(postaData) body : JSON.stringify({inventoryLossId:postaData.inventoryLossId})
}).then((response) => response.json()) }).then((response) => response.json())
.then( .then(
...@@ -258,7 +47,7 @@ export function deleteDamageItem(postaData,taskId) { ...@@ -258,7 +47,7 @@ export function deleteDamageItem(postaData,taskId) {
//处理数据如果 //处理数据如果
let success = json.meta.success; let success = json.meta.success;
if(success){ if(success){
dispatch(getReportDamageList({"taskId":500})) dispatch(getReportDamageList({"taskId":postaData.taskId,"storeId":postaData.storeId}))
}else{ }else{
dispatch(throwError(json.meta.message)) dispatch(throwError(json.meta.message))
} }
......
client/components/OtherQuestionComponent/EditProblemComponent.jsx
...@@ -12,27 +12,37 @@ export default class EditProblemItem extends React.Component{ ...@@ -12,27 +12,37 @@ export default class EditProblemItem extends React.Component{
currentBigId:undefined, currentBigId:undefined,
currentSmallId:undefined, currentSmallId:undefined,
problemList:{}, problemList:{},
currentDetailProblem:[] currentDetailProblem:[],
currentDetailTitle:"分类问题",
currentDetailSonTitle:"具体问题",
showRemark:""
} }
} }
componentWillMount(){ componentWillMount(){
let props = this.props; let props = this.props;
// console.log(state) // console.log(state)
let Problems_format = {}; let Problems_format = {};
let {baseInfo} = props; let {baseInfo,problemInfo} = props;
console.log(baseInfo)
props.problemInfo.map((item,index)=>{ props.problemInfo.map((item,index)=>{
Problems_format[item.id] = {}; Problems_format[item.id] = {};
Problems_format[item.id].message = item.message; Problems_format[item.id].message = item.message;
Problems_format[item.id].type = item.type; Problems_format[item.id].type = item.type;
Problems_format[item.id].dicDetails = item.dicDetails; Problems_format[item.id].dicDetails = item.dicDetails;
}); });
let currentRemarkLength = baseInfo.remark.length;
let showRemark = baseInfo.remark;
if(currentRemarkLength>200){
showRemark = String(showRemark).substring(0,199)
console.log(showRemark.length)
}
this.setState({ this.setState({
problemList:Problems_format, problemList:Problems_format,
currentDetailProblem:props.problemInfo[0].dicDetails, currentDetailProblem:props.problemInfo[0].dicDetails,
currentBigId:baseInfo.problemType, currentBigId:baseInfo.problemType,
currentSmallId:baseInfo.detailProblemType, currentSmallId:baseInfo.detailProblemType,
currentDetailTitle:baseInfo.message?baseInfo.message:"分类问题",
currentDetailSonTitle:baseInfo.smallMessage?baseInfo.smallMessage:"具体问题",
showRemark:showRemark
}); });
} }
...@@ -48,11 +58,8 @@ export default class EditProblemItem extends React.Component{ ...@@ -48,11 +58,8 @@ export default class EditProblemItem extends React.Component{
data.files = nextImgList.files; data.files = nextImgList.files;
data.troubelId = trouleId; data.troubelId = trouleId;
editProblemItem(data); editProblemItem(data);
}else{
console.log("==================不相等===========")
} }
} }
} }
...@@ -65,6 +72,12 @@ export default class EditProblemItem extends React.Component{ ...@@ -65,6 +72,12 @@ export default class EditProblemItem extends React.Component{
return; return;
} }
} }
if(value == "showCategoryElement"){
this.setState({"currentDetailTitle":"分类问题"})
}
if(value == "showDetailElement"){
this.setState({"currentDetailSonTitle":"具体问题"})
}
this.setState( this.setState(
{ {
[value]:!this.state[value] [value]:!this.state[value]
...@@ -87,19 +100,24 @@ export default class EditProblemItem extends React.Component{ ...@@ -87,19 +100,24 @@ export default class EditProblemItem extends React.Component{
}); });
//处理数据 //处理数据
let bigProblemId = event.currentTarget.getAttribute('data-id'); let bigProblemId = event.currentTarget.getAttribute('data-id');
let title = event.currentTarget.getAttribute('data-value');
let childProblem = this.state.problemList[String(bigProblemId)].dicDetails; let childProblem = this.state.problemList[String(bigProblemId)].dicDetails;
this.setState({ this.setState({
currentDetailProblem:childProblem, currentDetailProblem:childProblem,
currentBigId:bigProblemId, currentBigId:bigProblemId,
showDetailElement:true currentDetailTitle:title,
showCategoryElement:false,
currentDetailSonTitle:"具体问题"
}); });
data.type = "problemType"; data.type = "problemType";
data.message = title;
data.problemId = bigProblemId; data.problemId = bigProblemId;
data.troubelId = trouleId; data.troubelId = trouleId;
editProblemItem(data) editProblemItem(data)
} }
handleDetailProblem_Child(event){ handleDetailProblem_Child(event){
let {editProblemItem,trouleId} = this.props; let {editProblemItem,trouleId} = this.props;
let title = event.currentTarget.getAttribute('data-value');
let data = {}; let data = {};
//处理选中样式 //处理选中样式
this.setState({ this.setState({
...@@ -108,9 +126,12 @@ export default class EditProblemItem extends React.Component{ ...@@ -108,9 +126,12 @@ export default class EditProblemItem extends React.Component{
//处理数据 //处理数据
let smallProblemId = event.currentTarget.getAttribute('date-id'); let smallProblemId = event.currentTarget.getAttribute('date-id');
this.setState({ this.setState({
currentSmallId:smallProblemId currentSmallId:smallProblemId,
currentDetailSonTitle:title,
showDetailElement:false
}) })
data.type = "detailProblemType"; data.type = "detailProblemType";
data.smallMessage = title;
data.problemId = smallProblemId; data.problemId = smallProblemId;
data.troubelId = trouleId; data.troubelId = trouleId;
editProblemItem(data) editProblemItem(data)
...@@ -118,6 +139,15 @@ export default class EditProblemItem extends React.Component{ ...@@ -118,6 +139,15 @@ export default class EditProblemItem extends React.Component{
handleClickEditRemark(){ handleClickEditRemark(){
console.log("点击编辑跳转到文本框") console.log("点击编辑跳转到文本框")
} }
showImg(imgSrc){
let {showPopup,hidePopup} = this.props;
let showImgDom = <div onClick={()=>hidePopup()} className={"showBigImg"}>
<img src={imgSrc} alt=""/>
</div>;
showPopup({
popupChild : showImgDom
});
}
render(){ render(){
let props = this.props; let props = this.props;
let imgFiles = props.baseInfo.files?props.baseInfo.files:[]; let imgFiles = props.baseInfo.files?props.baseInfo.files:[];
...@@ -136,6 +166,7 @@ export default class EditProblemItem extends React.Component{ ...@@ -136,6 +166,7 @@ export default class EditProblemItem extends React.Component{
let categoryProblemUi = props.problemInfo.map((item,index)=>{ let categoryProblemUi = props.problemInfo.map((item,index)=>{
return <li key={"bigProblem"+index} return <li key={"bigProblem"+index}
date-index={index} date-index={index}
data-value={item.message}
data-id = {item.id} data-id = {item.id}
className={this.state.currentBigId == item.id ? 'active_li':''} className={this.state.currentBigId == item.id ? 'active_li':''}
onClick={(e)=>(this.handleDetailProblem_Father.bind(this,e))()}>{item.message}</li> onClick={(e)=>(this.handleDetailProblem_Father.bind(this,e))()}>{item.message}</li>
...@@ -143,6 +174,7 @@ export default class EditProblemItem extends React.Component{ ...@@ -143,6 +174,7 @@ export default class EditProblemItem extends React.Component{
let detailCategoryProblemUi = this.state.currentDetailProblem.map((item,index)=>{ let detailCategoryProblemUi = this.state.currentDetailProblem.map((item,index)=>{
return <li key={'detailProblem'+index} return <li key={'detailProblem'+index}
date-index={index} date-index={index}
data-value={item.message}
date-id = {item.messageId} date-id = {item.messageId}
className={this.state.currentSmallId == item.messageId ? 'active_li':''} className={this.state.currentSmallId == item.messageId ? 'active_li':''}
onClick={(e)=>(this.handleDetailProblem_Child.bind(this,e))()}>{item.message}</li> onClick={(e)=>(this.handleDetailProblem_Child.bind(this,e))()}>{item.message}</li>
...@@ -153,14 +185,13 @@ export default class EditProblemItem extends React.Component{ ...@@ -153,14 +185,13 @@ export default class EditProblemItem extends React.Component{
key={"troubelImg"+index} key={"troubelImg"+index}
noCloseBtn={false} noCloseBtn={false}
handleClikCloseFunc = {deleteImg(troubleId,taskType,item.id)} handleClikCloseFunc = {deleteImg(troubleId,taskType,item.id)}
handleClikImgFunc = {()=>{}} handleClikImgFunc = {()=>{this.showImg(item.filePath)}}
type={"custom"} type={"custom"}
imgSrc = {item.filePath} imgSrc = {item.filePath}
></ImgToolComponent> ></ImgToolComponent>
}); });
//备注部分 //备注部分
let remarkText = props.remarkText; let remarkText = props.remarkText;
return ( return (
<div className={"editUploadItem clearfix"}> <div className={"editUploadItem clearfix"}>
<span className={"closeBtn"} onClick={deleteProblem()}>×</span> <span className={"closeBtn"} onClick={deleteProblem()}>×</span>
...@@ -170,7 +201,7 @@ export default class EditProblemItem extends React.Component{ ...@@ -170,7 +201,7 @@ export default class EditProblemItem extends React.Component{
<div className={"newTroubleContent clearfix"}> <div className={"newTroubleContent clearfix"}>
<span className={"startIcon"}>*</span> <span className={"startIcon"}>*</span>
<div className={"fakeSelect"}> <div className={"fakeSelect"}>
<div className={"problemCategoryTitle"} onClick={this.handleShowElement.bind(this,"showCategoryElement")} >分类问题</div> <div className={"problemCategoryTitle"} onClick={this.handleShowElement.bind(this,"showCategoryElement")} >{this.state.currentDetailTitle}</div>
{ {
this.state.showCategoryElement?( this.state.showCategoryElement?(
<ul className={"problemCategory"} name="" id=""> <ul className={"problemCategory"} name="" id="">
...@@ -182,7 +213,7 @@ export default class EditProblemItem extends React.Component{ ...@@ -182,7 +213,7 @@ export default class EditProblemItem extends React.Component{
} }
</div> </div>
<div className={"fakeSelect"}> <div className={"fakeSelect"}>
<div className={"problemCategoryTitle detailTitle "+(this.state.currentBigId?"":"noActive")} onClick={this.handleShowElement.bind(this,"showDetailElement")}>具体问题</div> <div className={"problemCategoryTitle detailTitle "+(this.state.currentBigId?"":"noActive")} onClick={this.handleShowElement.bind(this,"showDetailElement")}>{this.state.currentDetailSonTitle}</div>
{ {
this.state.showDetailElement?( this.state.showDetailElement?(
<ul className={"DetailProblem"} name="" id=""> <ul className={"DetailProblem"} name="" id="">
...@@ -197,8 +228,18 @@ export default class EditProblemItem extends React.Component{ ...@@ -197,8 +228,18 @@ export default class EditProblemItem extends React.Component{
<div className={"newTroubleRemark clearfix"}> <div className={"newTroubleRemark clearfix"}>
<span className={"startIcon"}>*</span> <span className={"startIcon"}>*</span>
<div className={"remarkContent"}> <div className={"remarkContent"}>
<div className={"editIcon"} onClick={props.clickEdit}>编辑</div> <div className={"btnContaienr"}>
<div className={"remarkText"}>{remarkText?remarkText:("编辑检查结果")}</div> <button
className={"editIcon"}
onClick={props.clickEdit}
disabled={!this.state.currentSmallId || !this.state.currentBigId?true:false}
>编辑
</button>
</div>
<div
className={"defalutRemarkText "+(this.state.showRemark?"remarkText":"")}>
{this.state.showRemark?this.state.showRemark:("编辑检查结果")}
</div>
</div> </div>
</div> </div>
<div className={"damageImgs clearfix"}> <div className={"damageImgs clearfix"}>
......
client/components/OtherQuestionComponent/index.css
...@@ -39,6 +39,10 @@ ...@@ -39,6 +39,10 @@
font-size: 24px; font-size: 24px;
color: #ff7860; color: #ff7860;
text-align: right; text-align: right;
display: inline-block;
float: right;
background-color: #ffffff;
border: none;
} }
.editUploadItem .damageImgs .uploadImgRight { .editUploadItem .damageImgs .uploadImgRight {
float: left; float: left;
...@@ -46,7 +50,7 @@ ...@@ -46,7 +50,7 @@
.editUploadItem .damageImgs .operationLeft { .editUploadItem .damageImgs .operationLeft {
float: left; float: left;
} }
.editUploadItem .newTroubleRemark .remarkContent .remarkText { .editUploadItem .newTroubleRemark .remarkContent .defalutRemarkText {
height: 198px; height: 198px;
border: 1px solid #e5e5e5; border: 1px solid #e5e5e5;
border-radius: 10px; border-radius: 10px;
...@@ -57,6 +61,10 @@ ...@@ -57,6 +61,10 @@
width: 1250px; width: 1250px;
text-align: center; text-align: center;
overflow: auto; overflow: auto;
}
.editUploadItem .newTroubleRemark .remarkContent .remarkText {
text-align: left;
line-height: 40px;
} }
.editUploadItem .newTroubleTitle{ .editUploadItem .newTroubleTitle{
......
client/components/ReportDamageListComponent/DamageItemComponent/DamageItem.jsx
...@@ -8,15 +8,34 @@ export default class DamageItem extends React.Component{ ...@@ -8,15 +8,34 @@ export default class DamageItem extends React.Component{
text: '' text: ''
} }
} }
showImg(imgSrc){
let {showPopup,hidePopup} = this.props;
let showImgDom = <div onClick={()=>hidePopup()} className={"showBigImg"}>
<img src={imgSrc} alt=""/>
</div>;
showPopup({
popupChild : showImgDom
});
}
render(){ render(){
let {itemInfo,deleteItem} = this.props; let {itemInfo,deleteItem} = this.props;
let {lossPosition,packingStatus,skuBaseInfoVo,inventoryLossId} = itemInfo; let {lossPosition,packingStatus,skuBaseInfoVo,inventoryLossId,fileModelList} = itemInfo;
let productContent = '' let productContent = ''
skuBaseInfoVo.skuAttributesVoList.map((item,index)=>{ skuBaseInfoVo.skuAttributesVoList.map((item,index)=>{
let newText = ""; let newText = "";
newText = item.value+item.unit; newText = item.value+item.unit;
productContent+=newText; productContent+=newText;
}) })
let imgListUi = fileModelList.map((item,index)=>{
console.log(item.filePath)
return <ImgToolComponent
key={index+"image"}
noCloseBtn={true}
type={"custom"}
imgSrc = { item.filePath}
handleClikImgFunc = {()=>{this.showImg(item.filePath)}}
></ImgToolComponent>
})
return ( return (
<div className={"damageProductItem"}> <div className={"damageProductItem"}>
...@@ -40,8 +59,7 @@ export default class DamageItem extends React.Component{ ...@@ -40,8 +59,7 @@ export default class DamageItem extends React.Component{
<p className={"status font32"}>商品状态:<span>{packingStatus}</span></p> <p className={"status font32"}>商品状态:<span>{packingStatus}</span></p>
</div> </div>
<div className={"damageImgs clearfix"}> <div className={"damageImgs clearfix"}>
<ImgToolComponent noCloseBtn={true} type={"custom"} imgSrc = { require('./img/lol.gif')} ></ImgToolComponent> {imgListUi}
<ImgToolComponent noCloseBtn={true} type={"custom"} imgSrc = { require('./img/lol.gif')} ></ImgToolComponent>
</div> </div>
</div> </div>
</div> </div>
......
client/components/ReportDamageListComponent/DamageItemComponent/index.css
...@@ -96,6 +96,7 @@ ...@@ -96,6 +96,7 @@
} }
.damageProductItem .productOtherInfo .damageImgs{ .damageProductItem .productOtherInfo .damageImgs{
margin-top: 32px; margin-top: 32px;
height:64.45px;
} }
.damageProductItem .productOtherInfo .damageImgs .imgItem { .damageProductItem .productOtherInfo .damageImgs .imgItem {
width: 90px; width: 90px;
......
client/components/ScanBarCodeComponent/ProductDetailComponent/ProductDetailItem.jsx
...@@ -8,7 +8,8 @@ export default class ProductDetailItem extends React.Component{ ...@@ -8,7 +8,8 @@ export default class ProductDetailItem extends React.Component{
this.state = { this.state = {
currentPosition:undefined, currentPosition:undefined,
currentPakageStatus:undefined, currentPakageStatus:undefined,
currentImgFiles:[] currentImgFiles:[],
canClickSubmitBtn:true,
} }
} }
componentWillMount(){ componentWillMount(){
...@@ -68,10 +69,22 @@ export default class ProductDetailItem extends React.Component{ ...@@ -68,10 +69,22 @@ export default class ProductDetailItem extends React.Component{
handleSubmit(){ handleSubmit(){
let {inventorylossId,skuBaseInfoVo,handleSubmitProductInfo,data_currentProblemObj,changePages,clearProductSuccess} = this.props; let {inventorylossId,skuBaseInfoVo,handleSubmitProductInfo,data_currentProblemObj,changePages,clearProductSuccess} = this.props;
this.setState({
canClickSubmitBtn:false
})
handleSubmitProductInfo(data_currentProblemObj); handleSubmitProductInfo(data_currentProblemObj);
clearProductSuccess() clearProductSuccess()
} }
showImg(imgSrc){
let {showPopup,hidePopup} = this.props;
let showImgDom = <div onClick={()=>hidePopup()} className={"showBigImg"}>
<img src={imgSrc} alt=""/>
</div>;
showPopup({
popupChild : showImgDom
});
}
render(){ render(){
let props = this.props; let props = this.props;
...@@ -109,6 +122,8 @@ export default class ProductDetailItem extends React.Component{ ...@@ -109,6 +122,8 @@ export default class ProductDetailItem extends React.Component{
noCloseBtn ={false} noCloseBtn ={false}
imgSrc = {item.filePath} imgSrc = {item.filePath}
handleClikCloseFunc = {()=>{props.handleDeleteImg(item.id)}} handleClikCloseFunc = {()=>{props.handleDeleteImg(item.id)}}
handleClikImgFunc = {()=>{this.showImg(item.filePath)}}
></ImgToolComponent> ></ImgToolComponent>
}) })
skuBaseInfoVo.skuAttributesVoList.map((item,index)=>{ skuBaseInfoVo.skuAttributesVoList.map((item,index)=>{
...@@ -172,8 +187,8 @@ export default class ProductDetailItem extends React.Component{ ...@@ -172,8 +187,8 @@ export default class ProductDetailItem extends React.Component{
<div className={"btnContainer"}> <div className={"btnContainer"}>
<button <button
onClick={this.handleSubmit.bind(this)} onClick={this.handleSubmit.bind(this)}
className={"submitEditBtn"+(this.state.currentPosition==undefined || this.state.currentPakageStatus==undefined ||((Number(this.state.currentPakageStatus)==2 && imgFileList.length<=0))?" ":" selectBtn")} className={"submitEditBtn"+(this.state.currentPosition==undefined || this.state.currentPakageStatus==undefined ||((Number(this.state.currentPakageStatus)==2 && imgFileList.length<=0)||!this.state.canClickSubmitBtn)?" ":" selectBtn")}
disabled={this.state.currentPosition==undefined || this.state.currentPakageStatus==undefined ||(Number(this.state.currentPakageStatus)==2 && imgFileList.length<=0)?true:false} disabled={(this.state.currentPosition==undefined || this.state.currentPakageStatus==undefined ||(Number(this.state.currentPakageStatus)==2 && imgFileList.length<=0)||!this.state.canClickSubmitBtn)?true:false}
>提交</button> >提交</button>
</div> </div>
</div> </div>
......
client/components/ScanBarCodeComponent/ProductDetailComponent/index.css
...@@ -19,7 +19,6 @@ ...@@ -19,7 +19,6 @@
} }
.productContainer .baseInfo .skuInfo{ .productContainer .baseInfo .skuInfo{
float: left; float: left;
width: 200px;
margin-left: 30px; margin-left: 30px;
} }
.productContainer .baseInfo .skuInfo p{ .productContainer .baseInfo .skuInfo p{
......
client/containers/OtherQuestionContainer/OtherQuestionContainer.jsx
...@@ -6,6 +6,7 @@ import HeaderComponent from '../../components/CommonComponent/HeaderComponent/He ...@@ -6,6 +6,7 @@ import HeaderComponent from '../../components/CommonComponent/HeaderComponent/He
import PopupComponent from '../../components/CommonComponent/PopupComponent/PopupComponent' import PopupComponent from '../../components/CommonComponent/PopupComponent/PopupComponent'
import ButtonComponent from '../../components/CommonComponent/ButtonComponent/ButtonComponent' import ButtonComponent from '../../components/CommonComponent/ButtonComponent/ButtonComponent'
import TextArea from "../TextAreaContainer/TextAreaContainer"; import TextArea from "../TextAreaContainer/TextAreaContainer";
let overPassIcon = UTILPATH.localImg.overPassIcon;
import Qrcode from '../Qrcode/Qrcode' import Qrcode from '../Qrcode/Qrcode'
require('./index.css'); require('./index.css');
export default class OtherQuestionContainer extends React.Component{ export default class OtherQuestionContainer extends React.Component{
...@@ -20,6 +21,8 @@ export default class OtherQuestionContainer extends React.Component{ ...@@ -20,6 +21,8 @@ export default class OtherQuestionContainer extends React.Component{
taskTy:"OP", taskTy:"OP",
showPop:false, showPop:false,
popupInfo:{}, popupInfo:{},
bigProblemTitle:"",
detailProblemTitle:""
} }
} }
componentWillMount() { componentWillMount() {
...@@ -77,14 +80,20 @@ export default class OtherQuestionContainer extends React.Component{ ...@@ -77,14 +80,20 @@ export default class OtherQuestionContainer extends React.Component{
} }
// 2. 在编辑备注页面组件 点击返回 // 2. 在编辑备注页面组件 点击返回
handleEditGoBack(hasChange){ handleEditGoBack(hasChange){
this.setState({ if(!hasChange){
showPop:true, this.handleRealExitEditRemarkOpeation("exit");
popupInfo:{ }else{
"popupText":"是否放弃更新编辑的内容", this.setState({
"showPopup":true, showPop:true,
"popupButtons": [<ButtonComponent key={"btn"} option={this.handleRealExitEditRemarkOpeation.bind(this,"cancel")} text={"取消"}/>,<ButtonComponent key={"btn"} option={this.handleRealExitEditRemarkOpeation.bind(this,"exit")} text={"确定"}/>] popupInfo:{
} "popupText":"是否放弃更新编辑的内容",
}) "showPopup":true,
"popupButtons": [<ButtonComponent key={"backBtn"} option={this.handleRealExitEditRemarkOpeation.bind(this,"cancel")} text={"取消"}/>,<ButtonComponent key={"btn"} option={this.handleRealExitEditRemarkOpeation.bind(this,"exit")} text={"确定"}/>]
}
})
}
...@@ -246,7 +255,7 @@ export default class OtherQuestionContainer extends React.Component{ ...@@ -246,7 +255,7 @@ export default class OtherQuestionContainer extends React.Component{
render(){ render(){
//let 难道初始化的数据： //let 难道初始化的数据：
let {state,addNewProblem,editProblemItem,deleteProblem,getRefreshImg} = this.props; let {state,addNewProblem,editProblemItem,deleteProblem,getRefreshImg,showPopup,hidePopup} = this.props;
let {otherQuestion,refreshImg,userInfo,storeInfo} = state; let {otherQuestion,refreshImg,userInfo,storeInfo} = state;
let {problems} = otherQuestion; let {problems} = otherQuestion;
let feeds = otherQuestion.feeds; let feeds = otherQuestion.feeds;
...@@ -272,7 +281,8 @@ export default class OtherQuestionContainer extends React.Component{ ...@@ -272,7 +281,8 @@ export default class OtherQuestionContainer extends React.Component{
addImg = {()=>(this.handleAddImg.bind(this,troubleId))} addImg = {()=>(this.handleAddImg.bind(this,troubleId))}
deleteImg = {(errorId,type,fileId)=>(this.handleDeleteImg.bind(this,errorId,type,fileId))} deleteImg = {(errorId,type,fileId)=>(this.handleDeleteImg.bind(this,errorId,type,fileId))}
taskType = {this.state.taskTy} taskType = {this.state.taskTy}
showPopup={showPopup}
hidePopup={hidePopup}
key={key}/> key={key}/>
editProblemItemUI.push(currentItemUi); editProblemItemUI.push(currentItemUi);
} }
...@@ -323,7 +333,7 @@ export default class OtherQuestionContainer extends React.Component{ ...@@ -323,7 +333,7 @@ export default class OtherQuestionContainer extends React.Component{
<button className={"addMoreBtn"} onClick={this.handleAddNewTroble.bind(this)}><span>+</span>录入更多</button> <button className={"addMoreBtn"} onClick={this.handleAddNewTroble.bind(this)}><span>+</span>录入更多</button>
<button className={"noMoreBtn"} onClick={this.handleSubmitProblemList.bind(this)}>提交</button> <button className={"noMoreBtn"} onClick={this.handleSubmitProblemList.bind(this)}>提交</button>
</div> </div>
<div className={"overPass"} onClick={this.handleOverPass.bind(this)}>跳过</div> <div className={"overPass"} onClick={this.handleOverPass.bind(this)}>跳过 &nbsp;&nbsp;<img src={overPassIcon} alt=""/></div>
</div> </div>
} }
......
client/containers/OtherQuestionContainer/index.css
...@@ -6,7 +6,7 @@ ...@@ -6,7 +6,7 @@
} }
.OtherQuestionContainer .otherQuestionTitleContainer{ .OtherQuestionContainer .otherQuestionTitleContainer{
padding: 56px 0 34px 38px; padding: 25px 0 25px 38px;
line-height: 25px; line-height: 25px;
font-size: 25px; font-size: 25px;
} }
...@@ -16,8 +16,8 @@ ...@@ -16,8 +16,8 @@
} }
.OtherQuestionContainer .overPass{ .OtherQuestionContainer .overPass{
position: absolute; position: absolute;
right: 30px; right:87px;
top: 50px; top:114px;
display: inline-block; display: inline-block;
color: green; color: green;
font-size: 32px; font-size: 32px;
......
client/containers/PageContainer/PageContainer.jsx
...@@ -437,6 +437,8 @@ class PageContainer extends React.Component { ...@@ -437,6 +437,8 @@ class PageContainer extends React.Component {
storeInfo={state.storeInfo} storeInfo={state.storeInfo}
userInfo={state.userInfo} userInfo={state.userInfo}
state = {state} state = {state}
showPopup={(info)=>this.showPopup(info)}
hidePopup={()=>this.hidePopup()}
/>; />;
break; break;
case showPage[4]: case showPage[4]:
...@@ -453,6 +455,8 @@ class PageContainer extends React.Component { ...@@ -453,6 +455,8 @@ class PageContainer extends React.Component {
storeInfo={state.storeInfo} storeInfo={state.storeInfo}
userInfo={state.userInfo} userInfo={state.userInfo}
state = {state} state = {state}
showPopup={(info)=>this.showPopup(info)}
hidePopup={()=>this.hidePopup()}
/>; />;
break; break;
case showPage[7]: case showPage[7]:
......
client/containers/ReportDamagesListContainer/ReportDamagesListContainer.jsx
...@@ -14,16 +14,20 @@ export default class ReportDamagesListContainer extends React.Component{ ...@@ -14,16 +14,20 @@ export default class ReportDamagesListContainer extends React.Component{
let {getReportDamageList,state} = this.props; let {getReportDamageList,state} = this.props;
let{userInfo,headerInfo,storeInfo} = state; let{userInfo,headerInfo,storeInfo} = state;
let postData = {}; let postData = {};
postData.taskId=headerInfo.taskId?headerInfo.taskId:Number(500) postData.taskId=headerInfo.taskId?headerInfo.taskId:Number(500);
postData.storeId = headerInfo.storeId;
getReportDamageList(postData) getReportDamageList(postData)
} }
hanldeDeleteDamageItem(data){ hanldeDeleteDamageItem(data){
let postData = {}; let postData = {};
postData.inventoryLossId = data;
let {deleteDamageItem,state} = this.props; let {deleteDamageItem,state} = this.props;
let{userInfo,headerInfo,storeInfo} = state; let{userInfo,headerInfo,storeInfo} = state;
let taskId = headerInfo.taskId?headerInfo.taskId:Number(500); let taskId = headerInfo.taskId?headerInfo.taskId:Number(500);
deleteDamageItem(postData,taskId) let storeId = headerInfo.storeId?headerInfo.storeId:Number(17);
postData.inventoryLossId = data;
postData.storeId = storeId;
postData.taskId = taskId;
deleteDamageItem(postData)
} }
hanleAddMoreClick(){ hanleAddMoreClick(){
let {changePages} = this.props; let {changePages} = this.props;
...@@ -36,6 +40,7 @@ export default class ReportDamagesListContainer extends React.Component{ ...@@ -36,6 +40,7 @@ export default class ReportDamagesListContainer extends React.Component{
render(){ render(){
let {reportDamageList,userInfo,storeInfo} = this.props.state; let {reportDamageList,userInfo,storeInfo} = this.props.state;
let {showPopup,hidePopup} = this.props;
let reportDamageListUi =[]; let reportDamageListUi =[];
let damageListUi = []; let damageListUi = [];
if(reportDamageList && reportDamageList.length>0){ if(reportDamageList && reportDamageList.length>0){
...@@ -45,11 +50,14 @@ export default class ReportDamagesListContainer extends React.Component{ ...@@ -45,11 +50,14 @@ export default class ReportDamagesListContainer extends React.Component{
key={k} key={k}
itemInfo = {i} itemInfo = {i}
deleteItem = {this.hanldeDeleteDamageItem.bind(this)} deleteItem = {this.hanldeDeleteDamageItem.bind(this)}
showPopup = {showPopup}
hidePopup = {hidePopup}
/>; />;
}); });
} }
let swiperOptions = { let swiperOptions = {
width : 987, width : 1044,
spaceBetween: 30, spaceBetween: 30,
freeMode:true, freeMode:true,
// slidesPerView: 2.6, // slidesPerView: 2.6,
......
client/containers/ScanBarCodeContainer/ScanBarCodeContaienr.jsx
...@@ -35,9 +35,10 @@ export default class ScanBarCodeContainer extends React.Component{ ...@@ -35,9 +35,10 @@ export default class ScanBarCodeContainer extends React.Component{
let {scanBarCode,userInfo,storeInfo,refreshImg,errMsg} = state; let {scanBarCode,userInfo,storeInfo,refreshImg,errMsg} = state;
let productInfo = state.scanBarCode; let productInfo = state.scanBarCode;
let {inventorylossId,skuBaseInfoVo,packingList,positionList,data_currentProblemObj,submit} = productInfo; let {inventorylossId,skuBaseInfoVo,packingList,positionList,data_currentProblemObj,submit} = productInfo;
let {clearProductSuccess} = this.props let {clearProductSuccess,showPopup,hidePopup} = this.props;
if(submit){ if(submit){
changePages(CONFIG.showPage[3]) changePages(CONFIG.showPage[3]);
return
} }
let productDetailUi = <ProductDetailItem let productDetailUi = <ProductDetailItem
skuBaseInfoVo = {skuBaseInfoVo} skuBaseInfoVo = {skuBaseInfoVo}
...@@ -53,6 +54,8 @@ export default class ScanBarCodeContainer extends React.Component{ ...@@ -53,6 +54,8 @@ export default class ScanBarCodeContainer extends React.Component{
refreshImg = {refreshImg} refreshImg = {refreshImg}
changePages = {changePages} changePages = {changePages}
clearProductSuccess = {clearProductSuccess} clearProductSuccess = {clearProductSuccess}
showPopup={showPopup}
hidePopup={hidePopup}
/> />
if(scanBarCode.skuBaseInfoVo && scanBarCode.skuBaseInfoVo.skuId && (!errMsg.errMsg || errMsg.errMsg=="") ){ if(scanBarCode.skuBaseInfoVo && scanBarCode.skuBaseInfoVo.skuId && (!errMsg.errMsg || errMsg.errMsg=="") ){
this.setState({ this.setState({
...@@ -60,7 +63,8 @@ export default class ScanBarCodeContainer extends React.Component{ ...@@ -60,7 +63,8 @@ export default class ScanBarCodeContainer extends React.Component{
showPopup:true, showPopup:true,
popupChild:productDetailUi popupChild:productDetailUi
}, },
showProductInfo:true showProductInfo:true,
canChangeBtnColor:true
}) })
} }
...@@ -101,11 +105,14 @@ export default class ScanBarCodeContainer extends React.Component{ ...@@ -101,11 +105,14 @@ export default class ScanBarCodeContainer extends React.Component{
let {getProductInfo,state} = this.props; let {getProductInfo,state} = this.props;
let {headerInfo} = state; let {headerInfo} = state;
let postData = {}; let postData = {};
postData.warehouseId = headerInfo.storeId?Number(headerInfo.storeId):Number("7"); postData.warehouseId = headerInfo.storeId?Number(headerInfo.storeId):Number("17");
postData.taskId = headerInfo.taskId?Number(headerInfo.taskId):Number("1"); postData.taskId = headerInfo.taskId?Number(headerInfo.taskId):Number("1");
postData.sellOrderId = headerInfo.sellOrderId?Number(headerInfo.sellOrderId):Number(21); postData.sellOrderId = headerInfo.sellOrderId?Number(headerInfo.sellOrderId):Number(21);
postData.skuBarcode = String(this.state.barCodeValue); postData.skuBarcode = String(this.state.barCodeValue);
getProductInfo(postData) getProductInfo(postData);
this.setState({
canChangeBtnColor:false,
})
} }
// 点击再次再次尝试 // 点击再次再次尝试
......
client/containers/TextAreaContainer/TextAreaContainer.jsx
...@@ -55,7 +55,7 @@ export default class TextAreaContainer extends React.Component{ ...@@ -55,7 +55,7 @@ export default class TextAreaContainer extends React.Component{
} }
goBack(){ goBack(){
let hasChange = this.state.text || this.state.text !== this.state.originText ? true : false; let hasChange = this.state.text !== this.state.originText ? true : false;
this.props.goBack(hasChange); this.props.goBack(hasChange);
} }
......
client/reducers/otherQuestion.js
...@@ -83,9 +83,11 @@ function editProblem(state,data) { ...@@ -83,9 +83,11 @@ function editProblem(state,data) {
} }
if(type == "problemType"){ if(type == "problemType"){
currentProblemObj.problemType = data.problemId; currentProblemObj.problemType = data.problemId;
currentProblemObj.message = data.message;
} }
if(type == "detailProblemType"){ if(type == "detailProblemType"){
currentProblemObj.detailProblemType = data.problemId; currentProblemObj.detailProblemType = data.problemId;
currentProblemObj.smallMessage = data.smallMessage;
} }
if(type == "imgFiles"){ if(type == "imgFiles"){
currentProblemObj.files = data.files; currentProblemObj.files = data.files;
......
client/util/image.js
...@@ -7,6 +7,7 @@ import clockIcon from '../image/clock.png'; ...@@ -7,6 +7,7 @@ import clockIcon from '../image/clock.png';
import breakImg from '../image/breakImg.png'; import breakImg from '../image/breakImg.png';
import plusIcon_disabled from '../image/plusIcon_disabled.png'; import plusIcon_disabled from '../image/plusIcon_disabled.png';
import refresh_disabled from '../image/refresh_disabled.png'; import refresh_disabled from '../image/refresh_disabled.png';
import overPassIcon from '../image/overPassIcon.png'
const localHost = 'http://localhost:7788'; const localHost = 'http://localhost:7788';
...@@ -81,6 +82,6 @@ const handleImgLoad = (ref)=>{ ...@@ -81,6 +82,6 @@ const handleImgLoad = (ref)=>{
return style; return style;
} }
const localImg = {headlogo,defaultImg,addIcon,refreshIcon,plusIcon,clockIcon,breakImg,refresh_disabled,plusIcon_disabled} const localImg = {headlogo,defaultImg,addIcon,refreshIcon,plusIcon,clockIcon,breakImg,refresh_disabled,plusIcon_disabled,overPassIcon}
module.exports = {localHost,devHost,masterHost,getPic,handleImgError,handleImgLoad,localImg}; module.exports = {localHost,devHost,masterHost,getPic,handleImgError,handleImgLoad,localImg};
\ 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