Skip to content

S
SuperMan
Commit 6166b237 authored by 黄奎's avatar 黄奎
Browse files
Options

页面修改

parent 5c32db81
Hide whitespace changes
Inline Side-by-side
Showing with 233 additions and 115 deletions
src/assets/utils/alioss.js
View file @ 6166b237
......@@ -2,8 +2,8 @@ var OSS = require('ali-oss').Wrapper
export function client(data) {
var client = new OSS({
region: 'oss-cn-hangzhou.aliyuncs.com', //云账号AccessKey有所有API访问权限，建议遵循阿里云安全最佳实践，部署在服务端使用RAM子账号或STS，部署在客户端使用STS。
accessKeyId: 'LTAIwE7l9dImZSa3',
accessKeySecret: 'j47Ajn0d0WzUCIX8Biyj3P2r8QDltI',
accessKeyId: 'LTAI5tFgqt1pwnoA35cigYTr',
accessKeySecret: 'wXPoEqJ7qLdvX9iBluIebhCPSzoemy',
bucket: 'reborndev'
}) //后端提供数据
return client
......
src/components/busManagement/BookAcar/components/JapanOrderList.vue
View file @ 6166b237
......@@ -11,85 +11,83 @@
</style>
<template>
<table border="0" cellspacing="1" cellpadding="0" class="busStatisticsTalbe" v-loading='loading'>
<tr>
<th width="100" rowspan="2" v-if="pagesTitle=='印象车行-运行统计表'">车公司</th>
<th width="110" rowspan="2" v-if="pagesTitle=='印象车行-运行统计表'">车牌号</th>
<th width="110" rowspan="2" v-if="pagesTitle=='印象车行-运行统计表'">司机</th>
<th width="150" rowspan="2" v-if="pagesTitle=='印象车行-运行统计表'">车型</th>
<th width="150" rowspan="2">使用单位</th>
<th width="100" colspan="3">用车性质</th>
<th width="100" colspan="2">用车时间</th>
<th rowspan="2" :colspan="ColsCount">用车详情 </th>
</tr>
<tr>
<th width="100">接机</th>
<th width="100">送机</th>
<th width="100">包机</th>
<th width="100">出发预订</th>
<th width="100">结束预订</th>
</tr>
<tbody v-for="(outItem,outindex) in OrderList" class="splitTrCss1" :key="outindex">
<tr>
<td v-if="pagesTitle=='印象车行-运行统计表'">
{{outItem.SupplierName}}
</td>
<td v-if="pagesTitle=='印象车行-运行统计表'">
{{outItem.CarNo}}
</td>
<td v-if="pagesTitle=='印象车行-运行统计表'">
{{outItem.DriverName}} {{outItem.CopilotDriverName}}
</td>
<td v-if="pagesTitle=='印象车行-运行统计表'">
{{outItem.CarName}}
</td>
<td>
{{outItem.CustomerName}}
</td>
<td>
{{outItem.AirportPickUpCount}}
</td>
<td>
{{outItem.SendingMachineCount}}
</td>
<td>
{{outItem.UseDayCount}}
</td>
<td>
{{outItem.UseDateStr}}
</td>
<td>
{{outItem.EndUseDateStr}}
</td>
<td v-for="(item,index) in ColsCount" :key="index">
<div class="w135" v-if="(index+1)<=outItem.OrderDayCalendar.length">
<div v-if="outItem.OrderDayCalendar[index].UseState>-1">
<p>
{{outItem.OrderDayCalendar[index].UseDateStr}}
</p>
<el-tooltip class="item" effect="dark" placement="top">
<div slot="content" style="width:200px;">{{outItem.OrderDayCalendar[index].BusContent}}</div>
<span>{{outItem.OrderDayCalendar[index].StartCity}}
<template
v-if="outItem.OrderDayCalendar[index].StartCity&&outItem.OrderDayCalendar[index].EndCity">--></template>
{{outItem.OrderDayCalendar[index].EndCity}}
</span>
</el-tooltip>
<p>
<span style="color: #4BCA81;" v-if="(outItem.OrderDayCalendar[index].UseState==2)">√</span>
                      <span style="color: #ff6600;" v-else-if="(outItem.OrderDayCalendar[index].UseState==1)">O</span>
                      <span style="color: #E95252;" v-else>×</span>
</p>
</div>
</div>
</td>
</tr>
</tbody>
</table>
<div class="japanorder">
<el-table :data="OrderList" style="width: 100%" height="250">
<el-table-column fixed prop="CustomerName" label="使用单位" width="150">
</el-table-column>
<el-table-column fixed label="用车性质" width="165">
<el-table-column prop="UseType" label="接机" width="50">
<template slot-scope="scope">
<template v-if="scope.row.UseType==1">
<span>√</span>
</template>
</template>
</el-table-column>
<el-table-column prop="UseType" label="送机" width="50">
<template slot-scope="scope">
<template v-if="scope.row.UseType==2">
<span>√</span>
</template>
</template>
</el-table-column>
<el-table-column prop="UseType" label="一日游" width="65">
<template slot-scope="scope">
<template v-if="scope.row.UseType==4">
<span>√</span>
</template>
</template>
</el-table-column>
</el-table-column>
<el-table-column fixed prop="GuestNum" label="人数" width="80">
<template slot-scope="scope">
<span>
{{scope.row.GuestNum}} <template v-if="scope.row.TourGuideNum==4">
+{{scope.row.TourGuideNum}}
</template>
</span>
</template>
</el-table-column>
<el-table-column fixed label="用车时段" width="160">
<el-table-column prop="StartTime" label="出发预定" width="80">
<template slot-scope="scope">
<span>{{scope.row.StartTime}}</span>
</template>
</el-table-column>
<el-table-column prop="EndTime" label="结束预定" width="80">
<template slot-scope="scope">
<span>{{scope.row.EndTime}}</span>
</template>
</el-table-column>
<template v-for="(item,index) in headerList">
<el-table-column :key="index" :prop="item.LabelValue" :label="item.LabelName" width="135" align="center">
<template slot-scope="scope">
<template v-if="scope.row.OrderDayCalendar[index].UseState!=-1">
<el-tooltip class="item" effect="dark" placement="top">
<div slot="content" style="width:200px;">{{scope.row.OrderDayCalendar[index].BusContent}}</div>
<div>
<span>{{scope.row.OrderDayCalendar[index].StartCity}}
<template
v-if="scope.row.OrderDayCalendar[index].StartCity&&scope.row.OrderDayCalendar[index].EndCity">--></template>
{{scope.row.OrderDayCalendar[index].EndCity}}
</span>
<p>
<span style="color: #4BCA81;" v-if="(scope.row.OrderDayCalendar[index].UseState==2)">√</span>
<span style="color: #ff6600;" v-else-if="(scope.row.OrderDayCalendar[index].UseState==1)">O</span>
<span style="color: #E95252;" v-else>×</span>
</p>
</div>
</el-tooltip>
</template>
</template>
</el-table-column>
</template>
</el-table-column>
</el-table>
</div>
</template>
<script>
export default {
props: ["OrderList", "pagesTitle", 'loading', 'ColsCount'],
props: ["OrderList", "pagesTitle", 'loading', 'headerList'],
data() {
return {};
},
......@@ -129,4 +127,9 @@
</script>
<style></style>
<style scope="this api replaced by slot-scope in 2.5.0+">
.japanorder .el-table .el-table__cell.is-hidden>* {
visibility: initial !important;
}
</style>
src/components/busManagement/JapanBusOrderMonthStatistics.vue
View file @ 6166b237
......@@ -46,7 +46,8 @@
</div>
<div style="width: 100%; overflow-x: auto;padding-bottom: 10px; margin-top: 10px; " class="ownScrollbarStyle"
:style="{height: boxHeight + 'px'}">
<OrderList :pagesTitle="Title" :OrderList="DataList" :ColsCount="ColsCount" :loading="loading" @success="msg.pageIndex=1,GetList()">
<OrderList :pagesTitle="Title" :headerList="headerList" :OrderList="DataList" :loading="loading"
@success="msg.pageIndex=1,GetList()">
</OrderList>
</div>
<el-pagination background @current-change="handleCurrentChange" :current-page.sync="currentPage"
......@@ -76,7 +77,8 @@
},
DataList: [],
boxHeight: 0,
ColsCount:1,//动态计算跨多少列
ColsCount: 1, //动态计算跨多少列
headerList: [], //动态表头
}
},
components: {
......@@ -93,13 +95,38 @@
this.getList();
},
getList() {
this.loading = true
this.apipost('JapanCar_get_GetJapanOrderStatisticsPageList', this.msg, res => {
this.loading = true;
this.headerList = [];
this.apipost('JapanCar_get_GetJapanOrderCarConfirmPageList', this.msg, res => {
this.loading = false;
console.log("JapanCar_get_GetJapanOrderCarConfirmPageList", JSON.parse(JSON.stringify(res.data)));
if (res.data.resultCode == 1) {
this.ColsCount=res.data.data.MaxUseDay;
this.total = res.data.data.pmodel.count;
this.DataList = res.data.data.pmodel.pageData;
this.total = res.data.data.count;
var tempArray = res.data.data.pageData;
if (tempArray && tempArray.length > 0) {
var headerArray = tempArray[0].OrderDayCalendar;
if (headerArray && headerArray.length > 0) {
headerArray.forEach((item, index) => {
this.headerList.push({
LabelName: item.UseDateStr,
LabelValue: "" + index + ""
})
});
}
// tempArray.forEach(item => {
// item.OrderDayCalendar.forEach(subItem => {
// item[subItem.UseDateStr] = {
// BusContent: subItem.BusContent,
// EndCity: subItem.EndCity,
// StartCity: subItem.StartCity,
// UseDateStr: subItem.UseDateStr,
// UseState: subItem.UseState,
// };
// });
// });
}
console.log("tempArray", tempArray)
this.DataList = tempArray;
} else {
this.Error(res.data.message);
}
......
src/plug/index.js
View file @ 6166b237
......@@ -122,8 +122,8 @@ export default {
let isOnline = 0; //0-本地测试，1-线上
let ocrUrl = "http://192.168.5.46:8888";
domainUrl = "http://192.168.5.214";
// domainUrl = "http://192.168.5.46";
domainUrl = "http://192.168.5.25:8083";
domainUrl = "http://192.168.5.46";
//domainUrl = "http://192.168.5.25:8083";
// domainUrl = "http://reborn.oytour.com";
let crmLocalFileStreamDownLoadUrl = "";
crmLocalFileStreamDownLoadUrl = locationName.indexOf('oytour') !== -1 ? "http://crm.oytour.com" : "http://testcrm.oytour.com";
......@@ -140,17 +140,14 @@ export default {
crmUrl = "http://testcrm.oytour.com";
ocrUrl = "http://ocr.oytour.com";
isOnline = 1;
}
else if(locationName.indexOf('ys.oytour')!==-1)
{
} else if (locationName.indexOf('ys.oytour') !== -1) {
domainUrl = "http://reborn.oytour.com";
mallUrl = "https://mallapi.oytour.com";
lxymallUrl = "https://erpmallapi.oytour.com";
crmUrl = "http://crm.oytour.com";
ocrUrl = "http://ocr.oytour.com";
isOnline = 1;
}
else if (locationName.indexOf('oytour') !== -1) {
} else if (locationName.indexOf('oytour') !== -1) {
domainUrl = "http://reborn.oytour.com";
mallUrl = "https://mallapi.oytour.com";
lxymallUrl = "https://erpmallapi.oytour.com";
......@@ -182,9 +179,9 @@ export default {
//google地图图片地址
GoogleMapImageUrl: "http://imgfile.oytour.com",
//上传站点
UploadUrl: locationName.indexOf('oytour') !== -1 || locationName.indexOf('viitto') !== -1 ? "http://upload.oytour.com" : "http://192.168.5.214:8120",
UploadUrl: locationName.indexOf('oytour') !== -1 || locationName.indexOf('viitto') !== -1 ? "http://upload.oytour.com" : "http://192.168.5.46:8120",
//文件站点
ViittoFileUrl: locationName.indexOf('oytour') !== -1 || locationName.indexOf('viitto') !== -1 ? "http://imgfile.oytour.com" : 'http://192.168.5.214:8130',
ViittoFileUrl: locationName.indexOf('oytour') !== -1 || locationName.indexOf('viitto') !== -1 ? "http://imgfile.oytour.com" : 'http://192.168.5.46:8130',
javaUrl: locationName.indexOf('oytour') !== -1 || locationName.indexOf('viitto') !== -1 ? (locationName.indexOf('oytour') !== -1 ? "http://efficient.oytour.com" : "http://47.96.12.235:9001") : "http://192.168.10.123:9000",
javaUrlNew: locationName.indexOf('oytour') !== -1 || locationName.indexOf('viitto') !== -1 ? (locationName.indexOf('oytour') !== -1 ? "http://property.oytour.com" : "http://47.96.12.235:9001") : "http://192.168.10.123:9000",
//Java接口本站文件流下载地址
......@@ -273,8 +270,8 @@ export default {
if (this.$route.name.indexOf('login') === -1 && this.$route.name.indexOf('clientConfirm') === -1 &&
this.$route.name.indexOf('confirmationOrderDownLoadNew') === -1 && this.$route.name.indexOf('PrintPage') === -1 &&
this.$route.name.indexOf('TravelContractConfirm') === -1 && this.$route.name.indexOf('ViittoContractConfirm') === -1 &&
this.$route.name.indexOf('OrderProfitLossList') === -1 && this.$route.name.indexOf('clientProtocol') === -1
&& this.$route.name.indexOf('clientDisclaimerProtocol')===-1
this.$route.name.indexOf('OrderProfitLossList') === -1 && this.$route.name.indexOf('clientProtocol') === -1 &&
this.$route.name.indexOf('clientDisclaimerProtocol') === -1
) {
let previousPathInfo = {
path: this.$route.name,
......@@ -339,9 +336,7 @@ export default {
guestId: guestId,
}
})
}
else if(this.$route.path=="/clientDisclaimerProtocol")
{
} else if (this.$route.path == "/clientDisclaimerProtocol") {
let TCID = this.$route.query.TCID;
let OrderId = this.$route.query.OrderId;
let GuestId = this.$route.query.GuestId;
......@@ -353,8 +348,7 @@ export default {
GuestId: GuestId,
}
})
}
else if (this.$route.path == "/TravelContractConfirm") {
} else if (this.$route.path == "/TravelContractConfirm") {
let ContractId = this.$route.query.ContractId;
this.$router.push({
name: "TravelContractConfirm",
......@@ -987,14 +981,78 @@ export default {
Vue.prototype.previewPDF = function (url) {
window.open(url);
},
//阿里文件下载
Vue.prototype.ALiFileDownLoad2024 = function (objectKey) {
var uploadUrl = that.domainManager().UploadUrl + "/Upload/AliFileDownLoad?fileName=" + objectKey;
that.$http({
headers: {
'Content-Type': 'application/json'
},
method: 'get',
url: uploadUrl,
data: {},
responseType: 'arraybuffer'
}).then(res => {
var fileType = {
type: "application/pdf"
};
var fileExtension = objectKey.split('.').pop().toLowerCase();
switch (fileExtension) {
case 'jpg':
fileType.type = "";
break;
case 'jpeg':
fileType.type = "";
break;
case 'png':
fileType.type = "";
break;
case 'txt':
fileType.type = "";
break;
case 'pdf':
fileType.type = "";
break;
case 'mp3':
fileType.type = "";
break;
case 'wav':
fileType.type = "";
break;
case 'mp4':
fileType.type = "";
break;
case 'avi':
fileType.type = "";
break;
case 'mov':
fileType.type = "";
break;
case 'video':
fileType.type = "";
break;
}
let blob = new Blob([res.data], fileType)
let fileUrl = URL.createObjectURL(blob);
let link = document.createElement('a');
link.href = fileUrl;
link.setAttribute("download", fileName);
link.click();
that.loadingText = "";
}).catch(function (reason) {
that.$message.error('下载失败');
});
},
//文件下载
Vue.prototype.downloadFile = function (objectKey) {
var co = require('co');
var OSS = require('ali-oss');
var oss = new OSS({
region: 'oss-cn-hangzhou',
accessKeyId: 'LTAIwE7l9dImZSa3',
accessKeySecret: 'j47Ajn0d0WzUCIX8Biyj3P2r8QDltI',
accessKeyId: 'LTAI5tFgqt1pwnoA35cigYTr',
accessKeySecret: 'wXPoEqJ7qLdvX9iBluIebhCPSzoemy',
bucket: 'reborndev'
})
let url = oss.signatureUrl(objectKey);
......@@ -1009,7 +1067,7 @@ export default {
var OSS = require('ali-oss');
var oss = new OSS({
region: 'oss-cn-hangzhou',
accessKeyId: 'LTAIwE7l9dImZSa3',
accessKeyId: 'LTAI4jwDHbEXZJAa',
accessKeySecret: 'j47Ajn0d0WzUCIX8Biyj3P2r8QDltI',
bucket: 'reborndev'
})
......@@ -1051,8 +1109,8 @@ export default {
var OSS = require('ali-oss');
var oss = new OSS({
region: 'oss-cn-hangzhou',
accessKeyId: 'LTAIwE7l9dImZSa3',
accessKeySecret: 'j47Ajn0d0WzUCIX8Biyj3P2r8QDltI',
accessKeyId: 'LTAI5tFgqt1pwnoA35cigYTr',
accessKeySecret: 'wXPoEqJ7qLdvX9iBluIebhCPSzoemy',
bucket: 'reborndev'
})
let url = oss.signatureUrl(objectKey);
......@@ -1115,10 +1173,40 @@ export default {
})
},
//path 请按照"/模块名称/用户ID/自定义文件夹/" /谁搞错一次5块红包
//files 文件数组
//p 进度回调函数
Vue.prototype.uploadFile = function (path, files, successCall) {
Vue.prototype.UploadFileToAli2024 = function (path, files, successCall) {
if (files && files.length > 0) {
let nameList = new Array()
for (let index = 0; index < files.length; index++) {
nameList.push(this.random_string());
}
let that = this;
co(function* () {
for (let index = 0; index < files.length; index++) {
let fileName = nameList[index]
fileName = path + fileName + "." + files[index].name.split('.').pop()
var formData = new FormData();
var uploadUrl = that.domainManager().UploadUrl + "/Upload/UploadToALiOSS?filePath=" + path;
formData.append("myfile", files[index]);
that.$http.post(uploadUrl, formData, {})
.then(res => {
successCall(res);
}).catch(function (reason) {
that.$refs['my-upload'].clearFiles();
that.$message.error('上传失败！');
that.MsgBus.$emit('UploadSelfFileErr')
});
}
}).catch(function (err) {
that.$refs['my-upload'].clearFiles();
that.$message.error('上传失败！');
});
}
}
//path 请按照"/模块名称/用户ID/自定义文件夹/" /谁搞错一次5块红包
//files 文件数组
//p 进度回调函数
Vue.prototype.uploadFile = function (path, files, successCall) {
if (files && files.length > 0) {
let nameList = new Array()
for (let index = 0; index < files.length; index++) {
......@@ -1126,8 +1214,8 @@ export default {
}
var oss = new OSS({
region: 'oss-cn-chengdu',
accessKeyId: 'LTAIwE7l9dImZSa3',
accessKeySecret: 'j47Ajn0d0WzUCIX8Biyj3P2r8QDltI',
accessKeyId: 'LTAI5tFgqt1pwnoA35cigYTr',
accessKeySecret: 'wXPoEqJ7qLdvX9iBluIebhCPSzoemy',
bucket: 'vt-im-bucket'
})
let that = this;
......@@ -1154,8 +1242,8 @@ export default {
var OSS = require('ali-oss');
var oss = new OSS({
region: 'oss-cn-chengdu',
accessKeyId: 'LTAIwE7l9dImZSa3',
accessKeySecret: 'j47Ajn0d0WzUCIX8Biyj3P2r8QDltI',
accessKeyId: 'LTAI5tFgqt1pwnoA35cigYTr',
accessKeySecret: 'wXPoEqJ7qLdvX9iBluIebhCPSzoemy',
bucket: 'vt-im-bucket'
})
var resultJson = {
......
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