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
90046ad6
Commit
90046ad6
authored
Nov 02, 2024
by
zhengyi
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
当费用申请记录的费用金额为0时,允许直接删除该条记录
parent
a5b25c53
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
69 additions
and
24 deletions
+69
-24
order.js
src/api/ecw/order.js
+7
-0
feeApplication.vue
src/views/ecw/order/feeApplication.vue
+62
-24
No files found.
src/api/ecw/order.js
View file @
90046ad6
...
@@ -108,6 +108,13 @@ export function feeApplicationCreateBatch(data){
...
@@ -108,6 +108,13 @@ export function feeApplicationCreateBatch(data){
data
:
data
,
data
:
data
,
})
})
}
}
// 删除申请费用
export
function
feeApplicationDelete
(
id
){
return
request
({
url
:
'
order/fee-application/delete?id=
'
+
id
,
method
:
'
delete
'
,
})
}
// 根据订单ID获取是否有正在申请的费用申请
// 根据订单ID获取是否有正在申请的费用申请
export
function
getFeeApplicationApproveByOrderId
(
orderId
){
export
function
getFeeApplicationApproveByOrderId
(
orderId
){
...
...
src/views/ecw/order/feeApplication.vue
View file @
90046ad6
...
@@ -13,24 +13,32 @@
...
@@ -13,24 +13,32 @@
<el-divider></el-divider>
<el-divider></el-divider>
<el-form
label-width=
"100px"
inline
>
<el-form
label-width=
"100px"
inline
>
<el-form-item
:label=
"$t('订单号') + ':'"
<el-form-item
:label=
"$t('订单号') + ':'"
><div
class=
"content"
>
>
<div
class=
"content"
>
{{
orderDetails
.
orderNo
}}
{{
orderDetails
.
orderNo
}}
</div></el-form-item
</div>
</el-form-item
>
>
<el-form-item
:label=
"$t('发货人') + ':'"
<el-form-item
:label=
"$t('发货人') + ':'"
><div
class=
"content"
>
>
<div
class=
"content"
>
{{
orderDetails
.
consignorVO
?
orderDetails
.
consignorVO
.
name
:
""
}}
{{
orderDetails
.
consignorVO
?
orderDetails
.
consignorVO
.
name
:
""
}}
</div></el-form-item
</div>
</el-form-item
>
>
<el-form-item
:label=
"$t('唛头')"
<el-form-item
:label=
"$t('唛头')"
><div
class=
"content"
>
{{
orderDetails
.
marks
}}
</div></el-form-item
>
<div
class=
"content"
>
{{
orderDetails
.
marks
}}
</div>
</el-form-item
>
>
<el-form-item>
<el-form-item>
<el-button
<el-button
:disabled=
"!!processInstanceId || editMode"
:disabled=
"!!processInstanceId || editMode"
@
click=
"addCost"
@
click=
"addCost"
>
{{
$t
(
"
添加申请
"
)
}}
</el-button
>
{{
$t
(
"
添加申请
"
)
}}
></el-form-item
</el-button
>
</el-form-item
>
>
</el-form>
</el-form>
<el-table
:data=
"list"
>
<el-table
:data=
"list"
>
...
@@ -106,25 +114,35 @@
...
@@ -106,25 +114,35 @@
<
template
v-slot:default=
"scope"
>
<
template
v-slot:default=
"scope"
>
<el-tag
v-if=
"scope.row.status !== 0 && !scope.row.editMode"
>
{{
<el-tag
v-if=
"scope.row.status !== 0 && !scope.row.editMode"
>
{{
STATUS
[
scope
.
row
.
status
]
STATUS
[
scope
.
row
.
status
]
}}
</el-tag>
}}
</el-tag>
<!--el-button type="text" v-if="scope.row.status == 1" @click="examineFn">
{{
$t
(
'
审核中
'
)
}}
</el-button-->
<!--el-button type="text" v-if="scope.row.status == 1" @click="examineFn">
{{
$t
(
'
审核中
'
)
}}
</el-button-->
<el-button
<el-button
type=
"text"
type=
"text"
v-if=
"modifable(scope.$index)"
v-if=
"modifable(scope.$index)"
@
click=
"modify(scope.row)"
@
click=
"modify(scope.row)"
>
{{
$t
(
"
修改
"
)
}}
</el-button
>
{{
$t
(
"
修改
"
)
}}
</el-button
>
>
<el-button
<el-button
type=
"text"
type=
"text"
v-if=
"scope.row.status === 0"
v-if=
"scope.row.status === 0"
@
click=
"del(scope.$index)"
@
click=
"del(scope.$index)"
>
删除
</el-button
>
删除
</el-button
>
<el-button
type=
"text"
v-if=
"scope.row.id && scope.row.applicationFee === 0"
@
click=
"deleteByFeeIsZero(scope.row.id)"
>
删除
</el-button
>
>
</
template
>
</
template
>
</el-table-column>
</el-table-column>
</el-table>
</el-table>
<div
style=
"padding: 20px"
>
<div
style=
"padding: 20px"
>
<work-flow
xmlkey=
"free_apply"
v-model=
"selectedUsers"
/>
<work-flow
xmlkey=
"free_apply"
v-model=
"selectedUsers"
/>
</div>
</div>
<div
style=
"text-align: center; margin-top: 20px"
>
<div
style=
"text-align: center; margin-top: 20px"
>
<el-button
<el-button
...
@@ -133,25 +151,29 @@
...
@@ -133,25 +151,29 @@
style=
"margin-right: 30px"
style=
"margin-right: 30px"
:disabled=
"!feeList.length && !editMode"
:disabled=
"!feeList.length && !editMode"
@
click=
"submit"
@
click=
"submit"
>
{{ $t("提交") }}
</el-button
>
{{ $t("提交") }}
</el-button
>
>
<el-button
<el-button
type=
"primary"
type=
"primary"
v-if=
"processInstanceId"
v-if=
"processInstanceId"
style=
"margin-right: 30px"
style=
"margin-right: 30px"
@
click=
"goProcessDetail"
@
click=
"goProcessDetail"
>
{{ $t("审核中") }}
</el-button
>
{{ $t("审核中") }}
</el-button
>
>
<el-button
<el-button
type=
"primary"
type=
"primary"
v-if=
"processInstanceId"
v-if=
"processInstanceId"
style=
"margin-right: 30px"
style=
"margin-right: 30px"
@
click=
"cancel"
@
click=
"cancel"
>
{{ $t("取消审核") }}
</el-button
>
{{ $t("取消审核") }}
</el-button
>
>
<el-button
@
click=
"$emit('update:dialogVisible', false)"
>
{{
<el-button
@
click=
"$emit('update:dialogVisible', false)"
>
{{
$t("返回")
$t("返回")
}}
</el-button>
}}
</el-button>
</div>
</div>
</div>
</div>
</el-dialog>
</el-dialog>
...
@@ -168,13 +190,14 @@ import {
...
@@ -168,13 +190,14 @@ import {
getFeeApplicationApproveByOrderId
,
getFeeApplicationApproveByOrderId
,
getBatchFeeByProcessId
,
getBatchFeeByProcessId
,
qetBatchFeeByBusinessId
,
qetBatchFeeByBusinessId
,
getBatchFeeByBusinessId
,
getBatchFeeByBusinessId
,
feeApplicationDelete
,
}
from
"
@/api/ecw/order
"
;
}
from
"
@/api/ecw/order
"
;
import
{
getDictDatas
,
DICT_TYPE
}
from
"
@/utils/dict
"
;
import
{
getDictDatas
,
DICT_TYPE
}
from
"
@/utils/dict
"
;
import
workFlow
from
"
@/components/WorkFlow
"
;
import
workFlow
from
"
@/components/WorkFlow
"
;
export
default
{
export
default
{
name
:
"
feeApplication
"
,
name
:
"
feeApplication
"
,
components
:
{
workFlow
},
components
:
{
workFlow
},
props
:
{
props
:
{
orderId
:
[
Number
,
String
],
orderId
:
[
Number
,
String
],
dialogVisible
:
{
dialogVisible
:
{
...
@@ -234,7 +257,7 @@ export default {
...
@@ -234,7 +257,7 @@ export default {
});
});
// 查询历史申请
// 查询历史申请
feeApplicationListByOrderId
({
orderId
:
this
.
orderId
}).
then
((
res
)
=>
{
feeApplicationListByOrderId
({
orderId
:
this
.
orderId
}).
then
((
res
)
=>
{
this
.
list
=
res
.
data
;
this
.
list
=
res
.
data
;
});
});
...
@@ -270,6 +293,17 @@ export default {
...
@@ -270,6 +293,17 @@ export default {
status
:
0
,
status
:
0
,
});
});
},
},
deleteByFeeIsZero
(
id
)
{
this
.
$confirm
(
this
.
$t
(
"
确定要删除此条费用申请么?
"
)).
then
(()
=>
{
feeApplicationDelete
(
id
).
then
((
r
)
=>
{
this
.
$message
({
type
:
"
success
"
,
message
:
this
.
$t
(
"
删除成功
"
),
});
this
.
$emit
(
"
update:dialogVisible
"
,
false
);
});
});
},
submit
()
{
submit
()
{
// 判断费用申请是否有未填项
// 判断费用申请是否有未填项
const
errList
=
this
.
feeList
.
filter
((
item
)
=>
{
const
errList
=
this
.
feeList
.
filter
((
item
)
=>
{
...
@@ -319,7 +353,7 @@ export default {
...
@@ -319,7 +353,7 @@ export default {
confirmButtonText
:
this
.
$t
(
"
确定
"
),
confirmButtonText
:
this
.
$t
(
"
确定
"
),
cancelButtonText
:
this
.
$t
(
"
取消
"
),
cancelButtonText
:
this
.
$t
(
"
取消
"
),
})
})
.
then
(({
value
})
=>
{
.
then
(({
value
})
=>
{
let
item
=
this
.
list
.
find
((
e
)
=>
e
.
status
===
1
);
let
item
=
this
.
list
.
find
((
e
)
=>
e
.
status
===
1
);
feeApplicationCancel
({
feeApplicationCancel
({
huifu
:
value
,
huifu
:
value
,
...
@@ -332,7 +366,8 @@ export default {
...
@@ -332,7 +366,8 @@ export default {
this
.
$emit
(
"
update:dialogVisible
"
,
false
);
this
.
$emit
(
"
update:dialogVisible
"
,
false
);
});
});
})
})
.
catch
(()
=>
{});
.
catch
(()
=>
{
});
},
},
},
},
watch
:
{
watch
:
{
...
@@ -353,14 +388,17 @@ export default {
...
@@ -353,14 +388,17 @@ export default {
<
style
scoped
lang=
"scss"
>
<
style
scoped
lang=
"scss"
>
.fee-application
{
.fee-application
{
padding
:
0
20px
;
padding
:
0
20px
;
h1
{
h1
{
font-weight
:
600
;
font-weight
:
600
;
font-size
:
20px
;
font-size
:
20px
;
}
}
.content
{
.content
{
width
:
200px
;
width
:
200px
;
}
}
}
}
.my-process-designer
{
.my-process-designer
{
height
:
calc
(
100vh
-
200px
);
height
:
calc
(
100vh
-
200px
);
}
}
...
...
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