Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
J
jiedao-app-operator-master
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Boards
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
lanbaoming
jiedao-app-operator-master
Commits
9259c5cf
Commit
9259c5cf
authored
Sep 29, 2022
by
dragondean@qq.com
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
bugs
parent
1179bff7
Changes
6
Show whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
26 additions
and
18 deletions
+26
-18
order.js
src/api/ecw/order.js
+5
-3
cargoControl.vue
src/views/ecw/order/cargoControl.vue
+13
-10
SpecialDiscount.vue
src/views/ecw/order/components/SpecialDiscount.vue
+2
-1
TransferCargo.vue
src/views/ecw/order/components/TransferCargo.vue
+2
-0
index.vue
src/views/ecw/order/index.vue
+3
-2
index.vue
src/views/ecw/order/special/index.vue
+1
-2
No files found.
src/api/ecw/order.js
View file @
9259c5cf
...
...
@@ -346,10 +346,12 @@ export function cancelOrderSpecial(orderApprovalId,data) {
}
// 获得订单特价申请详情
export
function
getOrderSpecial
(
orderItemId
,
type
=
1
)
{
export
function
getOrderSpecial
(
orderId
,
type
,
params
)
{
console
.
log
(
orderId
,
type
,
params
)
return
request
({
url
:
'
/ecw/order/special/info/
'
+
orderItemId
+
'
/
'
+
type
,
method
:
'
get
'
url
:
'
/ecw/order/special/info/
'
+
orderId
+
'
/
'
+
type
,
method
:
'
get
'
,
params
})
}
...
...
src/views/ecw/order/cargoControl.vue
View file @
9259c5cf
...
...
@@ -101,7 +101,8 @@
</el-table-column>
<el-table-column
:label=
"$t('控货状态')"
align=
"center"
prop=
"transportId"
>
<
template
slot-scope=
"{row}"
>
<dict-tag
:type=
"DICT_TYPE.CONTROL_GOODS_STATUS"
:value=
"row.cargoControlStatus"
/>
<template
v-if=
"row.cargoControlStatus == 1 && row.isToReview"
>
放货中
</
template
>
<dict-tag
v-else
:type=
"DICT_TYPE.CONTROL_GOODS_STATUS"
:value=
"row.cargoControlStatus"
/>
</template>
</el-table-column>
...
...
@@ -112,24 +113,26 @@
<el-button
type=
"text"
size=
"mini"
@
click=
"showReleaseOrderId=scope.row.orderId"
>
{{
$t
(
'
放货
'
)
}}
</el-button>
<el-button
type=
"text"
size=
"mini"
@
click=
"showTransferOrder = scope.row"
>
{{
$t
(
'
控货权转移
'
)
}}
</el-button>
</
template
>
<!--部分控货-->
<
template
v-if=
"scope.row.cargoControlStatus == 2"
>
<el-button
type=
"text"
size=
"mini"
@
click=
"toDetail(scope.row)"
>
{{
$t
(
'
修改
'
)
}}
</el-button>
<el-button
type=
"text"
size=
"mini"
@
click=
"toDetail(scope.row)"
>
{{
$t
(
'
取消
'
)
}}
</el-button>
<el-button
type=
"text"
size=
"mini"
@
click=
"review(scope.row)"
v-if=
"scope.row.isToReview"
>
{{
$t
(
'
放货复核
'
)
}}
</el-button>
</
template
>
<!--已完成放货-->
<
template
v-if=
"scope.row.cargoControlStatus == 1"
>
<el-button
type=
"text"
size=
"mini"
@
click=
"toDetail(scope.row)"
>
{{
$t
(
'
查看
'
)
}}
</el-button>
<!--已全部放货,但是未复核-->
<
template
v-if=
"scope.row.cargoControlStatus == 1 && scope.row.isToReview"
>
<el-button
type=
"text"
size=
"mini"
@
click=
"review(scope.row)"
>
{{
$t
(
'
放货复核
'
)
}}
</el-button>
</
template
>
<!--已完成放货,切没有待复核;真正的放货完成-->
<
template
v-if=
"scope.row.cargoControlStatus == 1 && !scope.row.isToReview"
>
<!--
<el-button
type=
"text"
size=
"mini"
@
click=
"toDetail(scope.row)"
>
{{
$t
(
'
查看
'
)
}}
</el-button>
-->
<el-button
type=
"text"
size=
"mini"
@
click=
"cargoTransfer(scope.row)"
>
{{
$t
(
'
调货
'
)
}}
</el-button>
<el-button
type=
"text"
size=
"mini"
@
click=
"showFallbackOrder=scope.row"
v-if=
"scope.row.isReleaseAfterGoods"
>
{{
$t
(
'
反复核
'
)
}}
</el-button>
</
template
>
<!-- <el-button type="text" size="mini" >取消</el-button>
<el-button type="text" size="mini" @click="$router.push('cargo_control/detail?id=' + scope.row.orderId)" >查看</el-button> -->
</template>
</el-table-column>
</el-table>
...
...
src/views/ecw/order/components/SpecialDiscount.vue
View file @
9259c5cf
...
...
@@ -78,6 +78,7 @@ import WorkFlow from '@/components/WorkFlow'
export
default
{
name
:
"
specialDiscount
"
,
props
:
{
order
:
Object
,
orderItemId
:
Number
,
}
,
components
:
{
...
...
@@ -128,7 +129,7 @@ export default {
}
)
}
,
getOrderSpecial
(){
getOrderSpecial
(
this
.
order
ItemId
).
then
(
r
=>
{
getOrderSpecial
(
this
.
order
.
orderId
,
1
,
{
orderItemId
:
this
.
orderItemId
}
).
then
(
r
=>
{
this
.
form
=
r
.
data
getProductType
(
this
.
form
.
productType
).
then
(
res
=>
{
this
.
productType
=
res
.
data
...
...
src/views/ecw/order/components/TransferCargo.vue
View file @
9259c5cf
...
...
@@ -115,11 +115,13 @@ export default {
computed
:{
releaseVolme
(){
return
row
=>
{
if
(
!
row
.
releaseNum
)
return
0
return
new
Decimal
(
row
.
sumVolume
).
mul
(
row
.
releaseNum
).
div
(
row
.
sumNum
).
toFixed
(
2
)
}
},
releaseWeight
(){
return
row
=>
{
if
(
!
row
.
releaseNum
)
return
0
return
new
Decimal
(
row
.
sumWeight
).
mul
(
row
.
releaseNum
).
div
(
row
.
sumNum
).
toFixed
(
2
)
}
}
...
...
src/views/ecw/order/index.vue
View file @
9259c5cf
...
...
@@ -253,8 +253,9 @@
</
template
>
<!-- 入仓补充 -->
<
template
v-if=
"
include(scope.row.inWarehouseState, [201,202, 208, 202, 210, 202, 211, 202, 213, 214, 215, 216]) ||
include(scope.row.abnormalState, [99 ,2 ,3 ,4 ,9 ,10 ,11 ,12 ,14])
include(scope.row.inWarehouseState, [201,202, 208, 202, 210, 202, 211, 202, 213, 214, 215, 216]) &&
scope.row.abnormalState != 1 &&
include(scope.row.status, [2,3,5,10,9,8])
"
>
<el-dropdown-item
@
click.native=
"$router.push('/order/warehousing-add?id=' + scope.row.orderId)"
v-hasPermi=
"['ecw:order:update']"
>
{{
$t
(
'
入仓补充
'
)
}}
</el-dropdown-item>
</
template
>
...
...
src/views/ecw/order/special/index.vue
View file @
9259c5cf
...
...
@@ -108,8 +108,7 @@
</div>
</el-card>
<special-discount
v-if=
"!!showDiscountItemId"
:orderItemId=
"showDiscountItemId"
/>
<special-discount
v-if=
"!!showDiscountItemId"
:order=
"order"
:orderItemId=
"showDiscountItemId"
/>
</div>
</template>
...
...
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