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
7341ea4b
Commit
7341ea4b
authored
Apr 23, 2023
by
youjie
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
no message
parent
b2064a67
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
225 additions
and
228 deletions
+225
-228
productQueryOne.vue
src/components/SalesModule/productQueryOne.vue
+1
-1
order-form.vue
src/components/orderCommon/order-form.vue
+224
-227
No files found.
src/components/SalesModule/productQueryOne.vue
View file @
7341ea4b
...
@@ -628,7 +628,7 @@
...
@@ -628,7 +628,7 @@
</td>
</td>
</tr>
</tr>
<tr
v-if=
"addMsg.GuestList.length==0"
>
<tr
v-if=
"addMsg.GuestList.length==0"
>
<td
colspan=
"
5
"
>
暂无房客信息
</td>
<td
colspan=
"
6
"
>
暂无房客信息
</td>
</tr>
</tr>
</tbody>
</tbody>
</table>
</table>
...
...
src/components/orderCommon/order-form.vue
View file @
7341ea4b
...
@@ -10,11 +10,9 @@
...
@@ -10,11 +10,9 @@
border-top
:
3px
solid
#38425d
;
border-top
:
3px
solid
#38425d
;
background-color
:
#ffffff
;
background-color
:
#ffffff
;
padding
:
10px
10px
0
;
padding
:
10px
10px
0
;
width
:
100%
;
width
:
100%
;
padding
:
20px
20px
10px
80px
;
padding
:
20px
20px
10px
80px
;
}
}
.title
{
.title
{
border-left
:
3px
solid
#e95252
;
border-left
:
3px
solid
#e95252
;
text-indent
:
15px
;
text-indent
:
15px
;
height
:
16px
;
height
:
16px
;
...
@@ -23,8 +21,7 @@
...
@@ -23,8 +21,7 @@
margin-bottom
:
20px
;
margin-bottom
:
20px
;
line-height
:
14px
;
line-height
:
14px
;
color
:
#000
;
color
:
#000
;
}
}
</
style
>
</
style
>
<
template
>
<
template
>
<div
class=
"commonOrderForm"
>
<div
class=
"commonOrderForm"
>
...
@@ -135,6 +132,11 @@
...
@@ -135,6 +132,11 @@
type=
"date"
@
change=
"getUnionTravelPrice(priceObj, 1)"
></el-date-picker>
type=
"date"
@
change=
"getUnionTravelPrice(priceObj, 1)"
></el-date-picker>
</el-form-item>
</el-form-item>
</el-col>
</el-col>
<template>
</
template
>
<el-col
:span=
"4"
v-if=
"showCity&&pagesTitle=='跟团游产品'"
>
<el-col
:span=
"4"
v-if=
"showCity&&pagesTitle=='跟团游产品'"
>
<!--返回城市-->
<!--返回城市-->
<el-form-item
:label=
"$t('salesModule.BackCity')"
prop=
"ReturnArriveCityId"
>
<el-form-item
:label=
"$t('salesModule.BackCity')"
prop=
"ReturnArriveCityId"
>
...
@@ -163,7 +165,8 @@
...
@@ -163,7 +165,8 @@
</el-col>
</el-col>
<el-col
:span=
"4"
>
<el-col
:span=
"4"
>
<el-form-item
:label=
"$t('salesModule.TeamPrice')"
prop=
"TC_Price"
>
<el-form-item
:label=
"$t('salesModule.TeamPrice')"
prop=
"TC_Price"
>
<el-input
v-if=
"addMsg.GroupType != 4"
v-model=
"addMsg.TC_Price"
:disabled=
"pagesTitle=='跟团游产品'?false:true"
<el-input
v-if=
"addMsg.GroupType != 4"
v-model=
"addMsg.TC_Price"
:disabled=
"pagesTitle=='跟团游产品'?false:true"
@
input=
"getTotalPrice()"
>
@
input=
"getTotalPrice()"
>
</el-input>
</el-input>
<el-input
v-else
v-model=
"SingleDMCPricex"
:disabled=
"true"
@
input=
"getTotalPrice()"
></el-input>
<el-input
v-else
v-model=
"SingleDMCPricex"
:disabled=
"true"
@
input=
"getTotalPrice()"
></el-input>
...
@@ -264,15 +267,10 @@
...
@@ -264,15 +267,10 @@
</
template
>
</
template
>
<
template
v-if=
"pagesTitle=='当地游产品'"
>
<
template
v-if=
"pagesTitle=='当地游产品'"
>
<el-col
:span=
"4"
>
<el-col
:span=
"4"
>
<p
v-if=
'priceObj.IsSupportChildren==2'
<p
v-if=
'priceObj.IsSupportChildren==2'
style=
"color: #E95252; font-size: 12px; line-height: 40px; text-align: center;"
>
{{
$t
(
'salesModule.NoSupplier'
)
}}
!
</p>
style=
"color: #E95252; font-size: 12px; line-height: 40px; text-align: center;"
>
<el-form-item
v-if=
'priceObj.IsSupportChildren==1'
v-show=
"addMsg.GroupType !== '4'"
:label=
"$t('salesModule.ChildNum')"
prop=
"ChirdNoNeedBedNum"
>
{{
$t
(
'salesModule.NoSupplier'
)
}}
!
</p>
<el-input
v-model=
'addMsg.ChirdNum'
:disabled=
"addMsg.GroupType==='4'"
@
keyup
.
native=
"checkInteger(addMsg,'ChirdNoNeedBedNum')"
<el-form-item
v-if=
'priceObj.IsSupportChildren==1'
v-show=
"addMsg.GroupType !== '4'"
@
input=
'getNumber();getHouseNo();getTotalPrice();autoRemarks("ChirdNoNeedBedNum","儿童人数");'
@
change=
"getNumGuest"
></el-input>
:label=
"$t('salesModule.ChildNum')"
prop=
"ChirdNoNeedBedNum"
>
<el-input
v-model=
'addMsg.ChirdNum'
:disabled=
"addMsg.GroupType==='4'"
@
keyup
.
native=
"checkInteger(addMsg,'ChirdNoNeedBedNum')"
@
input=
'getNumber();getHouseNo();getTotalPrice();autoRemarks("ChirdNoNeedBedNum","儿童人数");'
@
change=
"getNumGuest"
></el-input>
</el-form-item>
</el-form-item>
</el-col>
</el-col>
</
template
>
</
template
>
...
@@ -414,8 +412,7 @@
...
@@ -414,8 +412,7 @@
<el-form-item
:label=
"$t('salesModule.ScenicRefund')"
>
<el-form-item
:label=
"$t('salesModule.ScenicRefund')"
>
<el-select
filterable
multiple
class=
"multiple_input"
v-model=
"addMsg.ScenicRefundArr"
<el-select
filterable
multiple
class=
"multiple_input"
v-model=
"addMsg.ScenicRefundArr"
:placeholder=
"$t('pub.pleaseSel')"
@
change=
"ScenicRefundMethods"
>
:placeholder=
"$t('pub.pleaseSel')"
@
change=
"ScenicRefundMethods"
>
<el-option
v-for=
"(item,index) in ScenicRefundList"
:label=
"item.ScenicName"
:value=
"item.Id"
<el-option
v-for=
"(item,index) in ScenicRefundList"
:label=
"item.ScenicName"
:value=
"item.Id"
:key=
"index"
>
:key=
"index"
>
</el-option>
</el-option>
</el-select>
</el-select>
</el-form-item>
</el-form-item>
...
@@ -504,8 +501,8 @@
...
@@ -504,8 +501,8 @@
//团期编号,订单编号(新增传0),下单人选择的公司
//团期编号,订单编号(新增传0),下单人选择的公司
props
:
[
props
:
[
'showCity'
,
'showCity'
,
'PTCID'
,
//团期编号(必须传),
'PTCID'
,
//团期编号(必须传),
'POrderId'
,
//订单编号(新增传0)
'POrderId'
,
//订单编号(新增传0)
'PBranchId'
,
//销售公司/联运公司
'PBranchId'
,
//销售公司/联运公司
'PProductType'
,
//产品类型(1-常规团,2-包机团)
'PProductType'
,
//产品类型(1-常规团,2-包机团)
'productObj'
,
'productObj'
,
...
@@ -1056,7 +1053,7 @@
...
@@ -1056,7 +1053,7 @@
},
},
(
res
)
=>
{
(
res
)
=>
{
if
(
res
.
data
.
resultCode
==
1
)
{
if
(
res
.
data
.
resultCode
==
1
)
{
this
.
minPrice
=
res
.
data
.
data
&&
res
.
data
.
data
.
LowDeposit
;
this
.
minPrice
=
res
.
data
.
data
&&
res
.
data
.
data
.
LowDeposit
;
}
}
},
},
);
);
...
@@ -1076,7 +1073,7 @@
...
@@ -1076,7 +1073,7 @@
},
},
//计算少价金额
//计算少价金额
getTypePrice
()
{
getTypePrice
()
{
if
(
this
.
pagesTitle
==
'当地游产品'
)
{
if
(
this
.
pagesTitle
==
'当地游产品'
)
{
this
.
addMsg
.
ContactName
=
''
this
.
addMsg
.
ContactName
=
''
this
.
addMsg
.
ContactMobile
=
''
this
.
addMsg
.
ContactMobile
=
''
}
}
...
@@ -1413,7 +1410,7 @@
...
@@ -1413,7 +1410,7 @@
qz
:
""
,
qz
:
""
,
qzf
:
""
,
qzf
:
""
,
}
}
if
(
this
.
pagesTitle
==
'当地游产品'
)
{
if
(
this
.
pagesTitle
==
'当地游产品'
)
{
this
.
addMsg
.
GroupType
=
"1"
this
.
addMsg
.
GroupType
=
"1"
}
}
this
.
clientSourceList
=
[];
this
.
clientSourceList
=
[];
...
@@ -1526,9 +1523,9 @@
...
@@ -1526,9 +1523,9 @@
this
.
addMsg
.
IsChildrenTour
=
this
.
priceObj
.
IsSupportChildren
;
this
.
addMsg
.
IsChildrenTour
=
this
.
priceObj
.
IsSupportChildren
;
this
.
addMsg
.
IsBirdDiscount
=
this
.
priceObj
.
IsBirdDiscount
;
this
.
addMsg
.
IsBirdDiscount
=
this
.
priceObj
.
IsBirdDiscount
;
let
url
let
url
if
(
this
.
PProductType
==
1
)
{
if
(
this
.
PProductType
==
1
)
{
url
=
'sellorder_post_SetOrderInfo_02'
url
=
'sellorder_post_SetOrderInfo_02'
}
else
if
(
this
.
PProductType
==
2
)
{
}
else
if
(
this
.
PProductType
==
2
)
{
url
=
'sellorder_post_SetTravelTeamOrderForB2B'
//团下单接口sellorder_post_SetOrderInfoForB2B
url
=
'sellorder_post_SetTravelTeamOrderForB2B'
//团下单接口sellorder_post_SetOrderInfoForB2B
}
}
this
.
apipost
(
url
,
this
.
apipost
(
url
,
...
@@ -1683,10 +1680,11 @@
...
@@ -1683,10 +1680,11 @@
"sellorder_get_GetSellClientTypeEnumList"
,
{},
"sellorder_get_GetSellClientTypeEnumList"
,
{},
(
res
)
=>
{
(
res
)
=>
{
if
(
res
.
data
.
resultCode
==
1
)
{
if
(
res
.
data
.
resultCode
==
1
)
{
if
(
this
.
showCity
)
{
if
(
this
.
showCity
)
{
this
.
customerTypeList
=
res
.
data
.
data
;
this
.
customerTypeList
=
res
.
data
.
data
;
}
else
{
}
else
{
this
.
customerTypeList
=
res
.
data
.
data
.
filter
(
item
=>
item
.
Id
<
3
);
this
.
customerTypeList
=
res
.
data
.
data
.
filter
(
item
=>
item
.
Id
<
3
);
console
.
log
(
'this.customerTypeList'
,
this
.
customerTypeList
)
}
}
}
}
},
},
...
@@ -1814,8 +1812,8 @@
...
@@ -1814,8 +1812,8 @@
this
.
getTradeWay
();
this
.
getTradeWay
();
},
},
watch
:
{
watch
:
{
productObj
:
{
productObj
:{
handler
(
oldValue
,
newVal
)
{
handler
(
oldValue
,
newVal
){
this
.
clearMsg
();
this
.
clearMsg
();
this
.
getTravelPirceInfo
()
this
.
getTravelPirceInfo
()
this
.
addMsg
.
DepartureCityId
=
oldValue
.
StartCityID
this
.
addMsg
.
DepartureCityId
=
oldValue
.
StartCityID
...
@@ -1823,7 +1821,7 @@
...
@@ -1823,7 +1821,7 @@
this
.
addMsg
.
GoCityTime
=
this
.
starTime
=
oldValue
.
StartCityTime
;
this
.
addMsg
.
GoCityTime
=
this
.
starTime
=
oldValue
.
StartCityTime
;
this
.
addMsg
.
BackCityTime
=
this
.
endTime
=
oldValue
.
BackCityTime
;
this
.
addMsg
.
BackCityTime
=
this
.
endTime
=
oldValue
.
BackCityTime
;
this
.
priceObj
=
JSON
.
parse
(
JSON
.
stringify
(
oldValue
))
this
.
priceObj
=
JSON
.
parse
(
JSON
.
stringify
(
oldValue
))
if
(
this
.
pagesTitle
==
'当地游产品'
)
{
if
(
this
.
pagesTitle
==
'当地游产品'
)
{
let
str
=
''
let
str
=
''
if
(
oldValue
.
OtherPrice
>
0
)
{
if
(
oldValue
.
OtherPrice
>
0
)
{
str
+=
'杂费'
+
oldValue
.
OtherPrice
+
'/人;'
str
+=
'杂费'
+
oldValue
.
OtherPrice
+
'/人;'
...
@@ -1851,5 +1849,4 @@
...
@@ -1851,5 +1849,4 @@
}
}
}
}
};
};
</
script
>
</
script
>
\ No newline at end of file
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