Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
S
SuperMan
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
1
Issues
1
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
罗超
SuperMan
Commits
6665015f
Commit
6665015f
authored
Apr 17, 2023
by
沈良进
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'master' of
http://gitlab.oytour.com/luochao/superman
parents
c1115705
8e7ea6cf
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
2117 additions
and
43 deletions
+2117
-43
list.vue
src/components/FinancialModule/HandDispensingFee/list.vue
+61
-43
addFinancialDocumentsSPF.vue
src/components/FinancialModule/addFinancialDocumentsSPF.vue
+2056
-0
No files found.
src/components/FinancialModule/HandDispensingFee/list.vue
View file @
6665015f
...
@@ -21,7 +21,7 @@
...
@@ -21,7 +21,7 @@
<th>
分公司制单流程
</th>
<th>
分公司制单流程
</th>
<th>
币种
</th>
<th>
币种
</th>
<th>
操作人
</th>
<th>
操作人
</th>
<th>
操作
</th>
<th
v-if=
"S_CheckAllOrder"
>
操作
</th>
</tr>
</tr>
</thead>
</thead>
<template
v-for=
"(subItem,subIndex) in DataList"
>
<template
v-for=
"(subItem,subIndex) in DataList"
>
...
@@ -32,8 +32,10 @@
...
@@ -32,8 +32,10 @@
</td>
</td>
<td
v-if=
"childIndex==0"
:rowspan=
"subItem.DetailList.length"
>
<td
v-if=
"childIndex==0"
:rowspan=
"subItem.DetailList.length"
>
{{
subItem
.
ClientName
}}
{{
subItem
.
ClientName
}}
<el-popover
style=
"max-width: 900px;"
trigger=
"click"
popper-class=
"pro_tripDetails"
>
<el-popover
v-if=
"subItem.HistoryClientList.length>0"
style=
"width: 500px;overflow: hidden;"
trigger=
"click"
popper-class=
"pro_tripDetails"
>
<el-tag
v-for=
"(ds, din) in Details"
:key=
"ds"
size=
"small"
>
{{
ds
.
ClientName
}}
</el-tag>
<div
v-if=
"Details.length>0"
style=
"display: flex;flex-wrap: wrap;"
>
<el-tag
v-for=
"(ds, din) in Details"
:key=
"din"
size=
"small"
>
{{
ds
.
ClientName
}}
</el-tag>
</div>
<span
slot=
"reference"
@
click=
"getDetails(subIndex,1)"
style=
"color: #409EFF;cursor: pointer;"
>
历史付款对象
</span>
<span
slot=
"reference"
@
click=
"getDetails(subIndex,1)"
style=
"color: #409EFF;cursor: pointer;"
>
历史付款对象
</span>
</el-popover>
</el-popover>
</td>
</td>
...
@@ -50,7 +52,7 @@
...
@@ -50,7 +52,7 @@
<p>
{{
subItem
.
UpdateByName
}}
</p>
<p>
{{
subItem
.
UpdateByName
}}
</p>
<p>
{{
subItem
.
UpdateDate
}}
</p>
<p>
{{
subItem
.
UpdateDate
}}
</p>
</td>
</td>
<td>
<td
v-if=
"S_CheckAllOrder&&childIndex==0"
:rowspan=
"subItem.DetailList.length"
>
<el-button-group
size=
'mini'
>
<el-button-group
size=
'mini'
>
<el-tooltip
class=
"item"
effect=
"dark"
content=
"编辑手配费"
placement=
"top-start"
>
<el-tooltip
class=
"item"
effect=
"dark"
content=
"编辑手配费"
placement=
"top-start"
>
<el-button
type=
"primary"
icon=
"el-icon-edit"
<el-button
type=
"primary"
icon=
"el-icon-edit"
...
@@ -72,16 +74,16 @@
...
@@ -72,16 +74,16 @@
</table>
</table>
</div>
</div>
<el-dialog
title=
"手配费"
:visible
.
sync=
"showVisible"
width=
"
102
0px"
>
<el-dialog
title=
"手配费"
:visible
.
sync=
"showVisible"
width=
"
97
0px"
>
<el-form
ref=
"addMsg"
:model=
"addMsg"
:rules=
"rules"
label-width=
"90px"
>
<el-form
ref=
"addMsg"
:model=
"addMsg"
:rules=
"rules"
label-width=
"90px"
>
<el-row>
<el-row>
<el-col
:span=
"
6
"
>
<el-col
:span=
"
8
"
>
<el-form-item
label=
"名称"
prop=
"Name"
>
<el-form-item
label=
"名称"
prop=
"Name"
>
<el-input
type=
"text"
v-model=
"addMsg.Name"
></el-input>
<el-input
type=
"text"
v-model=
"addMsg.Name"
></el-input>
</el-form-item>
</el-form-item>
</el-col>
</el-col>
<el-col
:span=
"
6
"
>
<el-col
:span=
"
8
"
>
<el-form-item
label=
"付款对象"
prop=
""
>
<el-form-item
label=
"付款对象"
prop=
"
ClientID
"
>
<el-select
filterable
v-model=
"addMsg.ClientID"
placeholder=
"选择付款对象"
style=
"width: 100%;"
>
<el-select
filterable
v-model=
"addMsg.ClientID"
placeholder=
"选择付款对象"
style=
"width: 100%;"
>
<el-option
v-for=
"item in ClientAccountList"
<el-option
v-for=
"item in ClientAccountList"
:label=
"item.AccountAlias"
:value=
"item.ID"
:key=
'item.ID'
>
:label=
"item.AccountAlias"
:value=
"item.ID"
:key=
'item.ID'
>
...
@@ -89,7 +91,15 @@
...
@@ -89,7 +91,15 @@
</el-select>
</el-select>
</el-form-item>
</el-form-item>
</el-col>
</el-col>
<el-col
:span=
"6"
>
<el-col
:span=
"8"
>
<el-form-item
label=
"历史对象"
prop=
"ClientIdList"
>
<el-select
filterable
v-model=
"addMsg.ClientIdList"
multiple
collapse-tags
placeholder=
"历史对象"
style=
"width: 100%;"
>
<el-option
v-for=
"(item,index) in ClientAccountList"
:key=
"item.ID"
:label=
"item.AccountAlias"
:value=
"item.ID"
>
</el-option>
</el-select>
</el-form-item>
</el-col>
<el-col
:span=
"8"
>
<el-form-item
label=
"适配公司"
prop=
"BranchId"
>
<el-form-item
label=
"适配公司"
prop=
"BranchId"
>
<el-select
v-model=
"addMsg.BranchId"
placeholder=
"选择适配公司"
style=
"width: 100%;"
>
<el-select
v-model=
"addMsg.BranchId"
placeholder=
"选择适配公司"
style=
"width: 100%;"
>
<el-option
v-for=
"item in companyList"
:label=
'item.BName'
:value=
'item.Id'
:key=
'item.Id'
>
<el-option
v-for=
"item in companyList"
:label=
'item.BName'
:value=
'item.Id'
:key=
'item.Id'
>
...
@@ -97,7 +107,7 @@
...
@@ -97,7 +107,7 @@
</el-select>
</el-select>
</el-form-item>
</el-form-item>
</el-col>
</el-col>
<el-col
:span=
"
6
"
>
<el-col
:span=
"
8
"
>
<el-form-item
label=
"币种"
prop=
"CurrencyId"
>
<el-form-item
label=
"币种"
prop=
"CurrencyId"
>
<el-select
placeholder=
"选择币种"
<el-select
placeholder=
"选择币种"
v-model=
"addMsg.CurrencyId"
style=
"width: 100%;"
@
change=
"getCurrent(addMsg.CurrencyId)"
>
v-model=
"addMsg.CurrencyId"
style=
"width: 100%;"
@
change=
"getCurrent(addMsg.CurrencyId)"
>
...
@@ -111,10 +121,9 @@
...
@@ -111,10 +121,9 @@
<div
style=
"width: 100%;border-bottom: 1px solid #e2e2e2;padding-bottom: 10px;margin-top: 10px;"
<div
style=
"width: 100%;border-bottom: 1px solid #e2e2e2;padding-bottom: 10px;margin-top: 10px;"
v-for=
"(x,y) in addMsg.DetailList"
:key=
'y'
>
v-for=
"(x,y) in addMsg.DetailList"
:key=
'y'
>
<div
style=
"display: flex;align-items: center;margin-bottom: 10px;"
>
<div
style=
"display: flex;align-items: center;margin-bottom: 10px;"
>
<el-form-item
:prop=
"'DetailList.'+ y +'.Type'"
<el-form-item
label=
"类型"
>
:rules=
"productGroup.Type"
label=
"类型"
>
<el-select
style=
"width: 80px;"
v-model=
"x.Type"
@
change=
"gettdName(x.Id,y,1)"
<el-select
style=
"width: 100px;"
v-model=
"x.Type"
@
change=
"gettdName(x.Id,y,1)"
clearable
disabled
>
clearable
>
<el-option
v-for=
"item in TypeListArr"
:key=
"item.Id"
:label=
"item.Name"
:disabled=
"item.disabled"
<el-option
v-for=
"item in TypeListArr"
:key=
"item.Id"
:label=
"item.Name"
:disabled=
"item.disabled"
:value=
"item.Id"
></el-option>
:value=
"item.Id"
></el-option>
</el-select>
</el-select>
...
@@ -127,7 +136,7 @@
...
@@ -127,7 +136,7 @@
</el-form-item>
</el-form-item>
<el-form-item
:prop=
"'DetailList.'+ y +'.CostTypeId'"
<el-form-item
:prop=
"'DetailList.'+ y +'.CostTypeId'"
:rules=
"productGroup.CostTypeId"
label=
"费用类型"
>
:rules=
"productGroup.CostTypeId"
label=
"费用类型"
>
<el-select
v-model=
"x.CostTypeId"
style=
"width: 100px;"
@
change=
"gettdName(x.Id,y,2)"
<el-select
filterable
v-model=
"x.CostTypeId"
style=
"width: 100px;"
@
change=
"gettdName(x.Id,y,2)"
clearable
>
clearable
>
<el-option
v-for=
"item in costType"
:key=
"item.ID"
:label=
"item.Name"
<el-option
v-for=
"item in costType"
:key=
"item.ID"
:label=
"item.Name"
:value=
"item.ID"
></el-option>
:value=
"item.ID"
></el-option>
...
@@ -135,7 +144,7 @@
...
@@ -135,7 +144,7 @@
</el-form-item>
</el-form-item>
<el-form-item
:prop=
"'DetailList.'+ y +'.FlowZId'"
<el-form-item
:prop=
"'DetailList.'+ y +'.FlowZId'"
:rules=
"productGroup.FlowZId"
label=
"总部流程"
>
:rules=
"productGroup.FlowZId"
label=
"总部流程"
>
<el-select
v-model=
"x.FlowZId"
style=
"width: 100px;"
@
change=
"gettdName(x.Id,y,3)"
<el-select
filterable
v-model=
"x.FlowZId"
style=
"width: 100px;"
@
change=
"gettdName(x.Id,y,3)"
clearable
>
clearable
>
<el-option
v-for=
"item in TemplateGetList"
:key=
"item.Id"
:label=
"item.Name"
<el-option
v-for=
"item in TemplateGetList"
:key=
"item.Id"
:label=
"item.Name"
:value=
"item.Id"
></el-option>
:value=
"item.Id"
></el-option>
...
@@ -143,23 +152,23 @@
...
@@ -143,23 +152,23 @@
</el-form-item>
</el-form-item>
<el-form-item
:prop=
"'DetailList.'+ y +'.FlowFId'"
<el-form-item
:prop=
"'DetailList.'+ y +'.FlowFId'"
:rules=
"productGroup.FlowFId"
label=
"分部流程"
>
:rules=
"productGroup.FlowFId"
label=
"分部流程"
>
<el-select
v-model=
"x.FlowFId"
style=
"width: 100px;"
@
change=
"gettdName(x.Id,y,4)"
<el-select
filterable
v-model=
"x.FlowFId"
style=
"width: 100px;"
@
change=
"gettdName(x.Id,y,4)"
clearable
>
clearable
>
<el-option
v-for=
"item in TemplateGetList"
:key=
"item.Id"
:label=
"item.Name"
<el-option
v-for=
"item in TemplateGetList"
:key=
"item.Id"
:label=
"item.Name"
:value=
"item.Id"
></el-option>
:value=
"item.Id"
></el-option>
</el-select>
</el-select>
</el-form-item>
</el-form-item>
<div>
<div>
<el-button
style=
"margin-left: 15px;padding: 6px;"
type=
"danger"
size=
"mini"
class=
"el-icon-delete"
circle
<
!-- <
el-button style="margin-left: 15px;padding: 6px;" type="danger" size="mini" class="el-icon-delete" circle
v-if="addMsg.DetailList.length>1" @click="addMsg.DetailList.splice(y,1)">
v-if="addMsg.DetailList.length>1" @click="addMsg.DetailList.splice(y,1)">
</el-button>
</el-button>
-->
</div>
</div>
</div>
</div>
</div>
</div>
<el-button
size=
"mini"
type=
"primary"
<
!-- <
el-button size="mini" type="primary"
class=
"el-icon-circle-plus-outline"
circle
@
click=
"addDetailList"
></el-button>
class="el-icon-circle-plus-outline" circle @click="addDetailList"></el-button>
-->
</el-form-item>
</el-form-item>
</el-form>
</el-form>
...
@@ -179,9 +188,10 @@
...
@@ -179,9 +188,10 @@
Id
:
0
,
Id
:
0
,
Name
:
''
,
Name
:
''
,
ClientID
:
null
,
ClientID
:
null
,
ClientIdList
:[],
ClientIds
:
''
,
ClientIds
:
''
,
DetailList
:
[{
DetailList
:
[{
Type
:
''
,
Type
:
1
,
Unit_Price
:
null
,
Unit_Price
:
null
,
CostTypeId
:
null
,
CostTypeId
:
null
,
FlowZId
:
null
,
FlowZId
:
null
,
...
@@ -215,7 +225,7 @@
...
@@ -215,7 +225,7 @@
{
Name
:
'餐'
,
Id
:
2
,
disabled
:
false
},
{
Name
:
'餐'
,
Id
:
2
,
disabled
:
false
},
{
Name
:
'车'
,
Id
:
3
,
disabled
:
false
},
{
Name
:
'车'
,
Id
:
3
,
disabled
:
false
},
{
Name
:
'门票'
,
Id
:
4
,
disabled
:
false
},
{
Name
:
'门票'
,
Id
:
4
,
disabled
:
false
},
],
//
团队
类型
],
//类型
ClientAccountList
:
[],
//付款对象
ClientAccountList
:
[],
//付款对象
showVisible
:
false
,
//弹窗的显示
showVisible
:
false
,
//弹窗的显示
addMsg
:
Object
.
assign
({},
addobj
),
addMsg
:
Object
.
assign
({},
addobj
),
...
@@ -240,6 +250,11 @@
...
@@ -240,6 +250,11 @@
message
:
'请选择币种'
,
message
:
'请选择币种'
,
trigger
:
'change'
trigger
:
'change'
}],
}],
ClientIdList
:
[{
required
:
true
,
message
:
'请选择历史付款对象'
,
trigger
:
'change'
}],
},
},
productGroupRules2
:{
productGroupRules2
:{
Id
:
[{
Id
:
[{
...
@@ -313,6 +328,8 @@
...
@@ -313,6 +328,8 @@
},
},
//获取详情
//获取详情
getDetails
(
index
,
type
)
{
getDetails
(
index
,
type
)
{
// console.log(this.DataList[index].HistoryClientList)
// return
this
.
Details
=
type
==
1
?
this
.
DataList
[
index
].
HistoryClientList
:
this
.
DataList
[
index
].
DetailList
;
this
.
Details
=
type
==
1
?
this
.
DataList
[
index
].
HistoryClientList
:
this
.
DataList
[
index
].
DetailList
;
},
},
//获取当前下拉选中币种
//获取当前下拉选中币种
...
@@ -398,6 +415,8 @@
...
@@ -398,6 +415,8 @@
this
.
addMsg
.
DetailList
.
forEach
(
item
=>
{
this
.
addMsg
.
DetailList
.
forEach
(
item
=>
{
item
.
Unit_Price
=
Number
(
item
.
Unit_Price
)
item
.
Unit_Price
=
Number
(
item
.
Unit_Price
)
})
})
this
.
addMsg
.
ClientIdList
=
data
.
ClientIds
.
split
(
','
).
map
(
Number
)
this
.
addMsg
=
Object
.
assign
({},
this
.
addMsg
),
this
.
showVisible
=
true
;
this
.
showVisible
=
true
;
},
},
DeleteRules
(
ID
)
{
//删除
DeleteRules
(
ID
)
{
//删除
...
@@ -425,9 +444,10 @@
...
@@ -425,9 +444,10 @@
Id
:
0
,
Id
:
0
,
Name
:
''
,
Name
:
''
,
ClientID
:
null
,
ClientID
:
null
,
ClientIdList
:[],
ClientIds
:
''
,
ClientIds
:
''
,
DetailList
:
[{
DetailList
:
[{
Type
:
''
,
Type
:
1
,
Unit_Price
:
null
,
Unit_Price
:
null
,
CostTypeId
:
null
,
CostTypeId
:
null
,
FlowZId
:
null
,
FlowZId
:
null
,
...
@@ -435,32 +455,26 @@
...
@@ -435,32 +455,26 @@
}],
}],
}
}
this
.
showVisible
=
true
;
this
.
showVisible
=
true
;
this
.
addDetailList
()
},
},
addDetailList
()
{
//新增类型
addDetailList
()
{
//新增类型
let
isdisabled
=
false
// let isdisabled = false
let
isdisabledXHS
=
false
// let isdisabledXHS = false
for
(
let
i
=
0
;
i
<
this
.
addMsg
.
DetailList
.
length
;
i
++
){
for
(
let
i
=
2
;
i
<
5
;
i
++
){
let
x
=
this
.
addMsg
.
DetailList
[
i
]
}
let
obj
=
{
let
obj
=
{
Type
:
''
,
Type
:
i
,
Unit_Price
:
null
,
Unit_Price
:
null
,
CostTypeId
:
null
,
CostTypeId
:
null
,
FlowZId
:
null
,
FlowZId
:
null
,
FlowFId
:
null
FlowFId
:
null
}
}
this
.
addMsg
.
DetailList
.
push
(
obj
)
this
.
addMsg
.
DetailList
.
push
(
obj
)
}
},
},
submit
(
formName
)
{
submit
(
formName
)
{
this
.
addMsg
.
ClientIds
=
this
.
addMsg
.
ClientIdList
.
join
(
','
)
this
.
$refs
[
formName
].
validate
((
valid
)
=>
{
this
.
$refs
[
formName
].
validate
((
valid
)
=>
{
if
(
valid
)
{
if
(
valid
)
{
console
.
log
(
this
.
addMsg
.
HistoryClientList
,
'---'
)
let
ClientIds
if
(
this
.
addMsg
.
HistoryClientList
){
ClientIds
=
this
.
addMsg
.
HistoryClientList
.
map
(
item
=>
{
return
item
.
ClientId
})
}
this
.
addMsg
.
ClientIds
=
ClientIds
?
ClientIds
.
join
(
','
):
''
this
.
apipost
(
this
.
apipost
(
'handfee_post_SetHandFeeInfo'
,
this
.
addMsg
,
'handfee_post_SetHandFeeInfo'
,
this
.
addMsg
,
res
=>
{
res
=>
{
...
@@ -504,6 +518,10 @@
...
@@ -504,6 +518,10 @@
.p-5
{
.p-5
{
padding
:
5px
0
;
padding
:
5px
0
;
}
}
/
deep
/
.el-tag--small
{
margin
:
0
2px
2px
;
padding
:
0
3px
;
}
</
style
>
</
style
>
\ No newline at end of file
src/components/FinancialModule/addFinancialDocumentsSPF.vue
0 → 100644
View file @
6665015f
This source diff could not be displayed because it is too large. You can
view the blob
instead.
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