Skip to content

C
CRM
Commit 599d2bf8 authored by liudong1993's avatar liudong1993
Browse files
Options

Merge branch 'master' of http://gitlab.oytour.com/huaguohao/crm

parents 2d559b9d b692d6ef
Hide whitespace changes
Inline Side-by-side
Showing with 449 additions and 63 deletions
src/App.vue
View file @ 599d2bf8
...@@ -9,10 +9,20 @@ export default { ...@@ -9,10 +9,20 @@ export default {
return {}; return {};
}, },
mounted() { mounted() {
if (!this.getLocalStorage()) { if (!this.getLocalStorage()&&!this.$route.query.token) {
this.$router.push({ this.$router.push({
path: "/login", path: "/login",
}); });
} else if(this.$route.query.token) { // erp自动登陆传过来的参数
let data = this.$route.query
let parameter = data.data[0]
this.$router.push({
path: `/automaticLogin`,
query:{
token: data.token,
erpOrderObj: JSON.stringify(parameter),
}
})
} else { } else {
this.$router.push({ this.$router.push({
name: "Home", name: "Home",
......
src/assets/css/login2019.css 0 → 100644
View file @ 599d2bf8
.newSummaryLogin .item img {
width: 100%;
}
.login_Div {
background: #fff;
padding: 60px 0 20px 0;
box-sizing: border-box;
height: 100%;
width: 60%;
margin: 0 auto;
}
.newSummaryLogin .error-msg{
color:#cccccc;
font-size:12px;
text-align: left;
width:300px;
margin:0 auto 0;
height:20px;
padding-left: 16px;
}
.newSummaryLogin .error-msg img{
position:relative;
top:3px;
margin:0 10px 0 5px;
}
.login_Div .sumMainTitle{
font-size:28px;
padding-top: 40px;
color:#333;
margin-bottom:40px;
font-weight:bold;
}
.login_Div .littTitle{
font-size:18px;
color:#333333;
}
.login_Div .icon-login-name, .login_Div .icon-login-password{
width:16px;
height:15px;
display:inline-block;
position:absolute;
top:10px;
color: #000000
}
.login_Div .login-commonBotm{
width: 100%;
position:relative;
margin:10px auto 0 0;
}
.login_Div .login-commonBotm img{
float:left;
margin-top:14px;
}
.login_Div input.input{
width: 100%;
height:40px;
outline:none;
padding-left: 30px;
border:none;
border-bottom: 1px solid #CCCCCC;
color: #333333;
caret-color:#E95252;
}
.login_Div input::-webkit-input-placeholder {
color: #999999;
font-size: 12px;
}
.newSummaryLogin .sumPhone{width:100%;text-align:center;color:#333;margin-bottom:10px;}
.login_Div input:-webkit-autofill , .login_Div textarea:-webkit-autofill, .login_Div select:-webkit-autofill {
-webkit-text-fill-color: #ededed !important;
-webkit-box-shadow: 0 0 0px 1000px transparent inset !important;
background-color:transparent;
background-image: none;
transition: background-color 50000s ease-in-out 0s;
}
.login_Div .sLoginBtn{
margin-top:30px;
width: 100%;
height:40px;
background:#EE4454;
border-radius:4px;
outline:none;
border:none;
color:#fff;
transition: all linear 0.5s;
}
.login_Div .sLoginBtn:hover{
opacity:.8;
cursor:pointer;
background-color: #E95252;
color: #FFFFFF
}
.login_Div .validatCode{
color:#333333;
}
.newSummaryLogin .msgTips p{
color:#333333!important;
}
.newSummaryLogin .msgTips p, .newSummaryLogin .msgTips h2{
color:#333333!important;
}
.newSummaryLogin .bindTitle{margin-bottom:10px;}
.newSummaryLogin .changeBtn{
margin-top:10px;
}
.login-box .forgetPw{
/* width:300px; */
height:40px;
display: flex;
justify-content: space-between;
margin:auto;
color:#999999;
font-size:12px;
text-align: right;
line-height: 40px;
}
.forgetPw span{
cursor: pointer;
}
.newSummaryLogin .login-box .forgetPw span:hover{
color: #E95252;
}
.newSummaryLogin .login-way{
width:300px;
height:40px;
margin:25px auto;
font-size:12px;
color:#CCCCCC;
display: none;
line-height:40px;
}
.newSummaryLogin .wayLeft{
float:left;
}
.newSummaryLogin .icon-login-qqicon{
width:16px;
height:15px;
display:inline-block;
position:relative;
top:3px;
background:url(../img/qqIco.png) no-repeat;
}
.newSummaryLogin .icon-login-wechaticon{
width:19px;
height:15px;
display:inline-block;
position:relative;
top:3px;
background:url(../img/wechatIco.png) no-repeat;
}
.newSummaryLogin .wayRight{
float:right;
}
.newSummaryLogin .validatCode{
position: absolute;
right:0;
top:13px;
padding-left:10px;
color:#333;
font-size:12px;
letter-spacing: 2px;
border-left:1px solid #cccccc;
}
.newSummaryLogin .validatCode span:first-child{cursor: pointer;}
.newSummaryLogin .btValidate{
margin-top:30px;
}
.newSummaryLogin .login_elephant{
position: absolute;
left:-15px;
top:-80px;
}
.newSummaryLogin .homepage-hero-module,
.video-container {
position: relative;
height: 100vh;
overflow: hidden;
}
.newSummaryLogin .name_bline_left{position: absolute;right: 50%;bottom: 0;width: 0;height: 2px;background-color: #E95252;transition: all linear 0.5s;}
.newSummaryLogin .name_bline_right{position: absolute;left: 50%;bottom: 0;width: 0;height: 2px;background-color: #E95252;transition: all linear 0.5s;}
.newSummaryLogin .pwd_bline_left{position: absolute;right: 50%;bottom: 0;width: 0;height: 2px;background-color: #E95252;transition: all linear 0.5s;}
.newSummaryLogin .pwd_bline_right{position: absolute;left: 50%;bottom: 0;width: 0;height: 2px;background-color: #E95252;transition: all linear 0.5s;}
.newSummaryLogin .login-Div input:-webkit-autofill , .login-Div textarea:-webkit-autofill, .login-Div select:-webkit-autofill {
-webkit-text-fill-color: #ededed !important;
-webkit-box-shadow: 0 0 0px 1000px transparent inset !important;
background-color:transparent;
background-image: none;
transition: background-color 50000s ease-in-out 0s;
}
.newSummaryLogin ._bline_w{width: 50%;}
src/components/customerManage/customerOrder.vue
View file @ 599d2bf8
...@@ -68,6 +68,17 @@ ...@@ -68,6 +68,17 @@
<div class="customerManage"> <div class="customerManage">
<div class="tools"> <div class="tools">
<h1>订单管理</h1> <h1>订单管理</h1>
<div class="rightmenu">
<el-dropdown @command="handleCommand">
<el-button class="crm-btn crm-btn-more easy-btn margin-right0">
<i class="iconfont icongengduo"></i>
</el-button>
<el-dropdown-menu slot="dropdown">
<!-- <el-dropdown-item command="1"><i class="iconfont icondaoru"></i> 导入</el-dropdown-item> -->
<el-dropdown-item command="2"><i class="iconfont icondaochu"></i> 导出</el-dropdown-item>
</el-dropdown-menu>
</el-dropdown>
</div>
</div> </div>
<div class="query-box"> <div class="query-box">
<el-row :gutter="30"> <el-row :gutter="30">
...@@ -169,59 +180,9 @@ ...@@ -169,59 +180,9 @@
<span>取消数</span> <span>取消数</span>
<span class="red">{{StatModel.CancelNum}}人</span> <span class="red">{{StatModel.CancelNum}}人</span>
</div> </div>
<!-- <el-row :gutter="30">
<el-col :span="3">
<div class="statistics-box">
<span>应收</span>
<span>{{StatModel.Money}}</span>
</div>
</el-col>
<el-col :span="3">
<div class="statistics-box">
<span>实收</span>
<span>{{StatModel.IncomeMoney}}</span>
</div>
</el-col>
<el-col :span="3">
<div class="statistics-box">
<span>退款</span>
<span class="red">{{StatModel.BackMoney}}</span>
</div>
</el-col>
<el-col :span="3">
<div class="statistics-box">
<span>手续费</span>
<span>{{StatModel.TaxMoney}}</span>
</div>
</el-col>
<el-col :span="3">
<div class="statistics-box">
<span>成本</span>
<span>{{StatModel.PayMoney}}</span>
</div>
</el-col>
<el-col :span="3">
<div class="statistics-box">
<span>待收</span>
<span>{{StatModel.DueinMoney}}</span>
</div>
</el-col>
<el-col :span="3">
<div class="statistics-box">
<span>报名数</span>
<span class="blue">{{StatModel.NorNumber}}人</span>
</div>
</el-col>
<el-col :span="3">
<div class="statistics-box">
<span>取消数</span>
<span class="red">{{StatModel.CancelNum}}人</span>
</div>
</el-col>
</el-row> -->
</div> </div>
<div class="query-box status-box"> <div class="query-box status-box">
<!-- <div class="status-text"> <div class="status-text">
<div class="tis-k" style="background: #2961FE"></div> <div class="tis-k" style="background: #2961FE"></div>
<span>已打单</span> <span>已打单</span>
</div> </div>
...@@ -232,7 +193,7 @@ ...@@ -232,7 +193,7 @@
<div class="status-text"> <div class="status-text">
<div class="tis-k" style="background: #3FC4FF"></div> <div class="tis-k" style="background: #3FC4FF"></div>
<span>已通过</span> <span>已通过</span>
</div> --> </div>
</div> </div>
<orderList :dataList="dataList" :loading="loading" @emptyMore="emptyMore"></orderList> <orderList :dataList="dataList" :loading="loading" @emptyMore="emptyMore"></orderList>
<div> <div>
...@@ -284,10 +245,40 @@ ...@@ -284,10 +245,40 @@
} }
}, },
mounted() { mounted() {
var date = new Date();
　　var today = date.getDate();
　　if(parseInt(today) < 10){
　　　　today = '0' + today;
　　}
　　var dataMonth = date.getMonth() + 1;
　　if(parseInt(dataMonth) < 10){
　　　　dataMonth = '0' + dataMonth;
　　}
var newdate = date.getFullYear() + '-' + dataMonth + '-' + today +' ' + '00:00:00';
　　var lastDate = date.getFullYear() + '-' + dataMonth + '-' + today +' ' + '23:59:59';
this.timeList = [newdate,lastDate]
// erp自动登陆传过来的参数
if(this.$route.query.erpOrderObj){
let data = JSON.parse(this.$route.query.erpOrderObj)
this.msg.OrderId = data.OrderId
}
this.GetTicketStatusEnumList() this.GetTicketStatusEnumList()
this.getList() this.getList()
}, },
methods: { methods: {
handleCommand(command) {
if(command=='2'){
this.downLoadExcel()
}
},
//点击下载
downLoadExcel() {
let msg = JSON.parse(JSON.stringify(this.msg));
this.GetLocalFile(
"/api/Order/GetGuestOrderStatisticsToExcel",
msg,'订单表.xls'
);
},
// 清空下拉 // 清空下拉
emptyMore(){ emptyMore(){
this.dataList.forEach(item=>{ this.dataList.forEach(item=>{
...@@ -300,16 +291,16 @@ ...@@ -300,16 +291,16 @@
"/api/Order/GetTicketStatusEnumList", "/api/Order/GetTicketStatusEnumList",
{}, {},
(res) => { (res) => {
if (res.data.resultCode == 1) { if (res.data.resultCode == 1) {
this.ticketingStatusList = res.data.data; this.ticketingStatusList = res.data.data;
let data = { let data = {
Name:'全部', Name:'全部',
Id:'0' Id:'0'
}
this.ticketingStatusList.unshift(data)
} else {
this.$message.error(res.data.message);
} }
this.ticketingStatusList.unshift(data)
} else {
this.$message.error(res.data.message);
}
} }
); );
}, },
......
src/components/customerManage/orderList.vue
View file @ 599d2bf8
...@@ -114,6 +114,7 @@ ...@@ -114,6 +114,7 @@
</el-tooltip> </el-tooltip>
<div> <div>
<el-select style="width:80px;" class="select-right" <el-select style="width:80px;" class="select-right"
clearable clearable
size="mini" size="mini"
v-model="item.More" placeholder="更多" v-model="item.More" placeholder="更多"
......
src/plugins/index.js
View file @ 599d2bf8
import md5 from 'js-md5' import md5 from 'js-md5'
export default { export default {
data: { data: {
...@@ -204,6 +204,49 @@ export default { ...@@ -204,6 +204,49 @@ export default {
successCall(res) successCall(res)
} }
}, faildCall) }, faildCall)
},
// 自动登录HTTP提交数据
Vue.prototype.apipostLogin = function (cmd, msg, successCall, faildCall) {
if (msg == null || msg == "") {
msg = {}
}
var apiurl = this.domainManager().PostUrl + cmd;
var timestamp = (new Date()).valueOf();
var token = "";
var key = "";
var data = localStorage.erpuserInfo
if (localStorage.erpuserInfo != null) {
token = data.token;
}
var encodeMsg = encodeURIComponent(JSON.stringify(msg)).toLowerCase();
var md5Str = md5(`cmd=${cmd}&msg=${encodeMsg}&timestamp=${timestamp}&token=${token}&key=${key}`);
var postData = {
"msg": msg,
"timestamp": timestamp,
"token": token,
"sign": md5Str
}
if (localStorage.g && localStorage.g != 'undefined') {
postData.groupId = 2;
}
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) {
// this.$router.push({
// path: `/automaticLogin?token=${data.token}&data=${JSON.stringify(data.data)}`
// })
} else if (res.data.resultCode == 10005) {
this.$router.go(-1)
} else {
successCall(res)
}
}, faildCall)
}, },
//Java接口 //Java接口
...@@ -256,6 +299,46 @@ export default { ...@@ -256,6 +299,46 @@ export default {
successCall(res) successCall(res)
} }
}, faildCall) }, faildCall)
},
//下载文件
Vue.prototype.GetLocalFile = function (cmd, msg, fileName, successCall) {
if (msg == null || msg == "") {
msg = {}
}
var apiurl = this.domainManager().PostUrl + cmd;
var timestamp = (new Date()).valueOf();
var token = "";
var key = "";
if (this.getLocalStorage() != null) {
token = this.getLocalStorage().token;
key = this.getLocalStorage().SecretKey;
}
var encodeMsg = encodeURIComponent(JSON.stringify(msg)).toLowerCase();
var md5Str = md5(`cmd=${cmd}&msg=${encodeMsg}&timestamp=${timestamp}&token=${token}&key=${key}`);
var postData = {
"msg": msg,
// "cmd": cmd,
"timestamp": timestamp,
"token": token,
"sign": md5Str
}
this.$http.post(apiurl, postData, {
headers: {
'Content-Type': 'application/json',
'Referer-Viitto': this.$route.path
}
}).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();
successCall(res);
}).catch(function (res) { });
} }
} }
} }
\ No newline at end of file
src/router.js
View file @ 599d2bf8
...@@ -17,6 +17,7 @@ import customerApr from "./components/approval/customerApr" ...@@ -17,6 +17,7 @@ import customerApr from "./components/approval/customerApr"
import customerMap from "./components/customerManage/customerMap" import customerMap from "./components/customerManage/customerMap"
import customerConfiguration from "./components/customerManage/customerConfiguration" import customerConfiguration from "./components/customerManage/customerConfiguration"
import customerOrder from "./components/customerManage/customerOrder" import customerOrder from "./components/customerManage/customerOrder"
import automaticLogin from './views/automaticLogin'
Vue.use(Router); Vue.use(Router);
export default new Router({ export default new Router({
...@@ -42,6 +43,16 @@ export default new Router({ ...@@ -42,6 +43,16 @@ export default new Router({
content: "IE=Edge,chrome=1" content: "IE=Edge,chrome=1"
} }
}, },
{
path: "/",
name: "automaticLogin",
component: automaticLogin,
meta: {
title: "欢迎使用CRM系统-请登录使用",
"http-equiv": "X-UA-Compatible",
content: "IE=Edge,chrome=1"
}
},
{ {
path: "/index", path: "/index",
name: "index", name: "index",
......
src/views/automaticLogin.vue 0 → 100644
View file @ 599d2bf8
<style>
@import "../assets/css/login2019.css";
.Autologin{
position: fixed;
left: 0;
top: 0;
right: 0;
bottom: 0;
/* transform: translate(-50%,-50%); */
background: url('../assets/img/login/load.gif')no-repeat center;
background-size: 350px auto;
}
</style>
<template>
<div>
<div class="Autologin">
<div class="gifContent">
</div>
</div>
</div>
</template>
<script>
export default {
data() {
return {
loading: false,
msg:{},
userInfo: {
name: "",
password: "",
Domain: ""
},
erpOrderObj:{},
obj:{}
}
},
components: {
},
mounted() {
console.log('--------', '')
},
created() {
console.log('=========', '')
if(this.$route.query){
let param = JSON.parse(this.$route.query.data) ;
this.obj.token=this.$route.query.token;
if(param){
this.obj.parameter=param[0]
localStorage.erpuserInfo = JSON.stringify(this.obj);
}
}
if(!this.getLocalStorage()){
this.autoLogin()
}else{
var data = JSON.parse(localStorage.erpuserInfo)
this.$router.push({
path: data.parameter.path,
query:{
erpOrderObj: JSON.stringify(data.parameter),
}
});
}
},
methods: {
autoLogin(){
this.apipostLogin("/api/AutoLogin/CRMAutoLogin", this.msg, (res) => {
var jsonData = res.data;
if (jsonData.resultCode == 1) {
localStorage.autoLogin = JSON.stringify(autoLogin);
var userData = jsonData.data;
var userJson = JSON.stringify(userData);
localStorage.userInfo = userJson;
this.loginState = 0;
var data = JSON.parse(localStorage.erpuserInfo)
console.log('-----------', '')
this.$router.push({
path: data.parameter.path,
query:{
erpOrderObj: JSON.stringify(data.parameter),
}
});
} else {
this.$message({
message: res.data.message,
type: "error",
});
this.loginState = 0;
}
});
}
},
}
</script>
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