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
955de0b7
Commit
955de0b7
authored
May 31, 2019
by
华国豪
🙄
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
修改了bug
parent
c40da16b
Show whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
29 additions
and
5 deletions
+29
-5
leaderReimbursement.vue
src/components/LeaderManagement/leaderReimbursement.vue
+17
-2
groupTourOrder.vue
src/components/SalesModule/groupTourOrder.vue
+1
-1
groupTourOrderByTuan.vue
src/components/SalesModule/groupTourOrderByTuan.vue
+1
-1
leaderPay2.vue
src/components/leaderPay2.vue
+10
-1
No files found.
src/components/LeaderManagement/leaderReimbursement.vue
View file @
955de0b7
...
@@ -423,7 +423,7 @@
...
@@ -423,7 +423,7 @@
</td>
</td>
<td
width=
"80"
class=
"_zhidan"
>
<td
width=
"80"
class=
"_zhidan"
>
<input
type=
"button"
<input
type=
"button"
v
-if=
"isUpdate=='true' && item.LeaderGetPrice < (TotalNav.reimburseTotalPrice.PlanPrice * 0.95)"
v
alue=
"制单"
value=
"制单"
class=
"normalBtn"
@
click=
"goZhiDan(item)"
/>
class=
"normalBtn"
@
click=
"goZhiDan(item)"
/>
</td>
</td>
</tr>
</tr>
...
@@ -501,7 +501,7 @@
...
@@ -501,7 +501,7 @@
}
}
});
});
},
},
goZhiDan
:
function
(
obj
)
{
goZhiDan
2
:
function
(
obj
)
{
let
allMoney
=
this
.
TotalNav
.
reimburseTotalPrice
.
PlanPrice
*
0.95
let
allMoney
=
this
.
TotalNav
.
reimburseTotalPrice
.
PlanPrice
*
0.95
let
totailMoney
=
0
let
totailMoney
=
0
this
.
nav
.
forEach
(
x
=>
{
this
.
nav
.
forEach
(
x
=>
{
...
@@ -539,6 +539,21 @@
...
@@ -539,6 +539,21 @@
}
}
});
});
},
},
goZhiDan
:
function
(
obj
)
{
if
(
this
.
list
.
hotelNoSureInfo
!==
''
)
{
this
.
$confirm
(
`
${
this
.
list
.
hotelNoSureInfo
}
,是否去制单?`
,
this
.
$t
(
'tips.tips'
),
{
confirmButtonText
:
this
.
$t
(
'pub.sureBtn'
),
cancelButtonText
:
this
.
$t
(
'pub.cancelBtn'
),
type
:
'warning'
}).
then
(()
=>
{
this
.
goZhiDan2
(
obj
)
}).
catch
(()
=>
{
return
false
});
}
else
{
this
.
goZhiDan2
(
obj
)
}
},
addOtherList
(
index
,
id
)
{
addOtherList
(
index
,
id
)
{
this
.
list
.
OtherOrderReportList
.
OtherList
.
push
({
this
.
list
.
OtherOrderReportList
.
OtherList
.
push
({
OrderType
:
'1'
,
OrderType
:
'1'
,
...
...
src/components/SalesModule/groupTourOrder.vue
View file @
955de0b7
...
@@ -2769,7 +2769,7 @@
...
@@ -2769,7 +2769,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
)
{
...
...
src/components/SalesModule/groupTourOrderByTuan.vue
View file @
955de0b7
...
@@ -3097,7 +3097,7 @@ submitYSZEForm(){
...
@@ -3097,7 +3097,7 @@ submitYSZEForm(){
this
.
getDdlyList
(
this
.
addMsg
.
CustomerType
);
this
.
getDdlyList
(
this
.
addMsg
.
CustomerType
);
let
maxPeopleNum
=
(
Number
(
this
.
addMsg
.
ManNum
)
+
Number
(
this
.
addMsg
.
ChirdNoNeedBedNum
)
+
Number
(
this
.
addMsg
.
ChirdNeedBedNum
)
+
Number
(
this
.
addMsg
.
OldPeopleNum
)
+
Number
(
this
.
addMsg
.
AirticketNum
)
)
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
.
Unit_PriceList
=
[];
this
.
apipost
(
'sellorder_post_GetLessPrice'
,
{
"TCID"
:
obj
.
tcid
,
"MaxPeopleNum"
:
M
axPeopleNum
},
res
=>
{
this
.
apipost
(
'sellorder_post_GetLessPrice'
,
{
"TCID"
:
obj
.
tcid
,
"MaxPeopleNum"
:
m
axPeopleNum
},
res
=>
{
this
.
LessMoney
=
res
.
data
.
data
.
lessMoney
;
this
.
LessMoney
=
res
.
data
.
data
.
lessMoney
;
if
(
parseFloat
(
this
.
LessMoney
)
>
0
){
if
(
parseFloat
(
this
.
LessMoney
)
>
0
){
for
(
var
i
=
0
;
i
<=
parseInt
(
this
.
LessMoney
)
/
10
;
i
++
)
{
for
(
var
i
=
0
;
i
<=
parseInt
(
this
.
LessMoney
)
/
10
;
i
++
)
{
...
...
src/components/leaderPay2.vue
View file @
955de0b7
...
@@ -343,7 +343,13 @@ input[type="number"] {
...
@@ -343,7 +343,13 @@ input[type="number"] {
</p>
</p>
</td>
</td>
<td
width=
"80"
class=
"_zhidan"
>
<td
width=
"80"
class=
"_zhidan"
>
<input
v-if=
"dataList.LeaderApply && dataList.LeaderApply.Status && dataList.LeaderApply.Status==2"
<input
v-if=
"TimeXiao"
type=
"button"
value=
"制单"
class=
"leader2Btn"
@
click=
"goZhiDan(item)"
>
<input
v-else-if=
"dataList.LeaderApply && dataList.LeaderApply.Status && dataList.LeaderApply.Status==2"
type=
"button"
type=
"button"
value=
"制单"
value=
"制单"
class=
"leader2Btn"
class=
"leader2Btn"
...
@@ -414,6 +420,7 @@ export default {
...
@@ -414,6 +420,7 @@ export default {
TotalPriceData
:
[],
TotalPriceData
:
[],
blankUrl
:
""
,
blankUrl
:
""
,
TotalNav
:
[],
TotalNav
:
[],
TimeXiao
:
false
,
};
};
},
},
methods
:
{
methods
:
{
...
@@ -511,6 +518,8 @@ export default {
...
@@ -511,6 +518,8 @@ export default {
res
=>
{
res
=>
{
if
(
res
.
data
.
resultCode
==
1
)
{
if
(
res
.
data
.
resultCode
==
1
)
{
this
.
nav
=
res
.
data
.
data
;
this
.
nav
=
res
.
data
.
data
;
let
time
=
this
.
nav
[
0
].
StartDateStr
this
.
TimeXiao
=
time
<
'2019-05-01'
?
true
:
false
}
else
{
}
else
{
this
.
Error
(
res
.
data
.
message
);
this
.
Error
(
res
.
data
.
message
);
}
}
...
...
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