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
5ab02301
Commit
5ab02301
authored
Jan 29, 2019
by
华国豪
🙄
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
'***麻烦各位更新一下index.js 里面的一个金额转换方法我加了东西 **** 修改了订单的金额修改权限问题@@@@'
parent
6b96539e
Show whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
34 additions
and
17 deletions
+34
-17
Details.vue
src/components/Details.vue
+6
-0
addReceivablesDocuments.vue
src/components/FinancialModule/addReceivablesDocuments.vue
+1
-0
groupTourOrderByTuan.vue
src/components/SalesModule/groupTourOrderByTuan.vue
+8
-8
RegistrationList.vue
src/components/TravelManager/TravelList/RegistrationList.vue
+7
-6
index.js
src/plug/index.js
+4
-3
config.js
src/router/config.js
+8
-0
No files found.
src/components/Details.vue
View file @
5ab02301
...
...
@@ -533,6 +533,9 @@ export default {
case
"/AccountPageList"
:
//财务 下属账号页面
path
=
"/institutionsManagement"
;
break
;
case
"/SalesFinancialDetail"
:
//销售
path
=
"/groupTourOrder"
;
break
;
}
//找到Root
...
...
@@ -738,6 +741,9 @@ export default {
case
"/AccountPageList"
:
//财务 下属账号页面
path
=
"/institutionsManagement"
;
break
;
case
"/SalesFinancialDetail"
:
//销售
path
=
"/groupTourOrder"
;
break
;
}
//找到Root
...
...
src/components/FinancialModule/addReceivablesDocuments.vue
View file @
5ab02301
...
...
@@ -955,6 +955,7 @@ export default {
if
(
res
.
data
.
resultCode
==
1
){
let
AccList
=
res
.
data
.
data
;
let
newAccList
=
[];
// if (typeof this.GetDetail.walist !== Array) return false
this
.
GetDetail
.
walist
.
forEach
(
x
=>
{
if
(
x
.
Type
===
1
){
AccList
.
forEach
(
y
=>
{
...
...
src/components/SalesModule/groupTourOrderByTuan.vue
View file @
5ab02301
...
...
@@ -804,7 +804,7 @@
</el-col>
-->
<el-col
:span=
"4"
>
<el-form-item
label=
"应收总额"
prop=
"PreferPrice"
>
<el-input
v-model=
'addMsg.PreferPrice'
:disabled=
"
true
"
></el-input>
<el-input
v-model=
'addMsg.PreferPrice'
:disabled=
"
!IsUpdateOrderMoney
"
></el-input>
</el-form-item>
</el-col>
<el-col
:span=
"4"
>
...
...
@@ -1118,7 +1118,7 @@
</el-col>
<el-col
:span=
"4"
>
<el-form-item
label=
"应收总额"
prop=
"PreferPrice"
>
<el-input
v-model=
'addMsg.PreferPrice'
:disabled=
"
true
"
></el-input>
<el-input
v-model=
'addMsg.PreferPrice'
:disabled=
"
!IsUpdateOrderMoney
"
></el-input>
</el-form-item>
</el-col>
<el-col
:span=
"4"
>
...
...
@@ -1406,7 +1406,7 @@
<p
v-if=
"item.isUnionOrder==1"
class=
"GO_union"
>
联
</p>
<p
class=
"fbold over_ellipsis"
style=
"width: 100%;"
:title=
"item.orderId"
>
{{
item
.
orderId
}}
</p>
<p
class=
"fz12 over_ellipsis"
style=
"width: 100%;"
>
{{
item
.
commissionSPeopleName
==
'无'
?
''
:
item
.
commissionSPeopleName
}}
</p>
<p>
发团:
{{
item
.
start
Date
}}
</p>
<p>
下单时间:
{{
item
.
create
Date
}}
</p>
</td>
<td>
<img
v-if=
'!item.createPhoto'
src=
"../../assets/img/litheader.png"
/>
...
...
@@ -1454,8 +1454,7 @@
</el-popover>
</td>
<td
style=
"color:#FF9C00"
>
<span
v-if=
"item.isOwn==1||userId==1||userId==5||positionId==168"
>
{{
item
.
tC_Price
}}
</span>
<span
v-else
>
*****
</span>
<span>
{{
item
.
tC_Price
}}
</span>
</td>
<td
style=
"color:#FF9C00"
>
<span
v-if=
"item.isOwn==1||userId==1||userId==5||positionId==168"
>
{{
item
.
unit_Price
}}
</span>
...
...
@@ -1653,7 +1652,7 @@
<p
v-if=
"item.isUnionOrder==1"
class=
"GO_union"
>
联
</p>
<p
class=
"fbold over_ellipsis"
style=
"width: 100%;"
:title=
"item.orderId"
>
{{item.orderId}}
</p>
<p
class=
"fz12 over_ellipsis"
style=
"width: 100%;"
>
{{item.commissionSPeopleName=='无'?'':item.commissionSPeopleName}}
</p>
<p>
发团:{{item.start
Date}}
</p>
<p>
下单时间:{{item.create
Date}}
</p>
</td>
<td>
<img
v-if=
'!item.createPhoto'
src=
"../../assets/img/litheader.png"
/>
...
...
@@ -1701,8 +1700,7 @@
</el-popover>
</td>
<td
style=
"color:#FF9C00"
>
<span
v-if=
"item.isOwn==1||userId==1||userId==5||positionId==168"
>
{{item.tC_Price}}
</span>
<span
v-else
>
*****
</span>
<span>
{{item.tC_Price}}
</span>
</td>
<td
style=
"color:#FF9C00"
>
<span
v-if=
"item.isOwn==1||userId==1||userId==5||positionId==168"
>
{{item.unit_Price}}
</span>
...
...
@@ -2169,6 +2167,7 @@ export default {
TCNUM
:
''
}
},
IsUpdateOrderMoney
:
false
,
//订单编号及业务员信息
subInfo
:{
CreateBy
:
''
,
...
...
@@ -3386,6 +3385,7 @@ export default {
this
.
loading
=
false
;
this
.
total
=
res
.
data
.
data
.
count
;
this
.
list
=
res
.
data
.
data
.
pageData
.
rtData
;
this
.
IsUpdateOrderMoney
=
res
.
data
.
data
.
pageData
.
isUpdateOrderMoney
this
.
cancelRtData
=
res
.
data
.
data
.
pageData
.
cancelRtData
[
0
].
list
;
this
.
seat
.
YSeat
=
res
.
data
.
data
.
pageData
.
ySeatNum
this
.
seat
.
CSeat
=
res
.
data
.
data
.
pageData
.
eSeatNum
...
...
src/components/TravelManager/TravelList/RegistrationList.vue
View file @
5ab02301
...
...
@@ -889,7 +889,7 @@
<el-row
:gutter=
"20"
>
<el-col
:span=
"4"
>
<el-form-item
label=
"应收总额"
prop=
"PreferPrice"
>
<el-input
v-model=
'addMsg.PreferPrice'
:disabled=
"
true
"
></el-input>
<el-input
v-model=
'addMsg.PreferPrice'
:disabled=
"
!this.OrderDataList.IsUpdateOrderMoney
"
></el-input>
</el-form-item>
</el-col>
<el-col
:span=
"4"
>
...
...
@@ -1160,7 +1160,7 @@
<el-col
:span=
"4"
>
<el-form-item
label=
"应收总额"
prop=
"PreferPrice"
>
<el-input
v-model=
'addMsg.PreferPrice'
@
keyup
.
native=
"checkInteger(addMsg,'PreferPrice')"
@
input
.
native=
'getTicheng()'
:disabled=
"
true&¬Update
"
></el-input>
:disabled=
"
!this.OrderDataList.IsUpdateOrderMoney
"
></el-input>
</el-form-item>
</el-col>
<el-col
:span=
"4"
>
...
...
@@ -1328,7 +1328,7 @@
<div
style=
"width: 100%; height: auto; overflow-x: auto;"
class=
"ownScrollbarStyle"
>
<table
class=
"RegisTrationTable"
border=
"0"
cellspacing=
"0"
cellpadding=
"0"
v-loading=
'loading'
>
<tr>
<th
width=
"
13
0"
>
单号
</th>
<th
width=
"
24
0"
>
单号
</th>
<th
width=
"150"
>
客户信息
</th>
<th
width=
"70"
>
人数/机位数
</th>
<th
width=
"110"
>
单价
</th>
...
...
@@ -1358,7 +1358,8 @@
</div>
<div
class=
"RL_CreatInfo"
>
{{
item
.
CreateBy
}}
<span
v-if=
"item.LeaveStr!=''"
style=
"color:red"
>
(
{{
item
.
LeaveStr
}}
)
</span></div>
<div
class=
"RL_CreatInfo"
>
关联销售:
{{
item
.
CommissionSPeopleName
}}
</div>
<p>
发团:
{{
item
.
startDate
}}
</p>
<p>
下单时间:
{{
item
.
CreateDate
}}
</p>
</td>
<td>
<p
class=
"fz12 over_ellipsis"
style=
"width: 90%;"
>
领队控位
</p>
...
...
src/plug/index.js
View file @
5ab02301
...
...
@@ -115,13 +115,13 @@ export default {
Vue
.
prototype
.
domainManager
=
function
()
{
let
domainUrl
=
''
;
let
locationName
=
window
.
location
.
hostname
;
//
domainUrl = "http://192.168.2.214:8082"; //214主域名
domainUrl
=
"http://192.168.2.214:8082"
;
//214主域名
// domainUrl = "http://192.168.2.88"; //王悦主域名
// domainUrl = "http://127.0.0.1"; //214主域名
// domainUrl = "http://192.168.2.16:8083"; //
王悦
主域名
// domainUrl = "http://192.168.2.16:8083"; //
刘东
主域名
// domainUrl = "http://127.0.0.1"; //214主域名
// domainUrl = "http://192.168.2.65:8025"; //吴春主域名
domainUrl
=
"http://192.168.2.214
:8082"
;
//罗超主域名
// domainUrl = "http://192.168.2.106
:8082"; //罗超主域名
if
(
locationName
.
indexOf
(
'oytour'
)
!==-
1
)
{
domainUrl
=
"https://reborn.oytour.com"
;
}
else
if
(
locationName
.
indexOf
(
'viitto'
)
!==-
1
)
{
...
...
@@ -525,6 +525,7 @@ export default {
//价钱格式化,三位数逗号分隔,保留两位小数 duanjun
Vue
.
prototype
.
moneyFormat
=
function
(
value
)
{
if
(
!
value
)
return
(
'0.00'
)
let
nStr
=
Number
(
value
).
toFixed
(
2
)
nStr
+=
''
;
let
x
=
nStr
.
split
(
'.'
);
...
...
src/router/config.js
View file @
5ab02301
...
...
@@ -1771,6 +1771,14 @@ export default {
title
:
'跟团游订单'
},
},
{
// 销售 跟团游订单
path
:
'/SalesFinancialDetail'
,
name
:
'SalesFinancialDetail'
,
component
:
resolve
=>
require
([
'@/components/SalesModule/SalesFinancialDetail'
],
resolve
),
meta
:
{
title
:
'销售财务单据'
},
},
{
// 销售 拜访月历
path
:
'/visitMonthStatistics'
,
name
:
'visitMonthStatistics'
,
...
...
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