Skip to content

C
CRM
Commit 04078522 authored by 黄奎's avatar 黄奎
Browse files
Options

跳转ERP域名调整

parent 8ca738ae
Show whitespace changes
Inline Side-by-side
Showing with 780 additions and 758 deletions
src/components/customerManage/orderProfits.vue
View file @ 04078522
......@@ -392,13 +392,13 @@
</template>
<script>
export default {
props: ["orderId","GuestId"],
export default {
props: ["orderId", "GuestId"],
data() {
return {
loading: true,
d: null,
userInfo:{}
userInfo: {}
};
},
mounted() {
......@@ -408,8 +408,9 @@ export default {
methods: {
init() {
this.apipost2(
"crm_post_GetCRMGuestOrderCheck",
{ OrderId: this.orderId },
"crm_post_GetCRMGuestOrderCheck", {
OrderId: this.orderId
},
(res) => {
if (res.data.resultCode == 1) {
this.d = res.data.data;
......@@ -422,12 +423,10 @@ export default {
openDetails(item) {
let href;
let url = this.domainManager().erpRoutingUrl;
let data = [
{
let data = [{
path: "FinancialDocumentsDetail",
id: item.FrID,
},
];
}, ];
href =
url +
"automaticLogin?token=" +
......@@ -470,8 +469,7 @@ export default {
if (this.userInfo.EmName == row.EnterName) {
if (row.OrderStatus != "2") {
if (num == '1' || num == '3') {
data = [
{
data = [{
path: "ChoiceAddFinancialDocuments",
type: type,
OtherType: 55,
......@@ -479,20 +477,17 @@ export default {
ReFinanceId2: num,
GuestId: this.GuestId,
RelevanceFrId: 5, // 单据类型 5其他
},
];
}, ];
}
if (num == '2') {
data = [
{
data = [{
path: "ChoiceAddFinancialDocuments",
type: type,
OtherType: 55,
ReFinanceId: this.orderId,
ReFinanceId2: num,
GuestId: this.GuestId,
},
];
}, ];
}
href =
url +
......@@ -506,11 +501,11 @@ export default {
}
},
},
};
};
</script>
<style>
.finance-list-box {
.finance-list-box {
padding: 0 20px 20px 20px;
position: absolute;
top: 54px;
......@@ -518,13 +513,15 @@ export default {
left: 0;
right: 0;
overflow-y: auto;
}
.none-finance {
}
.none-finance {
height: 30px;
text-align: center;
color: #666666;
}
.TB_comtitle {
}
.TB_comtitle {
color: #333333;
padding-left: 10px;
height: 14px;
......@@ -532,162 +529,169 @@ export default {
font-size: 14px;
border-left: 3px solid #4d7afd;
margin-bottom: 20px;
}
}
.Team_Details {
.Team_Details {
margin-top: 20px;
font-size: 12px;
}
}
.Team_DList {
.Team_DList {
border: 1px solid #e6e6e6;
background-color: #fff;
margin-top: 20px;
padding: 20px;
height: 167px;
}
.tipTable tr td {
}
.tipTable tr td {
height: 30px !important;
}
.singeRowTable tr th {
}
.singeRowTable tr th {
height: 30px;
text-align: left !important;
padding-left: 12px !important;
}
}
.singeRowTable tr td {
.singeRowTable tr td {
border: 1px solid #e5e5e5;
padding: 0px !important;
padding-left: 12px !important;
font-size: 13px;
}
}
/* .Team_Content .el-col-5 {
/* .Team_Content .el-col-5 {
margin-right: 18px;
} */
.Team_Coins {
.Team_Coins {
color: #ff9c00;
}
}
.Team_income {
.Team_income {
color: #4d7afd;
text-decoration: underline;
cursor: pointer;
}
}
.TB-Title {
.TB-Title {
float: left;
position: relative;
top: 10px;
}
.TB-Title.B-Title-fr{
}
.TB-Title.B-Title-fr {
display: flex;
justify-content: space-between;
}
}
.Team_ComCoin {
.Team_ComCoin {
width: 60%;
margin: auto;
text-align: left;
}
}
.Team_btmDiv {
.Team_btmDiv {
margin-top: 5px;
}
}
.Team_collection {
.Team_collection {
margin-top: 40px;
display: flex;
flex-direction: column;
}
.Team_collection tr th{
}
.Team_collection tr th {
border: 1px solid #e5e5e5;
font-size: 14px;
}
}
.Team_outCome {
.Team_outCome {
color: #ff9c00;
}
}
.Team_Pay {
.Team_Pay {
color: #ff5150;
}
}
.TeamAddBtn {
.TeamAddBtn {
float: right;
margin-bottom: 10px;
}
}
.Team_DList div {
.Team_DList div {
margin-bottom: 8px;
color: #666666;
}
}
.Team_firstTitle {
.Team_firstTitle {
font-size: 14px;
/* font-family: "PingFang-SC-Bold"; */
color: #333333 !important;
}
}
.Team_comCoinType {
.Team_comCoinType {
display: inline-block;
width: 24px;
height: 24px;
border-radius: 50%;
position: relative;
top: -1px;
}
}
.Team_shou {
.Team_shou {
background-color: #d7e6ff;
color: #4d7afd;
}
}
.Team_firstTitle span {
.Team_firstTitle span {
margin-right: 10px;
text-align: center;
line-height: 24px;
font-size: 12px;
vertical-align: middle;
}
.Team_Incontent {
}
.Team_Incontent {
font-size: 12px;
}
.Team_Incontent span {
}
.Team_Incontent span {
font-size: 12px;
font-family: "PingFangSC-Fine";
}
}
.Team_zhichu {
.Team_zhichu {
background-color: #fde2df;
color: #ff504f;
}
}
.Team_lirun {
.Team_lirun {
background-color: #d1f3ea;
color: #1bc594;
}
}
.Team_BtnList {
.Team_BtnList {
margin-top: 30px;
text-align: center;
}
}
.TB_Rate,
.TB_PayMoney {
.TB_Rate,
.TB_PayMoney {
margin-left: 20px;
}
}
.TeamBalancePayment .TB_PrintDiv {
.TeamBalancePayment .TB_PrintDiv {
height: 40px;
}
}
.span_all {
.span_all {
margin-left: 15px;
}
.TeamExpectList {
}
.TeamExpectList {
max-height: 105px;
overflow: auto;
margin-bottom: 0 !important;
}
}
</style>
\ No newline at end of file
src/components/guestManagement/Agreement copy.vue
View file @ 04078522
......@@ -326,14 +326,16 @@
</el-table-column>
<el-table-column label="退款" :width="120">
<template slot-scope="scope">
{{scope.row.BackMoney}}<i v-if="scope.row.OrderStatus!=2&&scope.row.OrderStatus!=5&&scope.row.OrderStatus!=6"
{{scope.row.BackMoney}}<i
v-if="scope.row.OrderStatus!=2&&scope.row.OrderStatus!=5&&scope.row.OrderStatus!=6"
@click="makeAdocument(scope.row,scope.$index,2)" class="iconfont iconjia- numIcon"></i>
</template>
</el-table-column>
<el-table-column label="成本" :width="120">
<template slot-scope="scope">
<div class="agreement-IncomeMoney-box">
{{scope.row.PayMoney}}<i v-if="scope.row.OrderStatus!=2&&scope.row.OrderStatus!=5&&scope.row.OrderStatus!=6"
{{scope.row.PayMoney}}<i
v-if="scope.row.OrderStatus!=2&&scope.row.OrderStatus!=5&&scope.row.OrderStatus!=6"
@click="makeAdocument(scope.row,scope.$index,3)" class="iconfont iconjia- numIcon">
<div v-show="scope.row.cost" class="agreement-IncomeMoney-pop">
<div class="float-flag-shape"></div>
......@@ -362,8 +364,7 @@
</el-table-column>
<el-table-column label="出票状态" :width="90">
<template slot-scope="scope">
<span @click="modifyStatus(scope.row)" class="cp tatusText"
:class="scope.row.TicketStatus==1?'grey':
<span @click="modifyStatus(scope.row)" class="cp tatusText" :class="scope.row.TicketStatus==1?'grey':
(scope.row.TicketStatus==2?'success':
(scope.row.TicketStatus==3?'error':
(scope.row.TicketStatus==4?'cancel':
......@@ -433,8 +434,9 @@
<template slot-scope="scope">
<div class="item-but-box">
<div class="enedit-box">
<el-tooltip v-if="scope.row.OrderStatus!=2&&scope.row.OrderStatus!=5&&scope.row.OrderStatus!=6" class="item-but"
effect="dark" content="编辑订单" placement="top">
<el-tooltip
v-if="scope.row.OrderStatus!=2&&scope.row.OrderStatus!=5&&scope.row.OrderStatus!=6"
class="item-but" effect="dark" content="编辑订单" placement="top">
<i class="iconfont iconwenbenbianji cp" @click="editOrder(scope.row)"></i>
</el-tooltip>
<div>
......@@ -472,7 +474,7 @@
components: {
orderDetailsDrawer
},
props: ["detailsData","ID", "BusinessType"],
props: ["detailsData", "ID", "BusinessType"],
data() {
return {
VisaList: [{
......@@ -589,40 +591,42 @@
handleCommand(command) {
let data = [{
path: "",
LureEmpNmae: this.detailsData.CreateByStr,//引流姓名
LureEmpId: this.detailsData.CreateBy,//引流id
LureEmpNmae: this.detailsData.CreateByStr, //引流姓名
LureEmpId: this.detailsData.CreateBy, //引流id
CRMGuestId: this.ID, //客人ID
CRMGuestName: this.detailsData.SurName+this.detailsData.Name //客人ID
CRMGuestName: this.detailsData.SurName + this.detailsData.Name //客人ID
}]
let href
let url = this.domainManager().erpRoutingUrl;
if (command == 1) {
this.addBusiness();
}else{
} else {
if (command == 2) {
data[0].path = 'VisaProductAddOrder'
href =url +"automaticLogin?token=" +this.getLocalStorage().token +"&data=" +JSON.stringify(data);
}else if (command == 3) {
href = url + "automaticLogin?token=" + this.getLocalStorage().token + "&data=" + JSON.stringify(
data);
} else if (command == 3) {
data[0].path = 'productQuery'
href =url +"automaticLogin?token=" +this.getLocalStorage().token +"&data=" +JSON.stringify(data);
}
else if (command == 4) {
href = url + "automaticLogin?token=" + this.getLocalStorage().token + "&data=" + JSON.stringify(
data);
} else if (command == 4) {
data[0].path = 'productQueryOne'
href =url +"automaticLogin?token=" +this.getLocalStorage().token +"&data=" +JSON.stringify(data);
}
else if (command == 5) {
href = url + "automaticLogin?token=" + this.getLocalStorage().token + "&data=" + JSON.stringify(
data);
} else if (command == 5) {
data[0].path = 'singleProductHotelList'
href =url +"automaticLogin?token=" +this.getLocalStorage().token +"&data=" +JSON.stringify(data);
}
else if (command == 6) {
href = url + "automaticLogin?token=" + this.getLocalStorage().token + "&data=" + JSON.stringify(
data);
} else if (command == 6) {
data[0].path = 'SingleticketList'
href =url +"automaticLogin?token=" +this.getLocalStorage().token +"&data=" +JSON.stringify(data);
}
else if (command == 7) {
href = url + "automaticLogin?token=" + this.getLocalStorage().token + "&data=" + JSON.stringify(
data);
} else if (command == 7) {
data[0].path = 'BookAcarList'
href =url +"automaticLogin?token=" +this.getLocalStorage().token +"&data=" +JSON.stringify(data);
href = url + "automaticLogin?token=" + this.getLocalStorage().token + "&data=" + JSON.stringify(
data);
}
if(href){
if (href) {
window.open(href);
}
......@@ -720,7 +724,7 @@
}
},
// 修改日期
modifiedDate(row){
modifiedDate(row) {
let $this = this
this.MsgBus.$emit("modifiedDateOrderBoxOpen", $this.ID, row, true);
},
......@@ -947,7 +951,7 @@
ReFinanceId: row.OrderId,
ReFinanceId2: num,
GuestId: row.GuestId,
RelevanceFrId: num==2?1:row.OrderType, // 单据类型
RelevanceFrId: num == 2 ? 1 : row.OrderType, // 单据类型
}]
href = url + 'automaticLogin?token=' + this.getLocalStorage().token + '&data=' + JSON
.stringify(data)
......@@ -1054,7 +1058,8 @@
if (this.userInfo.EmployeeId != row.EnterID && this.userInfo.EmployeeId != row.CreateBy) {
this.ValidateOperator()
} else {
if (row.OrderStatus==1&&(row.TicketStatus == 1||row.TicketStatus == 5) || (row.visaStatus == 0||row.visaStatus == 1)) {
if (row.OrderStatus == 1 && (row.TicketStatus == 1 || row.TicketStatus == 5) || (row.visaStatus ==
0 || row.visaStatus == 1)) {
let $this = this;
this.MsgBus.$emit("editOrderTicketOrderBoxOpen", $this.ID, row, true);
} else {
......@@ -1067,15 +1072,14 @@
if (this.userInfo.EmployeeId != row.EnterID && this.userInfo.EmployeeId != row.CreateBy) {
this.ValidateOperator()
} else {
if (row.OrderStatus==1&&(row.TicketStatus == 1||row.TicketStatus == 5) || (row.visaStatus == 0||row.visaStatus == 1)) {
if (row.OrderStatus == 1 && (row.TicketStatus == 1 || row.TicketStatus == 5) || (row.visaStatus ==
0 || row.visaStatus == 1)) {
let $this = this;
this.MsgBus.$emit("editTicketOrderBoxOpen", $this.ID, row, true);
} else {
this.emptyMore()
}
}
},
openDetails(row) {
let href
......@@ -1181,8 +1185,9 @@
{
Name: '收损完结',
Id: '9',
show: (item.OrderStatus == 3 || item.OrderStatus == 4)
&& item.DueinMoney == 0 ? true : false
show: (item.OrderStatus == 3 || item.OrderStatus ==
4) &&
item.DueinMoney == 0 ? true : false
},
{
Name: '订单完结',
......@@ -1198,7 +1203,8 @@
{
Name: "修改日期",
Id: "10",
show: item.OrderType&&item.OrderType.indexOf(1) != -1?true:false,
show: item.OrderType && item.OrderType.indexOf(1) != -
1 ? true : false,
}
]
});
......
src/components/guestManagement/Agreement.vue
View file @ 04078522
......@@ -218,7 +218,8 @@
<el-col :span="8">
<div style="display: flex;flex-direction: row;align-items: center;">
<span class="font-size-12" style="padding-right: 10px;flex-shrink: 0;">订单类型：</span>
<el-select size="mini" width="200" v-model="msg.OrderType" placeholder="请选择" @change="handleCurrentChange(1)">
<el-select size="mini" width="200" v-model="msg.OrderType" placeholder="请选择"
@change="handleCurrentChange(1)">
<el-option v-for="item in OrderTypeList" :key="item.Id" :label="item.Name" :value="item.Id">
</el-option>
</el-select>
......@@ -273,7 +274,7 @@
orderList,
orderDetailsDrawer
},
props: ["detailsData","ID", "BusinessType"],
props: ["detailsData", "ID", "BusinessType"],
data() {
return {
title: '详情',
......@@ -332,11 +333,20 @@
Id: '3'
},
],
OrderStatusList: [
{Name: '不限',Id:0},
{Name: '正常',Id:1},
{Name: '取消',Id:2}], //订单状态
OrderTypeList:[],
OrderStatusList: [{
Name: '不限',
Id: 0
},
{
Name: '正常',
Id: 1
},
{
Name: '取消',
Id: 2
}
], //订单状态
OrderTypeList: [],
ticketingStatusList: [], // 出票状态
dataList: [],
loading: false,
......@@ -359,22 +369,22 @@
EnterId: '0', //业务员id
OrderState: 1, //订单状态
Q_IsCollect: "0", //收款状态
StartTime: "",//报名开始日期
EndTime: "",//报名结束日期
StartTime: "", //报名开始日期
EndTime: "", //报名结束日期
IsMyOrder: "1", //我的订单
FinishSTime: "",//完结开始时间
FinishETime: "",//完结结束时间
DepartSTime: "",//出发开始
DepartETime: "",//出发结束
TCNUM: "",//团号
ProductName: "",//商品名称
CustomerName: "",//客户名称
LureEmpId: 0,//引流人员
LineId: 0,//线路
TravelType: 0,//跟团类型 1跟团 2当地游
OrderType: "0",//订单类型
IsSelectCRM: 1,//1来源crm
IsMyOrder: 0,//1我的订单
FinishSTime: "", //完结开始时间
FinishETime: "", //完结结束时间
DepartSTime: "", //出发开始
DepartETime: "", //出发结束
TCNUM: "", //团号
ProductName: "", //商品名称
CustomerName: "", //客户名称
LureEmpId: 0, //引流人员
LineId: 0, //线路
TravelType: 0, //跟团类型 1跟团 2当地游
OrderType: "0", //订单类型
IsSelectCRM: 1, //1来源crm
IsMyOrder: 0, //1我的订单
},
total: 0,
currentOrder: null,
......@@ -420,40 +430,42 @@
handleCommand(command) {
let data = [{
path: "",
LureEmpNmae: this.detailsData.CreateByStr,//引流姓名
LureEmpId: this.detailsData.CreateBy,//引流id
LureEmpNmae: this.detailsData.CreateByStr, //引流姓名
LureEmpId: this.detailsData.CreateBy, //引流id
CRMGuestId: this.ID, //客人ID
CRMGuestName: this.detailsData.SurName+this.detailsData.Name //客人ID
CRMGuestName: this.detailsData.SurName + this.detailsData.Name //客人ID
}]
let href
let url = this.domainManager().erpRoutingUrl;
if (command == 1) {
this.addBusiness();
}else{
} else {
if (command == 2) {
data[0].path = 'VisaProductAddOrder'
href =url +"automaticLogin?token=" +this.getLocalStorage().token +"&data=" +JSON.stringify(data);
}else if (command == 3) {
href = url + "automaticLogin?token=" + this.getLocalStorage().token + "&data=" + JSON.stringify(
data);
} else if (command == 3) {
data[0].path = 'productQuery'
href =url +"automaticLogin?token=" +this.getLocalStorage().token +"&data=" +JSON.stringify(data);
}
else if (command == 4) {
href = url + "automaticLogin?token=" + this.getLocalStorage().token + "&data=" + JSON.stringify(
data);
} else if (command == 4) {
data[0].path = 'productQueryOne'
href =url +"automaticLogin?token=" +this.getLocalStorage().token +"&data=" +JSON.stringify(data);
}
else if (command == 5) {
href = url + "automaticLogin?token=" + this.getLocalStorage().token + "&data=" + JSON.stringify(
data);
} else if (command == 5) {
data[0].path = 'singleProductHotelList'
href =url +"automaticLogin?token=" +this.getLocalStorage().token +"&data=" +JSON.stringify(data);
}
else if (command == 6) {
href = url + "automaticLogin?token=" + this.getLocalStorage().token + "&data=" + JSON.stringify(
data);
} else if (command == 6) {
data[0].path = 'SingleticketList'
href =url +"automaticLogin?token=" +this.getLocalStorage().token +"&data=" +JSON.stringify(data);
}
else if (command == 7) {
href = url + "automaticLogin?token=" + this.getLocalStorage().token + "&data=" + JSON.stringify(
data);
} else if (command == 7) {
data[0].path = 'BookAcarList'
href =url +"automaticLogin?token=" +this.getLocalStorage().token +"&data=" +JSON.stringify(data);
href = url + "automaticLogin?token=" + this.getLocalStorage().token + "&data=" + JSON.stringify(
data);
}
if(href){
if (href) {
window.open(href);
}
......@@ -551,7 +563,7 @@
}
},
// 修改日期
modifiedDate(row){
modifiedDate(row) {
let $this = this
this.MsgBus.$emit("modifiedDateOrderBoxOpen", $this.ID, row, true);
},
......@@ -778,7 +790,7 @@
ReFinanceId: row.OrderId,
ReFinanceId2: num,
GuestId: row.GuestId,
RelevanceFrId: num==2?1:row.OrderType, // 单据类型
RelevanceFrId: num == 2 ? 1 : row.OrderType, // 单据类型
}]
href = url + 'automaticLogin?token=' + this.getLocalStorage().token + '&data=' + JSON
.stringify(data)
......@@ -885,7 +897,8 @@
if (this.userInfo.EmployeeId != row.EnterID && this.userInfo.EmployeeId != row.CreateBy) {
this.ValidateOperator()
} else {
if (row.OrderStatus==1&&(row.TicketStatus == 1||row.TicketStatus == 5) || (row.visaStatus == 0||row.visaStatus == 1)) {
if (row.OrderStatus == 1 && (row.TicketStatus == 1 || row.TicketStatus == 5) || (row.visaStatus ==
0 || row.visaStatus == 1)) {
let $this = this;
this.MsgBus.$emit("editOrderTicketOrderBoxOpen", $this.ID, row, true);
} else {
......@@ -898,15 +911,14 @@
if (this.userInfo.EmployeeId != row.EnterID && this.userInfo.EmployeeId != row.CreateBy) {
this.ValidateOperator()
} else {
if (row.OrderStatus==1&&(row.TicketStatus == 1||row.TicketStatus == 5) || (row.visaStatus == 0||row.visaStatus == 1)) {
if (row.OrderStatus == 1 && (row.TicketStatus == 1 || row.TicketStatus == 5) || (row.visaStatus ==
0 || row.visaStatus == 1)) {
let $this = this;
this.MsgBus.$emit("editTicketOrderBoxOpen", $this.ID, row, true);
} else {
this.emptyMore()
}
}
},
openDetails(row) {
let href
......
src/plugins/domainManager.js
View file @ 04078522
......@@ -18,17 +18,17 @@ export default function () {
domainPostUrl = "http://testapi.oytour.com"
}
}
let erpRoutingUrl = "";
let erpSiteUrl = "";
var storageUser = this.getLocalStorage();
if (locationName.indexOf('oytour') !== -1 || locationName.indexOf('testb2b.oytour.com') !== -1) {
erpRoutingUrl = "http://admin.oytour.com/#/";
erpSiteUrl = "http://admin.oytour.com/#/";
if (storageUser && storageUser.ERPUrl) {
erpRoutingUrl = storageUser.ERPUrl + "/#/";
erpSiteUrl = storageUser.ERPUrl + "/#/";
}
} else {
erpRoutingUrl = "http://localhost:8080/#/";
erpSiteUrl = "http://localhost:8080/#/";
if (storageUser && storageUser.ERPUrl) {
erpRoutingUrl = storageUser.ERPUrl + "/#/";
erpSiteUrl = storageUser.ERPUrl + "/#/";
}
}
......@@ -46,7 +46,7 @@ export default function () {
javaUrl: locationName.indexOf('testb2b') == -1 ? "http://efficient.oytour.com" : locationName.indexOf('testb2b.oytour.com') !== -1 ? "http://47.96.12.235:9001" : "http://192.168.10.215:9000",
ViittoFileUrl: locationName.indexOf('oytour') !== -1 || locationName.indexOf('testb2b.oytour.com') !== -1 ? "http://staticfile.oytour.com" : 'http://192.168.10.214:8130',
UploadUrl: locationName.indexOf('oytour') !== -1 || locationName.indexOf('testb2b.oytour.com') !== -1 ? "http://uploadfile.oytour.com" : "http://192.168.10.214:8120",
erpRoutingUrl: erpRoutingUrl
erpRoutingUrl: erpSiteUrl
};
return obj;
}
\ 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