Skip to content
Toggle navigation
P
Projects
G
Groups
S
Snippets
Help
肖康
/
cloudSystem
This project
Loading...
Sign in
Toggle navigation
Go to a project
Project
Repository
Issues
0
Merge Requests
0
Pipelines
Wiki
Snippets
Settings
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Commit
68f0f9aa
authored
Jan 07, 2025
by
LJM
Browse files
Options
_('Browse Files')
Download
Email Patches
Plain Diff
优化
parent
b2d6d5e3
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
9 additions
and
5 deletions
src/views/consignmentManagement/consignmentApplication.vue
src/views/consignmentManagement/consignmentContract.vue
src/views/consignmentManagement/consignmentApplication.vue
View file @
68f0f9aa
...
...
@@ -238,6 +238,10 @@ export default {
this
.
dialogVisible_1
=
true
;
break
;
case
2
:
if
(
this
.
multipleSelection
.
length
>
1
)
{
this
.
$message
.
warning
(
'不支持批量操作'
);
return
;
}
// 作废:校验待提审或进行中(未发货未入库)状态
const
invalidCancel
=
this
.
multipleSelection
.
filter
(
item
=>
!
([
0
,
2
].
includes
(
item
.
consignment_status
)
&&
item
.
deliver_status
==
0
&&
item
.
stock_in_status
==
0
));
if
(
invalidCancel
.
length
)
{
...
...
@@ -248,6 +252,10 @@ export default {
this
.
dialogVisible_2
=
true
;
break
;
case
3
:
if
(
this
.
multipleSelection
.
length
>
1
)
{
this
.
$message
.
warning
(
'不支持批量操作'
);
return
;
}
// 关单:校验进行中且部分发货/全部发货,部分入库状态
const
invalidClose
=
this
.
multipleSelection
.
filter
(
item
=>
!
(
item
.
consignment_status
==
'2'
&&
[
1
,
2
].
includes
(
item
.
deliver_status
)
&&
item
.
stock_in_status
==
1
));
if
(
invalidClose
.
length
)
{
...
...
src/views/consignmentManagement/consignmentContract.vue
View file @
68f0f9aa
...
...
@@ -27,11 +27,7 @@
</el-table-column>
<el-table-column
prop=
"status_name"
label=
"状态"
width=
"160"
:show-overflow-tooltip=
"true"
align=
"center"
></el-table-column>
<el-table-column
prop=
"commission_rate"
label=
"抽佣比例(%)"
width=
"160"
:show-overflow-tooltip=
"true"
align=
"center"
></el-table-column>
<el-table-column
label=
"合同有效期"
width=
"290"
:show-overflow-tooltip=
"true"
align=
"center"
>
<
template
slot-scope=
"scope"
>
{{
scope
.
row
.
start_time
}}
-
{{
scope
.
row
.
end_time
}}
</
template
>
</el-table-column>
<el-table-column
prop=
"end_time"
label=
"合同有效期"
width=
"290"
:show-overflow-tooltip=
"true"
align=
"center"
></el-table-column>
<el-table-column
prop=
"check_date"
label=
"对账日期"
width=
"160"
:show-overflow-tooltip=
"true"
align=
"center"
></el-table-column>
<el-table-column
prop=
"update_time"
label=
"更新时间"
width=
"160"
:show-overflow-tooltip=
"true"
align=
"center"
></el-table-column>
<el-table-column
prop=
"create_name"
label=
"创建人"
width=
"160"
:show-overflow-tooltip=
"true"
align=
"center"
></el-table-column>
...
...
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