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
01bd3f19
Commit
01bd3f19
authored
Jan 30, 2019
by
华国豪
🙄
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
'强东你在更新最后最后一下@@@!!'
parent
363c79bf
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
13 additions
and
8 deletions
+13
-8
addFinancialDocuments.vue
src/components/FinancialModule/addFinancialDocuments.vue
+4
-4
groupTourOrderByTuan.vue
src/components/SalesModule/groupTourOrderByTuan.vue
+8
-4
payURL.vue
src/components/commonPage/payURL.vue
+1
-0
No files found.
src/components/FinancialModule/addFinancialDocuments.vue
View file @
01bd3f19
...
...
@@ -200,9 +200,9 @@
:key=
'item.ID'
>
</el-option>
</el-select>
<el-select
filterable
v-if=
"msg.ClientType==7"
v-model=
'msg.IsLeader'
placeholder=
"客户名称"
class=
"w
80
_border_b_1"
>
<el-option
label=
'正式领队'
:value=
'1'
:key=
'1'
>
</el-option>
<el-option
label=
'临时领队'
:value=
'0'
:key=
'0'
>
</el-option>
<el-select
filterable
v-if=
"msg.ClientType==7"
v-model=
'msg.IsLeader'
placeholder=
"客户名称"
class=
"w
135
_border_b_1"
>
<el-option
label=
'正式领队
/导游
'
:value=
'1'
:key=
'1'
>
</el-option>
<el-option
label=
'临时领队
/导游
'
:value=
'0'
:key=
'0'
>
</el-option>
</el-select>
<template
v-if=
"msg.ClientType==7&&msg.IsPublic!=2&&msg.IsPublic!=3"
>
<el-select
v-if=
"msg.IsLeader==1"
filterable
v-model=
'msg.ClientID'
placeholder=
"客户名称"
@
change=
"GetClientAccountList(msg.ClientID)"
class=
"w135 _border_b_1"
>
...
...
@@ -842,7 +842,7 @@ export default {
}
if
(
this
.
msg
.
ClientType
===
''
)
return
this
.
$message
.
error
(
'请选择付款对象!'
);
// IsPublic 2 现金 IsLeader 0 临时领队
if
(
this
.
msg
.
IsPublic
<
2
){
if
(
this
.
msg
.
IsPublic
<
2
&&
this
.
IsLeader
===
1
){
if
(
this
.
msg
.
ClientID
===
''
)
return
this
.
$message
.
error
(
'请选择客户名称!'
);
if
(
this
.
msg
.
AccountNumber
===
''
)
return
this
.
$message
.
error
(
'请选择付款账户!'
);
}
else
{
...
...
src/components/SalesModule/groupTourOrderByTuan.vue
View file @
01bd3f19
...
...
@@ -1478,8 +1478,11 @@
</tr>
<tr
v-if=
'orderList.length>0'
v-for=
"(item2,index2) in orderList"
:key=
"index2"
>
<td>
{{
item2
.
FrID
}}
</td>
<td>
{{
item2
.
PayMoney
}}
</td>
<td>
{{
item2
.
TypeName
}}
</td>
<td>
<span
v-if=
"isUpdateOrder"
>
{{
item2
.
PayMoney
}}
</span>
<span
v-else
>
******
</span>
</td>
<td>
{{
item2
.
TypeName
}}
</td>
<td>
{{
item2
.
StatusName
}}
</td>
</tr>
<tr
v-if=
'orderList.length==0'
>
...
...
@@ -1487,8 +1490,9 @@
</tr>
</table>
</div>
<span
v-if=
'item.isEnd==0'
style=
"cursor: pointer;"
@
click=
"getOrderDetail(item)"
slot=
"reference"
>
{{
item
.
income
}}
</span>
<span
v-if=
'item.isEnd!=0'
style=
"cursor: pointer;color: #e95252;"
@
click=
"getOrderDetail(item)"
slot=
"reference"
>
{{
item
.
income
}}
</span>
<span
v-if=
'item.isEnd==0 && isUpdateOrder'
style=
"cursor: pointer;"
@
click=
"getOrderDetail(item)"
slot=
"reference"
>
{{
item
.
income
}}
</span>
<span
v-else-if=
'item.isEnd!=0 && isUpdateOrder'
style=
"cursor: pointer;color: #e95252;"
@
click=
"getOrderDetail(item)"
slot=
"reference"
>
{{
item
.
income
}}
</span>
<span
v-else
>
******
</span>
</el-popover>
</td>
<td>
...
...
src/components/commonPage/payURL.vue
View file @
01bd3f19
...
...
@@ -145,6 +145,7 @@
}
});
}
this
.
value
=
''
},
getPayDetail
(
obj
,
Type
)
{
let
nowTime
=
new
Date
()
...
...
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