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
0ca98590
Commit
0ca98590
authored
Mar 01, 2020
by
黄奎
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
页面修改
parent
74406993
Hide whitespace changes
Inline
Side-by-side
Showing
17 changed files
with
18 additions
and
39 deletions
+18
-39
Costdocuments.vue
src/components/FinancialModule/Costdocuments.vue
+2
-4
ExchangeLoss.vue
src/components/FinancialModule/ExchangeLoss.vue
+1
-4
JumpReport.vue
src/components/FinancialModule/JumpReport.vue
+2
-3
RecPayQuery.vue
src/components/FinancialModule/RecPayQuery.vue
+1
-3
RecPayQueryV2.vue
src/components/FinancialModule/RecPayQueryV2.vue
+1
-4
RecPayQueryWB.vue
src/components/FinancialModule/RecPayQueryWB.vue
+1
-4
AirTicketLossDetail.vue
...onents/FinancialModule/ReportForm/AirTicketLossDetail.vue
+2
-3
SaleTripList.vue
src/components/TravelManager/TravelList/SaleTripList.vue
+0
-1
TravelControlListSale.vue
...onents/TravelManager/TravelList/TravelControlListSale.vue
+0
-1
CostNewPrice.vue
...ponents/TravelManager/TravelNewQuotation/CostNewPrice.vue
+3
-3
oneday.vue
src/components/commonPage/oneday.vue
+1
-1
confirmationOrderDownLoad.vue
src/components/confirmationOrderDownLoad.vue
+1
-1
onedayList.vue
...ponents/newTravelmanager/TravelTripPreview/onedayList.vue
+0
-1
TravelDaysTrip_Direct.vue
...elmanager/oldTravelGroupControl/TravelDaysTrip_Direct.vue
+0
-1
initChatroomSDK.js
src/store/actions/initChatroomSDK.js
+0
-1
initNimSDK.js
src/store/actions/initNimSDK.js
+1
-2
msgs.js
src/store/actions/msgs.js
+2
-2
No files found.
src/components/FinancialModule/Costdocuments.vue
View file @
0ca98590
...
...
@@ -520,7 +520,7 @@ Vue.component('table-BillRVB',{ //单据样式
<template v-else-if="rowData.Is_Merge==1&&rowData.modelShow">
<my-HB-Bill :ID="rowData.FrID" :width="widthSon" :color="colorSon"></my-HB-Bill>
</template>
<span slot="reference" @click="rowData.modelShow = true
,conSole(rowData)
" style="text-decoration: underline;cursor: pointer;font-weight: bold" >{{rowData.FrID}}</span>
<span slot="reference" @click="rowData.modelShow = true" style="text-decoration: underline;cursor: pointer;font-weight: bold" >{{rowData.FrID}}</span>
</el-popover>`
,
props
:{
rowData
:{
...
...
@@ -544,9 +544,7 @@ Vue.component('table-BillRVB',{ //单据样式
}
},
methods
:{
conSole
(
rowData
){
}
}
})
Vue
.
component
(
'table-Info'
,{
//关联信息
...
...
src/components/FinancialModule/ExchangeLoss.vue
View file @
0ca98590
...
...
@@ -360,7 +360,7 @@ Vue.component('table-BillRVB',{ //单据样式
<template v-else-if="rowData.Is_Merge==1&&rowData.modelShow">
<my-HB-Bill :ID="rowData.FrID" :width="widthSon" :color="colorSon"></my-HB-Bill>
</template>
<span slot="reference" @click="rowData.modelShow = true
,conSole(rowData)
" style="text-decoration: underline;cursor: pointer;font-weight: bold" >{{rowData.FrID}}</span>
<span slot="reference" @click="rowData.modelShow = true" style="text-decoration: underline;cursor: pointer;font-weight: bold" >{{rowData.FrID}}</span>
</el-popover>`
,
props
:{
rowData
:{
...
...
@@ -384,9 +384,6 @@ Vue.component('table-BillRVB',{ //单据样式
}
},
methods
:{
conSole
(
rowData
){
}
}
})
Vue
.
component
(
'table-Info'
,{
//关联信息
...
...
src/components/FinancialModule/JumpReport.vue
View file @
0ca98590
...
...
@@ -455,7 +455,7 @@ Vue.component('table-BillRVB',{ //单据样式
<template v-else-if="rowData.Is_Merge==1&&rowData.modelShow">
<my-HB-Bill :ID="rowData.FrID" :width="widthSon" :color="colorSon"></my-HB-Bill>
</template>
<span slot="reference" @click="rowData.modelShow = true
,conSole(rowData)
" style="text-decoration: underline;cursor: pointer;font-weight: bold" >{{rowData.FrID}}</span>
<span slot="reference" @click="rowData.modelShow = true" style="text-decoration: underline;cursor: pointer;font-weight: bold" >{{rowData.FrID}}</span>
</el-popover>`
,
props
:{
rowData
:{
...
...
@@ -479,8 +479,7 @@ Vue.component('table-BillRVB',{ //单据样式
}
},
methods
:{
conSole
(
rowData
){
}
}
})
Vue
.
component
(
'table-Info'
,{
//关联信息
...
...
src/components/FinancialModule/RecPayQuery.vue
View file @
0ca98590
...
...
@@ -551,7 +551,7 @@ Vue.component('table-BillRVB',{ //单据样式
<template v-else-if="rowData.Is_Merge==1&&rowData.modelShow">
<my-HB-Bill :ID="rowData.FrID" :width="widthSon" :color="colorSon"></my-HB-Bill>
</template>
<span slot="reference" @click="rowData.modelShow = true
,conSole(rowData)
" style="text-decoration: underline;cursor: pointer;font-weight: bold" >{{rowData.FrID}}</span>
<span slot="reference" @click="rowData.modelShow = true" style="text-decoration: underline;cursor: pointer;font-weight: bold" >{{rowData.FrID}}</span>
</el-popover>`
,
props
:{
rowData
:{
...
...
@@ -575,8 +575,6 @@ Vue.component('table-BillRVB',{ //单据样式
}
},
methods
:{
conSole
(
rowData
){
}
}
})
Vue
.
component
(
'table-Info'
,{
//关联信息
...
...
src/components/FinancialModule/RecPayQueryV2.vue
View file @
0ca98590
...
...
@@ -460,7 +460,7 @@ Vue.component('table-BillRVB',{ //单据样式
<template v-else-if="rowData.Is_Merge==1&&rowData.modelShow">
<my-HB-Bill :ID="rowData.FrID" :width="widthSon" :color="colorSon"></my-HB-Bill>
</template>
<span slot="reference" @click="rowData.modelShow = true
,conSole(rowData)
" style="text-decoration: underline;cursor: pointer;font-weight: bold" >{{rowData.FrID}}</span>
<span slot="reference" @click="rowData.modelShow = true" style="text-decoration: underline;cursor: pointer;font-weight: bold" >{{rowData.FrID}}</span>
</el-popover>`
,
props
:{
rowData
:{
...
...
@@ -484,9 +484,6 @@ Vue.component('table-BillRVB',{ //单据样式
}
},
methods
:{
conSole
(
rowData
){
}
}
})
Vue
.
component
(
'table-Info'
,{
//关联信息
...
...
src/components/FinancialModule/RecPayQueryWB.vue
View file @
0ca98590
...
...
@@ -520,7 +520,7 @@ Vue.component('table-BillRVB',{ //单据样式
<template v-else-if="rowData.Is_Merge==1&&rowData.modelShow">
<my-HB-Bill :ID="rowData.FrID" :width="widthSon" :color="colorSon"></my-HB-Bill>
</template>
<span slot="reference" @click="rowData.modelShow = true
,conSole(rowData)
" style="text-decoration: underline;cursor: pointer;font-weight: bold" >{{rowData.FrID}}</span>
<span slot="reference" @click="rowData.modelShow = true" style="text-decoration: underline;cursor: pointer;font-weight: bold" >{{rowData.FrID}}</span>
</el-popover>`
,
props
:{
rowData
:{
...
...
@@ -544,9 +544,6 @@ Vue.component('table-BillRVB',{ //单据样式
}
},
methods
:{
conSole
(
rowData
){
}
}
})
Vue
.
component
(
'table-Info'
,{
//关联信息
...
...
src/components/FinancialModule/ReportForm/AirTicketLossDetail.vue
View file @
0ca98590
...
...
@@ -292,7 +292,7 @@ Vue.component('table-BillRVB',{ //单据样式
<template v-else-if="rowData.Is_Merge==1&&rowData.modelShow">
<my-HB-Bill :ID="rowData.FrID" :width="widthSon" :color="colorSon"></my-HB-Bill>
</template>
<span slot="reference" @click="rowData.modelShow = true
,conSole(rowData)
" style="text-decoration: underline;cursor: pointer;font-weight: bold" >{{rowData.FrID}}</span>
<span slot="reference" @click="rowData.modelShow = true" style="text-decoration: underline;cursor: pointer;font-weight: bold" >{{rowData.FrID}}</span>
</el-popover>`
,
props
:{
rowData
:{
...
...
@@ -316,8 +316,7 @@ Vue.component('table-BillRVB',{ //单据样式
}
},
methods
:{
conSole
(
rowData
){
}
}
})
Vue
.
component
(
'table-Info'
,{
//关联信息
...
...
src/components/TravelManager/TravelList/SaleTripList.vue
View file @
0ca98590
...
...
@@ -198,7 +198,6 @@
handleCurrentChange
(
val
)
{
this
.
queryMsg
.
pageIndex
=
val
;
this
.
getControlList
();
console
.
log
(
"asdf"
)
},
//重新查询
resetPageIndex
()
{
...
...
src/components/TravelManager/TravelList/TravelControlListSale.vue
View file @
0ca98590
...
...
@@ -931,7 +931,6 @@
"travel_get_GetTravelPrciePageList"
,
msg
,
res
=>
{
console
.
log
(
"123"
)
this
.
queryCommonData
.
loading
=
false
;
if
(
res
.
data
.
resultCode
==
1
)
{
this
.
queryCommonData
.
dataList
=
res
.
data
.
data
.
pageData
;
...
...
src/components/TravelManager/TravelNewQuotation/CostNewPrice.vue
View file @
0ca98590
...
...
@@ -1443,13 +1443,13 @@
that
.
getConvertMoney
(
x
.
OtherMoney
)
+
that
.
getConvertMoney
(
x
.
LeaderGuideDriveZhuSu
)
).
toFixed
(
0
);
console
.
log
(
"SubtotalMoney"
,
x
.
SubtotalMoney
);
//房餐车景点价格
var
trip
=
Number
(
that
.
getLocalTotalMoney
(
x
.
PeopleNumber
));
console
.
log
(
"trip"
,
trip
);
//其他价格
var
otherPrice
=
Number
(
that
.
getCostTotalMoney
());
console
.
log
(
"otherPrice"
,
otherPrice
);
x
.
TotalMoney
=
(
trip
+
otherPrice
+
Number
(
that
.
getConvertMoney
(
x
.
SubtotalMoney
))
).
toFixed
(
0
);
...
...
src/components/commonPage/oneday.vue
View file @
0ca98590
...
...
@@ -137,7 +137,7 @@
}
},
mounted
()
{
console
.
log
(
this
.
day
,
'datyyyy'
);
}
};
...
...
src/components/confirmationOrderDownLoad.vue
View file @
0ca98590
...
...
@@ -1604,7 +1604,7 @@
this
.
$set
(
this
.
tripList
,
j
,
x
)
x
.
dateTime
=
this
.
setDate
(
j
);
})
console
.
log
(
"this.tripList"
,
this
.
tripList
)
},
//上移下移(IsUp:0上移,1下移)
...
...
src/components/newTravelmanager/TravelTripPreview/onedayList.vue
View file @
0ca98590
...
...
@@ -162,7 +162,6 @@
that
.
scenicArray
[
0
].
NewImaArray
.
push
(
obj
);
that
.
scenicArray
[
0
].
NewScenicImg
=
JSON
.
stringify
(
that
.
scenicArray
[
0
].
NewImaArray
);
this
.
$forceUpdate
();
console
.
log
(
"that.scenicArray[0].NewImaArray"
,
that
.
scenicArray
[
0
].
NewImaArray
);
});
},
getImgInfo
(
item
)
{
...
...
src/components/newTravelmanager/oldTravelGroupControl/TravelDaysTrip_Direct.vue
View file @
0ca98590
...
...
@@ -486,7 +486,6 @@ export default {
this
.
subConfig
.
DayList
[
index
].
dayArray
.
push
(
daysArrayItem
);
break
;
}
console
.
log
(
" this.subConfig.DayList"
,
this
.
subConfig
.
DayList
);
},
//获取相似线路行程
...
...
src/store/actions/initChatroomSDK.js
View file @
0ca98590
...
...
@@ -32,7 +32,6 @@ export function initChatroomSDK ({ state, commit, dispatch }, obj) {
onerror
:
function
onChatroomError
(
error
,
obj
)
{
dispatch
(
'hideLoading'
)
if
(
error
)
{
console
.
log
(
'网络连接状态异常'
)
location
.
href
=
'#/room'
}
},
...
...
src/store/actions/initNimSDK.js
View file @
0ca98590
...
...
@@ -42,11 +42,10 @@ export function initNimSDK ({ state, commit, dispatch }, loginInfo) {
},
onerror
:
function
onError
(
event
)
{
// alert(JSON.stringify(event))
console
.
log
(
'网络连接状态异常'
)
//location.href = config.loginUrl
},
onwillreconnect
:
function
onWillReconnect
()
{
console
.
log
(
'网络连接状态异常'
)
},
ondisconnect
:
function
onDisconnect
(
error
)
{
switch
(
error
.
code
)
{
...
...
src/store/actions/msgs.js
View file @
0ca98590
...
...
@@ -203,7 +203,7 @@ export function sendFileMsg({
},
uploaderror
:
function
()
{
console
&&
console
.
log
(
'上传失败'
)
},
uploaddone
:
function
(
error
,
file
)
{
...
...
@@ -248,7 +248,7 @@ export function sendDataUrlMsg({
},
uploaderror
:
function
()
{
console
&&
console
.
log
(
'上传失败'
)
},
uploaddone
:
function
(
error
,
file
)
{
...
...
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