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
9aaeb5b7
Commit
9aaeb5b7
authored
Sep 10, 2019
by
华国豪
🙄
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
修复财务单据详上传图片问题,修复领队报账餐厅显示问题
parent
2d4fc89e
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
14 additions
and
9 deletions
+14
-9
FinancialDocumentsDetail.vue
src/components/FinancialModule/FinancialDocumentsDetail.vue
+9
-7
freeTravelOrder.vue
src/components/TravelManager/TravelList/freeTravelOrder.vue
+1
-1
leaderPay2.vue
src/components/leaderPay2.vue
+4
-1
No files found.
src/components/FinancialModule/FinancialDocumentsDetail.vue
View file @
9aaeb5b7
...
...
@@ -118,10 +118,10 @@
-webkit-box-orient
:
vertical
;
font-size
:
12px
;
}
._fujian_box
{
position
:
fixed
;
left
:
961
px
;
top
:
141px
;
.
FinancialDocumentsDetail
.
_fujian_box
{
position
:
absolute
;
left
:
895
px
;
top
:
-0
;
width
:
440px
;
}
._wenjian
{
...
...
@@ -262,8 +262,10 @@
text-decoration
:
underline
;
color
:
rgb
(
255
,
0
,
0
);
}
._addUpload_box_btm
{
padding-top
:
20px
;
.FinancialDocumentsDetail
._addUpload_box_btm
{
padding-top
:
20px
;
max-height
:
230px
;
overflow
:
auto
;
}
._addUpload_box_btm
img
{
width
:
100%
;
...
...
@@ -373,7 +375,7 @@
</
style
>
<
template
>
<div
class=
"page_fdd"
v-if=
"GetDetail"
>
<div
class=
"page_fdd
FinancialDocumentsDetail
"
v-if=
"GetDetail"
>
<div
class=
"_none_print"
>
<span
class=
"_Printing"
@
click=
"goPrintPage(GetDetail.Type,GetDetail.FrID,GetDetail.Is_Merge,OrderSource)"
>
打印单据
</span>
<span
v-if=
"GetDetail.TemplateId==48 || GetDetail.TemplateId==43"
class=
"Note_span"
@
click=
"goUrl('DebitNote',GetDetail.FrID)"
>
借支单下载
</span>
...
...
src/components/TravelManager/TravelList/freeTravelOrder.vue
View file @
9aaeb5b7
...
...
@@ -573,7 +573,7 @@ export default {
cancelButtonText
:
this
.
$t
(
'pub.cancelBtn'
),
type
:
'warning'
}).
then
(()
=>
{
this
.
apipost
(
'
dmc_post_ge
t_UpdateOrderCanClear'
,{
OrderID
:
OrderID
,
IsCanClear
:
type
},
res
=>
{
this
.
apipost
(
'
KKDayOrder_Pos
t_UpdateOrderCanClear'
,{
OrderID
:
OrderID
,
IsCanClear
:
type
},
res
=>
{
if
(
res
.
data
.
resultCode
==
1
){
this
.
Success
(
res
.
data
.
message
);
this
.
getList
();
...
...
src/components/leaderPay2.vue
View file @
9aaeb5b7
...
...
@@ -1694,6 +1694,7 @@
Diningdest
.
push
({
UseTimeStr
:
ai
.
UseTimeStr
,
DiningID
:
ai
.
DiningID
,
id
:
ai
.
DiningID
+
ai
.
UseTimeStr
,
data
:
[
ai
]
});
Diningmap
[
ai
.
UseTimeStr
]
=
ai
;
...
...
@@ -1712,6 +1713,7 @@
Diningdest
.
push
({
UseTimeStr
:
ai
.
UseTimeStr
,
DiningID
:
ai
.
DiningID
,
id
:
ai
.
DiningID
+
ai
.
UseTimeStr
,
data
:
[
ai
]
});
}
...
...
@@ -1724,7 +1726,8 @@
}
Diningdest
[
i
].
row
=
row
}
this
.
DiningDataList
=
this
.
unique
(
Diningdest
,
'DiningID'
);
console
.
log
(
Diningdest
)
this
.
DiningDataList
=
this
.
unique
(
Diningdest
,
'id'
);
// this.DiningDataList = Diningdest
//票
let
ScenicList
=
[]
...
...
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