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
3ef0f569
Commit
3ef0f569
authored
Oct 22, 2019
by
黄媛媛
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
单据详情和审核新增模板Id判断
parent
f323ae62
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
19 additions
and
6 deletions
+19
-6
BasicDocuments.vue
src/components/FinancialModule/BasicDocuments.vue
+9
-4
FinancialDocumentsDetail.vue
src/components/FinancialModule/FinancialDocumentsDetail.vue
+10
-1
salesOrderToday.vue
src/components/SalesVisa/salesOrderToday.vue
+0
-1
No files found.
src/components/FinancialModule/BasicDocuments.vue
View file @
3ef0f569
...
...
@@ -460,7 +460,7 @@
</div>
<p
class=
"_splic"
>
///////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
</p>
<div
class=
"_tit _tit2 w890px"
>
<myGuanBill
:ID=
"FrID"
:FrID=
'FrID'
:TemplateId=
'GetDetail.TemplateId'
v-if=
"(GetDetail.TemplateId === 63 || GetDetail.TemplateId === 59 || GetDetail.TemplateId === 43 || GetDetail.TemplateId === 48 || GetDetail.TemplateId === 53 || GetDetail.TemplateId === 56) && showModel"
/>
<myGuanBill
:ID=
"FrID"
:FrID=
'FrID'
:TemplateId=
'GetDetail.TemplateId'
v-if=
"(
((GetDetail.TemplateId === 36 || GetDetail.TemplateId === 37) && LeadState) ||
GetDetail.TemplateId === 63 || GetDetail.TemplateId === 59 || GetDetail.TemplateId === 43 || GetDetail.TemplateId === 48 || GetDetail.TemplateId === 53 || GetDetail.TemplateId === 56) && showModel"
/>
<myJiPiaoBill
:ID=
"FrID"
:FrID=
'FrID'
:TemplateId=
'GetDetail.TemplateId'
v-if=
"GetDetail.TemplateId === 2 || GetDetail.TemplateId === 12 && showModel"
/>
</div>
<
template
v-if=
"sonTCIDList"
>
...
...
@@ -1477,6 +1477,7 @@ export default {
showModel
:
false
,
MsgUrl
:
true
,
CostTypeState
:
false
,
LeadState
:
false
,
}
},
components
:{
"my-FlowChartModule"
:
myFlowChartModule
,
...
...
@@ -2330,9 +2331,13 @@ export default {
}
this
.
chongJudge
(
data
)
this
.
GetDetail
=
data
;
console
.
log
(
"this.GetDetail"
,
this
.
GetDetail
)
console
.
log
(
"this.GetDetail.FApplyForNumber"
,
this
.
GetDetail
.
FApplyForNumber
)
if
(
this
.
GetDetail
.
DetailList
){
this
.
GetDetail
.
DetailList
.
forEach
(
item
=>
{
if
(
item
.
CostTypeName
==
"领队导游资金池领款"
){
this
.
LeadState
=
true
;
}
})
}
if
(
this
.
GetDetail
.
DetailList
.
length
>
0
){
this
.
GetDetail
.
DetailList
.
forEach
(
item
=>
{
if
(
item
.
CostTypeName
==
"差旅费"
){
...
...
src/components/FinancialModule/FinancialDocumentsDetail.vue
View file @
3ef0f569
...
...
@@ -546,7 +546,7 @@
</div>
<p
class=
"_splic"
>
///////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
</p>
<div
class=
"_tit _tit2 w890px"
>
<myGuanBill
:ID=
"FrID"
:FrID=
'FrID'
:TemplateId=
'GetDetail.TemplateId'
v-if=
"(GetDetail.TemplateId === 63 || GetDetail.TemplateId === 59 || GetDetail.TemplateId === 43 || GetDetail.TemplateId === 48 || GetDetail.TemplateId === 53 || GetDetail.TemplateId === 56) && showModel"
/>
<myGuanBill
:ID=
"FrID"
:FrID=
'FrID'
:TemplateId=
'GetDetail.TemplateId'
v-if=
"(
((GetDetail.TemplateId === 36 || GetDetail.TemplateId === 37) && LeadState) ||
GetDetail.TemplateId === 63 || GetDetail.TemplateId === 59 || GetDetail.TemplateId === 43 || GetDetail.TemplateId === 48 || GetDetail.TemplateId === 53 || GetDetail.TemplateId === 56) && showModel"
/>
<myJiPiaoBill
:ID=
"FrID"
:FrID=
'FrID'
:TemplateId=
'GetDetail.TemplateId'
v-if=
"GetDetail.TemplateId === 2 || GetDetail.TemplateId === 12 && showModel"
/>
</div>
<
template
v-if=
"sonTCIDList"
>
...
...
@@ -848,6 +848,7 @@ import myJiPiaoBill from "./FinancialSubmodule/JiPiaoBillModule.vue";
export
default
{
data
(){
return
{
LeadState
:
false
,
//驳回弹窗
finacialDialog
:
false
,
ZhiDanRen
:
-
1
,
...
...
@@ -1353,6 +1354,14 @@ export default {
}
this
.
chongJudge
(
data
)
this
.
GetDetail
=
data
;
if
(
this
.
GetDetail
.
DetailList
){
this
.
GetDetail
.
DetailList
.
forEach
(
item
=>
{
if
(
item
.
CostTypeName
==
"领队导游资金池领款"
){
this
.
LeadState
=
true
;
}
})
}
this
.
showModel
=
true
// 截取掉驳回后面的审核步骤
this
.
ZhiDanRen
=
this
.
GetDetail
.
CreatBy
;
...
...
src/components/SalesVisa/salesOrderToday.vue
View file @
3ef0f569
...
...
@@ -236,7 +236,6 @@ export default {
},
methods
:{
Export
(){
console
.
log
(
"msg.QStartDate"
,
this
.
msg
.
QStartDate
);
if
(
!
this
.
msg
.
QStartDate
||
this
.
msg
.
QStartDate
==
""
){
this
.
Error
(
"请选择出发开始日期!"
)
return
;
...
...
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