Skip to content
Toggle navigation
Toggle navigation
This project
Loading...
Sign in
csbr-daop
/
fe-data-trusted-space
Go to a project
Toggle navigation
Toggle navigation pinning
Projects
Groups
Snippets
Help
Project
Activity
Repository
Pipelines
Graphs
Issues
0
Merge Requests
0
Wiki
Network
Create a new issue
Builds
Commits
Issue Boards
Files
Commits
Network
Compare
Branches
Tags
4d4b0583
authored
2025-04-18 13:03:24 +0800
by
lihua
Browse Files
Options
Browse Files
Tag
Download
Email Patches
Plain Diff
合同进度bug
1 parent
a92992c1
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
17 additions
and
16 deletions
src/components/Tools/table_search.vue
src/views/data_asset/contractProgress.vue
src/components/Tools/table_search.vue
View file @
4d4b058
...
...
@@ -183,8 +183,8 @@ onMounted(() => {
end-placeholder=
"结束时间"
/>
</
template
>
<
template
v-else-if=
"item.type == 'date-range'"
>
<el-date-picker
v-model=
"formInline[item.field]"
type=
"daterange"
start-placeholder=
"开始日期
"
format=
"YYYY-MM-DD"
value-format=
"YYYY-MM-DD"
end-placeholder=
"结束日期
"
/>
<el-date-picker
v-model=
"formInline[item.field]"
type=
"daterange"
:start-placeholder=
"item.startPlaceholder ?? '开始日期'
"
format=
"YYYY-MM-DD"
value-format=
"YYYY-MM-DD"
:end-placeholder=
"item.endPlaceholder ?? '结束日期'
"
/>
</
template
>
<
template
v-else-if=
"item.type == 'radio-button'"
>
<el-radio-group
v-model=
"formInline[item.field]"
@
change=
"radioGroupChange"
>
...
...
src/views/data_asset/contractProgress.vue
View file @
4d4b058
...
...
@@ -68,7 +68,8 @@ const searchItemList = ref([
type
:
"date-range"
,
field
:
"dateRange"
,
default
:
null
,
placeholder
:
"开始日期~结束日期"
,
startPlaceholder
:
'签约开始日期'
,
endPlaceholder
:
'签约结束日期'
,
clearable
:
true
,
required
:
true
}
...
...
@@ -104,7 +105,7 @@ const tableTools = ref();
const
handleSearchChange
=
(
val
,
row
,
info
)
=>
{
if
(
row
.
field
==
'contractTypeCode'
)
{
tableTools
.
value
.
toolSearch
.
formInline
.
contractNodeCode
=
''
;
searchItemList
.
value
[
2
].
options
=
val
==
'1'
?
registerContractNodesList
.
value
:
tradeContractNodesList
.
value
;
searchItemList
.
value
[
2
].
options
=
val
==
'1'
?
registerContractNodesList
.
value
:
(
!
val
?
[]
:
tradeContractNodesList
.
value
)
;
}
}
...
...
@@ -139,10 +140,10 @@ const tableInfo = ref({
loading
:
false
,
fields
:
[
{
label
:
"合同名称"
,
field
:
"contractName"
,
width
:
160
,
align
:
"left"
},
{
label
:
"合同类型"
,
field
:
"contractTypeName"
,
width
:
1
2
0
},
{
label
:
"合同类型"
,
field
:
"contractTypeName"
,
width
:
1
1
0
},
{
label
:
"甲方名称"
,
field
:
"partyAName"
,
width
:
180
},
{
label
:
"乙方名称"
,
field
:
"partyBName"
,
width
:
180
},
{
label
:
"签约日期"
,
field
:
"signContractDate"
,
width
:
TableColumnWidth
.
DATE
},
{
label
:
"签约日期"
,
field
:
"signContractDate"
,
width
:
110
},
],
childFields
:
[
{
label
:
"进展节点"
,
field
:
"contractNodeName"
,
width
:
140
,
align
:
"left"
},
...
...
@@ -163,12 +164,12 @@ const getNodeSteps = (scope) => {
return
{
list
:
contractNodeCodes
.
map
((
n
,
index
)
=>
{
return
{
tooltip
:
{
placement
:
'top'
,
content
:
n
.
name
,
className
:
'step_title_tooltip'
,
effect
:
'light'
,
},
//
tooltip: {
//
placement: 'top',
//
content: n.name,
//
className: 'step_title_tooltip',
//
effect: 'light',
//
},
title
:
n
.
name
,
value
:
index
+
1
}
...
...
@@ -399,7 +400,7 @@ const drawerSelectChange = (val, row, info) => {
if
(
item
.
field
==
'contractNodeCodes'
)
{
item
.
default
=
''
;
nodesInfo
.
value
=
[];
item
.
options
=
val
==
'1'
?
registerContractNodesList
.
value
:
tradeContractNodesList
.
value
;
item
.
options
=
val
==
'1'
?
registerContractNodesList
.
value
:
(
!
val
?
[]
:
tradeContractNodesList
.
value
)
;
}
});
}
else
if
(
row
.
field
==
'contractNodeCodes'
)
{
...
...
@@ -447,7 +448,7 @@ const handleTableEdit = (scope) => {
item
.
default
=
scope
.
row
[
item
.
field
];
if
(
item
.
field
==
'contractNodeCodes'
)
{
item
.
default
=
scope
.
row
.
contractNodeCodes
?.
map
(
c
=>
c
.
code
)
||
[];
item
.
options
=
scope
.
row
.
contractTypeCode
==
'1'
?
registerContractNodesList
.
value
:
tradeContractNodesList
.
value
;
item
.
options
=
scope
.
row
.
contractTypeCode
==
'1'
?
registerContractNodesList
.
value
:
(
!
scope
.
row
.
contractTypeCode
?
[]
:
tradeContractNodesList
.
value
)
;
}
})
nodesInfo
.
value
=
scope
.
row
.
contractNodes
?.
map
(
node
=>
{
...
...
@@ -689,7 +690,7 @@ onBeforeMount(() => {
<span>
{{
scope
.
row
[
field
.
field
||
''
]
||
'--'
}}
</span>
</
template
>
</el-table-column>
<el-table-column
label=
"进展阶段"
width=
"
37
0px"
align=
"center"
>
<el-table-column
label=
"进展阶段"
width=
"
45
0px"
align=
"center"
>
<
template
#
default=
"scope"
>
<div
class=
"custom-steps"
v-if=
"scope.row.contractNodeCodes?.length"
>
<StepBar
:steps-info=
"getNodeSteps(scope)"
/>
...
...
@@ -697,7 +698,7 @@ onBeforeMount(() => {
<span
v-else
>
--
</span>
</
template
>
</el-table-column>
<el-table-column
label=
"操作"
minWidth=
"12
0px"
align=
"left"
fixed=
"right"
show-overflow-tooltip
>
<el-table-column
label=
"操作"
width=
"10
0px"
align=
"left"
fixed=
"right"
show-overflow-tooltip
>
<
template
#
default=
"scope"
>
<span
class=
"text_btn"
@
click=
"handleTableEdit(scope)"
>
编辑
</span>
<span
class=
"text_btn ml4"
@
click=
"handleTableDel(scope)"
>
删除
</span>
...
...
Write
Preview
Styling with
Markdown
is supported
Attach a file
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 post a comment