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
b8730bbf
Commit
b8730bbf
authored
Mar 18, 2019
by
华国豪
🙄
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
财务type
parent
9e11decc
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
7 additions
and
8 deletions
+7
-8
CapitalAllocationDetail.vue
src/components/FinancialModule/CapitalAllocationDetail.vue
+1
-1
FinancialDocuments.vue
src/components/FinancialModule/FinancialDocuments.vue
+1
-1
FinancialDocumentsDetail.vue
src/components/FinancialModule/FinancialDocumentsDetail.vue
+2
-2
BillModule.vue
...ponents/FinancialModule/FinancialSubmodule/BillModule.vue
+1
-1
CouponList.vue
src/components/activity/CouponList.vue
+2
-3
No files found.
src/components/FinancialModule/CapitalAllocationDetail.vue
View file @
b8730bbf
...
...
@@ -234,7 +234,7 @@
padding
:
15px
;
margin
:
0
auto
;
}
.
_conten
,
._process
{
margin-top
:
20px
;
width
:
830px
;}
.
CapitalDetail
._conten
,
.CapitalDetail
._process
{
margin-top
:
20px
;
width
:
830px
;}
._process
{
background-color
:
white
;
padding
:
20px
15px
;
position
:
relative
;}
._process_box
{
border-top
:
1px
dashed
#BFBFBF
;
padding-top
:
30px
;
padding-bottom
:
40px
;}
._pb_son
{
position
:
relative
;
padding-left
:
75px
;
min-height
:
100px
;
padding-bottom
:
30px
}
...
...
src/components/FinancialModule/FinancialDocuments.vue
View file @
b8730bbf
...
...
@@ -562,7 +562,7 @@
<span
slot=
"reference"
@
click=
"item.modelShow = true"
class=
"text_d PingFangSC"
>
{{item.FrID}}
</span>
</el-popover>
</td>
<td><span
class=
"_bg__"
:class=
"item.Type==1?'_bg_green':'_bg_red'"
>
{{item.TypeName}}
</span></td>
<td><span
class=
"_bg__"
:class=
"item.Type==1
|| item.Type==5
?'_bg_green':'_bg_red'"
>
{{item.TypeName}}
</span></td>
<td
class=
"_number"
>
<
template
v-if=
"item.TCIDAndTCNUMList.length>0"
>
<div
class=
"_TCIDAndTCNUMList"
>
...
...
src/components/FinancialModule/FinancialDocumentsDetail.vue
View file @
b8730bbf
...
...
@@ -336,8 +336,8 @@
<span
class=
"_Printing"
@
click=
"goPrintPage(GetDetail.Type,GetDetail.FrID,GetDetail.Is_Merge,OrderSource)"
>
打印单据
</span>
<p
class=
"_tit"
>
{{
GetDetail
.
FinanceName
}}
<span
:class=
"
{color_shz:(GetDetail.StatusStr!=='通过'
&&
GetDetail.StatusStr!=='驳回'
&&
GetDetail.StatusStr!=='作废'),color_tg:GetDetail.StatusStr==='通过',color_bh:GetDetail.StatusStr==='驳回'}">
{{
GetDetail
.
StatusStr
}}
</span></p>
<div
class=
"_conten"
>
<my-Bill
v-if=
"GetDetail.Type!==1
||
GetDetail.Type!==5"
:isPrintPage=
"false"
:ID=
"GetDetail.FrID"
:width=
"widthSon"
:color=
"colorSon"
></my-Bill>
<my-RVB-Bill
v-else
-if=
"GetDetail.Type===1 || GetDetail.Type===5"
:ID=
"GetDetail.FrID"
:isPrintPage=
"false"
:width=
"widthSon"
:color=
"colorSon"
></my-RVB-Bill>
<my-Bill
v-if=
"GetDetail.Type!==1
&&
GetDetail.Type!==5"
:isPrintPage=
"false"
:ID=
"GetDetail.FrID"
:width=
"widthSon"
:color=
"colorSon"
></my-Bill>
<my-RVB-Bill
v-else
:ID=
"GetDetail.FrID"
:isPrintPage=
"false"
:width=
"widthSon"
:color=
"colorSon"
></my-RVB-Bill>
<div
class=
"_explain"
>
<p>
附加说明:
</p>
<table
border=
"1"
bordercolor=
"#D2D2D2"
style=
"border-collapse:collapse;margin-top:15px;"
width=
"100%"
v-if=
"GetDetail.TCIDAndTCNUMList.length>0"
>
...
...
src/components/FinancialModule/FinancialSubmodule/BillModule.vue
View file @
b8730bbf
...
...
@@ -218,7 +218,7 @@
<td
height=
"26px"
>
{{benMoney}}
</td>
<td
height=
"26px"
></td>
</tr>
<tr
v-if=
"GetDetail.CashierDetail&&GetDetail.CashierDetail.length&&
GetDetail.Type!=1
"
>
<tr
v-if=
"GetDetail.CashierDetail&&GetDetail.CashierDetail.length&&
(GetDetail.Type!=1|| GetDetail.Type!=5)
"
>
<td
height=
"34px"
class=
""
>
交易方式
</td>
<td
height=
"34px"
colspan=
"7"
class=
"_color_b"
>
<
template
v-for=
"(item,index) in GetDetail.CashierDetail"
>
...
...
src/components/activity/CouponList.vue
View file @
b8730bbf
...
...
@@ -363,7 +363,7 @@ export default {
this
.
apiJavaPost
(
"/api/sell/coupon/getCouponsList"
,
this
.
msg
,
res
=>
{
console
.
log
(
res
);
if
(
res
.
data
.
resultCode
===
1
)
{
this
.
currentPage
=
res
.
data
.
data
.
pageCount
//
this.currentPage = res.data.data.pageCount
this
.
total
=
res
.
data
.
data
.
count
this
.
DataList
=
res
.
data
.
data
.
pageData
}
else
{
...
...
@@ -421,8 +421,7 @@ export default {
this
.
addMsg
.
overlapUse
=
item
.
overlapUse
this
.
addMsg
.
useCondition
=
item
.
useCondition
this
.
addMsg
.
id
=
item
.
id
this
.
addMsg
.
couponCount
=
item
.
couponCount
console
.
log
(
item
.
couponCount
)
this
.
addMsg
.
couponCount
=
item
.
couponCount
this
.
isleaveBtn
=
true
;
},
handleCurrentChange
(
val
)
{
...
...
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