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
43466279
Commit
43466279
authored
Oct 17, 2023
by
沈良进
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
页面修改
parent
73831c5c
Show whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
711 additions
and
677 deletions
+711
-677
list.vue
src/components/FinancialModule/HandDispensingFee/list.vue
+687
-668
groupTourOrder.vue
src/components/SalesModule/groupTourOrder.vue
+1
-0
groupTourOrderByTuan.vue
src/components/SalesModule/groupTourOrderByTuan.vue
+19
-4
PassengerList.vue
src/components/Ticketing/PassengerList.vue
+0
-1
RegistrationList.vue
src/components/TravelManager/TravelList/RegistrationList.vue
+4
-4
No files found.
src/components/FinancialModule/HandDispensingFee/list.vue
View file @
43466279
...
...
@@ -32,11 +32,13 @@
</td>
<td
v-if=
"childIndex==0"
:rowspan=
"subItem.DetailList.length"
>
{{
subItem
.
ClientName
}}
<el-popover
v-if=
"subItem.HistoryClientList.length>0"
style=
"width: 500px;overflow: hidden;"
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"
>
<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>
</td>
<td><span
v-if=
"childItem.Type==1"
>
房
</span>
...
...
@@ -102,7 +104,7 @@
<
template
v-for=
"(subItem,subIndex) in visaDataList"
>
<tr>
<td>
{{
subItem
.
SetUpTypeStr
}}
</td>
<td
>
<td
>
{{
subItem
.
ExpenseAccountStr
}}
</td>
<td>
...
...
@@ -160,16 +162,18 @@
<el-col
:span=
"8"
>
<el-form-item
label=
"付款对象"
prop=
"ClientID"
>
<el-select
filterable
v-model=
"addMsg.ClientID"
placeholder=
"选择付款对象"
style=
"width: 100%;"
>
<el-option
v-for=
"item in ClientAccountList
"
:label=
"item.AccountAlias"
:value=
"item.ID"
:key=
'item.ID'
>
<el-option
v-for=
"item in ClientAccountList"
:label=
"item.AccountAlias"
:value=
"item.ID
"
:key=
'item.ID'
>
</el-option>
</el-select>
</el-form-item>
</el-col>
<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-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>
...
...
@@ -184,8 +188,8 @@
</el-col>
<el-col
:span=
"8"
>
<el-form-item
label=
"币种"
prop=
"CurrencyId"
>
<el-select
placeholder=
"选择币种"
v-model=
"addMsg.CurrencyId"
style=
"width: 100%;"
@
change=
"getCurrent(addMsg.CurrencyId)"
>
<el-select
placeholder=
"选择币种"
v-model=
"addMsg.CurrencyId"
style=
"width: 100%;"
@
change=
"getCurrent(addMsg.CurrencyId)"
>
<el-option
v-for=
"item in allCurrencyList"
:key=
"item.ID"
:label=
"item.Name"
:value=
"item.ID"
>
</el-option>
</el-select>
...
...
@@ -197,40 +201,34 @@
v-for=
"(x,y) in addMsg.DetailList"
:key=
'y'
>
<div
style=
"display: flex;align-items: center;margin-bottom: 10px;"
>
<el-form-item
label=
"类型"
>
<el-select
style=
"width: 80px;"
v-model=
"x.Type"
@
change=
"gettdName(x.Id,y,1)"
clearable
disabled
>
<el-select
style=
"width: 80px;"
v-model=
"x.Type"
@
change=
"gettdName(x.Id,y,1)"
clearable
disabled
>
<el-option
v-for=
"item in TypeListArr"
:key=
"item.Id"
:label=
"item.Name"
:disabled=
"item.disabled"
:value=
"item.Id"
></el-option>
</el-select>
</el-form-item>
<el-form-item
:prop=
"'DetailList.'+ y +'.Unit_Price'"
:rules=
"productGroup.Unit_Price"
label=
"金额"
>
<el-form-item
:prop=
"'DetailList.'+ y +'.Unit_Price'"
:rules=
"productGroup.Unit_Price"
label=
"金额"
>
<el-input
style=
"width: 100px;"
type=
"Number"
v-model=
"x.Unit_Price"
@
keyup
.
native=
"checkPrice(x,'Unit_Price',true)"
>
</el-input>
</el-form-item>
<el-form-item
:prop=
"'DetailList.'+ y +'.CostTypeId'"
:rules=
"productGroup.CostTypeId"
label=
"费用类型"
>
<el-form-item
:prop=
"'DetailList.'+ y +'.CostTypeId'"
:rules=
"productGroup.CostTypeId"
label=
"费用类型"
>
<el-select
filterable
v-model=
"x.CostTypeId"
style=
"width: 100px;"
@
change=
"gettdName(x.Id,y,2)"
clearable
>
<el-option
v-for=
"item in costType"
:key=
"item.ID"
:label=
"item.Name"
:value=
"item.ID"
></el-option>
<el-option
v-for=
"item in costType"
:key=
"item.ID"
:label=
"item.Name"
:value=
"item.ID"
></el-option>
</el-select>
</el-form-item>
<el-form-item
:prop=
"'DetailList.'+ y +'.FlowZId'"
:rules=
"productGroup.FlowZId"
label=
"总部流程"
>
<el-form-item
:prop=
"'DetailList.'+ y +'.FlowZId'"
:rules=
"productGroup.FlowZId"
label=
"总部流程"
>
<el-select
filterable
v-model=
"x.FlowZId"
style=
"width: 100px;"
@
change=
"gettdName(x.Id,y,3)"
clearable
>
<el-option
v-for=
"item in TemplateGetList"
:key=
"item.Id"
:label=
"item.Name"
:value=
"item.Id"
>
</el-option>
<el-option
v-for=
"item in TemplateGetList"
:key=
"item.Id"
:label=
"item.Name"
:value=
"item.Id"
>
</el-option>
</el-select>
</el-form-item>
<el-form-item
:prop=
"'DetailList.'+ y +'.FlowFId'"
:rules=
"productGroup.FlowFId"
label=
"分部流程"
>
<el-form-item
:prop=
"'DetailList.'+ y +'.FlowFId'"
:rules=
"productGroup.FlowFId"
label=
"分部流程"
>
<el-select
filterable
v-model=
"x.FlowFId"
style=
"width: 100px;"
@
change=
"gettdName(x.Id,y,4)"
clearable
>
<el-option
v-for=
"item in TemplateGetList"
:key=
"item.Id"
:label=
"item.Name"
:value=
"item.Id"
>
</el-option>
<el-option
v-for=
"item in TemplateGetList"
:key=
"item.Id"
:label=
"item.Name"
:value=
"item.Id"
>
</el-option>
</el-select>
</el-form-item>
...
...
@@ -251,35 +249,34 @@
<el-row
style=
"height: 100px;"
>
<el-col
:span=
"8"
>
<el-form-item
label=
"类型"
prop=
"SetUpType"
>
<el-select
filterable
v-model=
"addMsg.SetUpType"
placeholder=
"选择类型"
style=
"width: 100%;"
clearable
>
<el-option
v-for=
"item in SetUpTypeList"
:key=
"item.ID"
:label=
"item.Name"
:value=
"item.Id"
></el-option>
<el-select
filterable
v-model=
"addMsg.SetUpType"
placeholder=
"选择类型"
style=
"width: 100%;"
clearable
>
<el-option
v-for=
"item in SetUpTypeList"
:key=
"item.ID"
:label=
"item.Name"
:value=
"item.Id"
>
</el-option>
</el-select>
</el-form-item>
</el-col>
<el-col
:span=
"8"
>
<el-form-item
label=
"费用类型"
prop=
"ExpenseAccount"
>
<el-select
filterable
v-model=
"addMsg.ExpenseAccount"
placeholder=
"选择费用类型"
style=
"width: 100%;"
>
<el-option
v-for=
"(item,index) in costType"
:key=
"index"
:label=
"item.Name"
:value=
'item.ID'
>
</el-option>
<el-select
filterable
v-model=
"addMsg.ExpenseAccount"
placeholder=
"选择费用类型"
style=
"width: 100%;"
>
<el-option
v-for=
"(item,index) in costType"
:key=
"index"
:label=
"item.Name"
:value=
'item.ID'
>
</el-option>
</el-select>
</el-form-item>
</el-col>
<el-col
:span=
"8"
>
<el-form-item
label=
"总司流程"
prop=
"CompanyCourse"
>
<el-select
filterable
v-model=
"addMsg.CompanyCourse"
placeholder=
"选择总公司流程"
style=
"width: 100%;"
>
<el-option
v-for=
"item in TemplateGetList"
:key=
"item.Id"
:label=
"item.Name"
:value=
"item.Id"
>
</el-option>
<el-option
v-for=
"item in TemplateGetList"
:key=
"item.Id"
:label=
"item.Name"
:value=
"item.Id"
>
</el-option>
</el-select>
</el-form-item>
</el-col>
<el-col
:span=
"8"
>
<el-form-item
label=
"分司流程"
prop=
"BranchCourse"
>
<el-select
filterable
v-model=
"addMsg.BranchCourse"
placeholder=
"选择分公司流程"
style=
"width: 100%;"
>
<el-option
v-for=
"item in TemplateGetList"
:key=
"item.Id"
:label=
"item.Name"
:value=
"item.Id"
>
</el-option>
<el-option
v-for=
"item in TemplateGetList"
:key=
"item.Id"
:label=
"item.Name"
:value=
"item.Id"
>
</el-option>
</el-select>
</el-form-item>
</el-col>
...
...
@@ -287,14 +284,15 @@
<el-col
:span=
"8"
>
<el-form-item
label=
"月总流程"
prop=
"MonthlyCourse"
>
<el-select
filterable
v-model=
"addMsg.MonthlyCourse"
placeholder=
"选择月结总公司流程"
style=
"width: 100%;"
>
<el-option
v-for=
"item in TemplateGetList"
:key=
"item.Id"
:label=
"item.Name"
:value=
"item.Id"
>
</el-option>
<el-option
v-for=
"item in TemplateGetList"
:key=
"item.Id"
:label=
"item.Name"
:value=
"item.Id"
>
</el-option>
</el-select>
</el-form-item>
</el-col>
<el-col
:span=
"8"
>
<el-form-item
label=
"月分流程"
prop=
"BranchMonthlyCourse"
>
<el-select
filterable
v-model=
"addMsg.BranchMonthlyCourse"
placeholder=
"选择月结分公司流程"
style=
"width: 100%;"
>
<el-select
filterable
v-model=
"addMsg.BranchMonthlyCourse"
placeholder=
"选择月结分公司流程"
style=
"width: 100%;"
>
<el-option
v-for=
"item in TemplateGetList"
:label=
'item.Name'
:value=
'item.Id'
:key=
'item.Id'
>
</el-option>
</el-select>
...
...
@@ -308,10 +306,7 @@
</el-col>
<el-col
:span=
"8"
>
<el-form-item
label=
"启用月结"
prop=
""
>
<el-switch
v-model=
"addMsg.IsMonthly"
active-value=
"1"
inactive-value=
"0"
>
<el-switch
v-model=
"addMsg.IsMonthly"
active-value=
"1"
inactive-value=
"0"
>
</el-switch>
</el-form-item>
</el-col>
...
...
@@ -327,15 +322,15 @@
</div>
</template>
<
script
>
</template>
<
script
>
import
Vue
from
"vue"
;
const
addobj
=
{
Id
:
0
,
Name
:
''
,
ClientID
:
null
,
ClientIdList
:
[],
ClientIds
:
''
,
ClientIdList
:
[],
ClientIds
:
''
,
DetailList
:
[{
Type
:
1
,
Unit_Price
:
null
,
...
...
@@ -359,10 +354,10 @@
submitLoading
:
false
,
loadingVisa
:
false
,
divTitle
:
''
,
visaDataList
:
[],
visaDataList
:
[],
costType
:
[],
TemplateGetList
:
[],
Details
:
[],
TemplateGetList
:
[],
Details
:
[],
S_CheckAllOrder
:
false
,
CurrentNmae
:
''
,
//所有币种
...
...
@@ -378,15 +373,42 @@
loading
:
false
,
//加载层
DataList
:
[],
total
:
0
,
SetUpTypeList
:[],
TypeListArr
:
[
{
Name
:
'房'
,
Id
:
1
,
disabled
:
false
},
{
Name
:
'餐'
,
Id
:
2
,
disabled
:
false
},
{
Name
:
'车'
,
Id
:
3
,
disabled
:
false
},
{
Name
:
'门票'
,
Id
:
4
,
disabled
:
false
},
{
Name
:
'房费送客手数料'
,
Id
:
5
,
disabled
:
false
},
{
Name
:
'餐费送客手数料'
,
Id
:
6
,
disabled
:
false
},
{
Name
:
'门票送客手数料'
,
Id
:
7
,
disabled
:
false
},
SetUpTypeList
:
[],
TypeListArr
:
[{
Name
:
'房'
,
Id
:
1
,
disabled
:
false
},
{
Name
:
'餐'
,
Id
:
2
,
disabled
:
false
},
{
Name
:
'车'
,
Id
:
3
,
disabled
:
false
},
{
Name
:
'门票'
,
Id
:
4
,
disabled
:
false
},
{
Name
:
'房费送客手数料'
,
Id
:
5
,
disabled
:
false
},
{
Name
:
'餐费送客手数料'
,
Id
:
6
,
disabled
:
false
},
{
Name
:
'门票送客手数料'
,
Id
:
7
,
disabled
:
false
},
],
//类型
ClientAccountList
:
[],
//付款对象
showVisible
:
false
,
//弹窗的显示
...
...
@@ -448,7 +470,7 @@
trigger
:
'change'
}],
},
productGroupRules2
:
{
productGroupRules2
:
{
Id
:
[{
required
:
true
,
// message: '请选择人员',
...
...
@@ -482,8 +504,8 @@
trigger
:
'change'
}],
},
StencilFlowList
:[],
//签证制单流程
CostTypeList
:[],
//签证费用类型
StencilFlowList
:
[],
//签证制单流程
CostTypeList
:
[],
//签证费用类型
};
},
created
()
{
...
...
@@ -507,7 +529,7 @@
this
.
$refs
[
"addMsg"
].
resetFields
();
},
// 获取所有费用类型
getTemplateCostTypeList
()
{
getTemplateCostTypeList
()
{
// 单项签证制单费用类型
// this.apipost('Financial_post_GetTemplateCostTypeList',{},res=>{
// if(res.data.resultCode==1){
...
...
@@ -515,30 +537,29 @@
// }else{}
// },err=>{})
// 手配费费用类型
this
.
apipost
(
'financeinfo_post_GetCostTypeList'
,{
Type
:
null
},
res
=>
{
if
(
res
.
data
.
resultCode
==
1
){
this
.
costType
=
res
.
data
.
data
;
}
else
{
}
},
err
=>
{})
this
.
apipost
(
'financeinfo_post_GetCostTypeList'
,
{
Type
:
null
},
res
=>
{
if
(
res
.
data
.
resultCode
==
1
)
{
this
.
costType
=
res
.
data
.
data
;
}
else
{}
},
err
=>
{})
// 单项签证制单类型
this
.
apipost
(
'Financial_post_GetSetUpTypeEnumList'
,{},
res
=>
{
if
(
res
.
data
.
resultCode
==
1
)
{
this
.
SetUpTypeList
=
res
.
data
.
data
;
}
else
{}
},
err
=>
{})
this
.
apipost
(
'Financial_post_GetSetUpTypeEnumList'
,
{},
res
=>
{
if
(
res
.
data
.
resultCode
==
1
)
{
this
.
SetUpTypeList
=
res
.
data
.
data
;
}
else
{}
},
err
=>
{})
},
// 所有审核流程
FinancialFlowTemplate_post_GetList
()
{
// 手配费流程
this
.
apipost
(
"FinancialFlowTemplate_post_GetSingleList"
,
{},
"FinancialFlowTemplate_post_GetSingleList"
,
{},
res
=>
{
if
(
res
.
data
.
resultCode
==
1
)
{
this
.
TemplateGetList
=
res
.
data
.
data
;
}
else
{
}
}
else
{}
},
err
=>
{}
);
...
...
@@ -556,8 +577,8 @@
// );
},
//获取历史详情
getDetails
(
index
,
type
)
{
this
.
Details
=
type
==
1
?
this
.
DataList
[
index
].
HistoryClientList
:
this
.
DataList
[
index
].
DetailList
;
getDetails
(
index
,
type
)
{
this
.
Details
=
type
==
1
?
this
.
DataList
[
index
].
HistoryClientList
:
this
.
DataList
[
index
].
DetailList
;
},
//获取当前下拉选中币种
getCurrent
(
currencyId
)
{
...
...
@@ -570,14 +591,13 @@
//获取所有币种
getAllCurrency
()
{
this
.
apipost
(
"financeinfo_post_GetList"
,
{},
"financeinfo_post_GetList"
,
{},
res
=>
{
if
(
res
.
data
.
resultCode
==
1
)
{
this
.
allCurrencyList
=
res
.
data
.
data
;
}
},
err
=>
{
}
err
=>
{
}
);
},
//获取公司
...
...
@@ -610,11 +630,10 @@
},
GetVisaSetUpList
()
{
GetVisaSetUpList
()
{
this
.
loadingVisa
=
true
this
.
apipost
(
"Financial_post_GetVisaSetUpList"
,
{},
"Financial_post_GetVisaSetUpList"
,
{},
res
=>
{
this
.
loadingVisa
=
false
;
if
(
res
.
data
.
resultCode
==
1
)
{
...
...
@@ -624,8 +643,8 @@
err
=>
{}
);
},
gettdName
(
id
,
index
,
type
)
{
//获取团队类型名称
if
(
type
==
1
)
{
gettdName
(
id
,
index
,
type
)
{
//获取团队类型名称
if
(
type
==
1
)
{
this
.
TypeListArr
.
map
(
x
=>
{
if
(
x
.
Id
==
id
)
{
this
.
addMsg
.
DetailList
[
index
].
Name
=
x
.
Name
;
...
...
@@ -633,15 +652,14 @@
}
})
}
},
//获取付款列表
getFKList
()
{
let
msg
=
{
ID
:
0
,
Type
:
0
,
ObjID
:
0
,
CardNum
:
''
ID
:
0
,
Type
:
0
,
ObjID
:
0
,
CardNum
:
''
}
this
.
apipost
(
"financeinfo_post_GetClientAccountList"
,
msg
,
...
...
@@ -652,34 +670,31 @@
}
);
},
getEdit
(
row
,
type
)
{
//修改
getEdit
(
row
,
type
)
{
//修改
let
data
=
JSON
.
parse
(
JSON
.
stringify
(
row
))
this
.
addMsg
=
data
console
.
log
(
"data"
,
data
);
if
(
type
==
1
){
this
.
addMsg
.
DetailList
.
forEach
(
item
=>
{
if
(
type
==
1
)
{
this
.
addMsg
.
DetailList
.
forEach
(
item
=>
{
item
.
Unit_Price
=
Number
(
item
.
Unit_Price
)
})
this
.
addMsg
.
ClientIdList
=
data
.
ClientIds
.
split
(
','
).
map
(
Number
)
}
this
.
addMsg
=
Object
.
assign
({},
this
.
addMsg
)
if
(
!
type
)
{
if
(
!
type
)
{
this
.
addMsg
.
SetUpType
=
String
(
row
.
SetUpType
)
this
.
addMsg
.
IsMonthly
=
String
(
row
.
IsMonthly
)
this
.
addMsg
.
MonthlyCourse
=
row
.
MonthlyCourse
?
row
.
MonthlyCourse
:
null
this
.
addMsg
.
BranchMonthlyCourse
=
row
.
BranchMonthlyCourse
?
row
.
BranchMonthlyCourse
:
null
this
.
addMsg
.
MonthlyCourse
=
row
.
MonthlyCourse
?
row
.
MonthlyCourse
:
null
this
.
addMsg
.
BranchMonthlyCourse
=
row
.
BranchMonthlyCourse
?
row
.
BranchMonthlyCourse
:
null
}
this
.
showVisible
=
true
;
},
DeleteRules
(
ID
,
type
)
{
//删除
DeleteRules
(
ID
,
type
)
{
//删除
let
text
let
cmd
if
(
type
==
1
)
{
if
(
type
==
1
)
{
text
=
'是否删除手配费单据配置'
cmd
=
'handfee_post_DelHandFee'
}
else
{
}
else
{
text
=
'是否删除单项签证单据配置'
cmd
=
'Financial_post_DelVisaSetUp'
}
...
...
@@ -694,9 +709,9 @@
},
res
=>
{
if
(
res
.
data
.
resultCode
==
1
)
{
this
.
Success
(
res
.
data
.
message
)
if
(
type
==
1
)
{
if
(
type
==
1
)
{
this
.
getList
()
}
else
{
}
else
{
this
.
GetVisaSetUpList
()
}
}
else
{
...
...
@@ -711,8 +726,8 @@
Id
:
0
,
Name
:
''
,
ClientID
:
null
,
ClientIdList
:
[],
ClientIds
:
''
,
ClientIdList
:
[],
ClientIds
:
''
,
DetailList
:
[{
Type
:
1
,
Unit_Price
:
null
,
...
...
@@ -730,14 +745,14 @@
MonthlyCourse
:
null
,
BranchMonthlyCourse
:
null
,
}
this
.
divTitle
=
type
==
1
?
'新增手配费'
:
'新增单项签证单据配置'
this
.
divTitle
=
type
==
1
?
'新增手配费'
:
'新增单项签证单据配置'
this
.
showVisible
=
true
;
this
.
addDetailList
()
},
addDetailList
()
{
//新增类型
// let isdisabled = false
// let isdisabledXHS = false
for
(
let
i
=
2
;
i
<
8
;
i
++
)
{
for
(
let
i
=
2
;
i
<
8
;
i
++
)
{
let
obj
=
{
Type
:
i
,
Unit_Price
:
null
,
...
...
@@ -749,21 +764,21 @@
}
},
submit
(
formName
)
{
if
(
this
.
divTitle
.
indexOf
(
'手配费'
)
!=-
1
)
{
if
(
this
.
divTitle
.
indexOf
(
'手配费'
)
!=
-
1
)
{
this
.
addMsg
.
ClientIds
=
this
.
addMsg
.
ClientIdList
.
join
(
','
)
}
this
.
$refs
[
formName
].
validate
((
valid
)
=>
{
if
(
valid
)
{
if
(
this
.
divTitle
.
indexOf
(
'手配费'
)
!=-
1
)
{
if
(
this
.
divTitle
.
indexOf
(
'手配费'
)
!=
-
1
)
{
let
addMsg
=
{
Id
:
this
.
addMsg
.
Id
,
Name
:
this
.
addMsg
.
Name
,
ClientID
:
this
.
addMsg
.
ClientID
,
ClientIdList
:
this
.
addMsg
.
ClientIdList
,
ClientIds
:
this
.
addMsg
.
ClientIds
,
DetailList
:
this
.
addMsg
.
DetailList
,
BranchId
:
this
.
addMsg
.
BranchId
,
CurrencyId
:
this
.
addMsg
.
CurrencyId
,
ClientIdList
:
this
.
addMsg
.
ClientIdList
,
ClientIds
:
this
.
addMsg
.
ClientIds
,
DetailList
:
this
.
addMsg
.
DetailList
,
BranchId
:
this
.
addMsg
.
BranchId
,
CurrencyId
:
this
.
addMsg
.
CurrencyId
,
}
this
.
submitLoading
=
true
this
.
apipost
(
...
...
@@ -781,7 +796,7 @@
},
err
=>
{}
)
}
else
{
}
else
{
let
addMsg
=
{
Id
:
this
.
addMsg
.
Id
,
SetUpType
:
this
.
addMsg
.
SetUpType
,
...
...
@@ -818,31 +833,35 @@
mounted
()
{
let
userInfo
=
this
.
getLocalStorage
();
let
ActionMenuCode
=
userInfo
.
ActionMenuCode
;
if
(
ActionMenuCode
.
indexOf
(
'S_CheckAllOrder'
)
!=
-
1
)
{
if
(
ActionMenuCode
.
indexOf
(
'S_CheckAllOrder'
)
!=
-
1
)
{
this
.
S_CheckAllOrder
=
true
}
if
(
!
this
.
S_CheckAllOrder
)
{
if
(
!
this
.
S_CheckAllOrder
)
{
this
.
msg
.
BranchId
=
userInfo
.
RB_Group_id
}
}
};
</
script
>
<
style
scoped
>
</
script
>
<
style
scoped
>
@import
"../../../assets/css/cssReset.css"
;
/* .rule-box .el-select__tags{
top: 100%;
} */
.domesticCommissionRule
.query-box
input
{
height
:
34px
!important
;
}
.p-5
{
.p-5
{
padding
:
5px
0
;
}
/
deep
/
.el-tag--small
{
/
deep
/
.el-tag--small
{
margin
:
0
2px
2px
;
padding
:
0
3px
;
}
.sfd_tit
{
border-left
:
3px
solid
#E95252
;
text-indent
:
10px
;
...
...
@@ -851,4 +870,4 @@
margin
:
20px
0
10px
0
;
}
</
style
>
</
style
>
src/components/SalesModule/groupTourOrder.vue
View file @
43466279
...
...
@@ -2144,6 +2144,7 @@
<span
class=
"RL-redType RL-remarkCon"
v-if=
"item.guestList.length > 0"
>
<span
v-for=
"childItem in item.guestList"
style=
"color: blue"
>
{{ childItem.userName }}
<span
style=
"color:#f56c6c"
>
{{childItem.visaType==1?'(个签)':''}}
</span>
<span
style=
"color:#f56c6c"
>
{{childItem.ticketOutTypeStr}}
</span>
<span
v-if=
"childItem.isApplyPhoto == 1"
style=
"color: red"
>
({{ $t("salesModule.Zhao") }})
</span>
</span>
<span
v-if=
"item.photoNum > 0"
>
({{ $t("salesModule.NoPhoto") }} {{ item.photoNum
...
...
src/components/SalesModule/groupTourOrderByTuan.vue
View file @
43466279
...
...
@@ -2336,13 +2336,20 @@
IsLookOrder ||
isUpdateOrder)
"
>
<span
v-for=
"childItem in item.guestList"
style=
"color: blue"
>
{{childItem.userName}}
<span
style=
"color:#f56c6c"
>
{{childItem.visaType==1?'(个签)':''}}
</span><span
v-if=
"childItem.isApplyPhoto == 1"
style=
"color: red"
>
(照)
</span>
</span>
<span
v-for=
"childItem in item.guestList"
style=
"color: blue"
>
{{childItem.userName}}
<span
style=
"color:#f56c6c"
>
{{childItem.visaType==1?'(个签)':''}}
</span>
<span
style=
"color:#f56c6c"
>
{{childItem.ticketOutTypeStr}}
</span>
<span
v-if=
"childItem.isApplyPhoto == 1"
style=
"color: red"
>
(照)
</span>
</span>
<span
v-if=
"item.photoNum > 0"
>
(照片一人 {{ item.photoNum }}份)
</span>
</span>
<p
v-if=
"item.cancelGuestList && item.cancelGuestList.length > 0"
>
<span
class=
""
>
取消名单:
</span>
<span
class=
"RL-redType RL-remarkCon"
>
<span
style=
"color: red"
n
v-for=
"(childItem, childIndex) in item.cancelGuestList"
:key=
"childIndex+150000"
>
{{ childItem.userName }}
<span
style=
"color:#f56c6c"
>
{{childItem.visaType==1?'(个签)':''}}
</span>
</span>
<span
style=
"color: red"
n
v-for=
"(childItem, childIndex) in item.cancelGuestList"
:key=
"childIndex+150000"
>
{{ childItem.userName }}
<span
style=
"color:#f56c6c"
>
{{childItem.visaType==1?'(个签)':''}}
</span>
</span>
</span>
</p>
<span
style=
"display: block"
>
房间信息
<span
v-if=
"item.oneSex > 0"
...
...
@@ -2885,13 +2892,21 @@
IsLookOrder ||
isUpdateOrder)
"
>
<span
v-for=
"childItem in item.guestList"
style=
"color: blue"
>
{{ childItem.userName}}
<span
style=
"color:#f56c6c"
>
{{childItem.visaType==1?'(个签)':''}}
</span><span
v-if=
"childItem.isApplyPhoto == 1"
style=
"color: red"
>
(照)
</span>
</span>
<span
v-for=
"childItem in item.guestList"
style=
"color: blue"
>
{{ childItem.userName}}
<span
style=
"color:#f56c6c"
>
{{childItem.visaType==1?'(个签)':''}}
</span>
<span
style=
"color:#f56c6c"
>
{{childItem.ticketOutTypeStr}}
</span>
<span
v-if=
"childItem.isApplyPhoto == 1"
style=
"color: red"
>
(照)
</span>
</span>
<span
v-if=
"item.photoNum > 0"
>
(照片一人 {{ item.photoNum }}份)
</span>
</span>
<p
v-if=
"item.cancelGuestList && item.cancelGuestList.length > 0"
>
<span
class=
""
>
取消名单:
</span>
<span
class=
"RL-redType RL-remarkCon"
>
<span
style=
"color: red"
v-for=
"(childItem, childIndex) in item.cancelGuestList"
:key=
"childIndex+260000"
>
{{ childItem.userName }}
<span
style=
"color:#f56c6c"
>
{{childItem.visaType==1?'(个签)':''}}
</span>
</span>
<span
style=
"color: red"
v-for=
"(childItem, childIndex) in item.cancelGuestList"
:key=
"childIndex+260000"
>
{{ childItem.userName }}
<span
style=
"color:#f56c6c"
>
{{childItem.visaType==1?'(个签)':''}}
</span>
</span>
</span>
</p>
<span
style=
"display: block"
>
房间信息
<span
v-if=
"item.oneSex > 0"
...
...
src/components/Ticketing/PassengerList.vue
View file @
43466279
...
...
@@ -426,7 +426,6 @@
this
.
msg
,
res
=>
{
this
.
QueryMsg
.
loading
=
false
;
console
.
log
(
"res"
,
res
.
data
);
if
(
res
.
data
.
resultCode
==
1
)
{
this
.
msg
.
total
=
res
.
data
.
data
.
count
;
this
.
QueryMsg
.
dataList
=
res
.
data
.
data
.
pageData
;
...
...
src/components/TravelManager/TravelList/RegistrationList.vue
View file @
43466279
...
...
@@ -2097,8 +2097,8 @@
<span
style=
"color: blue !important"
v-for=
"(childItem,childIndex) in item.GuestList"
:key=
"childIndex"
@
click=
"goToPassenger(childItem, 2)"
>
{{ childItem.userName }}
<span
style=
"color:#f56c6c"
>
{{childItem.VisaType==1?'(个签)':''}}
</span>
<
!-- <
span style="color:#f56c6c">{{childItem.TicketOutTypeStr}}
</span>
-->
<span
style=
"color:#f56c6c"
>
{{childItem.TicketOutTypeStr}}
</span>
</span>
</p>
<p
v-if=
"item.CancelGuestList.length > 0"
>
...
...
@@ -2638,8 +2638,8 @@
@
click=
"goToPassenger2(msg.TCID, fourthItem.OrderId, 2)"
>
{{
fourthItem
.
userName
}}
<span
style=
"color:#f56c6c"
>
{{
fourthItem
.
VisaType
==
1
?
'(个签)'
:
''
}}
</span>
<
!--
<
span
style=
"color:#f56c6c"
>
{{
fourthItem
.
TicketOutTypeStr
}}
</span>
-->
<span
style=
"color:#f56c6c"
>
{{
fourthItem
.
TicketOutTypeStr
}}
</span>
</span>
</
template
>
</span>
...
...
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