Skip to content

S
SuperMan
Commit 1e6af53a authored by 黄奎's avatar 黄奎
Browse files
Options

页面修改

parent d00aad5b
Hide whitespace changes
Inline Side-by-side
Showing with 88 additions and 95 deletions
src/components/Supplier/HotelTotalStock.vue
View file @ 1e6af53a
......@@ -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/plug/index.js
View file @ 1e6af53a
......@@ -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.46";
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;
......@@ -1500,32 +1493,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 +1560,5 @@ export default {
}
return postData
}
}
}
}
}
\ No newline at end of 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