Skip to content

S
SuperMan
Commit d378cb3a authored by youjie's avatar youjie
Browse files
Options

Merge branch 'master' of http://gitlab.oytour.com/luochao/superman

parents 790a7085 8861b8d2
Hide whitespace changes
Inline Side-by-side
Showing with 343 additions and 336 deletions
src/App.vue
View file @ d378cb3a
<template>
<div id="app" :class="{'red-theme':isRed}">
<keep-alive>
<router-view v-if="$route.meta.keepAlive"/>
<router-view v-if="$route.meta.keepAlive" />
</keep-alive>
<router-view v-if="!$route.meta.keepAlive"/>
<router-view v-if="!$route.meta.keepAlive" />
<viewer :images="images" :options='imageOptions' @inited="inited" class="viewer" ref="viewer">
<img v-for="src in images" :src="src" :key="src">
</viewer>
......@@ -18,219 +17,230 @@
<script>
var sUserAgent = navigator.userAgent;
if (
sUserAgent.indexOf("Android") > -1 ||
sUserAgent.indexOf("iPhone") > -1 ||
sUserAgent.indexOf("iPad") > -1 ||
sUserAgent.indexOf("iPod") > -1 ||
sUserAgent.indexOf("Symbian") > -1
) {
// document.body.style.minWidth = '100%'
// document.body.style.maxWidth = '100%'
// document.body.style.overflow = 'hidden'
// document.html.style.minWidth = '100%'
} else {
document.body.style.minWidth = "1366px";
// document.html.style.minWidth = '1366px'
}
import chosenOpenMode from "./components/commonPage/chosenOpenMode";
import mycareer from "./components/champion/mycareer";
import { clearInterval } from "timers";
export default {
name: "App",
components: {
chosenOpenMode,
mycareer
},
created() {
//注册禁止后退，并且不做卸载
// history.go(-1)
// history.forward(-1)
if (localStorage.openMode && localStorage.openMode == 1) {
try {
history.pushState(null, null, document.URL);
window.addEventListener("popstate", function() {
history.pushState(null, null, document.URL);
});
} catch (err) {}
}
},
data() {
return {
images: [],
imageOptions: {
navbar: false,
title: false
},
dataShow: false,
haveOpenMode: false,
settingSys: false,
timer: null,
useTime: 0,
showCareer: false,
careerId: 0,
isRed: false
// sessionStorage.getItem("mazip") ? sessionStorage.getItem("mazip") : true
};
},
methods: {
inited(viewer) {
this.$viewer = viewer;
var sUserAgent = navigator.userAgent;
if (
sUserAgent.indexOf("Android") > -1 ||
sUserAgent.indexOf("iPhone") > -1 ||
sUserAgent.indexOf("iPad") > -1 ||
sUserAgent.indexOf("iPod") > -1 ||
sUserAgent.indexOf("Symbian") > -1
) {
// document.body.style.minWidth = '100%'
// document.body.style.maxWidth = '100%'
// document.body.style.overflow = 'hidden'
// document.html.style.minWidth = '100%'
} else {
document.body.style.minWidth = "1366px";
// document.html.style.minWidth = '1366px'
}
import chosenOpenMode from "./components/commonPage/chosenOpenMode";
import mycareer from "./components/champion/mycareer";
import {
clearInterval
} from "timers";
export default {
name: "App",
components: {
chosenOpenMode,
mycareer
},
closeCareer() {
this.showCareer = false;
created() {
//注册禁止后退，并且不做卸载
// history.go(-1)
// history.forward(-1)
if (localStorage.openMode && localStorage.openMode == 1) {
try {
history.pushState(null, null, document.URL);
window.addEventListener("popstate", function () {
history.pushState(null, null, document.URL);
});
} catch (err) {}
}
},
show(data) {
this.$set(this.images, data);
this.$viewer.show();
data() {
return {
images: [],
imageOptions: {
navbar: false,
title: false
},
dataShow: false,
haveOpenMode: false,
settingSys: false,
timer: null,
useTime: 0,
showCareer: false,
careerId: 0,
isRed: false
// sessionStorage.getItem("mazip") ? sessionStorage.getItem("mazip") : true
};
},
listeneruser() {
let that = this;
window.onblur = function() {
that.plaus();
if (that.useTime) {
let params = {
CreateBy: that.getLocalStorage().EmployeeId,
UsedTime: that.useTime
};
that.apipost("user_set_user_usederplog", params, r => {
if (r.data.resultCode == 1) {
that.UsedTime = 0;
methods: {
inited(viewer) {
this.$viewer = viewer;
},
closeCareer() {
this.showCareer = false;
},
show(data) {
this.$set(this.images, data);
this.$viewer.show();
},
listeneruser() {
let that = this;
window.onblur = function () {
that.plaus();
if (that.useTime) {
let params = {
CreateBy: that.getLocalStorage().EmployeeId,
UsedTime: that.useTime
};
if (params.CreateBy && params.CreateBy > 0) {
that.apipost("user_set_user_usederplog", params, r => {
if (r.data.resultCode == 1) {
that.UsedTime = 0;
}
});
}
});
}
};
window.onfocus = function () {
that.timekeeper();
};
},
timekeeper() {
if (!this.timer) {
this.timer = window.setInterval(() => {
this.useTime += 0.1;
}, 1000 * 6);
}
},
plaus() {
if (this.timer) {
window.clearInterval(this.timer);
this.timer = null;
}
};
window.onfocus = function() {
that.timekeeper();
};
},
timekeeper() {
if (!this.timer) {
this.timer = window.setInterval(() => {
this.useTime += 0.1;
}, 1000 * 6);
}
},
plaus() {
if (this.timer) {
window.clearInterval(this.timer);
this.timer = null;
}
}
},
mounted() {
if (
!this.getLocalStorage() &&
document.URL.indexOf("SupplierLogin") == -1 &&
document.URL.indexOf("clientConfirm") == -1 &&
document.URL.indexOf("TravelContractConfirm") == -1 &&
document.URL.indexOf("ViittoContractConfirm") == -1
) {
this.$router.push({
path: "/login"
});
} else {
mounted() {
if (
document.URL.indexOf("clientConfirm") != -1 ||
document.URL.indexOf("TravelContractConfirm") != -1 ||
document.URL.indexOf("ViittoContractConfirm") != -1
!this.getLocalStorage() &&
document.URL.indexOf("SupplierLogin") == -1 &&
document.URL.indexOf("clientConfirm") == -1 &&
document.URL.indexOf("TravelContractConfirm") == -1 &&
document.URL.indexOf("ViittoContractConfirm") == -1
) {
localStorage.openMode = 0;
this.$router.push({
path: "/login"
});
} else {
if (
document.URL.indexOf("clientConfirm") != -1 ||
document.URL.indexOf("TravelContractConfirm") != -1 ||
document.URL.indexOf("ViittoContractConfirm") != -1
) {
localStorage.openMode = 0;
} else {}
this.timekeeper();
this.listeneruser();
}
this.timekeeper();
this.listeneruser();
}
this.haveOpenMode = !localStorage.openMode;
this.MsgBus.$on("imgpreviewoverflow", content => {
this.show(content);
});
this.MsgBus.$on("imgpreviewshow", content => {
this.$viewer.show();
});
this.MsgBus.$on("imgpreviewshowindex", content => {
this.$viewer.view(this.images.indexOf(content));
this.$viewer.show();
});
this.MsgBus.$on("settingOpen", content => {
this.haveOpenMode = true;
this.settingSys = true;
});
this.MsgBus.$on("settingClose", content => {
this.haveOpenMode = false;
this.settingSys = false;
});
this.MsgBus.$on("imgprevpush", content => {
let isExsit = false;
this.images.forEach(x => {
if (x == content) isExsit = true;
this.haveOpenMode = !localStorage.openMode;
this.MsgBus.$on("imgpreviewoverflow", content => {
this.show(content);
});
if (!isExsit) this.images.push(content);
});
this.MsgBus.$on("imgprevclear", content => {
this.images = [];
});
this.MsgBus.$on("showCareer", empId => {
this.careerId = empId;
this.showCareer = true;
});
this.MsgBus.$on("hideCareer", content => {
this.careerId = 0;
this.showCareer = false;
});
this.MsgBus.$on("changeTheme", t => {
this.isRed = t == 1;
});
}
};
this.MsgBus.$on("imgpreviewshow", content => {
this.$viewer.show();
});
this.MsgBus.$on("imgpreviewshowindex", content => {
this.$viewer.view(this.images.indexOf(content));
this.$viewer.show();
});
this.MsgBus.$on("settingOpen", content => {
this.haveOpenMode = true;
this.settingSys = true;
});
this.MsgBus.$on("settingClose", content => {
this.haveOpenMode = false;
this.settingSys = false;
});
this.MsgBus.$on("imgprevpush", content => {
let isExsit = false;
this.images.forEach(x => {
if (x == content) isExsit = true;
});
if (!isExsit) this.images.push(content);
});
this.MsgBus.$on("imgprevclear", content => {
this.images = [];
});
this.MsgBus.$on("showCareer", empId => {
this.careerId = empId;
this.showCareer = true;
});
this.MsgBus.$on("hideCareer", content => {
this.careerId = 0;
this.showCareer = false;
});
this.MsgBus.$on("changeTheme", t => {
this.isRed = t == 1;
});
}
};
</script>
<style>
@import "//at.alicdn.com/t/font_635492_wcd7pw1105.css";
@import "./assets/css/Semibold.css";
@import "./assets/css/global/config.css";
@import "./assets/css/fileIcon.css";
/* html,body{height: 100%; min-width: 1366px; } */
html,
body {
margin: 0;
padding: 0;
background: #f9f9f9 url(assets/img/img-bg.png) no-repeat bottom left/100% auto;
height: 100%;
}
#app {
height: 100%;
}
#app > div {
display: flex;
flex-direction: column;
height: 100%;
}
.BMap_cpyCtrl {
display: none;
}
.anchorBL {
display: none;
}
.viewer {
display: none !important;
}
.showMyCareer {
position: absolute;
top: 0;
bottom: 0;
right: 0;
left: 0;
background: rgba(0, 0, 0, 0.3);
align-items: center;
justify-content: center;
z-index: 999999999999999;
}
.red-theme {
font-family: -apple-system, BlinkMacSystemFont, Segoe UI, Roboto,
Helvetica Neue, Arial, Apple Color Emoji, Segoe UI Emoji, Segoe UI Symbol,
Noto Color Emoji, MicrosoftJhengHeiBoldFix, "\5FAE\8EDF\6B63\9ED1\9AD4",
Microsoft JhengHei;
}
</style>
@import "//at.alicdn.com/t/font_635492_wcd7pw1105.css";
@import "./assets/css/Semibold.css";
@import "./assets/css/global/config.css";
@import "./assets/css/fileIcon.css";
/* html,body{height: 100%; min-width: 1366px; } */
html,
body {
margin: 0;
padding: 0;
background: #f9f9f9 url(assets/img/img-bg.png) no-repeat bottom left/100% auto;
height: 100%;
}
#app {
height: 100%;
}
#app>div {
display: flex;
flex-direction: column;
height: 100%;
}
.BMap_cpyCtrl {
display: none;
}
.anchorBL {
display: none;
}
.viewer {
display: none !important;
}
.showMyCareer {
position: absolute;
top: 0;
bottom: 0;
right: 0;
left: 0;
background: rgba(0, 0, 0, 0.3);
align-items: center;
justify-content: center;
z-index: 999999999999999;
}
.red-theme {
font-family: -apple-system, BlinkMacSystemFont, Segoe UI, Roboto,
Helvetica Neue, Arial, Apple Color Emoji, Segoe UI Emoji, Segoe UI Symbol,
Noto Color Emoji, MicrosoftJhengHeiBoldFix, "\5FAE\8EDF\6B63\9ED1\9AD4",
Microsoft JhengHei;
}
</style>
\ No newline at end of file
src/components/FinancialModule/platOrderquery.vue
View file @ d378cb3a
......@@ -241,8 +241,8 @@
<p class="fz12 over_ellipsis" style="width: 100%;">{{item.commissionSPeopleName=='无'?'':item.commissionSPeopleName}}</p>
<p>{{$t('hotel.hotel_StartTeam')}}：{{item.startDate}}</p>
<p v-if="item.tradeWay ==1">{{item.platformOrder}}</p>
<p v-if='item.commissionMoney' style="color:red">{{$t('salesModule.CommissionNum')}}：{{item.commissionMoney}}</p>
<p v-else-if="item.latestCommissionMoney" style="color:red">{{$t('salesModule.CommissionNum')}}：{{item.latestCommissionMoney}}</p>
<!-- <p v-if='item.commissionMoney' style="color:red">{{$t('salesModule.CommissionNum')}}：{{item.commissionMoney}}</p>
<p v-else-if="item.latestCommissionMoney" style="color:red">{{$t('salesModule.CommissionNum')}}：{{item.latestCommissionMoney}}</p> -->
<div>
<div style="color:green" v-if="item.commissionMoney==''||item.commissionMoney=='-1'">
<p v-if="item.extraRewardMoney>0">{{$t('salesModule.EWJLJE')}}：{{item.extraRewardMoney}}</p>
......@@ -890,8 +890,7 @@
this.getCtlxList()
this.getEmployee();
// this.getLineList();
// this.getDepartment();
this.getDdztList();
if (this.$route.query.id) {
this.msg.tempOrderId = this.$route.query.id;
......@@ -904,7 +903,7 @@
this.msg.QStartDate = this.$route.query.starTime === undefined ? "" : this.$route.query.starTime;
this.msg.QEndDate = this.$route.query.endTime === undefined ? "" : this.$route.query.endTime;
if (this.msg.QStartDate === "" && this.msg.QEndDate === "" && !this.msg.tempOrderId) {
let nowDay = new Date().toLocaleDateString();
let nowDay = this.FormartDate(new Date());
this.msg.QStartDate = nowDay;
this.msg.QEndDate = nowDay;
}
......
src/components/SalesModule/enrollTotal.vue
View file @ d378cb3a
......@@ -556,14 +556,14 @@
</p>
<p>{{ $t("hotel.hotel_StartTeam") }}：{{ item.startDate }}</p>
<p v-if="item.tradeWay == 1">{{ item.platformOrder }}</p>
<p v-if="item.commissionMoney" style="color: red">
<!-- <p v-if="item.commissionMoney" style="color: red;">
{{ $t("salesModule.CommissionNum") }}：{{ item.commissionMoney }}
</p>
<p v-else-if="item.latestCommissionMoney" style="color: red">
{{ $t("salesModule.CommissionNum") }}：{{
item.latestCommissionMoney
}}
</p>
</p> -->
<div>
<div
style="color: green"
......
src/components/SalesModule/enrollTotalForAirUnion.vue
View file @ d378cb3a
......@@ -583,7 +583,7 @@
this.msg.QStartDate = this.$route.query.starTime === undefined ? "" : this.$route.query.starTime;
this.msg.QEndDate = this.$route.query.endTime === undefined ? "" : this.$route.query.endTime;
if (this.msg.QStartDate === "" && this.msg.QEndDate === "" && !this.msg.tempOrderId) {
let nowDay = new Date().toLocaleDateString();
let nowDay =this.FormartDate(new Date());
this.msg.QStartDate = nowDay;
this.msg.QEndDate = nowDay;
}
......
src/components/SalesModule/enrollTotalTwo.vue
View file @ d378cb3a
......@@ -628,14 +628,7 @@
this.msg.CStartDate = this.$route.query.starTime === undefined ? "" : this.$route.query.starTime;
this.msg.QEndDate = this.$route.query.endTime === undefined ? "" : this.$route.query.endTime;
if (this.msg.CStartDate === "" && this.msg.QEndDate === "") {
// let nowDay = new Date().toLocaleDateString();
var dd = new Date();
dd.setDate(dd.getDate() + 3); //获取AddDayCount天后的日期
var y = dd.getFullYear();
var m = dd.getMonth() + 1; //获取当前月份的日期
var d = dd.getDate();
// this.msg.QStartDate = nowDay;
this.msg.QEndDate = y + '-' + m + '-' + d;
this.msg.QEndDate = this.FormartDate(new Date());
}
this.getList();
},
......
src/components/SalesModule/groupTourOrder.vue
View file @ d378cb3a
......@@ -1703,14 +1703,14 @@
</p>
<p>{{ $t("restaurant.res_oderTime") }}：{{ item.createDate }}</p>
<p v-if="item.tradeWay == 1">{{ item.platformOrder }}</p>
<p v-if="item.commissionMoney" style="color: red">
<!-- <p v-if="item.commissionMoney" style="color: red">
{{ $t("salesModule.Commission") }}：{{ item.commissionMoney }}
</p>
<p v-else-if="item.latestCommissionMoney" style="color: red">
{{ $t("salesModule.Commission") }}：{{
item.latestCommissionMoney
}}
</p>
</p> -->
<div>
<div style="color: green" v-if="
item.commissionMoney == '' || item.commissionMoney == '-1'
......
src/components/SalesModule/productQuery.vue
View file @ d378cb3a
......@@ -3614,7 +3614,7 @@
this.msg.TCIDList = this.TCIDList = this.$route.query.TCIDList;
}
if (this.msg.StartTime === "") {
let nowDay = new Date().toLocaleDateString();
let nowDay = this.FormartDate(new Date());
this.msg.StartTime = nowDay;
}
this.getEmployee();
......
src/components/SalesModule/productQueryOne.vue
View file @ d378cb3a
......@@ -2153,7 +2153,7 @@
this.msg.TCIDList = this.TCIDList = this.$route.query.TCIDList;
}
if (this.msg.StartTime === "") {
let nowDay = new Date().toLocaleDateString();
let nowDay =this.FormartDate(new Date());
this.msg.StartTime = nowDay;
}
this.getEmployee()
......
src/components/Supplier/HotelTotalStock.vue
View file @ d378cb3a
......@@ -371,10 +371,10 @@
<div class="block date">
<label class="demonstration">日付</label>
<el-date-picker v-model="msg.sDate" type="date" :placeholder="$t('admin.admin_choDate')"
value-format="yyyy-MM-dd" :picker-options="pickerOptions1">
value-format="yyyy-MM-dd" ><!--:picker-options="pickerOptions1"-->
</el-date-picker>
<el-date-picker v-model="msg.eDate" type="date" :placeholder="$t('admin.admin_choDate')"
value-format="yyyy-MM-dd" :picker-options="pickerOptions2">
value-format="yyyy-MM-dd" ><!--:picker-options="pickerOptions2"-->
</el-date-picker>
</div>
</li>
......
src/components/Ticketing/IndividualTicketOrder.vue
View file @ d378cb3a
......@@ -147,8 +147,8 @@
<p class="fz12 over_ellipsis" style="width: 100%;">{{item.commissionSPeopleName=='无'?'':item.commissionSPeopleName}}</p>
<p>{{$t('hotel.hotel_StartTeam')}}：{{item.startDate}}</p>
<p v-if="item.tradeWay ==1">{{item.platformOrder}}</p>
<p v-if='item.commissionMoney' style="color:red">{{$t('salesModule.CommissionNum')}}：{{item.commissionMoney}}</p>
<p v-else-if="item.latestCommissionMoney" style="color:red">{{$t('salesModule.CommissionNum')}}：{{item.latestCommissionMoney}}</p>
<!-- <p v-if='item.commissionMoney' style="color:red">{{$t('salesModule.CommissionNum')}}：{{item.commissionMoney}}</p>
<p v-else-if="item.latestCommissionMoney" style="color:red">{{$t('salesModule.CommissionNum')}}：{{item.latestCommissionMoney}}</p> -->
<div>
<div style="color:green" v-if="item.commissionMoney==''||item.commissionMoney=='-1'">
<p v-if="item.extraRewardMoney>0">{{$t('salesModule.EWJLJE')}}：{{item.extraRewardMoney}}</p>
......@@ -691,9 +691,8 @@
this.msg.QStartDate = this.$route.query.starTime === undefined ? "" : this.$route.query.starTime;
this.msg.QEndDate = this.$route.query.endTime === undefined ? "" : this.$route.query.endTime;
if (this.msg.QStartDate === "" && this.msg.QEndDate === "" && !this.msg.tempOrderId) {
let nowDay = new Date().toLocaleDateString();
// this.msg.QStartDate = nowDay;
// this.msg.QEndDate = nowDay;
let nowDay =this.FormartDate(new Date());
}
if (this.$route.query.orderId) {
this.msg.tempOrderId = this.$route.query.orderId;
......
src/components/TravelContractView.vue
View file @ d378cb3a
......@@ -722,61 +722,61 @@
<template v-if="CtObj.ContractTicketList&&CtObj.ContractTicketList.length>0">
<img
src="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABEAAAARCAMAAAAMs7fIAAAAflBMVEUAAAAAAACwsLC5ubm5ubm5ubm4uLizs7O1tbWmpqa5ubm5ubm3t7evr6////+5ubnt7e3y8vLq6ur6+vr09PTo6Oj4+Pjv7++8vLxYWFicnJxxcXFgYGDi4uLb29vBwcHExMS7u7uUlJSKiorg4ODT09PJycmjo6OCgoJpaWms464fAAAADnRSTlMACQ/7atLJvWBWCdW/WGJ0ck0AAACVSURBVBjTbc5HFoMwDEVRJ/QUWRiM40IJpO5/g5FNm+QOdI7e6LN/4oSvktiHvEdY4eBTKmCnzlQiqGbG2QruJ8Y4NMGgrWzgdvSlDr6uq+ullB7Xhu5WRlN+XLsXpSY96VGRpSA+rNYvJFvBp7O4lQhQCGHewgt7LhKElF0nCYiUNl/7FlZtnzNSZBGfRVnBgsOOvh9/9xAo+8NxzQAAAABJRU5ErkJggg=="
style="margin-bottom: -4px;" />
style="margin-bottom: -4px;width:17px;heigth:17px" />
</template>
<template v-else>
<img
src="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABEAAAARCAMAAAAMs7fIAAAAdVBMVEUAAAAAAACwsLDNzc3Q0ND///+5ubn///+5ubm8vLzz8/Pt7e3r6+vo6Ojv7+/6+vr4+PjS0tKbm5vk5OTf39/b29vCwsKJiYni4uLa2tqsrKx3d3e2trawsLCpqamkpKSSkpLExMSfn5+Li4uEhIR9fX0mJiaMZFtDAAAAB3RSTlMAEh3+/YUS7eKGqgAAAJ1JREFUGNNtzzcWwjAQRVHANkqjnJxt4v6XiMRBiILXza3+HP7UtQSXSNsl0YGhEru0SQigmiBJMJJghZSScisROWdRzoxKKWy0QuSUhfIxLizcjKNFKJ0fZtos/RGxPqOjXxFC4ClOCwjxEdaP983P8epZkWE3lrF1b6o0AwA4reG9h3AEnHvPUwjy5jb0qNQHnX9vcK3pDrljLV0vwMkLmE4T88cAAAAASUVORK5CYII="
style="margin-bottom: -4px;" />
style="margin-bottom: -4px;width:17px;heigth:17px" />
</template>
2
<template v-if="CtObj.ContractHotelList&&CtObj.ContractHotelList.length>0">
<img
src="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABEAAAARCAMAAAAMs7fIAAAAflBMVEUAAAAAAACwsLC5ubm5ubm5ubm4uLizs7O1tbWmpqa5ubm5ubm3t7evr6////+5ubnt7e3y8vLq6ur6+vr09PTo6Oj4+Pjv7++8vLxYWFicnJxxcXFgYGDi4uLb29vBwcHExMS7u7uUlJSKiorg4ODT09PJycmjo6OCgoJpaWms464fAAAADnRSTlMACQ/7atLJvWBWCdW/WGJ0ck0AAACVSURBVBjTbc5HFoMwDEVRJ/QUWRiM40IJpO5/g5FNm+QOdI7e6LN/4oSvktiHvEdY4eBTKmCnzlQiqGbG2QruJ8Y4NMGgrWzgdvSlDr6uq+ullB7Xhu5WRlN+XLsXpSY96VGRpSA+rNYvJFvBp7O4lQhQCGHewgt7LhKElF0nCYiUNl/7FlZtnzNSZBGfRVnBgsOOvh9/9xAo+8NxzQAAAABJRU5ErkJggg=="
style="margin-bottom: -4px;" />
style="margin-bottom: -4px;width:17px;heigth:17px" />
</template>
<template v-else>
<img
src="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABEAAAARCAMAAAAMs7fIAAAAdVBMVEUAAAAAAACwsLDNzc3Q0ND///+5ubn///+5ubm8vLzz8/Pt7e3r6+vo6Ojv7+/6+vr4+PjS0tKbm5vk5OTf39/b29vCwsKJiYni4uLa2tqsrKx3d3e2trawsLCpqamkpKSSkpLExMSfn5+Li4uEhIR9fX0mJiaMZFtDAAAAB3RSTlMAEh3+/YUS7eKGqgAAAJ1JREFUGNNtzzcWwjAQRVHANkqjnJxt4v6XiMRBiILXza3+HP7UtQSXSNsl0YGhEru0SQigmiBJMJJghZSScisROWdRzoxKKWy0QuSUhfIxLizcjKNFKJ0fZtos/RGxPqOjXxFC4ClOCwjxEdaP983P8epZkWE3lrF1b6o0AwA4reG9h3AEnHvPUwjy5jb0qNQHnX9vcK3pDrljLV0vwMkLmE4T88cAAAAASUVORK5CYII="
style="margin-bottom: -4px;" />
style="margin-bottom: -4px;width:17px;heigth:17px" />
</template>
3
<template v-if="CtObj.ContractPickUpList&&CtObj.ContractPickUpList.length>0">
<img
src="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABEAAAARCAMAAAAMs7fIAAAAflBMVEUAAAAAAACwsLC5ubm5ubm5ubm4uLizs7O1tbWmpqa5ubm5ubm3t7evr6////+5ubnt7e3y8vLq6ur6+vr09PTo6Oj4+Pjv7++8vLxYWFicnJxxcXFgYGDi4uLb29vBwcHExMS7u7uUlJSKiorg4ODT09PJycmjo6OCgoJpaWms464fAAAADnRSTlMACQ/7atLJvWBWCdW/WGJ0ck0AAACVSURBVBjTbc5HFoMwDEVRJ/QUWRiM40IJpO5/g5FNm+QOdI7e6LN/4oSvktiHvEdY4eBTKmCnzlQiqGbG2QruJ8Y4NMGgrWzgdvSlDr6uq+ullB7Xhu5WRlN+XLsXpSY96VGRpSA+rNYvJFvBp7O4lQhQCGHewgt7LhKElF0nCYiUNl/7FlZtnzNSZBGfRVnBgsOOvh9/9xAo+8NxzQAAAABJRU5ErkJggg=="
style="margin-bottom: -4px;" />
style="margin-bottom: -4px;width:17px;heigth:17px" />
</template>
<template v-else>
<img
src="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABEAAAARCAMAAAAMs7fIAAAAdVBMVEUAAAAAAACwsLDNzc3Q0ND///+5ubn///+5ubm8vLzz8/Pt7e3r6+vo6Ojv7+/6+vr4+PjS0tKbm5vk5OTf39/b29vCwsKJiYni4uLa2tqsrKx3d3e2trawsLCpqamkpKSSkpLExMSfn5+Li4uEhIR9fX0mJiaMZFtDAAAAB3RSTlMAEh3+/YUS7eKGqgAAAJ1JREFUGNNtzzcWwjAQRVHANkqjnJxt4v6XiMRBiILXza3+HP7UtQSXSNsl0YGhEru0SQigmiBJMJJghZSScisROWdRzoxKKWy0QuSUhfIxLizcjKNFKJ0fZtos/RGxPqOjXxFC4ClOCwjxEdaP983P8epZkWE3lrF1b6o0AwA4reG9h3AEnHvPUwjy5jb0qNQHnX9vcK3pDrljLV0vwMkLmE4T88cAAAAASUVORK5CYII="
style="margin-bottom: -4px;" />
style="margin-bottom: -4px;width:17px;heigth:17px" />
</template>
4
<template v-if="CtObj.ContractVisaList&&CtObj.ContractVisaList.length>0">
<img
src="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABEAAAARCAMAAAAMs7fIAAAAflBMVEUAAAAAAACwsLC5ubm5ubm5ubm4uLizs7O1tbWmpqa5ubm5ubm3t7evr6////+5ubnt7e3y8vLq6ur6+vr09PTo6Oj4+Pjv7++8vLxYWFicnJxxcXFgYGDi4uLb29vBwcHExMS7u7uUlJSKiorg4ODT09PJycmjo6OCgoJpaWms464fAAAADnRSTlMACQ/7atLJvWBWCdW/WGJ0ck0AAACVSURBVBjTbc5HFoMwDEVRJ/QUWRiM40IJpO5/g5FNm+QOdI7e6LN/4oSvktiHvEdY4eBTKmCnzlQiqGbG2QruJ8Y4NMGgrWzgdvSlDr6uq+ullB7Xhu5WRlN+XLsXpSY96VGRpSA+rNYvJFvBp7O4lQhQCGHewgt7LhKElF0nCYiUNl/7FlZtnzNSZBGfRVnBgsOOvh9/9xAo+8NxzQAAAABJRU5ErkJggg=="
style="margin-bottom: -4px;" />
style="margin-bottom: -4px;width:17px;heigth:17px" />
</template>
<template v-else>
<img
src="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABEAAAARCAMAAAAMs7fIAAAAdVBMVEUAAAAAAACwsLDNzc3Q0ND///+5ubn///+5ubm8vLzz8/Pt7e3r6+vo6Ojv7+/6+vr4+PjS0tKbm5vk5OTf39/b29vCwsKJiYni4uLa2tqsrKx3d3e2trawsLCpqamkpKSSkpLExMSfn5+Li4uEhIR9fX0mJiaMZFtDAAAAB3RSTlMAEh3+/YUS7eKGqgAAAJ1JREFUGNNtzzcWwjAQRVHANkqjnJxt4v6XiMRBiILXza3+HP7UtQSXSNsl0YGhEru0SQigmiBJMJJghZSScisROWdRzoxKKWy0QuSUhfIxLizcjKNFKJ0fZtos/RGxPqOjXxFC4ClOCwjxEdaP983P8epZkWE3lrF1b6o0AwA4reG9h3AEnHvPUwjy5jb0qNQHnX9vcK3pDrljLV0vwMkLmE4T88cAAAAASUVORK5CYII="
style="margin-bottom: -4px;" />
style="margin-bottom: -4px;width:17px;heigth:17px" />
</template>
5
<template
v-if="CtObj.ContractTicketAndHotel && (CtObj.ContractTicketAndHotel.ContractHotels ||CtObj.ContractTicketAndHotel.ContractTickets)">
<img
src="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABEAAAARCAMAAAAMs7fIAAAAflBMVEUAAAAAAACwsLC5ubm5ubm5ubm4uLizs7O1tbWmpqa5ubm5ubm3t7evr6////+5ubnt7e3y8vLq6ur6+vr09PTo6Oj4+Pjv7++8vLxYWFicnJxxcXFgYGDi4uLb29vBwcHExMS7u7uUlJSKiorg4ODT09PJycmjo6OCgoJpaWms464fAAAADnRSTlMACQ/7atLJvWBWCdW/WGJ0ck0AAACVSURBVBjTbc5HFoMwDEVRJ/QUWRiM40IJpO5/g5FNm+QOdI7e6LN/4oSvktiHvEdY4eBTKmCnzlQiqGbG2QruJ8Y4NMGgrWzgdvSlDr6uq+ullB7Xhu5WRlN+XLsXpSY96VGRpSA+rNYvJFvBp7O4lQhQCGHewgt7LhKElF0nCYiUNl/7FlZtnzNSZBGfRVnBgsOOvh9/9xAo+8NxzQAAAABJRU5ErkJggg=="
style="margin-bottom: -4px;" />
style="margin-bottom: -4px;width:17px;heigth:17px" />
</template>
<template v-else>
<img
src="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABEAAAARCAMAAAAMs7fIAAAAdVBMVEUAAAAAAACwsLDNzc3Q0ND///+5ubn///+5ubm8vLzz8/Pt7e3r6+vo6Ojv7+/6+vr4+PjS0tKbm5vk5OTf39/b29vCwsKJiYni4uLa2tqsrKx3d3e2trawsLCpqamkpKSSkpLExMSfn5+Li4uEhIR9fX0mJiaMZFtDAAAAB3RSTlMAEh3+/YUS7eKGqgAAAJ1JREFUGNNtzzcWwjAQRVHANkqjnJxt4v6XiMRBiILXza3+HP7UtQSXSNsl0YGhEru0SQigmiBJMJJghZSScisROWdRzoxKKWy0QuSUhfIxLizcjKNFKJ0fZtos/RGxPqOjXxFC4ClOCwjxEdaP983P8epZkWE3lrF1b6o0AwA4reG9h3AEnHvPUwjy5jb0qNQHnX9vcK3pDrljLV0vwMkLmE4T88cAAAAASUVORK5CYII="
style="margin-bottom: -4px;" />
style="margin-bottom: -4px;width:17px;heigth:17px" />
</template>
6 <img
src="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABEAAAARCAMAAAAMs7fIAAAAflBMVEUAAAAAAACwsLC5ubm5ubm5ubm4uLizs7O1tbWmpqa5ubm5ubm3t7evr6////+5ubnt7e3y8vLq6ur6+vr09PTo6Oj4+Pjv7++8vLxYWFicnJxxcXFgYGDi4uLb29vBwcHExMS7u7uUlJSKiorg4ODT09PJycmjo6OCgoJpaWms464fAAAADnRSTlMACQ/7atLJvWBWCdW/WGJ0ck0AAACVSURBVBjTbc5HFoMwDEVRJ/QUWRiM40IJpO5/g5FNm+QOdI7e6LN/4oSvktiHvEdY4eBTKmCnzlQiqGbG2QruJ8Y4NMGgrWzgdvSlDr6uq+ullB7Xhu5WRlN+XLsXpSY96VGRpSA+rNYvJFvBp7O4lQhQCGHewgt7LhKElF0nCYiUNl/7FlZtnzNSZBGfRVnBgsOOvh9/9xAo+8NxzQAAAABJRU5ErkJggg=="
style="margin-bottom: -4px;" />等共计
style="margin-bottom: -4px;width:17px;heigth:17px" />等共计
等共计<span>&nbsp;<font>{{getTotalNum(getCount())}}</font></span>&nbsp;项服务。</p>
<p>费用总额（小写）人民币<span>{{CtObj.C_TotalPrice}}</span>元&nbsp;&nbsp;（大写）人民币<span>
<font>{{number_chinese(CtObj.C_TotalPrice)}}</font>
......
src/components/TravelManager/TravelList/todayOrderTotal.vue
View file @ d378cb3a
......@@ -1211,7 +1211,8 @@ export default {
this.getLineList();
this.getDepartment();
this.getDdztList();
let nowDay = new Date().toLocaleDateString();
let nowDay =this.FormartDate(new Date());
if (this.$route.query.id) {
this.msg.tempOrderId = this.$route.query.id;
}
......
src/components/administrative/ConfirmationAdui.vue
View file @ d378cb3a
......@@ -590,7 +590,7 @@
this.msg.QStartDate = this.$route.query.starTime === undefined ? "" : this.$route.query.starTime;
this.msg.QEndDate = this.$route.query.endTime === undefined ? "" : this.$route.query.endTime;
if (this.msg.QStartDate === "" && this.msg.QEndDate === "" && !this.msg.tempOrderId) {
let nowDay = new Date().toLocaleDateString();
let nowDay = this.FormartDate(new Date());
this.msg.QStartDate = nowDay;
this.msg.QEndDate = nowDay;
}
......
src/plug/index.js
View file @ d378cb3a
......@@ -115,12 +115,12 @@ export default {
Vue.prototype.domainManager = function () {
let domainUrl = '';
let mallUrl = ""; //商城API
let lxymallUrl = '';//国内游api
let lxymallUrl = ''; //国内游api
let crmUrl = ""; //crm API
let locationName = window.location.hostname;
domainUrl ="http://192.168.10.36:8083";
domainUrl = "http://192.168.10.128";
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 = "";
javaUrldo = 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.2.215:9000";
//商城API
......@@ -144,7 +144,7 @@ export default {
DomainUrl: domainUrl,
//常用提交数据URL
PostUrl: domainUrl + "/api/common/post",
//上传文件URL
UploadFileUrl: domainUrl + '/api/File/post',
//本站模板文件下载地址
......@@ -170,7 +170,7 @@ export default {
//Java接口本站文件流下载地址
JavaLocalFileStreamDownLoadUrl: javaUrldo,
mallUrl: mallUrl,
lxymallUrl:lxymallUrl,
lxymallUrl: lxymallUrl,
crmUrl: crmUrl,
crmRoutingUrl: locationName.indexOf('oytour') !== -1 || locationName.indexOf('viitto') !== -1 ? "http://fcrmyx.oytour.com/#/" : "http://localhost:8081/#/",
};
......@@ -302,9 +302,7 @@ export default {
})
} else {
if (!localStorage.userInfo && localStorage.userInfo != "" && this.$route.path.toLowerCase() != "/login") {
this.$router.push({
path: '/login'
})
this.goToLogin(1);
}
}
var token = "";
......@@ -339,10 +337,8 @@ export default {
})
.then(res => {
if (res.data.resultCode == 10000 || res.data.resultCode == 10001) {
if (this.getLocalStorage()){
this.$router.push({
path: '/login'
});
if (this.getLocalStorage()) {
this.goToLogin(2);
}
} else if (res.resultCode == 10005) {
this.$router.go(-1);
......@@ -447,7 +443,7 @@ export default {
}
var token = "";
var type = "";
if (localStorage.crmuserInfo) {
if (localStorage.crmuserInfo) {
token = data.token;
type = data.type
}
......@@ -460,7 +456,7 @@ export default {
} else if (localStorage.language == "Japanese") {
tempLanguage = 2;
}
}
}
var postData = {
"msg": {},
"cmd": cmd,
......@@ -470,11 +466,11 @@ export default {
"languageId": tempLanguage
}
this.$http.post(apiurl, postData, {
headers: {
'Content-Type': 'application/json',
'Referer-Viitto': this.$route.path
}
})
headers: {
'Content-Type': 'application/json',
'Referer-Viitto': this.$route.path
}
})
.then(res => {
if (res.data.resultCode == 10000 || res.data.resultCode == 10001) {
this.$router.push({
......@@ -633,7 +629,6 @@ export default {
//请求Java接口
Vue.prototype.apiJavaPost = function (cmd, msg, successCall, faildCall) {
if (this.$route.name.indexOf('login') === -1 && this.$route.name.indexOf('confirmationOrderDownLoad') === -1 && this.$route.name.indexOf('PrintPage') === -1 && this.$route.name.indexOf('clientConfirm') === -1) {
let previousPathInfo = {
path: this.$route.name,
query: this.$route.query
......@@ -676,9 +671,7 @@ export default {
})
.then(res => {
if (res.resultCode == 10000 || res.resultCode == 10001) {
this.$router.push({
path: '/login'
})
this.goToLogin(3);
} else if (res.resultCode == 10005) {
this.$router.go(-1)
} else if (res.data.data && res.data.data.isJumpTwoCode == 1) {
......@@ -736,9 +729,7 @@ export default {
})
.then(res => {
if (res.resultCode == 10000 || res.resultCode == 10001) {
this.$router.push({
path: '/login'
})
this.goToLogin(4);
} else if (res.resultCode == 10005) {
this.$router.go(-1)
} else if (res.data.data && res.data.data.isJumpTwoCode == 1) {
......@@ -756,9 +747,7 @@ export default {
var apiurl = this.domainManager().LocalFileStreamDownLoadUrl;
var timestamp = (new Date()).valueOf();
if (!localStorage.userInfo && localStorage.userInfo != "" && this.$route.path.toLowerCase() != "/login") {
this.$router.push({
path: '/login'
})
this.goToLogin(5);
}
var token = "";
var key = "";
......@@ -791,57 +780,55 @@ export default {
}).catch(function (res) {});
},
//crm下载文件
Vue.prototype.crmGetLocalFile = function(cmd, msg, fileName, callBack) {
Vue.prototype.crmGetLocalFile = function (cmd, msg, fileName, callBack) {
if (msg == null || msg == "") {
msg = {}
msg = {}
}
var apiurl = this.domainManager().crmUrl + cmd;
var token = "";
var key = "";
if (this.getLocalStorage() != null) {
token = this.getLocalStorage().token;
key = this.getLocalStorage().SecretKey;
token = this.getLocalStorage().token;
key = this.getLocalStorage().SecretKey;
}
var encodeMsg = encodeURIComponent(JSON.stringify(msg)).toLowerCase();
var md5Str = md5(`msg=${encodeMsg}&token=${token}&key=${key}`);
var postData = {
"msg": msg,
"token": token,
"sign": md5Str
"msg": msg,
"token": token,
"sign": md5Str
}
this.$http.post(apiurl, postData, {
headers: {
'Content-Type': 'application/json',
'Referer-Viitto': this.$route.path,
},
responseType: 'blob'
headers: {
'Content-Type': 'application/json',
'Referer-Viitto': this.$route.path,
},
responseType: 'blob'
}).then((res) => {
let blob = new Blob([res.data], {
type: "application/vnd.ms-excel"
})
let url = URL.createObjectURL(blob);
let link = document.createElement('a');
link.href = url;
link.setAttribute("download", fileName);
document.body.appendChild(link);
link.click();
if (callBack) {
var result = {
Code: 1
};
callBack(result);
}
}).catch(function(res) {
let blob = new Blob([res.data], {
type: "application/vnd.ms-excel"
})
let url = URL.createObjectURL(blob);
let link = document.createElement('a');
link.href = url;
link.setAttribute("download", fileName);
document.body.appendChild(link);
link.click();
if (callBack) {
var result = {
Code: 1
};
callBack(result);
}
}).catch(function (res) {
});
}
Vue.prototype.JavaGetLocalFile = function (cmd, msg, fileName, successCall) {
}
Vue.prototype.JavaGetLocalFile = function (cmd, msg, fileName, successCall) {
var apiurl = this.domainManager().JavaLocalFileStreamDownLoadUrl + cmd;
var timestamp = (new Date()).valueOf();
if (!localStorage.userInfo && localStorage.userInfo != "" && this.$route.path.toLowerCase() != "/login") {
this.$router.push({
path: '/login'
})
this.goToLogin(6);
}
var token = "";
var key = "";
......@@ -877,6 +864,12 @@ export default {
successCall(res);
}).catch(function (res) {});
},
//跳转到登录页面
Vue.prototype.goToLogin = function (type) {
this.$router.push({
path: '/login'
})
},
//ERP本地缓存
Vue.prototype.getLocalStorage = function () {
var localStorageData = window.localStorage["userInfo"];
......@@ -1100,8 +1093,8 @@ export default {
} else if (type === 'h') {
poise = 'm_h'
}
var newpath= path.replace('http://192.168.10.214:8130', '').replace('https://imgfile.oytour.com', '').replace('https://imgfile.oytour.com', '').split('?')[0];
return url + '/image/index?filePath=' +newpath + '&process=resize,' + poise + ',w_' + w + ',h_' + h;
var newpath = path.replace('http://192.168.10.214:8130', '').replace('https://imgfile.oytour.com', '').replace('https://imgfile.oytour.com', '').split('?')[0];
return url + '/image/index?filePath=' + newpath + '&process=resize,' + poise + ',w_' + w + ',h_' + h;
}
Vue.prototype.uploadSelfBlob = function (path, files, successCall) {
let that = this;
......@@ -1160,6 +1153,18 @@ export default {
}
item[filed] = value;
}
//格式化日期
Vue.prototype.FormartDate = function (date) {
let today =
date.getFullYear() +
"-" +
(date.getMonth() < 9 ?
"0" + (date.getMonth() + 1) :
date.getMonth() + 1) +
"-" +
(date.getDate() < 10 ? "0" + date.getDate() : date.getDate());
return today;
}
//时间验证
Vue.prototype.checkTime = function (item, filed) {
var date = item[filed];
......@@ -1500,32 +1505,32 @@ export default {
}
return css;
},
//HTTP提交数据 5-18新的 司导旅行新加的
Vue.prototype.lxymallapipost = function (cmd, msg, successCall, faildCall, isOnline) {
var apiurl = this.domainManager().lxymallUrl + cmd;
var postData = this.GetNewPostData(cmd, msg, "");
this.$http.post(apiurl, postData, {
headers: {
'Content-Type': 'application/json',
'Referer-Viitto': this.$route.path
}
})
.then(res => {
if (res.data.resultCode == 10000 || res.data.resultCode == 10001) {} else if (res.resultCode == 10005) {
this.$router.go(-1);
} else {
successCall(res);
}
}, faildCall)
},
//公用跳转
Vue.prototype.CommonJump = function (path, obj) {
this.$router.push({
name: path,
query: obj
});
}
},
//HTTP提交数据 5-18新的 司导旅行新加的
Vue.prototype.lxymallapipost = function (cmd, msg, successCall, faildCall, isOnline) {
var apiurl = this.domainManager().lxymallUrl + cmd;
var postData = this.GetNewPostData(cmd, msg, "");
this.$http.post(apiurl, postData, {
headers: {
'Content-Type': 'application/json',
'Referer-Viitto': this.$route.path
}
})
.then(res => {
if (res.data.resultCode == 10000 || res.data.resultCode == 10001) {} else if (res.resultCode == 10005) {
this.$router.go(-1);
} else {
successCall(res);
}
}, faildCall)
},
//公用跳转
Vue.prototype.CommonJump = function (path, obj) {
this.$router.push({
name: path,
query: obj
});
}
//获取请求参数
Vue.prototype.GetNewPostData = function (cmd, msg, newCmd) {
if (msg == null || msg == "") {
......@@ -1567,5 +1572,5 @@ export default {
}
return postData
}
}
}
}
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