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
2cae19cd
Commit
2cae19cd
authored
Jun 24, 2025
by
liudong1993
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'master' of
http://gitlab.oytour.com/luochao/superman
parents
e76a1d8b
13ff9040
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
8 changed files
with
234 additions
and
185 deletions
+234
-185
App.vue
src/App.vue
+4
-2
Details.vue
src/components/Details.vue
+26
-14
Login2019.vue
src/components/Login2019.vue
+7
-0
travelTeamList.vue
src/components/TravelManager/TravelTeam/travelTeamList.vue
+2
-0
index.vue
src/components/index.vue
+156
-135
order-form2.vue
src/components/orderCommon/order-form2.vue
+2
-12
index.js
src/plug/index.js
+18
-6
index.js
src/store/actions/index.js
+19
-16
No files found.
src/App.vue
View file @
2cae19cd
...
@@ -168,7 +168,8 @@
...
@@ -168,7 +168,8 @@
document
.
URL
.
indexOf
(
"clientProtocol"
)
==
-
1
&&
document
.
URL
.
indexOf
(
"clientProtocol"
)
==
-
1
&&
document
.
URL
.
indexOf
(
"clientDisclaimerProtocol"
)
==
-
1
&&
document
.
URL
.
indexOf
(
"clientDisclaimerProtocol"
)
==
-
1
&&
document
.
URL
.
indexOf
(
"TravelContractConfirm"
)
==
-
1
&&
document
.
URL
.
indexOf
(
"TravelContractConfirm"
)
==
-
1
&&
document
.
URL
.
indexOf
(
"ViittoContractConfirm"
)
==
-
1
document
.
URL
.
indexOf
(
"ViittoContractConfirm"
)
==
-
1
&&
document
.
URL
.
indexOf
(
"ticketSpider"
)
==
-
1
)
{
)
{
this
.
$router
.
push
({
this
.
$router
.
push
({
path
:
"/login"
path
:
"/login"
...
@@ -179,7 +180,8 @@
...
@@ -179,7 +180,8 @@
document
.
URL
.
indexOf
(
"clientProtocol"
)
!=
-
1
||
document
.
URL
.
indexOf
(
"clientProtocol"
)
!=
-
1
||
document
.
URL
.
indexOf
(
"clientDisclaimerProtocol"
)
!=
-
1
||
document
.
URL
.
indexOf
(
"clientDisclaimerProtocol"
)
!=
-
1
||
document
.
URL
.
indexOf
(
"TravelContractConfirm"
)
!=
-
1
||
document
.
URL
.
indexOf
(
"TravelContractConfirm"
)
!=
-
1
||
document
.
URL
.
indexOf
(
"ViittoContractConfirm"
)
!=
-
1
document
.
URL
.
indexOf
(
"ViittoContractConfirm"
)
!=
-
1
||
document
.
URL
.
indexOf
(
"ticketSpider"
)
!=
-
1
)
{
)
{
// 车系统改变 单页面方式
// 车系统改变 单页面方式
if
(
this
.
typeSystem
==
1
)
{
if
(
this
.
typeSystem
==
1
)
{
...
...
src/components/Details.vue
View file @
2cae19cd
...
@@ -31,7 +31,8 @@
...
@@ -31,7 +31,8 @@
</div>
</div>
</div>
</div>
<div
class=
"flexParent"
v-if=
"openMode==1"
>
<div
class=
"flexParent"
v-if=
"openMode==1"
>
<div
v-if=
"typeSystem==0"
class=
"nav-tabs-box"
@
contextmenu
.
prevent=
"showRightMenu"
:style=
"{width:`${navWidth}px`}"
>
<div
v-if=
"typeSystem==0"
class=
"nav-tabs-box"
@
contextmenu
.
prevent=
"showRightMenu"
:style=
"{width:`${navWidth}px`}"
>
<el-tabs
v-if=
'tabs && tabs.length>0'
v-model=
"currentTabName"
style=
"margin-left: 120px;"
<el-tabs
v-if=
'tabs && tabs.length>0'
v-model=
"currentTabName"
style=
"margin-left: 120px;"
:closable=
"tabs.length>1"
type=
"card"
@
edit=
"handleTabsEdit"
>
:closable=
"tabs.length>1"
type=
"card"
@
edit=
"handleTabsEdit"
>
<el-tab-pane
:key=
"i"
v-for=
"(item,i) in tabs"
:label=
"item.title"
:name=
"item.name+'_'+i"
>
<el-tab-pane
:key=
"i"
v-for=
"(item,i) in tabs"
:label=
"item.title"
:name=
"item.name+'_'+i"
>
...
@@ -39,8 +40,8 @@
...
@@ -39,8 +40,8 @@
</el-tabs>
</el-tabs>
<div
class=
"browner-opera-box"
v-if=
"currentTag.history&¤tTag.history.length>0"
<div
class=
"browner-opera-box"
v-if=
"currentTag.history&¤tTag.history.length>0"
style=
"border-bottom: 1px solid #e4e7ed;"
>
style=
"border-bottom: 1px solid #e4e7ed;"
>
<i
class=
"iconfont icon-houtui"
@
click=
"goback(0)"
<i
class=
"iconfont icon-houtui"
@
click=
"goback(0)"
:class=
"{'active':currentTag && currentTag.hisIndex>0}"
:
class=
"{'active':currentTag && currentTag.hisIndex>0}"
:
title=
"$t('objFill.v101.houtui')"
></i>
:title=
"$t('objFill.v101.houtui')"
></i>
<i
class=
"iconfont icon-qianjin"
@
click=
"goback(1)"
<i
class=
"iconfont icon-qianjin"
@
click=
"goback(1)"
:class=
"{'active':currentTag && currentTag.hisIndex<currentTag.history.length-1}"
:class=
"{'active':currentTag && currentTag.hisIndex<currentTag.history.length-1}"
:title=
"$t('objFill.v101.qianjin')"
></i>
:title=
"$t('objFill.v101.qianjin')"
></i>
...
@@ -67,7 +68,8 @@
...
@@ -67,7 +68,8 @@
<li
class=
"split"
></li>
<li
class=
"split"
></li>
<li
@
click=
"closeCurrent"
:class=
"{'disable':tabs.length==1}"
>
{{$t('objFill.v101.guanbibqian')}}
</li>
<li
@
click=
"closeCurrent"
:class=
"{'disable':tabs.length==1}"
>
{{$t('objFill.v101.guanbibqian')}}
</li>
<li
@
click=
"closeOther"
:class=
"{'disable':tabs.length<2}"
>
{{$t('objFill.v101.guanbiqitbq')}}
</li>
<li
@
click=
"closeOther"
:class=
"{'disable':tabs.length<2}"
>
{{$t('objFill.v101.guanbiqitbq')}}
</li>
<li
@
click=
"closeRight"
:class=
"{'disable':currentRightIndex==tabs.length-1}"
>
{{$t('objFill.v101.guanbiycbq')}}
</li>
<li
@
click=
"closeRight"
:class=
"{'disable':currentRightIndex==tabs.length-1}"
>
{{$t('objFill.v101.guanbiycbq')}}
</li>
</ul>
</ul>
</div>
</div>
</template>
</template>
...
@@ -184,17 +186,18 @@
...
@@ -184,17 +186,18 @@
}
else
{
}
else
{
this
.
goUrl
(
'/'
+
hrefs
[
hrefs
.
length
-
1
])
this
.
goUrl
(
'/'
+
hrefs
[
hrefs
.
length
-
1
])
}
}
this
.
isRed
=
(
this
.
getLocalStorage
().
ThemeType
?
this
.
getLocalStorage
().
ThemeType
:
0
)
==
1
this
.
isRed
=
(
this
.
getLocalStorage
()
&&
this
.
getLocalStorage
().
ThemeType
?
this
.
getLocalStorage
().
ThemeType
:
0
)
==
1
},
},
methods
:
{
methods
:
{
nullMethod
()
{
nullMethod
()
{
},
},
changeMenuShowType
()
{
changeMenuShowType
()
{
if
(
this
.
$route
.
path
==
'/TravelManager'
)
{
if
(
this
.
$route
.
path
==
'/TravelManager'
)
{
this
.
isCollapse
=
true
;
this
.
isCollapse
=
true
;
localStorage
.
navsot
=
'a'
localStorage
.
navsot
=
'a'
}
else
{
}
else
{
this
.
isCollapse
=
!
this
.
isCollapse
;
this
.
isCollapse
=
!
this
.
isCollapse
;
localStorage
.
navsot
=
this
.
isCollapse
?
'a'
:
'b'
localStorage
.
navsot
=
this
.
isCollapse
?
'a'
:
'b'
}
}
...
@@ -406,9 +409,12 @@
...
@@ -406,9 +409,12 @@
}
}
},
},
getMenu
()
{
getMenu
()
{
this
.
menuList
=
this
.
getLocalStorage
().
UserMenu
;
this
.
menuList
=
[];
var
tempStorage
=
this
.
getLocalStorage
();
if
(
tempStorage
&&
tempStorage
.
UserMenu
)
{
this
.
menuList
=
tempStorage
.
UserMenu
;
}
let
path
=
this
.
$route
.
path
.
split
(
"?"
)[
0
];
let
path
=
this
.
$route
.
path
.
split
(
"?"
)[
0
];
let
root
=
0
;
let
root
=
0
;
let
temprootName
=
""
;
//根节点名称
let
temprootName
=
""
;
//根节点名称
let
tempparentName
=
""
;
//二级节点名称
let
tempparentName
=
""
;
//二级节点名称
...
@@ -642,8 +648,11 @@
...
@@ -642,8 +648,11 @@
}
}
},
},
getMenuV2
(
path
)
{
getMenuV2
(
path
)
{
this
.
menuList
=
this
.
getLocalStorage
().
UserMenu
;
this
.
menuList
=
[];
var
tempStorage
=
this
.
getLocalStorage
();
if
(
tempStorage
&&
tempStorage
.
UserMenu
)
{
this
.
menuList
=
tempStorage
.
UserMenu
;
}
let
root
=
0
;
let
root
=
0
;
let
temprootName
=
""
;
//根节点名称
let
temprootName
=
""
;
//根节点名称
let
tempparentName
=
""
;
//二级节点名称
let
tempparentName
=
""
;
//二级节点名称
...
@@ -878,8 +887,11 @@
...
@@ -878,8 +887,11 @@
return
tempcurrentName
return
tempcurrentName
},
},
getTitleByRouter
(
name
)
{
getTitleByRouter
(
name
)
{
let
obj
=
{
title
:
""
};
let
obj
=
{
if
(
routerConfig
.
routes
[
12
]
&&
routerConfig
.
routes
[
12
].
children
&&
routerConfig
.
routes
[
12
].
children
.
length
>
0
)
{
title
:
""
};
if
(
routerConfig
.
routes
[
12
]
&&
routerConfig
.
routes
[
12
].
children
&&
routerConfig
.
routes
[
12
].
children
.
length
>
0
)
{
routerConfig
.
routes
[
12
].
children
[
0
].
children
.
forEach
(
x
=>
{
routerConfig
.
routes
[
12
].
children
[
0
].
children
.
forEach
(
x
=>
{
if
(
x
.
name
==
name
)
{
if
(
x
.
name
==
name
)
{
obj
.
comp
=
x
.
component
obj
.
comp
=
x
.
component
...
@@ -993,7 +1005,7 @@
...
@@ -993,7 +1005,7 @@
window
.
localStorage
.
navTabs
=
JSON
.
stringify
(
this
.
tabs
)
window
.
localStorage
.
navTabs
=
JSON
.
stringify
(
this
.
tabs
)
},
},
created
()
{
created
()
{
if
(
localStorage
.
typeSystem
&&
localStorage
.
typeSystem
==
1
)
this
.
typeSystem
=
localStorage
.
typeSystem
if
(
localStorage
.
typeSystem
&&
localStorage
.
typeSystem
==
1
)
this
.
typeSystem
=
localStorage
.
typeSystem
}
}
};
};
...
...
src/components/Login2019.vue
View file @
2cae19cd
...
@@ -341,6 +341,13 @@
...
@@ -341,6 +341,13 @@
this
.
$cookie
.
set
(
"RB_Group_id"
,
userData
.
RB_Group_id
);
this
.
$cookie
.
set
(
"RB_Group_id"
,
userData
.
RB_Group_id
);
localStorage
.
menu
=
JSON
.
stringify
(
firstTire
)
localStorage
.
menu
=
JSON
.
stringify
(
firstTire
)
this
.
loginState
=
0
;
this
.
loginState
=
0
;
if
(
this
.
$route
.
query
&&
this
.
$route
.
query
.
path
)
{
var
goPath
=
this
.
$route
.
query
.
path
;
this
.
$router
.
push
({
path
:
goPath
});
return
;
}
if
(
!
jsonData
.
data
.
IsExactness
)
{
if
(
!
jsonData
.
data
.
IsExactness
)
{
this
.
$router
.
push
({
this
.
$router
.
push
({
path
:
"/resetPassword"
path
:
"/resetPassword"
...
...
src/components/TravelManager/TravelTeam/travelTeamList.vue
View file @
2cae19cd
...
@@ -847,6 +847,8 @@
...
@@ -847,6 +847,8 @@
created
()
{
created
()
{
this
.
CurrentUserInfo
=
this
.
getLocalStorage
();
this
.
CurrentUserInfo
=
this
.
getLocalStorage
();
this
.
getLineList
();
this
.
getLineList
();
let
nowDate
=
this
.
getBeforeDate
(
0
,
new
Date
().
Format
(
"yyyy-MM-dd"
))
this
.
queryMsg
.
SelectStartDate
=
nowDate
;
if
(
this
.
$route
.
query
)
{
if
(
this
.
$route
.
query
)
{
if
(
this
.
$route
.
query
.
tcmun
)
{
if
(
this
.
$route
.
query
.
tcmun
)
{
this
.
queryMsg
.
TCNUM
=
this
.
$route
.
query
.
tcmun
;
this
.
queryMsg
.
TCNUM
=
this
.
$route
.
query
.
tcmun
;
...
...
src/components/index.vue
View file @
2cae19cd
This diff is collapsed.
Click to expand it.
src/components/orderCommon/order-form2.vue
View file @
2cae19cd
...
@@ -1787,20 +1787,10 @@
...
@@ -1787,20 +1787,10 @@
Number
(
this
.
addMsg
.
ChirdNoNeedBedNum
)
:
Number
(
this
.
addMsg
.
ChirdNoNeedBedNum
)
:
0
;
0
;
}
}
this
.
addMsg
.
PredictRoomNum
=
// this.addMsg.PredictRoomNum = (Number(this.addMsg.AirticketNum) + (Number(this.addMsg.ManNum) +Number(this.addMsg.ChirdNeedBedNum) -Number(etbzc) +Number(this.addMsg.OldPeopleNum)) -Number(this.addMsg.TripleRoomNum) * 3 -Number(this.addMsg.SingleRoomNum)) /2 +Number(this.addMsg.SingleRoomNum) +Number(this.addMsg.TripleRoomNum);
(
Number
(
this
.
addMsg
.
AirticketNum
)
+
this
.
addMsg
.
PredictRoomNum
=
(
Number
(
this
.
addMsg
.
AirticketNum
)
+
(
Number
(
this
.
addMsg
.
ManNum
)
+
Number
(
this
.
addMsg
.
ChirdNeedBedNum
)
-
Number
(
etbzc
)
+
Number
(
this
.
addMsg
.
OldPeopleNum
))
-
Number
(
this
.
addMsg
.
TripleRoomNum
)
*
3
-
Number
(
this
.
addMsg
.
SingleRoomNum
))
/
2
+
Number
(
this
.
addMsg
.
SingleRoomNum
)
+
Number
(
this
.
addMsg
.
TripleRoomNum
);
(
Number
(
this
.
addMsg
.
ManNum
)
+
Number
(
this
.
addMsg
.
ChirdNeedBedNum
)
-
etbzc
+
Number
(
this
.
addMsg
.
OldPeopleNum
))
-
Number
(
this
.
addMsg
.
TripleRoomNum
)
*
3
-
Number
(
this
.
addMsg
.
SingleRoomNum
))
/
2
+
Number
(
this
.
addMsg
.
SingleRoomNum
)
+
Number
(
this
.
addMsg
.
TripleRoomNum
);
},
},
getNumber
()
{
getNumber
()
{
if
(
this
.
addMsg
.
GroupType
==
4
&&
parseInt
(
this
.
addMsg
.
AirticketNum
)
>
0
)
this
.
addMsg
.
ManNum
=
this
.
addMsg
.
AirticketNum
if
(
if
(
this
.
addMsg
.
GroupType
==
4
&&
this
.
addMsg
.
GroupType
==
4
&&
parseInt
(
this
.
addMsg
.
ChirdNoNeedBedNum
)
>
parseInt
(
this
.
addMsg
.
ChirdNoNeedBedNum
)
>
...
...
src/plug/index.js
View file @
2cae19cd
...
@@ -122,7 +122,7 @@ export default {
...
@@ -122,7 +122,7 @@ export default {
let
locationName
=
window
.
location
.
hostname
;
let
locationName
=
window
.
location
.
hostname
;
let
isOnline
=
0
;
//0-本地测试,1-线上
let
isOnline
=
0
;
//0-本地测试,1-线上
let
ocrUrl
=
"http://192.168.5.46:8888"
;
let
ocrUrl
=
"http://192.168.5.46:8888"
;
domainUrl
=
"http://192.168.5.
214
"
;
domainUrl
=
"http://192.168.5.
46
"
;
let
crmLocalFileStreamDownLoadUrl
=
""
;
let
crmLocalFileStreamDownLoadUrl
=
""
;
crmLocalFileStreamDownLoadUrl
=
locationName
.
indexOf
(
'oytour'
)
!==
-
1
?
"http://crm.oytour.com"
:
"http://testcrm.oytour.com"
;
crmLocalFileStreamDownLoadUrl
=
locationName
.
indexOf
(
'oytour'
)
!==
-
1
?
"http://crm.oytour.com"
:
"http://testcrm.oytour.com"
;
let
javaUrldo
=
""
;
let
javaUrldo
=
""
;
...
@@ -248,7 +248,6 @@ export default {
...
@@ -248,7 +248,6 @@ export default {
//警告提示
//警告提示
Vue
.
prototype
.
Warning
=
function
(
msg
)
{
Vue
.
prototype
.
Warning
=
function
(
msg
)
{
this
.
$message
({
this
.
$message
({
message
:
msg
,
message
:
msg
,
duration
:
2000
,
duration
:
2000
,
type
:
"warning"
type
:
"warning"
...
@@ -383,7 +382,7 @@ export default {
...
@@ -383,7 +382,7 @@ export default {
}
}
})
})
}
else
{
}
else
{
if
(
!
localStorage
.
userInfo
&&
localStorage
.
userInfo
!=
""
&&
this
.
$route
.
path
.
toLowerCase
()
!=
"/login"
)
{
if
(
!
localStorage
.
userInfo
&&
localStorage
.
userInfo
!=
""
&&
this
.
$route
.
path
.
toLowerCase
()
!=
"/login"
&&
this
.
$route
.
path
.
toLowerCase
()
!=
"/ticketspider"
)
{
this
.
goToLogin
(
1
);
this
.
goToLogin
(
1
);
}
}
}
}
...
@@ -973,8 +972,21 @@ export default {
...
@@ -973,8 +972,21 @@ export default {
},
},
//跳转到登录页面
//跳转到登录页面
Vue
.
prototype
.
goToLogin
=
function
(
type
)
{
Vue
.
prototype
.
goToLogin
=
function
(
type
)
{
var
newpath
=
""
;
var
query
=
{};
if
(
this
.
$route
.
path
)
{
newpath
=
this
.
$route
.
path
;
//ticketSpider?AirticketId=6995
if
(
this
.
$route
.
query
.
AirticketId
)
{
newpath
=
newpath
+
"?AirticketId="
+
this
.
$route
.
query
.
AirticketId
;
query
=
{
path
:
newpath
};
}
}
this
.
$router
.
push
({
this
.
$router
.
push
({
path
:
'/login'
path
:
'/login'
,
query
})
})
},
},
//ERP本地缓存
//ERP本地缓存
...
@@ -1314,7 +1326,7 @@ export default {
...
@@ -1314,7 +1326,7 @@ export default {
poise
=
'm_h'
poise
=
'm_h'
}
}
var
newpath
=
path
.
replace
(
'http://192.168.5.214:8130'
,
''
).
replace
(
'https://imgfile.oytour.com'
,
''
).
replace
(
'https://imgfile.oytour.com'
,
''
).
split
(
'?'
)[
0
];
var
newpath
=
path
.
replace
(
'http://192.168.5.214:8130'
,
''
).
replace
(
'https://imgfile.oytour.com'
,
''
).
replace
(
'https://imgfile.oytour.com'
,
''
).
split
(
'?'
)[
0
];
console
.
log
(
url
+
'/image/index?filePath='
+
newpath
+
'&process=resize,'
+
poise
+
',w_'
+
w
+
',h_'
+
h
,
'------------------'
)
console
.
log
(
url
+
'/image/index?filePath='
+
newpath
+
'&process=resize,'
+
poise
+
',w_'
+
w
+
',h_'
+
h
,
'------------------'
)
return
url
+
'/image/index?filePath='
+
newpath
+
'&process=resize,'
+
poise
+
',w_'
+
w
+
',h_'
+
h
;
return
url
+
'/image/index?filePath='
+
newpath
+
'&process=resize,'
+
poise
+
',w_'
+
w
+
',h_'
+
h
;
}
}
...
@@ -1973,4 +1985,4 @@ export default {
...
@@ -1973,4 +1985,4 @@ export default {
return
language
;
return
language
;
}
}
}
}
}
}
\ No newline at end of file
src/store/actions/index.js
View file @
2cae19cd
...
@@ -20,22 +20,25 @@ import {createTeam} from './team'
...
@@ -20,22 +20,25 @@ import {createTeam} from './team'
function
connectNim
({
state
,
commit
,
dispatch
},
obj
)
{
function
connectNim
({
state
,
commit
,
dispatch
},
obj
)
{
let
_storage
=
JSON
.
parse
(
window
.
localStorage
.
userInfo
);
if
(
window
.
localStorage
&&
window
.
localStorage
.
userInfo
)
let
{
force
}
=
Object
.
assign
({},
obj
)
{
// 操作为内容页刷新页面,此时无nim实例
let
_storage
=
JSON
.
parse
(
window
.
localStorage
.
userInfo
);
if
(
!
state
.
nim
||
force
)
{
let
{
force
}
=
Object
.
assign
({},
obj
)
let
loginInfo
=
{
// 操作为内容页刷新页面,此时无nim实例
// uid: '15281055345',
if
(
!
state
.
nim
||
force
)
{
// uid: '18380464246',
let
loginInfo
=
{
uid
:
_storage
.
ImAccount
,
// uid: '15281055345',
sdktoken
:
_storage
.
ImToken
// uid: '18380464246',
}
uid
:
_storage
.
ImAccount
,
if
(
!
loginInfo
.
uid
)
{
sdktoken
:
_storage
.
ImToken
// 无cookie,直接跳转登录页
}
pageUtil
.
turnPage
(
'无历史登录记录,请重新登录'
,
'login'
)
if
(
!
loginInfo
.
uid
)
{
}
else
{
// 无cookie,直接跳转登录页
// 有cookie,重新登录
pageUtil
.
turnPage
(
'无历史登录记录,请重新登录'
,
'login'
)
dispatch
(
'initNimSDK'
,
loginInfo
)
}
else
{
// 有cookie,重新登录
dispatch
(
'initNimSDK'
,
loginInfo
)
}
}
}
}
}
}
}
...
...
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