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
3d1fc95a
Commit
3d1fc95a
authored
May 23, 2019
by
华国豪
🙄
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
新增销售排行弹窗
parent
eddbcd8d
Hide whitespace changes
Inline
Side-by-side
Showing
7 changed files
with
121 additions
and
14 deletions
+121
-14
BasicDocuments.vue
src/components/FinancialModule/BasicDocuments.vue
+1
-1
FinancialDocumentsDetail.vue
src/components/FinancialModule/FinancialDocumentsDetail.vue
+1
-1
Lowpricemanagement.vue
src/components/SalesModule/Lowpricemanagement.vue
+67
-5
groupTourOrder.vue
src/components/SalesModule/groupTourOrder.vue
+3
-1
groupTourOrderByTuan.vue
src/components/SalesModule/groupTourOrderByTuan.vue
+2
-2
RegistrationList.vue
src/components/TravelManager/TravelList/RegistrationList.vue
+3
-2
index.vue
src/components/index.vue
+44
-2
No files found.
src/components/FinancialModule/BasicDocuments.vue
View file @
3d1fc95a
...
...
@@ -290,7 +290,7 @@
<td
v-if=
"OrderSource==9&&GetDetail.SourceID>0"
@
click=
"jumpPage('SettlementOrder',GetDetail.SourceID,2)"
>
<span
class=
"_jump_page _font_bold"
>
国内票务
</span>
</td>
<td
v-else-if=
"OrderSource==10&&GetDetail.SourceID>0"
@
click=
"jumpPage('FinancialOrder',GetDetail.SourceID,3)"
>
<span
class=
"_jump_page _font_bold"
>
签证收支
</span>
</td>
<td
v-else-if=
"OrderSource==4&&GetDetail.SourceID>0"
@
click=
"jumpPage('FinancialOrder',GetDetail,4)"
>
<span
class=
"_jump_page _font_bold"
>
机票收支
</span>
</td>
<td
v-if=
"GetDetail.TemplateId === 43 || GetDetail.TemplateId === 48 || GetDetail.TemplateId === 53"
@
click=
"jumpPlanPage('leaderReimbursement',o.TCID)"
>
<span
class=
"_jump_page _font_bold"
>
用款计划
</span>
</td>
<td
v-if=
"GetDetail.TemplateId === 43 || GetDetail.TemplateId === 48 || GetDetail.TemplateId === 53
|| GetDetail.TemplateId === 56
"
@
click=
"jumpPlanPage('leaderReimbursement',o.TCID)"
>
<span
class=
"_jump_page _font_bold"
>
用款计划
</span>
</td>
</tr>
</table>
<table
border=
"1"
bordercolor=
"#D2D2D2"
style=
"border-collapse:collapse;margin-top:15px;"
width=
"100%"
v-else-if=
"OrderSource==10"
>
...
...
src/components/FinancialModule/FinancialDocumentsDetail.vue
View file @
3d1fc95a
...
...
@@ -377,7 +377,7 @@
<td
v-if=
"OrderSource==9&&GetDetail.SourceID>0"
@
click=
"jumpPage('FinancialOrder',GetDetail,2)"
>
<span
class=
"_jump_page _font_bold"
>
国内票务
</span>
</td>
<td
v-else-if=
"OrderSource==10&&GetDetail.SourceID>0"
@
click=
"jumpPage('FinancialOrder',GetDetail,3)"
>
<span
class=
"_jump_page _font_bold"
>
签证收支
</span>
</td>
<td
v-else-if=
"OrderSource==4&&GetDetail.SourceID>0"
@
click=
"jumpPage('FinancialOrder',GetDetail,4)"
>
<span
class=
"_jump_page _font_bold"
>
机票收支
</span>
</td>
<td
v-if=
"GetDetail.TemplateId === 43 || GetDetail.TemplateId === 48 || GetDetail.TemplateId === 53"
@
click=
"jumpPlanPage('leaderReimbursement',o.TCID)"
>
<span
class=
"_jump_page _font_bold"
>
用款计划
</span>
</td>
<td
v-if=
"GetDetail.TemplateId === 43 || GetDetail.TemplateId === 48 || GetDetail.TemplateId === 53
|| GetDetail.TemplateId === 56
"
@
click=
"jumpPlanPage('leaderReimbursement',o.TCID)"
>
<span
class=
"_jump_page _font_bold"
>
用款计划
</span>
</td>
</tr>
</table>
<table
border=
"1"
bordercolor=
"#D2D2D2"
style=
"border-collapse:collapse;margin-top:15px;"
width=
"100%"
v-else-if=
"OrderSource==10"
>
...
...
src/components/SalesModule/Lowpricemanagement.vue
View file @
3d1fc95a
...
...
@@ -31,7 +31,7 @@
</tr>
<tr
v-for=
"(item,index) in dataList"
>
<td>
{{
item
.
CreateByStr
}}
</td>
<td>
{{
item
.
CreateDate
}}
</td>
<td>
{{
item
.
CreateDate
.
replace
(
'T'
,
' '
)
}}
</td>
<td>
{{
item
.
OrderId
}}
</td>
<td>
{{
item
.
OrderUnitPrice
}}
</td>
<td>
{{
item
.
ApplyPrice
}}
</td>
...
...
@@ -40,8 +40,8 @@
<td>
{{
item
.
ApplyReason
}}
</td>
<td>
<el-row
v-if=
"item.ApplyState === 0"
>
<button
class=
"normalBtn"
type=
"primary"
@
click=
"outerVisible = true,dialogTitle='审核理由',addMsg.ID=item.ID,addMsg.ApplyState= 1,addMsg.Reasons=item.Reasons"
>
同意
</button>
<button
class=
"hollowFixedBtn"
@
click=
"outerVisible = true,dialogTitle='拒绝理由',addMsg.ID=item.ID,addMsg.ApplyState= 2,addMsg.Reasons=item.ApplyReason"
>
拒绝
</button>
<button
class=
"normalBtn"
type=
"primary"
@
click=
"outerVisible = true,dialogTitle='审核理由',addMsg.ID=item.ID,addMsg.ApplyState= 1,addMsg.Reasons=item.Reasons
, GetApplyLessPrice(item)
"
>
同意
</button>
<button
class=
"hollowFixedBtn"
@
click=
"outerVisible = true,dialogTitle='拒绝理由',addMsg.ID=item.ID,addMsg.ApplyState= 2,addMsg.Reasons=item.ApplyReason
, GetApplyLessPrice(item, 1)
"
>
拒绝
</button>
</el-row>
</td>
</tr>
...
...
@@ -52,8 +52,11 @@
</div>
<el-dialog
custom-class=
'w450'
:title=
"dialogTitle"
:visible
.
sync=
"outerVisible"
center
:before-close=
"closeChangeMachie"
>
<el-form
:rules=
"rules"
ref=
"addMsg"
label-width=
"100px"
>
<el-form-item
label=
"优惠金额"
prop=
"Description"
>
<el-input
class=
'w217'
v-model=
"addMsg.ApplyPrice"
></el-input>
<el-form-item
label=
"成交单价"
prop=
"Description"
>
<el-input
v-if=
"EmployeeId === 1"
class=
'w217'
v-model=
"addMsg.ApplyPrice"
></el-input>
<el-select
v-model=
'addMsg.ApplyPrice'
v-else
>
<el-option
v-for=
"price in Unit_PriceList"
:label=
'price.LessMoney'
:value=
'price.ID'
:key=
'price.ID'
></el-option>
</el-select>
</el-form-item>
<el-form-item
:label=
"$t('system.label_info')"
prop=
"Description"
>
<el-input
maxlength=
'250'
class=
'w217'
type=
"textarea"
v-model=
"addMsg.Reasons"
></el-input>
...
...
@@ -110,12 +113,71 @@
verSionMsg
:
{
Status
:
0
},
EmployeeId
:
-
11
,
Unit_PriceList
:
[]
}
},
mounted
()
{
this
.
getList
()
let
userInfo
=
this
.
getLocalStorage
();
this
.
EmployeeId
=
userInfo
.
EmployeeId
},
methods
:
{
GetApplyLessPrice
:
function
(
obj
,
type
)
{
this
.
addMsg
.
ApplyPrice
=
''
console
.
log
(
obj
)
this
.
Unit_PriceList
=
[];
if
(
type
)
{
var
objk
=
{
ID
:
''
,
LessMoney
:
''
}
objk
.
ID
=
obj
.
OrderUnitPrice
;
objk
.
LessMoney
=
obj
.
OrderUnitPrice
;
this
.
Unit_PriceList
.
push
(
objk
);
return
false
}
let
msg
=
{
ID
:
obj
.
OrderId
,
userId
:
obj
.
UpdateBy
}
this
.
apipost
(
"lessprice_post_GetApplyLessPrice"
,
msg
,
res
=>
{
if
(
res
.
data
.
resultCode
==
1
)
{
let
LessMoney
=
res
.
data
.
data
.
LessMoney
;
let
OrderOldPrice
=
res
.
data
.
data
.
OrderOldPrice
;
console
.
log
(
'res.data.data'
,
res
.
data
.
data
,
'LessMoney'
,
LessMoney
,
OrderOldPrice
)
if
(
parseFloat
(
LessMoney
)
>
0
){
for
(
var
i
=
0
;
i
<=
parseInt
(
LessMoney
)
/
10
;
i
++
)
{
var
objk
=
{
ID
:
''
,
LessMoney
:
''
}
objk
.
ID
=
OrderOldPrice
-
i
*
10
;
objk
.
LessMoney
=
OrderOldPrice
-
i
*
10
;
this
.
Unit_PriceList
.
push
(
objk
);
}
if
(
this
.
Unit_PriceList
.
findIndex
(
markers
=>
markers
.
ID
==
OrderOldPrice
)
<
0
)
{
var
objk
=
{
ID
:
''
,
LessMoney
:
''
}
objk
.
ID
=
OrderOldPrice
;
objk
.
LessMoney
=
OrderOldPrice
;
this
.
Unit_PriceList
.
push
(
objk
);
}
}
else
{
var
objk
=
{
ID
:
''
,
LessMoney
:
''
}
objk
.
ID
=
OrderOldPrice
;
objk
.
LessMoney
=
OrderOldPrice
;
this
.
Unit_PriceList
.
push
(
objk
);
}
}
},
err
=>
{})
},
getList
()
{
//获取列表数据
this
.
apipost
(
"lessprice_get_GetLesspriceOrderPageList"
,
this
.
msg
,
res
=>
{
if
(
res
.
data
.
resultCode
==
1
)
{
...
...
src/components/SalesModule/groupTourOrder.vue
View file @
3d1fc95a
...
...
@@ -2757,9 +2757,11 @@
},
err
=>
{}
)
let
maxPeopleNum
=
(
Number
(
this
.
addMsg
.
ManNum
)
+
Number
(
this
.
addMsg
.
ChirdNoNeedBedNum
)
+
Number
(
this
.
addMsg
.
ChirdNeedBedNum
)
+
Number
(
this
.
addMsg
.
OldPeopleNum
)
+
Number
(
this
.
addMsg
.
AirticketNum
)
)
this
.
Unit_PriceList
=
[];
this
.
apipost
(
'sellorder_post_GetLessPrice'
,
{
"TCID"
:
obj
.
tcid
"TCID"
:
obj
.
tcid
,
"MaxPeopleNum"
:
MaxPeopleNum
},
res
=>
{
this
.
LessMoney
=
res
.
data
.
data
.
lessMoney
;
if
(
parseFloat
(
this
.
LessMoney
)
>
0
)
{
...
...
src/components/SalesModule/groupTourOrderByTuan.vue
View file @
3d1fc95a
...
...
@@ -3090,9 +3090,9 @@ submitYSZEForm(){
this
.
isShowLayer
=
false
;
this
.
isShowLayer2
=
true
;
}
let
maxPeopleNum
=
(
Number
(
this
.
addMsg
.
ManNum
)
+
Number
(
this
.
addMsg
.
ChirdNoNeedBedNum
)
+
Number
(
this
.
addMsg
.
ChirdNeedBedNum
)
+
Number
(
this
.
addMsg
.
OldPeopleNum
)
+
Number
(
this
.
addMsg
.
AirticketNum
)
)
this
.
Unit_PriceList
=
[];
this
.
apipost
(
'sellorder_post_GetLessPrice'
,
{
"TCID"
:
obj
.
tcid
},
res
=>
{
this
.
apipost
(
'sellorder_post_GetLessPrice'
,
{
"TCID"
:
obj
.
tcid
,
"MaxPeopleNum"
:
MaxPeopleNum
},
res
=>
{
this
.
LessMoney
=
res
.
data
.
data
.
lessMoney
;
if
(
parseFloat
(
this
.
LessMoney
)
>
0
){
for
(
var
i
=
0
;
i
<=
parseInt
(
this
.
LessMoney
)
/
10
;
i
++
)
{
...
...
src/components/TravelManager/TravelList/RegistrationList.vue
View file @
3d1fc95a
...
...
@@ -3136,10 +3136,11 @@
this
.
isShowLayer
=
false
;
this
.
isShowLayer2
=
true
;
}
let
maxPeopleNum
=
(
Number
(
this
.
addMsg
.
ManNum
)
+
Number
(
this
.
addMsg
.
ChirdNoNeedBedNum
)
+
Number
(
this
.
addMsg
.
ChirdNeedBedNum
)
+
Number
(
this
.
addMsg
.
OldPeopleNum
)
+
Number
(
this
.
addMsg
.
AirticketNum
)
)
this
.
Unit_PriceList
=
[];
this
.
apipost
(
'sellorder_post_GetLessPrice'
,
{
"TCID"
:
obj
.
TCID
"TCID"
:
obj
.
TCID
,
"MaxPeopleNum"
:
MaxPeopleNum
},
res
=>
{
this
.
LessMoney
=
res
.
data
.
data
.
lessMoney
;
if
(
parseFloat
(
this
.
LessMoney
)
>
0
)
{
...
...
src/components/index.vue
View file @
3d1fc95a
...
...
@@ -841,7 +841,7 @@
</el-dialog>
<a
class=
"weOytour"
ref=
"weOytour"
href=
"http://we.oytour.com:8110/"
target=
"view_window"
>
Preface
</a>
<el-dialog
custom-class=
'w800 PingFangSC _saleRnk'
title=
"销售排行"
:visible
.
sync=
"saleRnkShow"
center
:before-close=
"closeChangeMachie"
>
<saleRnk/>
<saleRnk
:detail=
'NewSaleRnkInfo'
@
closeChangeMachie=
"closeChangeMachie"
/>
</el-dialog>
<div
v-show=
"mazip==0"
id=
"downzip"
>
<div>
...
...
@@ -1085,6 +1085,7 @@ export default {
},
detailMessage
:
{},
downLoadList
:
[],
NewSaleRnkInfo
:
{},
};
},
filters
:
{
...
...
@@ -1428,6 +1429,7 @@ export default {
this
.
app_user_workflow_MyAuditCount
();
this
.
refreshSysNoteDate
();
this
.
GetUserIsRead
();
this
.
getNewSaleRnkInfo
()
},
created
()
{
//页面刚进入时开启长连接
...
...
@@ -1452,6 +1454,36 @@ export default {
}
},
methods
:
{
getNewSaleRnkInfo
:
function
(){
let
msg
=
{
StartDate
:
''
}
this
.
apipost
(
"orderank_post_GetDetails"
,
msg
,
res
=>
{
if
(
res
.
data
.
resultCode
==
1
)
{
// console.log('res.data.datares.data.datares.data.data',res)
this
.
NewSaleRnkInfo
=
res
.
data
.
data
let
New
=
this
.
NewSaleRnkInfo
.
StartDateMonth
+
this
.
NewSaleRnkInfo
.
StartDateDay
let
arr
=
localStorage
.
saleRnkInfo
?
JSON
.
parse
(
localStorage
.
saleRnkInfo
)
:
[]
let
rep
=
false
for
(
let
i
=
0
;
i
<
arr
.
length
;
i
++
){
if
(
arr
[
i
]
===
New
)
{
rep
=
true
return
}
}
if
(
!
rep
)
{
this
.
saleRnkShow
=
true
arr
.
push
(
this
.
NewSaleRnkInfo
.
StartDateMonth
+
this
.
NewSaleRnkInfo
.
StartDateDay
)
}
localStorage
.
saleRnkInfo
=
JSON
.
stringify
(
arr
)
}
},
err
=>
{}
);
},
downloadSingle
(
obj
){
// let reg = /^http(s)?:\/\/(.*?)\//
// this.downloadFileRename(obj.Url.replace(reg,''),obj.Name);
...
...
@@ -1460,7 +1492,8 @@ export default {
dom
.
click
();
},
closeChangeMachie
(
done
)
{
//弹出框关闭初始化弹框内表单
done
();
// done();
this
.
saleRnkShow
=
false
},
GetUserIsRead
(){
this
.
apipost
(
'app_user_notice_GetUserIsRead'
,{},
res
=>
{
...
...
@@ -4230,7 +4263,16 @@ export default {
margin-top:-30px;
margin-left:155px;
}
._saleRnk.el-dialog--center{
z-index: 2019523;
}
._saleRnk.el-dialog--center .el-dialog__body{
padding: 0;
max-height: 800px;
}
._saleRnk.el-dialog--center{
margin-top: 45px !important;
margin-bottom: 0 !important;
height: 850px;
}
</
style
>
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