Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
A
assets
Project
Project
Details
Activity
Releases
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
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
黄媛媛
assets
Commits
776226b9
Commit
776226b9
authored
Jul 14, 2020
by
黄媛媛
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
出库详情
parent
fc5000dd
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
256 additions
and
9 deletions
+256
-9
outboundApplication.vue
src/components/assetsman/outboundApplication.vue
+31
-9
outboundDetails.vue
src/components/assetsman/outboundDetails.vue
+219
-0
config.js
src/router/config.js
+6
-0
No files found.
src/components/assetsman/outboundApplication.vue
View file @
776226b9
...
...
@@ -65,18 +65,31 @@
<vxe-table-column
field=
"MallBaseName"
title=
"小程序名称"
></vxe-table-column>
<vxe-table-column
field=
"TenantName"
title=
"商户名称"
></vxe-table-column>
<vxe-table-column
field=
"OutNo"
title=
"出库订单号"
></vxe-table-column>
<vxe-table-column
field=
"Name"
title=
"出库状态"
>
<
template
v-slot=
"{ row }"
>
<span
class=
"commonStyle hoverSpan1"
></span>
<span
v-if=
"row.OutStatus==1"
>
未出库
</span>
<span
v-if=
"row.OutStatus==2"
>
部分出库
</span>
<span
v-if=
"row.OutStatus==3"
>
全部出库
</span>
</
template
>
</vxe-table-column>
<vxe-table-column
field=
"Delivered"
title=
"已发货数"
></vxe-table-column>
<vxe-table-column
field=
"NotOutStock"
title=
"未发货数"
></vxe-table-column>
<vxe-table-column
field=
"ExamineReason"
title=
"理由"
></vxe-table-column>
<vxe-table-column
field=
"address"
title=
"操作"
>
<
template
v-slot=
"{ row }"
>
<el-tooltip
class=
"item"
effect=
"dark"
content=
"审批"
placement=
"top"
>
<img
@
click=
"See(row,1)"
style=
"width:24px;height:24px"
src=
"../../assets/img/shenpi.png"
alt=
""
>
</el-tooltip>
<el-tooltip
class=
"item"
effect=
"dark"
content=
"拒绝"
placement=
"top"
>
<img
@
click=
"See(row,2)"
style=
"width:24px;height:24px"
src=
"../../assets/img/qx.png"
alt=
""
>
<!--
<el-tooltip
class=
"item"
effect=
"dark"
content=
"审批"
placement=
"top"
v-if=
"row.ApplyStatus==1"
>
<img
@
click=
"See(row,2)"
style=
"width:24px;height:24px"
src=
"../../assets/img/shenpi.png"
alt=
""
v-if=
"row.ApplyStatus==1"
>
</el-tooltip>
<el-tooltip
class=
"item"
effect=
"dark"
content=
"拒绝"
placement=
"top"
v-if=
"row.ApplyStatus==1"
>
<img
@
click=
"See(row,3)"
style=
"width:24px;height:24px"
src=
"../../assets/img/qx.png"
alt=
""
v-if=
"row.ApplyStatus==1"
>
</el-tooltip>
-->
<el-tooltip
class=
"item"
effect=
"dark"
content=
"查看详情"
placement=
"top"
>
<img
@
click=
"SeeDetails(row,'/outboundDetails')"
style=
"width:24px;height:24px"
src=
"../../assets/img/chakan.png"
alt=
""
/>
</el-tooltip>
</
template
>
</vxe-table-column>
</vxe-table>
...
...
@@ -148,7 +161,15 @@ export default {
},
methods
:
{
SeeDetails
(
item
,
path
){
this
.
$router
.
push
({
path
:
path
,
query
:
{
ID
:
item
.
ID
}
});
},
getList
()
{
this
.
loading
=
true
;
...
...
@@ -174,19 +195,20 @@ export default {
},
See
(
row
,
type
){
this
.
Updatemsg
.
ID
=
row
.
ID
;
this
.
Updatemsg
.
ApplyStatus
=
row
.
ApplyStatus
;
this
.
Updatemsg
.
ApplyStatus
=
type
;
this
.
Updatemsg
.
ExamineReason
=
''
;
this
.
isagree
=
type
;
this
.
dialogState
=
true
},
submitForm
(){
if
(
this
.
isagree
==
2
&&
this
.
Updatemsg
.
ExamineReason
==
''
){
if
(
this
.
isagree
==
3
&&
this
.
Updatemsg
.
ExamineReason
==
''
){
this
.
Error
(
'请填写理由'
);
return
}
console
.
log
(
this
.
Updatemsg
)
this
.
apiJavaPost
(
"/api/WarehouseOut/UpdateWarehouseOutApply"
,
this
.
msg
,
this
.
Update
msg
,
res
=>
{
if
(
res
.
data
.
resultCode
===
1
)
{
...
...
src/components/assetsman/outboundDetails.vue
0 → 100644
View file @
776226b9
<
template
>
<div
class=
"outboundDetails"
>
<div
class=
"routerTitle"
>
<span
class=
"pageTitle"
>
出库详情
<span
@
click=
"Backto"
style=
"position:relative;top:-5px"
class=
"backTo"
>
返回
</span></span>
<span
style=
"display:inline-flex;align-items:center;cursor: pointer;"
class=
"f12 cd6"
>
<span
style=
"margin-right:5px"
></span>
</span>
</div>
<div
class=
"padContent"
>
<div
class=
"xiangq"
>
<div>
<span
class=
"topkuang"
>
申请状态:
<span
v-if=
"tableData.ApplyStatus==1"
>
待审核
</span>
<span
v-if=
"tableData.ApplyStatus==2"
>
已审核
</span>
<span
v-if=
"tableData.ApplyStatus==3"
>
拒绝
</span>
</span>
<span
class=
"topkuang"
>
出库状态:
<span
v-if=
"tableData.OutStatus==0"
>
未出库
</span>
<span
v-if=
"tableData.OutStatus==1"
>
部分出库
</span>
<span
v-if=
"tableData.OutStatus==2"
>
全部出库
</span>
</span>
<span
class=
"topkuang"
>
审核理由:
{{
tableData
.
ExamineReason
}}
</span>
</div>
<div>
<el-button
v-if=
"tableData.ApplyStatus==1"
class=
'butoons'
type=
"primary"
round
@
click=
"See(2)"
>
审核
</el-button>
<el-button
v-if=
"tableData.ApplyStatus==1"
class=
'butoons'
type=
"danger"
round
@
click=
"See(3)"
>
拒绝
</el-button>
</div>
</div>
<!-- #e2e2e2 -->
<div>
<vxe-table
stripe
style=
"margin-top:15px"
:loading=
"loading"
:data=
"tableData.WarehouseOutGoodsList"
>
<vxe-table-column
field=
"OrderNo"
title=
"订单号"
width=
'300'
></vxe-table-column>
<vxe-table-column
field=
"GoodsName"
title=
"商品名称"
></vxe-table-column>
<vxe-table-column
field=
"Specification"
title=
"规则"
width=
'300'
></vxe-table-column>
<vxe-table-column
field=
"Number"
title=
"数量"
width=
'100'
></vxe-table-column>
<vxe-table-column
field=
"Name"
title=
"出库状态"
width=
'180'
>
<template
v-slot=
"
{ row }">
<span
class=
"commonStyle hoverSpan1"
></span>
<span
v-if=
"row.IsOut==0"
>
未出库
</span>
<span
v-if=
"row.IsOut==1"
>
已出库
</span>
</
template
>
</vxe-table-column>
</vxe-table>
</div>
</div>
<el-dialog
:title=
"isagree==2?'同意申请':'拒绝申请'"
:close-on-click-modal=
"false"
top=
"0"
:visible
.
sync=
"dialogState"
width=
"400px"
>
<el-form
class=
"MyEditForm"
label-width=
"0"
>
<el-form-item
prop=
"Name"
style=
"margin-left:60px;"
>
<span
class=
"label"
>
理由
</span>
<el-input
v-model=
"Updatemsg.ExamineReason"
type=
"textarea"
placeholder=
"请输入"
></el-input>
</el-form-item>
<div
class=
"btnformItem"
>
<span
class=
"submitBtn"
type=
"primary"
@
click=
"submitForm()"
>
确定
</span>
<span
class=
"exitBtn"
@
click=
"dialogState=false"
>
取消
</span>
</div>
</el-form>
</el-dialog>
</div>
</template>
<
script
>
import
"@riophae/vue-treeselect/dist/vue-treeselect.css"
;
export
default
{
name
:
"outboundDetails"
,
data
()
{
return
{
loading
:
false
,
tableData
:[],
morequery
:
false
,
Updatemsg
:{
ID
:
0
,
ExamineReason
:
''
,
ApplyStatus
:
0
},
total
:
0
,
isagree
:
1
,
//同意为2 拒绝为3
dialogState
:
false
,
};
},
mounted
()
{
this
.
getList
();
},
methods
:
{
Backto
(){
this
.
$router
.
push
({
path
:
"/outboundApplication"
});
},
getList
()
{
this
.
loading
=
true
;
this
.
apiJavaPost
(
"/api/WarehouseOut/GetWarehouseOutApply"
,
{
ID
:
this
.
$route
.
query
.
ID
},
res
=>
{
this
.
loading
=
false
;
if
(
res
.
data
.
resultCode
===
1
)
{
this
.
tableData
=
res
.
data
.
data
;
}
else
{
this
.
Error
(
res
.
data
.
message
);
}
},
null
);
},
currentChange
(
val
)
{
this
.
msg
.
pageIndex
=
val
;
this
.
getList
();
},
See
(
type
){
this
.
Updatemsg
.
ID
=
this
.
$route
.
query
.
ID
;
this
.
Updatemsg
.
ApplyStatus
=
type
;
this
.
Updatemsg
.
ExamineReason
=
''
;
this
.
isagree
=
type
;
this
.
dialogState
=
true
},
submitForm
(){
if
(
this
.
isagree
==
3
&&
this
.
Updatemsg
.
ExamineReason
.
length
==
0
){
this
.
Error
(
'请填写理由'
);
return
}
console
.
log
(
this
.
Updatemsg
)
this
.
apiJavaPost
(
"/api/WarehouseOut/UpdateWarehouseOutApply"
,
this
.
Updatemsg
,
res
=>
{
if
(
res
.
data
.
resultCode
===
1
)
{
this
.
dialogState
=
false
;
this
.
Backto
()
}
else
{
this
.
Error
(
res
.
data
.
message
);
}
},
null
);
}
}
};
</
script
>
<
style
>
.outboundDetails
.MyEditForm
.baseform
.el-form-item
:nth-child
(
4n
)
{
margin-right
:
0
;
}
.outboundDetails
.zczt1
{
background
:
#ffe4d5
;
color
:
#ffa87c
;
}
.outboundDetails
.zczt2
{
background
:
#beeff0
;
color
:
#089bab
;
}
.outboundDetails
.zczt3
{
background
:
#ffd6d5
;
color
:
#ff7874
;
}
.outboundDetails
.zczt4
{
background
:
#d7d6ff
;
color
:
#7b78ff
;
}
.outboundDetails
.Commonzczt
{
display
:
inline-block
;
width
:
24px
;
height
:
24px
;
line-height
:
24px
;
text-align
:
center
;
border-radius
:
50%
;
font-size
:
12px
;
font-family
:
"Microsoft YaHei"
;
}
.outboundDetails
{
width
:
100%
;
height
:
100%
;
}
.outboundDetails
.topkuang
{
padding
:
5px
10px
;
border
:
1px
solid
#e2e2e2
;
background
:
#e2e2e2
;
border-radius
:
15px
;
margin-right
:
25px
;
}
.outboundDetails
.xiangq
{
padding
:
15px
0
;
display
:
flex
;
flex-direction
:
row
;
align-items
:
center
;
justify-content
:
space-between
;
}
.outboundDetails
.butoons
{
/* float: right; */
margin-right
:
10px
;
}
</
style
>
src/router/config.js
View file @
776226b9
...
...
@@ -81,6 +81,12 @@ export default {
name
:
'outboundApplication'
,
component
:
resolve
=>
require
([
'@/components/assetsman/outboundApplication'
],
resolve
),
},
//出库详情
{
path
:
'/outboundDetails'
,
name
:
'outboundDetails'
,
component
:
resolve
=>
require
([
'@/components/assetsman/outboundDetails'
],
resolve
),
},
// 派发&退库
{
...
...
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