Skip to content

C
CRM
Commit 56a0d4a5 authored by 罗超's avatar 罗超
Browse files
Options

no message

parent e525831e
Hide whitespace changes
Inline Side-by-side
Showing with 169 additions and 55 deletions
src/App.vue
View file @ 56a0d4a5
...@@ -13,6 +13,15 @@ export default { ...@@ -13,6 +13,15 @@ export default {
this.$router.push({ this.$router.push({
path: "/login", path: "/login",
}); });
} else if(this.$route.query.token) { // erp自动登陆传过来的参数
let param = JSON.parse(this.$route.query.data)
let parameter =param[0]
this.$router.push({
path: parameter.path,
query:{
erpOrderObj: JSON.stringify(parameters),
}
});
} else { } else {
this.$router.push({ this.$router.push({
name: "Home", name: "Home",
......
src/components/customerManage/customerOrder.vue
View file @ 56a0d4a5
...@@ -175,59 +175,9 @@ ...@@ -175,59 +175,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>
...@@ -238,7 +188,7 @@ ...@@ -238,7 +188,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>
...@@ -290,6 +240,11 @@ ...@@ -290,6 +240,11 @@
} }
}, },
mounted() { mounted() {
// 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()
}, },
......
src/components/customerManage/orderList.vue
View file @ 56a0d4a5
...@@ -119,7 +119,7 @@ ...@@ -119,7 +119,7 @@
<i class="iconfont iconwenbenbianji cp" @click="editOrder(item)"></i> <i class="iconfont iconwenbenbianji cp" @click="editOrder(item)"></i>
</el-tooltip> </el-tooltip>
<div> <div>
<el-select style="width:130px" class="select-right" <el-select style="width:130px" class="select-right"
clearable clearable
size="mini" size="mini"
v-model="item.More" placeholder="更多" v-model="item.More" placeholder="更多"
...@@ -240,7 +240,7 @@ ...@@ -240,7 +240,7 @@
MoreList:[ MoreList:[
{Name:'编辑订单金额',Id:'5'}, {Name:'编辑订单金额',Id:'5'},
{Name:'取消订单',Id:'1'}, {Name:'取消订单',Id:'1'},
{Name:'订单转换',Id:'2'}, {Name:'订单转交',Id:'2'},
{Name:'修改出票状态',Id:'4'}, {Name:'修改出票状态',Id:'4'},
{Name:'操作日志',Id:'3'}, {Name:'操作日志',Id:'3'},
], ],
......
src/plugins/index.js
View file @ 56a0d4a5
import md5 from 'js-md5' import md5 from 'js-md5'
export default { export default {
data: { data: {
...@@ -195,6 +195,7 @@ export default { ...@@ -195,6 +195,7 @@ export default {
}) })
.then(res => { .then(res => {
if (res.data.resultCode == 10000 || res.data.resultCode == 10001) { if (res.data.resultCode == 10000 || res.data.resultCode == 10001) {
console.log(this.$route.query.token, '---')
this.$router.push({ this.$router.push({
path: '/login' path: '/login'
}) })
...@@ -204,6 +205,49 @@ export default { ...@@ -204,6 +205,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?JSON.parse(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'
})
} else if (res.data.resultCode == 10005) {
this.$router.go(-1)
} else {
successCall(res)
}
}, faildCall)
}, },
//Java接口 //Java接口
......
src/router.js
View file @ 56a0d4a5
...@@ -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({
...@@ -438,6 +439,16 @@ export default new Router({ ...@@ -438,6 +439,16 @@ export default new Router({
} }
] ]
}, },
{
path: "/",
name: "automaticLogin",
component: automaticLogin,
meta: {
title: "欢迎使用CRM系统-请登录使用",
"http-equiv": "X-UA-Compatible",
content: "IE=Edge,chrome=1"
}
},
{ {
path: '/table', path: '/table',
name: 'table', name: 'table',
......
src/views/automaticLogin.vue 0 → 100644
View file @ 56a0d4a5
<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() {
},
created() {
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", {}, (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)
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