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
0f836e78
Commit
0f836e78
authored
Jan 14, 2020
by
黄奎
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
页面修改
parent
83cba45d
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
257 additions
and
179 deletions
+257
-179
RegistrationList.vue
src/components/TravelManager/TravelList/RegistrationList.vue
+227
-170
leaderPay2.vue
src/components/leaderPay2.vue
+30
-9
No files found.
src/components/TravelManager/TravelList/RegistrationList.vue
View file @
0f836e78
This diff is collapsed.
Click to expand it.
src/components/leaderPay2.vue
View file @
0f836e78
...
@@ -571,7 +571,7 @@
...
@@ -571,7 +571,7 @@
<td
v-if=
"subIndex==0 && childIndex == 0"
:rowspan=
"item.row"
>
<td
v-if=
"subIndex==0 && childIndex == 0"
:rowspan=
"item.row"
>
{{
subItem
.
HotelName
}}
{{
subItem
.
HotelName
}}
</td>
</td>
<td
v-if=
"subIndex==0 && childIndex == 0"
:rowspan=
"item.row"
>
<td
v-if=
"subIndex==0 && childIndex == 0"
:rowspan=
"item.row"
>
{{
subItem
.
NewHotelName
}}
{{
subItem
.
NewHotelName
}}
</td>
</td>
<td>
<td>
...
@@ -974,6 +974,8 @@
...
@@ -974,6 +974,8 @@
<input
type=
"button"
class=
"leader2Btn"
@
click=
"AuditOrder(1)"
value=
"审核不通过"
<input
type=
"button"
class=
"leader2Btn"
@
click=
"AuditOrder(1)"
value=
"审核不通过"
v-show=
"dataList.LeaderApply.Status==1"
>
v-show=
"dataList.LeaderApply.Status==1"
>
<input
type=
"button"
class=
"leader2Btn"
value=
"打印"
@
click=
"printTable()"
>
<input
type=
"button"
class=
"leader2Btn"
value=
"打印"
@
click=
"printTable()"
>
<input
v-if=
"UserId==615 && dataList.LeaderApply.Status==2"
type=
"button"
class=
"leader2Btn"
value=
"取消审核"
@
click=
"CancelLeaderApply()"
>
</div>
</div>
</div>
</div>
<a
:href=
"blankUrl"
id=
"blankLink"
target=
"_blank"
style=
"display:none"
>
1
</a>
<a
:href=
"blankUrl"
id=
"blankLink"
target=
"_blank"
style=
"display:none"
>
1
</a>
...
@@ -1024,6 +1026,7 @@
...
@@ -1024,6 +1026,7 @@
export
default
{
export
default
{
data
()
{
data
()
{
return
{
return
{
UserId
:
0
,
LineId
:
0
,
LineId
:
0
,
planPriceList
:
[],
planPriceList
:
[],
zhuijiaList
:
[],
zhuijiaList
:
[],
...
@@ -1094,9 +1097,7 @@
...
@@ -1094,9 +1097,7 @@
if
(
subItem
.
DiningID
==
DiningID
&&
subItem
.
UseDinnerType
==
UseDinnerType
&&
subItem
.
UseTimeStr
==
if
(
subItem
.
DiningID
==
DiningID
&&
subItem
.
UseDinnerType
==
UseDinnerType
&&
subItem
.
UseTimeStr
==
UseTimeStr
)
{
UseTimeStr
)
{
totalPrice
+=
0
totalPrice
+=
0
}
}
else
{
else
{
totalPrice
+=
subItem
.
TradingTotalPrice
totalPrice
+=
subItem
.
TradingTotalPrice
}
}
DiningID
=
subItem
.
DiningID
;
DiningID
=
subItem
.
DiningID
;
...
@@ -1398,7 +1399,7 @@
...
@@ -1398,7 +1399,7 @@
}
else
{
}
else
{
this
.
$message
.
error
(
res
.
data
.
message
)
this
.
$message
.
error
(
res
.
data
.
message
)
}
}
},
null
)
},
null
)
},
},
goZhiDan
:
function
(
obj
)
{
goZhiDan
:
function
(
obj
)
{
...
@@ -1656,11 +1657,10 @@
...
@@ -1656,11 +1657,10 @@
let
list
=
[]
let
list
=
[]
for
(
var
j
=
0
;
j
<
Diningdest
.
length
;
j
++
)
{
for
(
var
j
=
0
;
j
<
Diningdest
.
length
;
j
++
)
{
var
dj
=
Diningdest
[
j
];
var
dj
=
Diningdest
[
j
];
if
(
dj
.
id
==
(
ai
.
NewDiningID
+
ai
.
UseTimeStr
+
ai
.
UseDinnerTypeStr
))
{
if
(
dj
.
id
==
(
ai
.
NewDiningID
+
ai
.
UseTimeStr
+
ai
.
UseDinnerTypeStr
))
{
dj
.
data
.
push
(
ai
);
dj
.
data
.
push
(
ai
);
break
;
break
;
}
}
else
{
else
{
list
.
push
(
ai
)
list
.
push
(
ai
)
}
}
}
}
...
@@ -1668,7 +1668,7 @@
...
@@ -1668,7 +1668,7 @@
Diningdest
.
push
({
Diningdest
.
push
({
UseTimeStr
:
ai
.
UseTimeStr
,
UseTimeStr
:
ai
.
UseTimeStr
,
DiningID
:
ai
.
NewDiningID
,
DiningID
:
ai
.
NewDiningID
,
id
:
ai
.
NewDiningID
+
ai
.
UseTimeStr
+
ai
.
UseDinnerTypeStr
,
id
:
ai
.
NewDiningID
+
ai
.
UseTimeStr
+
ai
.
UseDinnerTypeStr
,
data
:
[
ai
]
data
:
[
ai
]
});
});
}
}
...
@@ -1842,12 +1842,33 @@
...
@@ -1842,12 +1842,33 @@
this
.
$message
.
error
(
res
.
data
.
message
);
this
.
$message
.
error
(
res
.
data
.
message
);
}
}
},
err
=>
{})
},
err
=>
{})
},
//取消审核
CancelLeaderApply
()
{
var
that
=
this
;
this
.
Confirm
(
"是否要取消审核?"
,
function
()
{
var
msg
=
{
TCIDs
:
that
.
msg
.
TCIDs
};
that
.
apipost
(
"miniProgram_price_CancelLeaderApplyService"
,
msg
,
res
=>
{
if
(
res
.
data
.
resultCode
==
1
)
{
that
.
Success
(
'取消审核成功!'
);
that
.
getList
();
}
else
{
that
.
Error
(
res
.
data
.
data
);
}
},
null
);
});
}
}
},
},
created
()
{},
created
()
{},
mounted
()
{
mounted
()
{
this
.
isUpdate
=
this
.
$route
.
query
.
isUpdate
;
this
.
isUpdate
=
this
.
$route
.
query
.
isUpdate
;
this
.
msg
.
TCIDs
=
this
.
$route
.
query
.
id
;
this
.
msg
.
TCIDs
=
this
.
$route
.
query
.
id
;
let
userInfo
=
this
.
getLocalStorage
();
this
.
UserId
=
userInfo
.
EmployeeId
;
this
.
getzongJE
();
this
.
getzongJE
();
this
.
getNav
();
this
.
getNav
();
this
.
getList
();
this
.
getList
();
...
...
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