Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
M
max_android_panel
Overview
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Zhang Xin
max_android_panel
Commits
52496141
Commit
52496141
authored
6 years ago
by
wujiabao
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
add breakageContainer reducer
parent
bbf3c769
Show whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
27 additions
and
24 deletions
+27
-24
client/actions/common.js
+5
-4
client/components/BreakageComponent/BreakageProductDetail/BreakageProductDetail.jsx
+2
-2
client/components/BreakageComponent/BreakageProductDetail/index.css
+3
-1
client/containers/BreakageContainer/BreakageConatiner.jsx
+1
-1
client/containers/PageContainer/PageContainer.jsx
+2
-2
client/containers/TakeStokeContainer/index.css
+14
-14
No files found.
client/actions/common.js
View file @
52496141
...
...
@@ -18,7 +18,7 @@ const getTaskInfo = (data)=>{
// let {userInfo,storeInfo} = data;
return
(
dispatch
)
=>
{
// if(userInfo && userInfo.id && storeInfo && storeInfo.id) {
let
url
=
'http://192.168.10.128:8080/web/flat/ready/1/A/28'
;
let
url
=
'http://192.168.10.128:8080/web/flat/ready/1
3
/A/28'
;
// let url = `${ENV.domain}flat/ready/${storeInfo.id}/${userInfo.id}`;
fetch
(
url
,{
// credentials : 'include',
...
...
@@ -114,10 +114,11 @@ const getUserinfo = (employeeId,storeId)=>{
};
//test 没有散落货品
const
hasNoSku
=
(
storeInfo
)
=>
{
const
hasNoSku
=
(
commonInfo
)
=>
{
// console.log(commonInfo,'没有散落物品')
return
(
dispatch
)
=>
{
// let url=`${ENV.domain}/flat/work/status/1`;
let
url
=
'http://192.168.10.128:8080/web/flat/work/status/1/A/LR'
;
let
url
=
'http://192.168.10.128:8080/web/flat/work/status/1
3
/A/LR'
;
fetch
(
url
,{
// credentials : 'include',
method
:
'PUT'
,
...
...
@@ -134,7 +135,7 @@ const hasNoSku = (storeInfo)=>{
//拉取工单
const
getTaskList
=
(
data
=
{})
=>
{
// let url=`${ENV.domain}/flat/work/list/13`;
let
url
=
'http://192.168.10.128:8080/web/flat/work/list/1
/A
/28'
;
let
url
=
'http://192.168.10.128:8080/web/flat/work/list/1
3/A/336
/28'
;
return
(
dispatch
)
=>
{
fetch
(
url
,{
// credentials : 'include',
...
...
This diff is collapsed.
Click to expand it.
client/components/BreakageComponent/BreakageProductDetail/BreakageProductDetail.jsx
View file @
52496141
...
...
@@ -10,7 +10,7 @@ class BreakageProductDetail extends React.Component{
return
(
<
div
className=
{
'breakageContent'
}
>
<
div
className=
{
'commonPage'
}
>
<
div
className=
{
'pageTitle clo333 font40'
}
>
<
div
className=
{
'pageTitle clo333 font40'
}
style=
{
{
marginBottom
:
'20px'
}
}
>
<
span
>
上报遗留货品信息
</
span
>
</
div
>
<
div
className=
{
'pagebox'
}
>
...
...
@@ -33,7 +33,7 @@ class BreakageProductDetail extends React.Component{
</
div
>
<
div
className=
{
'ProductPosition'
}
>
<
h4
className=
{
'col333 font32'
}
>
请选择货品的位置:
</
h4
>
<
ul
>
<
ul
className=
{
'imgList'
}
>
<
li
><
img
src=
{
UTILPATH
.
localImg
.
defaultImg
}
alt=
""
/><
span
className=
{
'font28 col333'
}
>
上
</
span
></
li
>
<
li
className=
{
'active'
}
><
img
src=
{
UTILPATH
.
localImg
.
defaultImg
}
alt=
""
/><
span
className=
{
'font28 col333'
}
>
下
</
span
></
li
>
<
li
><
img
src=
{
UTILPATH
.
localImg
.
defaultImg
}
alt=
""
/><
span
className=
{
'font28 col333'
}
>
左
</
span
></
li
>
...
...
This diff is collapsed.
Click to expand it.
client/components/BreakageComponent/BreakageProductDetail/index.css
View file @
52496141
...
...
@@ -39,9 +39,10 @@
.pagebox
.breakProductStatus
p
span
:nth-of-type
(
2
)
{
margin-left
:
20px
;
}
.pagebox
.ProductPosition
ul
{
.pagebox
.ProductPosition
.imgList
{
display
:
flex
;
margin-top
:
20px
;
height
:
190px
;
}
.pagebox
.ProductPosition
ul
li
{
width
:
146px
;
...
...
@@ -52,6 +53,7 @@
.pagebox
.ProductPosition
ul
li
span
{
text-align
:
center
;
display
:
block
;
margin-top
:
10px
;
}
.pagebox
.ProductPosition
ul
li
img
{
...
...
This diff is collapsed.
Click to expand it.
client/containers/BreakageContainer/BreakageConatiner.jsx
View file @
52496141
...
...
@@ -22,7 +22,7 @@ class BreakageContainer extends React.Component {
return
(
<
div
className=
{
"BreakageContainer"
}
>
{
isShow
?<
div
>
isShow
?<
div
style=
{
{
width
:
'100%'
,
height
:
'100%'
}
}
>
<
HeaderComponent
headerInfo=
{
props
.
headerInfo
}
/>
<
LeftContainer
leftInfo=
{
props
.
headerInfo
}
/>
<
RightContainer
>
...
...
This diff is collapsed.
Click to expand it.
client/containers/PageContainer/PageContainer.jsx
View file @
52496141
...
...
@@ -57,7 +57,7 @@ class PageContainer extends React.Component {
constructor
(
props
)
{
super
(
props
);
this
.
state
=
{
showPage
:
showPage
[
1
3
],
showPage
:
showPage
[
1
1
],
lastPage
:
''
,
page
:
null
,
popupInfo
:
defaultPopupInfo
,
...
...
@@ -591,7 +591,7 @@ class PageContainer extends React.Component {
break;
case showPage[5]:
pages =
<
BreakageContainer
pullTaskList=
{
()
=>
{
dispatch
(
hasNoSku
(
state
.
commonInfo
.
storeInfo
))}
}
pullTaskList=
{
()
=>
{
dispatch
(
hasNoSku
(
state
.
commonInfo
))}
}
headerInfo=
{
state
.
commonInfo
}
getProductInfo=
{
(
barcode
)
=>
{
dispatch
(
getProductInfo
({
barcode
}))}
}
/>
;
...
...
This diff is collapsed.
Click to expand it.
client/containers/TakeStokeContainer/index.css
View file @
52496141
...
...
@@ -3,45 +3,45 @@
width
:
100%
;
height
:
100%
;
}
.commonPage
.pageTitle
span
:nth-of-type
(
2
)
{
.
TokeStokeContent
.
commonPage
.pageTitle
span
:nth-of-type
(
2
)
{
margin-left
:
10px
;
}
.pagebox
{
.
TokeStokeContent
.
pagebox
{
display
:
flex
;
margin-left
:
300px
;
box-sizing
:
border-box
;
}
.pagebox
.productImg
{
.
TokeStokeContent
.
pagebox
.productImg
{
width
:
200px
;
height
:
200px
;
border
:
2px
solid
#e5e5e5
;
}
.pagebox
.productDetail
{
.
TokeStokeContent
.
pagebox
.productDetail
{
margin-left
:
40px
;
}
.pagebox
.productDetail
p
{
.
TokeStokeContent
.
pagebox
.productDetail
p
{
text-align
:
left
;
margin-top
:
36px
;
}
.pagebox
.productDetail
p
:nth-of-type
(
1
)
{
.
TokeStokeContent
.
pagebox
.productDetail
p
:nth-of-type
(
1
)
{
margin-top
:
14px
;
}
.pagebox
.productDetail
p
:nth-of-type
(
2
)
span
:nth-of-type
(
2
)
{
.
TokeStokeContent
.
pagebox
.productDetail
p
:nth-of-type
(
2
)
span
:nth-of-type
(
2
)
{
margin-left
:
15px
;
}
.pagebox
.productDetail
p
span
:nth-of-type
(
1
)
{
.
TokeStokeContent
.
pagebox
.productDetail
p
span
:nth-of-type
(
1
)
{
margin-right
:
15px
;
}
.commonPage
.productNum
{
.
TokeStokeContent
.
commonPage
.productNum
{
width
:
auto
;
margin-top
:
100px
;
}
.commonPage
.productNum
p
{
.
TokeStokeContent
.
commonPage
.productNum
p
{
text-align
:
left
;
padding-left
:
540px
;
box-sizing
:
border-box
;
}
.commonPage
.productNum
p
span
:nth-of-type
(
2
),
.commonPage
.productNum
p
span
:nth-of-type
(
4
)
{
.
TokeStokeContent
.
commonPage
.productNum
p
span
:nth-of-type
(
2
),
.commonPage
.productNum
p
span
:nth-of-type
(
4
)
{
width
:
80px
;
height
:
80px
;
border
:
2px
solid
#e5e5e5
;
...
...
@@ -51,14 +51,14 @@
text-align
:
center
;
font-weight
:
800
;
}
.commonPage
.productNum
p
span
:nth-of-type
(
2
)
{
.
TokeStokeContent
.
commonPage
.productNum
p
span
:nth-of-type
(
2
)
{
margin-left
:
10px
;
}
.commonPage
.productNum
p
span
:nth-of-type
(
3
)
{
.
TokeStokeContent
.
commonPage
.productNum
p
span
:nth-of-type
(
3
)
{
font-weight
:
600
;
padding
:
20px
33px
;
}
.commonPage
.buttonComponent
{
.
TokeStokeContent
.
commonPage
.buttonComponent
{
/* position: absolute; */
margin-left
:
600px
;
/* bottom:100px; */
...
...
This diff is collapsed.
Click to expand it.
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment