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
171eaa42
Commit
171eaa42
authored
Jun 06, 2019
by
Mac
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
修改样式,修改跟团游订单里的明显显示问题,修改电话号码的判断,增加报名清单少价接口管理。
parent
ec2ecbc8
Show whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
120 additions
and
80 deletions
+120
-80
MyCustomer.vue
src/components/SalesModule/MyCustomer.vue
+1
-1
MyCustomerDetail.vue
src/components/SalesModule/MyCustomerDetail.vue
+75
-75
enrollTotal.vue
src/components/SalesModule/enrollTotal.vue
+1
-1
groupTourOrderByTuan.vue
src/components/SalesModule/groupTourOrderByTuan.vue
+2
-2
RegistrationList.vue
src/components/TravelManager/TravelList/RegistrationList.vue
+41
-1
No files found.
src/components/SalesModule/MyCustomer.vue
View file @
171eaa42
...
@@ -361,7 +361,7 @@ export default {
...
@@ -361,7 +361,7 @@ export default {
customerName
:[{
required
:
true
,
message
:
"请输入客户名"
,
trigger
:
"blur"
}],
customerName
:[{
required
:
true
,
message
:
"请输入客户名"
,
trigger
:
"blur"
}],
contactNumber
:[
contactNumber
:[
{
required
:
true
,
message
:
"请输入联系电话"
,
trigger
:
"blur"
},
{
required
:
true
,
message
:
"请输入联系电话"
,
trigger
:
"blur"
},
{
pattern
:
this
.
$commonUtils
.
Regex
.
el_ISphone
,
message
:
"请输入正确的电话"
}
{
pattern
:
/^1
[
123457890
]\d{9}
$/
,
message
:
"请输入正确的电话"
}
],
],
brandIds
:[{
required
:
true
,
message
:
"请选择所属品牌"
,
trigger
:
"change"
}],
brandIds
:[{
required
:
true
,
message
:
"请选择所属品牌"
,
trigger
:
"change"
}],
Duty
:[{
required
:
true
,
message
:
"请选择职务"
,
trigger
:
"change"
}],
Duty
:[{
required
:
true
,
message
:
"请选择职务"
,
trigger
:
"change"
}],
...
...
src/components/SalesModule/MyCustomerDetail.vue
View file @
171eaa42
...
@@ -345,7 +345,7 @@
...
@@ -345,7 +345,7 @@
],
],
contactPhone
:[
contactPhone
:[
{
required
:
true
,
message
:
'请输入联系人电话'
,
trigger
:
'blur'
},
{
required
:
true
,
message
:
'请输入联系人电话'
,
trigger
:
'blur'
},
{
pattern
:
/^
(
0|86|17951
)?(
13
[
0-9
]
|15
[
012356789
]
|17
[
012356789
]
|18
[
0-9
]
|19
[
0-9
]
|14
[
57
])[
0-9
]{8
}
$/
,
message
:
'请输入正确的手机'
}
{
pattern
:
/^
1
[
1234567890
]\d{9
}
$/
,
message
:
'请输入正确的手机'
}
],
],
},
},
msg
:{
msg
:{
...
...
src/components/SalesModule/enrollTotal.vue
View file @
171eaa42
...
@@ -276,7 +276,7 @@
...
@@ -276,7 +276,7 @@
<tr
style=
"height:20px"
>
<tr
style=
"height:20px"
>
<td
colspan=
"15"
class=
"RL_Order"
style=
"height:20px"
>
<td
colspan=
"15"
class=
"RL_Order"
style=
"height:20px"
>
<span
style=
"font-size: 14px;color: #333333"
>
名单:
</span>
<span
style=
"font-size: 14px;color: #333333"
>
名单:
</span>
<span
v-for=
"(childItem) in item.guestList"
>
{{
childItem
.
userName
}}
</span>
<span
v-for=
"(childItem) in item.guestList"
style=
"font-size: 14px;color: blue"
>
{{
childItem
.
userName
}}
</span>
<!--
<span
v-else
>
暂无名单
</span>
-->
<!--
<span
v-else
>
暂无名单
</span>
-->
<span
style=
"display: block;font-size: 14px;color: #333333"
>
房间信息:
{{
item
.
orderGuestHouseStr
}}
</span>
<span
style=
"display: block;font-size: 14px;color: #333333"
>
房间信息:
{{
item
.
orderGuestHouseStr
}}
</span>
</td>
</td>
...
...
src/components/SalesModule/groupTourOrderByTuan.vue
View file @
171eaa42
...
@@ -1746,8 +1746,8 @@
...
@@ -1746,8 +1746,8 @@
</tr>
</tr>
<tr
style=
"height:20px"
>
<tr
style=
"height:20px"
>
<td
colspan=
"15"
class=
"RL_Order"
style=
"height:20px"
>
<td
colspan=
"15"
class=
"RL_Order"
style=
"height:20px"
>
<span
class=
"RL-remarkTitle"
v-if=
"item.guestList.length>0 && item.isOwn
!=2
"
>
名单:
</span>
<span
class=
"RL-remarkTitle"
v-if=
"item.guestList.length>0 && item.isOwn
==1 && item.clientSource==1 ||userId==1||userId==5||positionId==168||isUpdateOrder
"
>
名单:
</span>
<span
class=
"RL-redType RL-remarkCon"
v-if=
"item.guestList.length>0 && item.isOwn
!=2
"
>
<span
class=
"RL-redType RL-remarkCon"
v-if=
"item.guestList.length>0 && item.isOwn
==1 && item.clientSource==1 ||userId==1||userId==5||positionId==168||isUpdateOrder
"
>
<span
v-for=
"(childItem) in item.guestList"
>
{{childItem.userName}}
</span>
<span
v-for=
"(childItem) in item.guestList"
>
{{childItem.userName}}
</span>
</span>
</span>
<!-- <span class="RL-redType RL-remarkCon" v-else>-->
<!-- <span class="RL-redType RL-remarkCon" v-else>-->
...
...
src/components/TravelManager/TravelList/RegistrationList.vue
View file @
171eaa42
...
@@ -3165,7 +3165,7 @@
...
@@ -3165,7 +3165,7 @@
this
.
Unit_PriceList
=
[];
this
.
Unit_PriceList
=
[];
this
.
apipost
(
'sellorder_post_GetLessPrice'
,
{
this
.
apipost
(
'sellorder_post_GetLessPrice'
,
{
"TCID"
:
obj
.
TCID
,
"TCID"
:
obj
.
TCID
,
"MaxPeopleNum"
:
M
axPeopleNum
"MaxPeopleNum"
:
m
axPeopleNum
},
res
=>
{
},
res
=>
{
this
.
LessMoney
=
res
.
data
.
data
.
lessMoney
;
this
.
LessMoney
=
res
.
data
.
data
.
lessMoney
;
if
(
parseFloat
(
this
.
LessMoney
)
>
0
)
{
if
(
parseFloat
(
this
.
LessMoney
)
>
0
)
{
...
@@ -3807,6 +3807,7 @@
...
@@ -3807,6 +3807,7 @@
}
else
{
}
else
{
this
.
addMsg
.
PreferPrice
=
Number
(
this
.
addMsg
.
YSeatNum
)
*
Number
(
this
.
addMsg
.
Unit_Price
)
+
this
.
OpSetLossMoney
;
this
.
addMsg
.
PreferPrice
=
Number
(
this
.
addMsg
.
YSeatNum
)
*
Number
(
this
.
addMsg
.
Unit_Price
)
+
this
.
OpSetLossMoney
;
}
}
this
.
getlessPrice
();
this
.
getTicheng
();
this
.
getTicheng
();
},
},
yzBigBed2
()
{
yzBigBed2
()
{
...
@@ -4770,6 +4771,45 @@
...
@@ -4770,6 +4771,45 @@
// }
// }
// },
// },
// err => {})
// err => {})
},
getlessPrice
(){
let
maxPeopleNum
=
(
Number
(
this
.
addMsg
.
ManNum
)
+
Number
(
this
.
addMsg
.
ChirdNoNeedBedNum
)
+
Number
(
this
.
addMsg
.
ChirdNeedBedNum
)
+
Number
(
this
.
addMsg
.
OldPeopleNum
)
+
Number
(
this
.
addMsg
.
AirticketNum
))
this
.
Unit_PriceList
=
[];
this
.
apipost
(
'sellorder_post_GetLessPrice'
,
{
"TCID"
:
this
.
addMsg
.
TCID
,
"MaxPeopleNum"
:
maxPeopleNum
},
res
=>
{
this
.
LessMoney
=
res
.
data
.
data
.
lessMoney
;
if
(
parseFloat
(
this
.
LessMoney
)
>
0
)
{
for
(
var
i
=
0
;
i
<=
parseInt
(
this
.
LessMoney
)
/
10
;
i
++
)
{
var
obj
=
{
ID
:
''
,
LessMoney
:
''
}
obj
.
ID
=
this
.
addMsg
.
TC_Price
-
i
*
10
;
obj
.
LessMoney
=
this
.
addMsg
.
TC_Price
-
i
*
10
;
this
.
Unit_PriceList
.
push
(
obj
);
}
if
(
this
.
Unit_PriceList
.
findIndex
(
markers
=>
markers
.
ID
==
this
.
addMsg
.
Unit_Price
)
<
0
)
{
var
obj
=
{
ID
:
''
,
LessMoney
:
''
}
obj
.
ID
=
this
.
addMsg
.
Unit_Price
;
obj
.
LessMoney
=
this
.
addMsg
.
Unit_Price
;
this
.
Unit_PriceList
.
push
(
obj
);
}
}
else
{
var
obj
=
{
ID
:
''
,
LessMoney
:
''
}
obj
.
ID
=
this
.
addMsg
.
Unit_Price
;
obj
.
LessMoney
=
this
.
addMsg
.
Unit_Price
;
this
.
Unit_PriceList
.
push
(
obj
);
}
},
err
=>
{})
}
}
},
},
mounted
()
{
mounted
()
{
...
...
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