Commit 0ca98590 authored by 黄奎's avatar 黄奎

页面修改

parent 74406993
...@@ -520,7 +520,7 @@ Vue.component('table-BillRVB',{ //单据样式 ...@@ -520,7 +520,7 @@ Vue.component('table-BillRVB',{ //单据样式
<template v-else-if="rowData.Is_Merge==1&&rowData.modelShow"> <template v-else-if="rowData.Is_Merge==1&&rowData.modelShow">
<my-HB-Bill :ID="rowData.FrID" :width="widthSon" :color="colorSon"></my-HB-Bill> <my-HB-Bill :ID="rowData.FrID" :width="widthSon" :color="colorSon"></my-HB-Bill>
</template> </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>`, </el-popover>`,
props:{ props:{
rowData:{ rowData:{
...@@ -544,9 +544,7 @@ Vue.component('table-BillRVB',{ //单据样式 ...@@ -544,9 +544,7 @@ Vue.component('table-BillRVB',{ //单据样式
} }
}, },
methods:{ methods:{
conSole(rowData){
}
} }
}) })
Vue.component('table-Info',{ //关联信息 Vue.component('table-Info',{ //关联信息
......
...@@ -360,7 +360,7 @@ Vue.component('table-BillRVB',{ //单据样式 ...@@ -360,7 +360,7 @@ Vue.component('table-BillRVB',{ //单据样式
<template v-else-if="rowData.Is_Merge==1&&rowData.modelShow"> <template v-else-if="rowData.Is_Merge==1&&rowData.modelShow">
<my-HB-Bill :ID="rowData.FrID" :width="widthSon" :color="colorSon"></my-HB-Bill> <my-HB-Bill :ID="rowData.FrID" :width="widthSon" :color="colorSon"></my-HB-Bill>
</template> </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>`, </el-popover>`,
props:{ props:{
rowData:{ rowData:{
...@@ -384,9 +384,6 @@ Vue.component('table-BillRVB',{ //单据样式 ...@@ -384,9 +384,6 @@ Vue.component('table-BillRVB',{ //单据样式
} }
}, },
methods:{ methods:{
conSole(rowData){
}
} }
}) })
Vue.component('table-Info',{ //关联信息 Vue.component('table-Info',{ //关联信息
......
...@@ -455,7 +455,7 @@ Vue.component('table-BillRVB',{ //单据样式 ...@@ -455,7 +455,7 @@ Vue.component('table-BillRVB',{ //单据样式
<template v-else-if="rowData.Is_Merge==1&&rowData.modelShow"> <template v-else-if="rowData.Is_Merge==1&&rowData.modelShow">
<my-HB-Bill :ID="rowData.FrID" :width="widthSon" :color="colorSon"></my-HB-Bill> <my-HB-Bill :ID="rowData.FrID" :width="widthSon" :color="colorSon"></my-HB-Bill>
</template> </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>`, </el-popover>`,
props:{ props:{
rowData:{ rowData:{
...@@ -479,8 +479,7 @@ Vue.component('table-BillRVB',{ //单据样式 ...@@ -479,8 +479,7 @@ Vue.component('table-BillRVB',{ //单据样式
} }
}, },
methods:{ methods:{
conSole(rowData){
}
} }
}) })
Vue.component('table-Info',{ //关联信息 Vue.component('table-Info',{ //关联信息
......
...@@ -551,7 +551,7 @@ Vue.component('table-BillRVB',{ //单据样式 ...@@ -551,7 +551,7 @@ Vue.component('table-BillRVB',{ //单据样式
<template v-else-if="rowData.Is_Merge==1&&rowData.modelShow"> <template v-else-if="rowData.Is_Merge==1&&rowData.modelShow">
<my-HB-Bill :ID="rowData.FrID" :width="widthSon" :color="colorSon"></my-HB-Bill> <my-HB-Bill :ID="rowData.FrID" :width="widthSon" :color="colorSon"></my-HB-Bill>
</template> </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>`, </el-popover>`,
props:{ props:{
rowData:{ rowData:{
...@@ -575,8 +575,6 @@ Vue.component('table-BillRVB',{ //单据样式 ...@@ -575,8 +575,6 @@ Vue.component('table-BillRVB',{ //单据样式
} }
}, },
methods:{ methods:{
conSole(rowData){
}
} }
}) })
Vue.component('table-Info',{ //关联信息 Vue.component('table-Info',{ //关联信息
......
...@@ -460,7 +460,7 @@ Vue.component('table-BillRVB',{ //单据样式 ...@@ -460,7 +460,7 @@ Vue.component('table-BillRVB',{ //单据样式
<template v-else-if="rowData.Is_Merge==1&&rowData.modelShow"> <template v-else-if="rowData.Is_Merge==1&&rowData.modelShow">
<my-HB-Bill :ID="rowData.FrID" :width="widthSon" :color="colorSon"></my-HB-Bill> <my-HB-Bill :ID="rowData.FrID" :width="widthSon" :color="colorSon"></my-HB-Bill>
</template> </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>`, </el-popover>`,
props:{ props:{
rowData:{ rowData:{
...@@ -484,9 +484,6 @@ Vue.component('table-BillRVB',{ //单据样式 ...@@ -484,9 +484,6 @@ Vue.component('table-BillRVB',{ //单据样式
} }
}, },
methods:{ methods:{
conSole(rowData){
}
} }
}) })
Vue.component('table-Info',{ //关联信息 Vue.component('table-Info',{ //关联信息
......
...@@ -520,7 +520,7 @@ Vue.component('table-BillRVB',{ //单据样式 ...@@ -520,7 +520,7 @@ Vue.component('table-BillRVB',{ //单据样式
<template v-else-if="rowData.Is_Merge==1&&rowData.modelShow"> <template v-else-if="rowData.Is_Merge==1&&rowData.modelShow">
<my-HB-Bill :ID="rowData.FrID" :width="widthSon" :color="colorSon"></my-HB-Bill> <my-HB-Bill :ID="rowData.FrID" :width="widthSon" :color="colorSon"></my-HB-Bill>
</template> </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>`, </el-popover>`,
props:{ props:{
rowData:{ rowData:{
...@@ -544,9 +544,6 @@ Vue.component('table-BillRVB',{ //单据样式 ...@@ -544,9 +544,6 @@ Vue.component('table-BillRVB',{ //单据样式
} }
}, },
methods:{ methods:{
conSole(rowData){
}
} }
}) })
Vue.component('table-Info',{ //关联信息 Vue.component('table-Info',{ //关联信息
......
...@@ -292,7 +292,7 @@ Vue.component('table-BillRVB',{ //单据样式 ...@@ -292,7 +292,7 @@ Vue.component('table-BillRVB',{ //单据样式
<template v-else-if="rowData.Is_Merge==1&&rowData.modelShow"> <template v-else-if="rowData.Is_Merge==1&&rowData.modelShow">
<my-HB-Bill :ID="rowData.FrID" :width="widthSon" :color="colorSon"></my-HB-Bill> <my-HB-Bill :ID="rowData.FrID" :width="widthSon" :color="colorSon"></my-HB-Bill>
</template> </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>`, </el-popover>`,
props:{ props:{
rowData:{ rowData:{
...@@ -316,8 +316,7 @@ Vue.component('table-BillRVB',{ //单据样式 ...@@ -316,8 +316,7 @@ Vue.component('table-BillRVB',{ //单据样式
} }
}, },
methods:{ methods:{
conSole(rowData){
}
} }
}) })
Vue.component('table-Info',{ //关联信息 Vue.component('table-Info',{ //关联信息
......
...@@ -198,7 +198,6 @@ ...@@ -198,7 +198,6 @@
handleCurrentChange(val) { handleCurrentChange(val) {
this.queryMsg.pageIndex = val; this.queryMsg.pageIndex = val;
this.getControlList(); this.getControlList();
console.log("asdf")
}, },
//重新查询 //重新查询
resetPageIndex() { resetPageIndex() {
......
...@@ -931,7 +931,6 @@ ...@@ -931,7 +931,6 @@
"travel_get_GetTravelPrciePageList", "travel_get_GetTravelPrciePageList",
msg, msg,
res => { res => {
console.log("123")
this.queryCommonData.loading = false; this.queryCommonData.loading = false;
if (res.data.resultCode == 1) { if (res.data.resultCode == 1) {
this.queryCommonData.dataList = res.data.data.pageData; this.queryCommonData.dataList = res.data.data.pageData;
......
...@@ -1443,13 +1443,13 @@ ...@@ -1443,13 +1443,13 @@
that.getConvertMoney(x.OtherMoney) + that.getConvertMoney(x.OtherMoney) +
that.getConvertMoney(x.LeaderGuideDriveZhuSu) that.getConvertMoney(x.LeaderGuideDriveZhuSu)
).toFixed(0); ).toFixed(0);
console.log("SubtotalMoney", x.SubtotalMoney);
//房餐车景点价格 //房餐车景点价格
var trip = Number(that.getLocalTotalMoney(x.PeopleNumber)); var trip = Number(that.getLocalTotalMoney(x.PeopleNumber));
console.log("trip", trip);
//其他价格 //其他价格
var otherPrice = Number(that.getCostTotalMoney()); var otherPrice = Number(that.getCostTotalMoney());
console.log("otherPrice", otherPrice);
x.TotalMoney = (trip + otherPrice + x.TotalMoney = (trip + otherPrice +
Number(that.getConvertMoney(x.SubtotalMoney)) Number(that.getConvertMoney(x.SubtotalMoney))
).toFixed(0); ).toFixed(0);
......
...@@ -137,7 +137,7 @@ ...@@ -137,7 +137,7 @@
} }
}, },
mounted() { mounted() {
console.log(this.day,'datyyyy');
} }
}; };
......
...@@ -1604,7 +1604,7 @@ ...@@ -1604,7 +1604,7 @@
this.$set(this.tripList, j, x) this.$set(this.tripList, j, x)
x.dateTime = this.setDate(j); x.dateTime = this.setDate(j);
}) })
console.log("this.tripList",this.tripList)
}, },
//上移下移(IsUp:0上移,1下移) //上移下移(IsUp:0上移,1下移)
......
...@@ -162,7 +162,6 @@ ...@@ -162,7 +162,6 @@
that.scenicArray[0].NewImaArray.push(obj); that.scenicArray[0].NewImaArray.push(obj);
that.scenicArray[0].NewScenicImg = JSON.stringify(that.scenicArray[0].NewImaArray); that.scenicArray[0].NewScenicImg = JSON.stringify(that.scenicArray[0].NewImaArray);
this.$forceUpdate(); this.$forceUpdate();
console.log("that.scenicArray[0].NewImaArray",that.scenicArray[0].NewImaArray);
}); });
}, },
getImgInfo(item) { getImgInfo(item) {
......
...@@ -486,7 +486,6 @@ export default { ...@@ -486,7 +486,6 @@ export default {
this.subConfig.DayList[index].dayArray.push(daysArrayItem); this.subConfig.DayList[index].dayArray.push(daysArrayItem);
break; break;
} }
console.log(" this.subConfig.DayList", this.subConfig.DayList);
}, },
//获取相似线路行程 //获取相似线路行程
......
...@@ -32,7 +32,6 @@ export function initChatroomSDK ({ state, commit, dispatch }, obj) { ...@@ -32,7 +32,6 @@ export function initChatroomSDK ({ state, commit, dispatch }, obj) {
onerror: function onChatroomError (error, obj) { onerror: function onChatroomError (error, obj) {
dispatch('hideLoading') dispatch('hideLoading')
if (error) { if (error) {
console.log('网络连接状态异常')
location.href = '#/room' location.href = '#/room'
} }
}, },
......
...@@ -42,11 +42,10 @@ export function initNimSDK ({ state, commit, dispatch }, loginInfo) { ...@@ -42,11 +42,10 @@ export function initNimSDK ({ state, commit, dispatch }, loginInfo) {
}, },
onerror: function onError (event) { onerror: function onError (event) {
// alert(JSON.stringify(event)) // alert(JSON.stringify(event))
console.log('网络连接状态异常')
//location.href = config.loginUrl //location.href = config.loginUrl
}, },
onwillreconnect: function onWillReconnect () { onwillreconnect: function onWillReconnect () {
console.log('网络连接状态异常')
}, },
ondisconnect: function onDisconnect (error) { ondisconnect: function onDisconnect (error) {
switch (error.code) { switch (error.code) {
......
...@@ -203,7 +203,7 @@ export function sendFileMsg({ ...@@ -203,7 +203,7 @@ export function sendFileMsg({
}, },
uploaderror: function () { uploaderror: function () {
console && console.log('上传失败')
}, },
uploaddone: function (error, file) { uploaddone: function (error, file) {
...@@ -248,7 +248,7 @@ export function sendDataUrlMsg({ ...@@ -248,7 +248,7 @@ export function sendDataUrlMsg({
}, },
uploaderror: function () { uploaderror: function () {
console && console.log('上传失败')
}, },
uploaddone: function (error, file) { uploaddone: function (error, file) {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment