Skip to content

C
CRM
Commit 780fc879 authored by 罗超's avatar 罗超
Browse files
Options

no message

parent 599d2bf8
Show whitespace changes
Inline Side-by-side
Showing with 152 additions and 97 deletions
src/App.vue
View file @ 780fc879
...@@ -13,15 +13,13 @@ export default { ...@@ -13,15 +13,13 @@ export default {
this.$router.push({ this.$router.push({
path: "/login", path: "/login",
}); });
} else if(this.$route.query.token) { // erp自动登陆传过来的参数 } else if(this.$route.query) { // erp自动登陆传过来的参数
let data = this.$route.query let data = this.$route.query
let parameter = data.data[0] let parameter = data.data[0]
console.log(data, 'apppppppppppppppp')
return
this.$router.push({ this.$router.push({
path: `/automaticLogin`, path: `/automaticLogin?toke=${data.token}&data=${JSON.stringify(parameter)}`,
query:{
token: data.token,
erpOrderObj: JSON.stringify(parameter),
}
}) })
} else { } else {
this.$router.push({ this.$router.push({
......
src/components/customerManage/customerOrder.vue
View file @ 780fc879
<style> <style>
@import '../../assets/css/customerManage.css'; @import '../../assets/css/customerManage.css';
.query-box .el-row .el-col{
.query-box .el-col-4 {
display: flex; display: flex;
align-items: center; align-items: center;
margin-bottom: 15px; margin-bottom: 15px;
} }
.query-box .el-row .el-col span{
/* .query-box .el-col-4>span.font-size-12 { flex-shrink: 0;
flex: 1 !important;
}
.query-box .el-col-4>div,
.query-box .el-col-4>span {
flex: 4
} }
.el-table__fixed-body-wrapper table {
padding-bottom: 8px !important;
} */
.statistics{ .statistics{
background: #fff; background: #fff;
display: flex; display: flex;
...@@ -69,45 +58,49 @@ ...@@ -69,45 +58,49 @@
<div class="tools"> <div class="tools">
<h1>订单管理</h1> <h1>订单管理</h1>
<div class="rightmenu"> <div class="rightmenu">
<el-dropdown @command="handleCommand"> <el-button size="mini" type="primary" @click="downLoadExcel">导出</el-button>
<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>
<div class="query-box"> <div class="query-box">
<el-row :gutter="30"> <el-row :gutter="20">
<el-col :span="4"> <el-col :xs="7" :sm="6" :md="5" :lg="4" :xl="3">
<span class="font-size-12" style="padding-right: 10px">订单号</span> <span class="font-size-12" style="padding-right: 10px">订单号</span>
<el-input size="mini" class="w210" v-model="msg.OrderId" placeholder="请输入订单号" <el-input size="mini" class="w210" v-model="msg.OrderId" placeholder="订单号"
@keyup.enter.native="getList"></el-input> @keyup.enter.native="getList"></el-input>
</el-col> </el-col>
<el-col :span="4"> <el-col :xs="7" :sm="6" :md="5" :lg="4" :xl="3">
<span class="font-size-12" style="padding-right: 10px">客人姓名</span> <span class="font-size-12" style="padding-right: 10px">客人姓名</span>
<el-input size="mini" class="w210" v-model="msg.GusetName" placeholder="请输入客人姓名" <el-input size="mini" class="w210" v-model="msg.GusetName" placeholder="客人姓名"
@keyup.enter.native="getList"></el-input> @keyup.enter.native="getList"></el-input>
</el-col> </el-col>
<el-col :span="4"> <el-col :xs="7" :sm="6" :md="5" :lg="4" :xl="3">
<span class="font-size-12" style="padding-right: 10px">出发城市</span> <span class="font-size-12" style="padding-right: 10px">出发城市</span>
<el-input size="mini" class="w210" v-model="msg.StartCityName" placeholder="请输入出发城市" <el-input size="mini" class="w210" v-model="msg.StartCityName" placeholder="出发城市"
@keyup.enter.native="getList"></el-input> @keyup.enter.native="getList"></el-input>
</el-col> </el-col>
<el-col :span="4"> <el-col :xs="7" :sm="6" :md="5" :lg="4" :xl="3">
<span class="font-size-12" style="padding-right: 10px">到达城市</span> <span class="font-size-12" style="padding-right: 10px">到达城市</span>
<el-input size="mini" class="w210" v-model="msg.EndCityName" placeholder="请输入到达城市" <el-input size="mini" class="w210" v-model="msg.EndCityName" placeholder="到达城市"
@keyup.enter.native="getList"></el-input> @keyup.enter.native="getList"></el-input>
</el-col> </el-col>
<el-col :span="4"> <el-col :xs="7" :sm="6" :md="5" :lg="4" :xl="3">
<span class="font-size-12" style="padding-right: 10px">业务员</span> <span class="font-size-12" style="padding-right: 10px">业务员</span>
<el-input size="mini" class="w210" v-model="msg.EnterID" placeholder="请输入业务员id" <el-select
@keyup.enter.native="getList"></el-input> size="mini"
filterable
v-model="msg.EnterID"
@change="getList"
clearable
placeholder="业务员">
<el-option
v-for="item in EmployeeList"
:label='item.EmName'
:value='item.EmployeeId'
:key='item.EmployeeId'>
</el-option>
</el-select>
</el-col> </el-col>
<el-col :span="4"> <el-col :xs="7" :sm="6" :md="5" :lg="4" :xl="3">
<span class="font-size-12" style="padding-right: 10px">出票状态</span> <span class="font-size-12" style="padding-right: 10px">出票状态</span>
<el-select size="mini" v-model="msg.TicketStatus" @change="getList"> <el-select size="mini" v-model="msg.TicketStatus" @change="getList">
<el-option v-for="(item,index) in ticketingStatusList" <el-option v-for="(item,index) in ticketingStatusList"
...@@ -115,7 +108,7 @@ ...@@ -115,7 +108,7 @@
:label="item.Name" :value="item.Id"> </el-option> :label="item.Name" :value="item.Id"> </el-option>
</el-select> </el-select>
</el-col> </el-col>
<el-col :span="4"> <el-col :xs="7" :sm="6" :md="5" :lg="4" :xl="3">
<span class="font-size-12" style="padding-right: 10px">订单状态</span> <span class="font-size-12" style="padding-right: 10px">订单状态</span>
<el-select size="mini" v-model="msg.OrderStatus" @change="getList"> <el-select size="mini" v-model="msg.OrderStatus" @change="getList">
<el-option v-for="(item,index) in OrderStatusList" <el-option v-for="(item,index) in OrderStatusList"
...@@ -123,7 +116,7 @@ ...@@ -123,7 +116,7 @@
:label="item.Name" :value="item.Id"> </el-option> :label="item.Name" :value="item.Id"> </el-option>
</el-select> </el-select>
</el-col> </el-col>
<el-col :span="4"> <el-col :xs="7" :sm="6" :md="5" :lg="4" :xl="3">
<span class="font-size-12" style="padding-right: 10px">收款状态</span> <span class="font-size-12" style="padding-right: 10px">收款状态</span>
<el-select size="mini" v-model="msg.Q_IsCollect" @change="getList"> <el-select size="mini" v-model="msg.Q_IsCollect" @change="getList">
<el-option v-for="(item,index) in QIsCollectList" <el-option v-for="(item,index) in QIsCollectList"
...@@ -131,18 +124,28 @@ ...@@ -131,18 +124,28 @@
:label="item.Name" :value="item.Id"> </el-option> :label="item.Name" :value="item.Id"> </el-option>
</el-select> </el-select>
</el-col> </el-col>
<el-col :span="4"> <el-col :xs="8" :sm="7" :md="6" :lg="4" :xl="3">
<span class="font-size-12" style="padding-right: 10px">报名时间</span> <span class="font-size-12" style="padding-right: 10px">报名开始</span>
<el-date-picker <el-date-picker
v-model="timeList" v-model="msg.StartTime"
@change="getList" @change="getList"
size="mini" size="mini"
style="width: 100%;" style="width: 100%;"
value-format="yyyy-MM-dd" format="yyyy-MM-dd"
type="datetimerange" type="date"
range-separator="至" placeholder="开始日期">
start-placeholder="开始日期" </el-date-picker>
end-placeholder="结束日期"> </el-col>
<el-col :xs="8" :sm="7" :md="6" :lg="4" :xl="3">
<span class="font-size-12" style="padding-right: 10px">报名结束</span>
<el-date-picker
v-model="msg.EndTime"
@change="getList"
size="mini"
style="width: 100%;"
format="yyyy-MM-dd"
type="date"
placeholder="结束日期">
</el-date-picker> </el-date-picker>
</el-col> </el-col>
</el-row> </el-row>
...@@ -229,7 +232,7 @@ ...@@ -229,7 +232,7 @@
TicketStatus:"0",//出票状态 TicketStatus:"0",//出票状态
OrderStatus:"1",//订单状态 OrderStatus:"1",//订单状态
Q_IsCollect:"0",//收款状态 Q_IsCollect:"0",//收款状态
StartTime:"", StartTime:"2022-04-28",
EndTime:"" EndTime:""
}, },
ticketingStatusList:[],// 出票状态 ticketingStatusList:[],// 出票状态
...@@ -241,42 +244,59 @@ ...@@ -241,42 +244,59 @@
{Name:'不限',Id:'0'}, {Name:'不限',Id:'0'},
{Name:'已收齐',Id:'1'}, {Name:'已收齐',Id:'1'},
{Name:'未收齐',Id:'2'} {Name:'未收齐',Id:'2'}
] ],
EmployeeList:[]
} }
}, },
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自动登陆传过来的参数 // erp自动登陆传过来的参数
if(this.$route.query.erpOrderObj){ if(this.$route.query.erpOrderObj){
let data = JSON.parse(this.$route.query.erpOrderObj) let data = JSON.parse(this.$route.query.erpOrderObj)
this.msg.OrderId = data.OrderId this.msg.OrderId = data.OrderId
} }
this.GetTicketStatusEnumList() this.Employee() //业务员
this.GetTicketStatusEnumList() //出票枚举
this.getList() this.getList()
}, },
methods: { methods: {
handleCommand(command) { // 获取业务员
if(command=='2'){ Employee() {
this.downLoadExcel() let userInfo = this.getLocalStorage();
let msg = {
RB_Group_id: userInfo.RB_Group_id,
BranchId: -1,
DepartmentId: 0,
PostId: 0,
IsLeave: 0,
};
this.apipost2(
"admin_get_EmployeeGetList",
msg,
(res) => {
if (res.data.resultCode == 1) {
this.EmployeeList = res.data.data;
} else {
} }
}, },
(err) => {}
);
},
//点击下载 //点击下载
downLoadExcel() { downLoadExcel() {
let msg = JSON.parse(JSON.stringify(this.msg)); if(!this.msg.StartTime||!this.msg.EndTime){
let tips = '请选择开始时间、结束时间！'
this.$confirm(tips, '提示', {
confirmButtonText: '确定',
cancelButtonText: '取消',
type: 'warning'
}).then(() => {
}).catch(() => { });
return
}
this.GetLocalFile( this.GetLocalFile(
"/api/Order/GetGuestOrderStatisticsToExcel", "/api/Order/GetGuestOrderStatisticsToExcel",
msg,'订单表.xls' this.msg,'订单表.xls'
); );
}, },
// 清空下拉 // 清空下拉
...@@ -306,8 +326,6 @@ ...@@ -306,8 +326,6 @@
}, },
getList(){ getList(){
this.loading = true; this.loading = true;
this.msg.StartTime = this.timeList[0]
this.msg.EndTime = this.timeList[1]
this.apipost( this.apipost(
"/api/Order/GetGuestOrderStatisticsPageList", "/api/Order/GetGuestOrderStatisticsPageList",
this.msg, this.msg,
......
src/components/guestManagement/guestManagement.vue
View file @ 780fc879
...@@ -519,9 +519,9 @@ ...@@ -519,9 +519,9 @@
pageIndex: 1, pageIndex: 1,
pageSize: 30, pageSize: 30,
ContactNumber: "", ContactNumber: "",
WhereType: -1, WhereType: 1,
OrderBy: "", OrderBy: "",
ID: 36, ID: 37,
Q_TOrderState:"0" Q_TOrderState:"0"
}, },
total: 0, total: 0,
...@@ -549,7 +549,7 @@ ...@@ -549,7 +549,7 @@
}, ], }, ],
sceneList: [], sceneList: [],
SceneEmployeeList: [], SceneEmployeeList: [],
sceneID: 36, sceneID: 37,
visible: false, visible: false,
}; };
}, },
......
src/components/guestManagement/ticketOrder.vue
View file @ 780fc879
...@@ -293,8 +293,21 @@ ...@@ -293,8 +293,21 @@
<el-row v-if="name=='订单转交'"> <el-row v-if="name=='订单转交'">
<el-col> <el-col>
<div class="MyEditForm-item"> <div class="MyEditForm-item">
<el-form-item label="转交id" prop="EnterId"> <el-form-item label="转交业务员" prop="EnterId">
<el-input placeholder="请输入转交人id" onkeyup="this.value=this.value.replace(/[^\d.]/g,'');" v-model="form.EnterId"></el-input> <el-select
size="mini"
filterable
v-model="form.EnterId"
clearable
placeholder="请选择业务员">
<el-option
v-for="item in EmployeeList"
:label='item.EmName'
:value='item.EmployeeId'
:key='item.EmployeeId'>
</el-option>
</el-select>
<!-- <el-input placeholder="请输入转交人id" onkeyup="this.value=this.value.replace(/[^\d.]/g,'');" v-model="form.EnterId"></el-input> -->
</el-form-item> </el-form-item>
</div> </div>
</el-col> </el-col>
...@@ -364,6 +377,7 @@ export default { ...@@ -364,6 +377,7 @@ export default {
}, },
data() { data() {
return { return {
EmployeeList:[],
width:"", width:"",
logData:[], logData:[],
total:0, total:0,
...@@ -468,6 +482,7 @@ export default { ...@@ -468,6 +482,7 @@ export default {
} }
if(this.name=='订单转交'){ if(this.name=='订单转交'){
this.width="400px" this.width="400px"
this.Employee()
} }
if(this.name=='编辑订单金额'){ if(this.name=='编辑订单金额'){
this.width="600px" this.width="600px"
...@@ -478,6 +493,28 @@ export default { ...@@ -478,6 +493,28 @@ export default {
}, 50); }, 50);
}, },
methods: { methods: {
// 获取业务员
Employee() {
let userInfo = this.getLocalStorage();
let msg = {
RB_Group_id: userInfo.RB_Group_id,
BranchId: -1,
DepartmentId: 0,
PostId: 0,
IsLeave: 0,
};
this.apipost2(
"admin_get_EmployeeGetList",
msg,
(res) => {
if (res.data.resultCode == 1) {
this.EmployeeList = res.data.data;
} else {
}
},
(err) => {}
);
},
closedDialog() { closedDialog() {
this.MsgBus.$emit("closeTicketOrderDialogBox"); this.MsgBus.$emit("closeTicketOrderDialogBox");
}, },
......
src/plugins/index.js
View file @ 780fc879
...@@ -215,7 +215,7 @@ export default { ...@@ -215,7 +215,7 @@ export default {
var timestamp = (new Date()).valueOf(); var timestamp = (new Date()).valueOf();
var token = ""; var token = "";
var key = ""; var key = "";
var data = localStorage.erpuserInfo var data = JSON.parse(localStorage.erpuserInfo)
if (localStorage.erpuserInfo != null) { if (localStorage.erpuserInfo != null) {
token = data.token; token = data.token;
} }
...@@ -238,9 +238,9 @@ export default { ...@@ -238,9 +238,9 @@ export default {
}) })
.then(res => { .then(res => {
if (res.data.resultCode == 10000 || res.data.resultCode == 10001) { if (res.data.resultCode == 10000 || res.data.resultCode == 10001) {
// this.$router.push({ this.$router.push({
// path: `/automaticLogin?token=${data.token}&data=${JSON.stringify(data.data)}` path: `/automaticLogin?token=${data.token}&data=${JSON.stringify(data.parameter)}`
// }) })
} else if (res.data.resultCode == 10005) { } else if (res.data.resultCode == 10005) {
this.$router.go(-1) this.$router.go(-1)
} else { } else {
...@@ -317,7 +317,6 @@ export default { ...@@ -317,7 +317,6 @@ export default {
var md5Str = md5(`cmd=${cmd}&msg=${encodeMsg}&timestamp=${timestamp}&token=${token}&key=${key}`); var md5Str = md5(`cmd=${cmd}&msg=${encodeMsg}&timestamp=${timestamp}&token=${token}&key=${key}`);
var postData = { var postData = {
"msg": msg, "msg": msg,
// "cmd": cmd,
"timestamp": timestamp, "timestamp": timestamp,
"token": token, "token": token,
"sign": md5Str "sign": md5Str
...@@ -325,8 +324,9 @@ export default { ...@@ -325,8 +324,9 @@ export default {
this.$http.post(apiurl, postData, { this.$http.post(apiurl, postData, {
headers: { headers: {
'Content-Type': 'application/json', 'Content-Type': 'application/json',
'Referer-Viitto': this.$route.path 'Referer-Viitto': this.$route.path,
} },
responseType: 'blob'
}).then((res) => { }).then((res) => {
let blob = new Blob([res.data], { let blob = new Blob([res.data], {
type: "application/vnd.ms-excel" type: "application/vnd.ms-excel"
...@@ -337,7 +337,12 @@ export default { ...@@ -337,7 +337,12 @@ export default {
link.setAttribute("download", fileName); link.setAttribute("download", fileName);
document.body.appendChild(link); document.body.appendChild(link);
link.click(); link.click();
successCall(res); if (callBack) {
var result = {
Code: 1
};
callBack(result);
}
}).catch(function (res) { }); }).catch(function (res) { });
} }
} }
......
src/router.js
View file @ 780fc879
...@@ -44,11 +44,11 @@ export default new Router({ ...@@ -44,11 +44,11 @@ export default new Router({
} }
}, },
{ {
path: "/", path: "/automaticLogin",
name: "automaticLogin", name: "automaticLogin",
component: automaticLogin, component: automaticLogin,
meta: { meta: {
title: "欢迎使用CRM系统-请登录使用", title: "欢迎使用CRM系统-自动登录",
"http-equiv": "X-UA-Compatible", "http-equiv": "X-UA-Compatible",
content: "IE=Edge,chrome=1" content: "IE=Edge,chrome=1"
} }
......
src/views/automaticLogin.vue
View file @ 780fc879
<style> <style>
@import "../assets/css/login2019.css"; /* @import "../assets/css/login2019.css"; */
.Autologin{ .Autologin{
position: fixed; position: fixed;
left: 0; left: 0;
...@@ -14,6 +14,7 @@ ...@@ -14,6 +14,7 @@
<template> <template>
<div> <div>
<div class="Autologin"> <div class="Autologin">
<div class="gifContent"> <div class="gifContent">
</div> </div>
...@@ -39,10 +40,8 @@ ...@@ -39,10 +40,8 @@
}, },
mounted() { mounted() {
console.log('--------', '')
}, },
created() { created() {
console.log('=========', '')
if(this.$route.query){ if(this.$route.query){
let param = JSON.parse(this.$route.query.data) ; let param = JSON.parse(this.$route.query.data) ;
this.obj.token=this.$route.query.token; this.obj.token=this.$route.query.token;
...@@ -68,13 +67,11 @@ ...@@ -68,13 +67,11 @@
this.apipostLogin("/api/AutoLogin/CRMAutoLogin", this.msg, (res) => { this.apipostLogin("/api/AutoLogin/CRMAutoLogin", this.msg, (res) => {
var jsonData = res.data; var jsonData = res.data;
if (jsonData.resultCode == 1) { if (jsonData.resultCode == 1) {
localStorage.autoLogin = JSON.stringify(autoLogin);
var userData = jsonData.data; var userData = jsonData.data;
var userJson = JSON.stringify(userData); var userJson = JSON.stringify(userData);
localStorage.userInfo = userJson; localStorage.userInfo = userJson;
this.loginState = 0; this.loginState = 0;
var data = JSON.parse(localStorage.erpuserInfo) var data = JSON.parse(localStorage.erpuserInfo)
console.log('-----------', '')
this.$router.push({ this.$router.push({
path: data.parameter.path, path: data.parameter.path,
query:{ query:{
......
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