Commit 429898f3 authored by youjie's avatar youjie

修复签证成本制单

parent aca883b8
......@@ -373,7 +373,6 @@
if(this.$route.query.crmOrderObj){
let crmOrderObj = JSON.parse(this.$route.query.crmOrderObj)
this.msg.OrderId = crmOrderObj.OrderId
console.log(crmOrderObj.OrderId,'======酒店订单')
}
this.getEmployee()
this.GetList();
......
......@@ -1513,6 +1513,12 @@ export default {
this.GetEditOrderCreateByAuth();
this.getCompanyMsg.RB_Group_Id = this.getDepartmentMsg.RB_Group_Id =
userInfo.RB_Group_id; //集团
// crm自动登陆传过来的参数
if(this.$route.query.crmOrderObj){
let crmOrderObj = JSON.parse(this.$route.query.crmOrderObj)
this.msg.tempOrderId = crmOrderObj.OrderId
}
this.getCompany();
this.getCtlxList();
......
......@@ -4786,11 +4786,6 @@
} else {
this.msg.QStartDate = new Date().Format("yyyy-MM-dd");
}
// crm自动登陆传过来的参数
if(this.$route.query.crmOrderObj){
let crmOrderObj = JSON.parse(this.$route.query.crmOrderObj)
console.log(crmOrderObj.OrderId,'======跟团订单')
}
this.getEmployee();
this.getList();
this.getLineList();
......
......@@ -4076,11 +4076,7 @@
this.msg.tempOrderId = this.$route.query.id
}
this.msg.QStartDate = new Date().Format('yyyy-MM-dd')
// crm自动登陆传过来的参数
if(this.$route.query.crmOrderObj){
let crmOrderObj = JSON.parse(this.$route.query.crmOrderObj)
console.log(crmOrderObj.OrderId,'======一日游订单')
}
this.getEmployee()
this.getList()
this.getLineList()
......
......@@ -492,7 +492,8 @@
SendEndDate: '',
Name: '',
VisaTCNUM: '',
VisaOrderStatus: '0'
VisaOrderStatus: '0',
OrderId: ''
},
addMsg: {
Id: 0,
......@@ -830,7 +831,7 @@
// crm自动登陆传过来的参数
if(this.$route.query.crmOrderObj){
let crmOrderObj = JSON.parse(this.$route.query.crmOrderObj)
console.log(crmOrderObj.OrderId,'======签证订单')
this.msg.OrderId = crmOrderObj.OrderId
}
this.qjGroupId = this.QjGroupId();
this.userInfo = this.getLocalStorage();
......
......@@ -511,6 +511,7 @@
VisaOrderStatus: '0',
CreateBy: 0,
RB_Branch_Id: -1,
OrderId: ''
},
addMsg: {
Id: 0,
......@@ -875,6 +876,11 @@
},
},
mounted() {
// crm自动登陆传过来的参数
if(this.$route.query.crmOrderObj){
let crmOrderObj = JSON.parse(this.$route.query.crmOrderObj)
this.msg.OrderId = crmOrderObj.OrderId
}
this.qjGroupId = this.QjGroupId();
this.userInfo = this.getLocalStorage();
this.getEmployee()
......
......@@ -1003,7 +1003,7 @@
<el-tooltip v-if="item.visaOrderStatus!=2" class="" effect="dark" content="制单"
placement="top">
<i class="el-icon-circle-plus cursor-pointer c059FF6"
@click="makeAdocument(item, index, 3)"></i>
@click="makeAdocument(item, index, 1)"></i>
</el-tooltip>
</div>
</div>
......@@ -1037,11 +1037,11 @@
<el-tooltip class="" effect="dark" content="制单"
placement="top">
<i class="el-icon-circle-plus cursor-pointer c059FF6"
@click="makeAdocument(item, index, 2)"></i>
@click="makeAdocument(item, index, 3)"></i>
</el-tooltip>
<el-tooltip class="" effect="dark" content="冲抵" placement="top">
<i class="el-icon-circle-plus cursor-pointer c3FC4FF"
@click="isOffset(item, index, 2)"></i>
@click="isOffset(item, index, 3)"></i>
</el-tooltip>
</div>
</div>
......
......@@ -66,11 +66,10 @@
let crmOrderObj = JSON.parse(this.$route.query.crmOrderObj)
this.dataObj.OrderId = crmOrderObj.OrderId
if(crmOrderObj.Type<4){
this.dataObj.tab = this.$route.query.Type
this.dataObj.tab = String(crmOrderObj.Type)
}else{
this.dataObj.tab = '0'
}
console.log(crmOrderObj.OrderId,'======包车订单销售')
} else{
this.dataObj.OrderId = ''
this.dataObj.tab = '0'
......
......@@ -68,11 +68,11 @@
let crmOrderObj = JSON.parse(this.$route.query.crmOrderObj)
this.dataObj.OrderId = crmOrderObj.OrderId
if(crmOrderObj.Type<4){
this.dataObj.tab = this.$route.query.Type
this.dataObj.tab = String(crmOrderObj.Type)
}else{
this.dataObj.tab = '0'
}
console.log(crmOrderObj.OrderId,'======包车订单OP')
} else{
this.dataObj.OrderId = ''
this.dataObj.tab = '0'
......
......@@ -473,7 +473,6 @@ export default {
if(this.$route.query.crmOrderObj){
let crmOrderObj = JSON.parse(this.$route.query.crmOrderObj)
this.msg.OrderId = crmOrderObj.OrderId
console.log(crmOrderObj.OrderId,'======门票订单')
}
},
mounted() {
......
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