Skip to content

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

no message

parent eefe4c5e
Show whitespace changes
Inline Side-by-side
Showing with 202 additions and 222 deletions
src/App.vue
View file @ c3375518
...@@ -13,11 +13,9 @@ export default { ...@@ -13,11 +13,9 @@ export default {
this.$router.push({ this.$router.push({
path: "/login", path: "/login",
}); });
} else if(this.$route.query) { // erp自动登陆传过来的参数 } else if(this.$route.query.token) { // 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?toke=${data.token}&data=${JSON.stringify(parameter)}`, path: `/automaticLogin?toke=${data.token}&data=${JSON.stringify(parameter)}`,
}) })
...@@ -34,7 +32,7 @@ export default { ...@@ -34,7 +32,7 @@ export default {
<style> <style>
@import "./assets/css/tablevoerride.css"; @import "./assets/css/tablevoerride.css";
@import "./assets/global/font.css"; @import "./assets/global/font.css";
@import "//at.alicdn.com/t/font_1627123_ipry94iiny.css"; @import "//at.alicdn.com/t/font_1627123_xio004ni8y.css";
@import url("//at.alicdn.com/t/font_1627123_grz80mbm3sv.css"); @import url("//at.alicdn.com/t/font_1627123_grz80mbm3sv.css");
/* @import './assets/css/common.css'; */ /* @import './assets/css/common.css'; */
@import "./assets/css/init.css"; @import "./assets/css/init.css";
......
src/components/customerManage/orderList.vue
View file @ c3375518
...@@ -91,14 +91,15 @@ ...@@ -91,14 +91,15 @@
{{item.DueinMoney}} {{item.DueinMoney}}
</td> </td>
<td style="border:none"> <td style="border:none">
<p @click="modifyStatus(item)" <span @click="modifyStatus(item)"
class="cp tatusText" class="cp tatusText"
:class="item.TicketStatus==1?'grey': :class="item.TicketStatus==1?'grey':
(item.TicketStatus==2?'success': (item.TicketStatus==2?'success':
(item.TicketStatus==3?'error': (item.TicketStatus==3?'error':
(item.TicketStatus==4?'Black':'')))"> (item.TicketStatus==4?'Black':'')))">
{{item.TicketStatusName}} {{item.TicketStatusName}}
</p> </span>
<i v-if="item.TicketStatus!=1&&item.TicketVoucherList!=[]&&item.CancelVoucherList!=[]" class="iconfont iconpingzhengchaxun Credentials" @click="viewCredentials(item)"></i>
</td> </td>
<td style="border:none"> <td style="border:none">
<div style="background: rgba(2, 196, 153, 0.2);width: 70px;border-radius: 2px;text-align: center" <div style="background: rgba(2, 196, 153, 0.2);width: 70px;border-radius: 2px;text-align: center"
...@@ -146,7 +147,8 @@ ...@@ -146,7 +147,8 @@
<div class="documents-left"> <div class="documents-left">
<div>收入单据：</div> <div>收入单据：</div>
<span <span
v-for="(item,index) in item.IncomeFinance" :key="index" >{{item.FrID}}</span> v-for="(item,index) in item.IncomeFinance" :key="index"
@click="openDetails(item)">{{item.FrID}}</span>
</div> </div>
<div class="documents-right"> <div class="documents-right">
<el-tooltip <el-tooltip
...@@ -159,7 +161,8 @@ ...@@ -159,7 +161,8 @@
<div class="documents-left"> <div class="documents-left">
<div>退款单据：</div> <div>退款单据：</div>
<span <span
v-for="(item,index) in item.BackFinance" :key="index" >{{item.FrID}}</span> v-for="(item,index) in item.BackFinance" :key="index"
@click="openDetails(item)">{{item.FrID}}</span>
</div> </div>
<div class="documents-right"> <div class="documents-right">
<el-tooltip <el-tooltip
...@@ -172,7 +175,8 @@ ...@@ -172,7 +175,8 @@
<div class="documents-left"> <div class="documents-left">
<div>成本单据：</div> <div>成本单据：</div>
<span <span
v-for="(item,index) in item.PayFinance" :key="index">{{item.FrID}}</span> v-for="(item,index) in item.PayFinance" :key="index"
@click="openDetails(item)">{{item.FrID}}</span>
</div> </div>
<div class="documents-right"> <div class="documents-right">
<el-tooltip <el-tooltip
...@@ -256,6 +260,11 @@ ...@@ -256,6 +260,11 @@
this.userInfo = this.getLocalStorage(); this.userInfo = this.getLocalStorage();
}, },
methods: { methods: {
// 查看出票凭据
viewCredentials(row){
let $this = this;
this.MsgBus.$emit("CredentialsOrderTicketOrderBoxOpen", $this.ID, row, true);
},
chooseMore(row){ chooseMore(row){
// 取消订单 // 取消订单
if(row.More=='1'){ if(row.More=='1'){
...@@ -284,24 +293,18 @@ ...@@ -284,24 +293,18 @@
}, },
// 验证操作员 // 验证操作员
ValidateOperator(){ ValidateOperator(){
let tips = '您没有操作权限' this.$message({
this.$confirm('此订单'+tips+'!', '提示', { type: 'warning',
confirmButtonText: '确定', message: '抱歉,该订单您没有操作权限!'
cancelButtonText: '取消',
type: 'warning'
}).then(() => {
this.$emit('emptyMore')
}).catch(() => {
this.$emit('emptyMore')
}); });
this.$emit('emptyMore')
}, },
// 制作单据 // 制作单据
makeAdocument(row,num){ makeAdocument(row,num){
if(this.userInfo.EmName!=row.EnterName){ if(this.userInfo.EmName!=row.EnterName){
this.ValidateOperator() this.ValidateOperator()
}else{ }else{
if(row.OrderStatus!='2'){
let type let type
type = num==1? 1:2 // 1收款 2退款 3成本 type = num==1? 1:2 // 1收款 2退款 3成本
let href let href
...@@ -324,6 +327,7 @@ ...@@ -324,6 +327,7 @@
href = url+'automaticLogin?token='+this.getLocalStorage().token+'&data=' + JSON.stringify(data) href = url+'automaticLogin?token='+this.getLocalStorage().token+'&data=' + JSON.stringify(data)
window.open(href); window.open(href);
} }
}
}, },
// 操作日志 // 操作日志
operationLog(row){ operationLog(row){
...@@ -334,27 +338,12 @@ ...@@ -334,27 +338,12 @@
if(this.userInfo.EmName!=row.EnterName){ if(this.userInfo.EmName!=row.EnterName){
this.ValidateOperator() this.ValidateOperator()
}else{ }else{
if(row.OrderStatus==2){ if(row.TicketStatus==3||row.TicketStatus==4||row.OrderStatus=='2'){
let tips = '该订单已取消，不能修改出票状态'
this.$confirm(tips, '提示', {
confirmButtonText: '确定',
cancelButtonText: '取消',
type: 'warning'
}).then(() => {
this.$emit('emptyMore')
}).catch(() => {
this.$emit('emptyMore')
});
}else{
if(row.TicketStatus==3){
return
}else if(row.TicketStatus==4){
return return
}else{ }else{
this.MsgBus.$emit("reviseTicketOrderBoxOpen", row.GuestId, row, true); this.MsgBus.$emit("reviseTicketOrderBoxOpen", row.GuestId, row, true);
} }
} }
}
}, },
...@@ -363,6 +352,7 @@ ...@@ -363,6 +352,7 @@
if(this.userInfo.EmName!=row.EnterName){ if(this.userInfo.EmName!=row.EnterName){
this.ValidateOperator() this.ValidateOperator()
}else{ }else{
if(row.OrderStatus!='2'&&row.IncomeFinance==[]&&row.BackFinance==[]&&row.PayFinance==[]){
let tips = '此操作将取消该订单，是否继续取消?' let tips = '此操作将取消该订单，是否继续取消?'
this.$confirm(tips, '提示', { this.$confirm(tips, '提示', {
confirmButtonText: '确定', confirmButtonText: '确定',
...@@ -386,6 +376,7 @@ ...@@ -386,6 +376,7 @@
}); });
}); });
} }
}
}, },
// 编辑订单 // 编辑订单
...@@ -396,28 +387,7 @@ ...@@ -396,28 +387,7 @@
if(row.TicketStatus==1&&row.OrderStatus==1){ if(row.TicketStatus==1&&row.OrderStatus==1){
this.MsgBus.$emit("editOrderTicketOrderBoxOpen", row.GuestId, row, true); this.MsgBus.$emit("editOrderTicketOrderBoxOpen", row.GuestId, row, true);
}else{ }else{
let tips = ''
if(row.TicketStatus==2&&row.OrderStatus==1){
tips = '已出票'
}
if(row.TicketStatus==3&&row.OrderStatus==1){
tips = '航班熔断'
}
if(row.TicketStatus==4&&row.OrderStatus==1){
tips = '用户取消航班'
}
if(row.OrderStatus==2){
tips = '已取消'
}
this.$confirm('此订单'+tips+'，无法编辑订单金额?', '提示', {
confirmButtonText: '确定',
cancelButtonText: '取消',
type: 'warning'
}).then(() => {
this.$emit('emptyMore')
}).catch(() => {
this.$emit('emptyMore') this.$emit('emptyMore')
});
} }
} }
}, },
...@@ -429,36 +399,28 @@ ...@@ -429,36 +399,28 @@
if(row.TicketStatus==1&&row.OrderStatus==1){ if(row.TicketStatus==1&&row.OrderStatus==1){
this.MsgBus.$emit("editTicketOrderBoxOpen", row.GuestId, row, true); this.MsgBus.$emit("editTicketOrderBoxOpen", row.GuestId, row, true);
}else{ }else{
let tips = ''
if(row.TicketStatus==2&&row.OrderStatus==1){
tips = '已出票'
}
if(row.TicketStatus==3&&row.OrderStatus==1){
tips = '航班熔断'
}
if(row.TicketStatus==4&&row.OrderStatus==1){
tips = '用户取消航班'
}
if(row.OrderStatus==2){
tips = '已取消'
}
this.$confirm('此订单'+tips+'，无法编辑订单金额?', '提示', {
confirmButtonText: '确定',
cancelButtonText: '取消',
type: 'warning'
}).then(() => {
this.$emit('emptyMore')
}).catch(() => {
this.$emit('emptyMore') this.$emit('emptyMore')
});
} }
} }
}, },
openDetails(item) { openDetails(item) {
console.log(item.ID); let href
this.MsgBus.$emit("busnessDrawerShow", item.ID, 1); let url
if(this.isOnline()){
url = 'http://yx.oytour.com/#/'
}else{
url = 'http://www.test.com:8080/#/'
}
let data = [
{
path:'FinancialDocumentsDetail',
id: item.FrID
}
]
href = url+'automaticLogin?token='+this.getLocalStorage().token+'&data=' + JSON.stringify(data)
window.open(href);
}, },
// 获取出票状态枚举 // 获取出票状态枚举
GetTicketStatusEnumList(){ GetTicketStatusEnumList(){
...@@ -782,4 +744,7 @@ ...@@ -782,4 +744,7 @@
.select-right{ .select-right{
margin-left: 5px; margin-left: 5px;
} }
.Credentials{
color: #2961FE;
}
</style> </style>
\ No newline at end of file
src/components/guestManagement/Agreement.vue
View file @ c3375518
...@@ -48,6 +48,9 @@ ...@@ -48,6 +48,9 @@
.select-right{ .select-right{
margin-left: 5px; margin-left: 5px;
} }
.Credentials{
color: #2961FE;
}
</style> </style>
<template> <template>
<div class="Business"> <div class="Business">
...@@ -159,16 +162,17 @@ ...@@ -159,16 +162,17 @@
</el-table-column> </el-table-column>
<el-table-column <el-table-column
label="出票状态" label="出票状态"
show-overflow-tooltip> width="90">
<template slot-scope="scope"> <template slot-scope="scope">
<p @click="modifyStatus(scope.row)" <span @click="modifyStatus(scope.row)"
class="cp tatusText" class="cp tatusText"
:class="scope.row.TicketStatus==1?'grey': :class="scope.row.TicketStatus==1?'grey':
(scope.row.TicketStatus==2?'success': (scope.row.TicketStatus==2?'success':
(scope.row.TicketStatus==3?'error': (scope.row.TicketStatus==3?'error':
(scope.row.TicketStatus==4?'Black':'')))"> (scope.row.TicketStatus==4?'Black':'')))">
{{scope.row.TicketStatusName}} {{scope.row.TicketStatusName}}
</p> </span>
<i v-if="scope.row.TicketStatus!=1&&scope.row.TicketVoucherList!=[]&&scope.row.CancelVoucherList!=[]" class="iconfont iconpingzhengchaxun Credentials" @click="viewCredentials(scope.row)"></i>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column <el-table-column
...@@ -189,7 +193,8 @@ ...@@ -189,7 +193,8 @@
show-overflow-tooltip> show-overflow-tooltip>
<template slot-scope="scope"> <template slot-scope="scope">
<p v-for="(item,index) in scope.row.IncomeFinance" :key="index" <p v-for="(item,index) in scope.row.IncomeFinance" :key="index"
:class="item.Status==1?'income_1':'income_2'"> :class="item.Status==1?'income_1':'income_2'"
@click="openDetails(item.FrID)">
{{item.FrID}} {{item.FrID}}
</p> </p>
</template> </template>
...@@ -198,7 +203,9 @@ ...@@ -198,7 +203,9 @@
label="退款单据" label="退款单据"
show-overflow-tooltip> show-overflow-tooltip>
<template slot-scope="scope"> <template slot-scope="scope">
<p v-for="(item,index) in scope.row.BackFinance" :key="index"> <p v-for="(item,index) in scope.row.BackFinance" :key="index"
:class="item.Status==1?'income_1':'income_2'"
@click="openDetails(item.FrID)">
{{item.FrID}} {{item.FrID}}
</p> </p>
</template> </template>
...@@ -207,7 +214,9 @@ ...@@ -207,7 +214,9 @@
label="成本单据" label="成本单据"
show-overflow-tooltip> show-overflow-tooltip>
<template slot-scope="scope"> <template slot-scope="scope">
<p v-for="(item,index) in scope.row.PayFinance" :key="index"> <p v-for="(item,index) in scope.row.PayFinance" :key="index"
:class="item.Status==1?'income_1':'income_2'"
@click="openDetails(item.FrID)">
{{item.FrID}} {{item.FrID}}
</p> </p>
</template> </template>
...@@ -308,6 +317,11 @@ export default { ...@@ -308,6 +317,11 @@ export default {
}); });
}, },
methods: { methods: {
// 查看出票凭据
viewCredentials(row){
let $this = this;
this.MsgBus.$emit("CredentialsOrderTicketOrderBoxOpen", $this.ID, row, true);
},
// 清空下拉 // 清空下拉
emptyMore(){ emptyMore(){
this.dataList.forEach(item=>{ this.dataList.forEach(item=>{
...@@ -338,26 +352,26 @@ export default { ...@@ -338,26 +352,26 @@ export default {
}, },
// 转换订单 // 转换订单
convertOrder(row){ convertOrder(row){
if(row.OrderStatus!='2'){
let $this = this;
this.MsgBus.$emit("convertOrderTicketOrderBoxOpen", $this.ID, row, true); this.MsgBus.$emit("convertOrderTicketOrderBoxOpen", $this.ID, row, true);
}
}, },
// 验证操作员 // 验证操作员
ValidateOperator(){ ValidateOperator(){
let tips = '您没有操作权限' this.$message({
this.$confirm('此订单'+tips+'!', '提示', { type: 'warning',
confirmButtonText: '确定', message: '抱歉,该订单您没有操作权限!'
cancelButtonText: '取消',
type: 'warning'
}).then(() => {
this.emptyMore()
}).catch(() => {
this.emptyMore()
}); });
this.emptyMore()
}, },
// 制作单据 // 制作单据
makeAdocument(row,num){ makeAdocument(row,num){
if(this.userInfo.EmName!=row.EnterName){ if(this.userInfo.EmName!=row.EnterName){
this.ValidateOperator() this.ValidateOperator()
}else{ }else{
if(row.OrderStatus!='2'){
let type let type
type = num==1? 1:2 // 1收款 2退款 3成本 type = num==1? 1:2 // 1收款 2退款 3成本
let href let href
...@@ -380,6 +394,8 @@ export default { ...@@ -380,6 +394,8 @@ export default {
href = url+'automaticLogin?token='+this.getLocalStorage().token+'&data=' + JSON.stringify(data) href = url+'automaticLogin?token='+this.getLocalStorage().token+'&data=' + JSON.stringify(data)
window.open(href); window.open(href);
} }
}
}, },
// 操作日志 // 操作日志
operationLog(row){ operationLog(row){
...@@ -392,16 +408,7 @@ export default { ...@@ -392,16 +408,7 @@ export default {
this.ValidateOperator() this.ValidateOperator()
}else{ }else{
if(row.OrderStatus==2){ if(row.OrderStatus==2){
let tips = '该订单已取消，不能修改出票状态'
this.$confirm(tips, '提示', {
confirmButtonText: '确定',
cancelButtonText: '取消',
type: 'warning'
}).then(() => {
this.emptyMore()
}).catch(() => {
this.emptyMore() this.emptyMore()
});
}else{ }else{
if(row.TicketStatus==3){ if(row.TicketStatus==3){
return return
...@@ -421,6 +428,7 @@ export default { ...@@ -421,6 +428,7 @@ export default {
if(this.userInfo.EmName!=row.EnterName){ if(this.userInfo.EmName!=row.EnterName){
this.ValidateOperator() this.ValidateOperator()
}else{ }else{
if(row.OrderStatus!='2'&&row.IncomeFinance==[]&&row.BackFinance==[]&&row.PayFinance==[]){
let tips = '此操作将取消该订单，是否继续取消?' let tips = '此操作将取消该订单，是否继续取消?'
this.$confirm(tips, '提示', { this.$confirm(tips, '提示', {
confirmButtonText: '确定', confirmButtonText: '确定',
...@@ -443,6 +451,13 @@ export default { ...@@ -443,6 +451,13 @@ export default {
message: '已取消' message: '已取消'
}); });
}); });
}else{
this.$message({
type: 'warning',
message: '该订单已有财务单据，不能取消!'
});
this.emptyMore()
}
} }
}, },
...@@ -455,28 +470,7 @@ export default { ...@@ -455,28 +470,7 @@ export default {
let $this = this; let $this = this;
this.MsgBus.$emit("editOrderTicketOrderBoxOpen", $this.ID, row, true); this.MsgBus.$emit("editOrderTicketOrderBoxOpen", $this.ID, row, true);
}else{ }else{
let tips = ''
if(row.TicketStatus==2&&row.OrderStatus==1){
tips = '已出票'
}
if(row.TicketStatus==3&&row.OrderStatus==1){
tips = '航班熔断'
}
if(row.TicketStatus==4&&row.OrderStatus==1){
tips = '用户取消航班'
}
if(row.OrderStatus==2){
tips = '已取消'
}
this.$confirm('此订单'+tips+'，无法编辑订单金额?', '提示', {
confirmButtonText: '确定',
cancelButtonText: '取消',
type: 'warning'
}).then(() => {
this.emptyMore()
}).catch(() => {
this.emptyMore() this.emptyMore()
});
} }
} }
}, },
...@@ -489,35 +483,28 @@ export default { ...@@ -489,35 +483,28 @@ export default {
let $this = this; let $this = this;
this.MsgBus.$emit("editTicketOrderBoxOpen", $this.ID, row, true); this.MsgBus.$emit("editTicketOrderBoxOpen", $this.ID, row, true);
}else{ }else{
let tips = ''
if(row.TicketStatus==2&&row.OrderStatus==1){
tips = '已出票'
}
if(row.TicketStatus==3&&row.OrderStatus==1){
tips = '航班熔断'
}
if(row.TicketStatus==4&&row.OrderStatus==1){
tips = '用户取消航班'
}
if(row.OrderStatus==2){
tips = '已取消'
}
this.$confirm('此订单'+tips+'，无法编辑订单金额?', '提示', {
confirmButtonText: '确定',
cancelButtonText: '取消',
type: 'warning'
}).then(() => {
this.emptyMore() this.emptyMore()
}).catch(() => {
this.emptyMore()
});
} }
} }
}, },
openDetails(scope) { openDetails(row) {
this.MsgBus.$emit("busnessDrawerShow", scope.row.ID, 1); let href
let url
if(this.isOnline()){
url = 'http://yx.oytour.com/#/'
}else{
url = 'http://www.test.com:8080/#/'
}
let data = [
{
path:'FinancialDocumentsDetail',
id: row
}
]
href = url+'automaticLogin?token='+this.getLocalStorage().token+'&data=' + JSON.stringify(data)
window.open(href);
}, },
// 获取出票状态枚举 // 获取出票状态枚举
GetTicketStatusEnumList(){ GetTicketStatusEnumList(){
...@@ -569,8 +556,6 @@ export default { ...@@ -569,8 +556,6 @@ export default {
let $this = this; let $this = this;
this.MsgBus.$emit("addTicketOrderBoxOpen", $this.ID, 0, true); this.MsgBus.$emit("addTicketOrderBoxOpen", $this.ID, 0, true);
}, },
guanlian() {},
jiechuguanlian() {},
handleSizeChange(val) { handleSizeChange(val) {
this.msg.pageSize = val; this.msg.pageSize = val;
this.getList(); this.getList();
......
src/components/guestManagement/customerDialogBox.vue
View file @ c3375518
...@@ -184,7 +184,7 @@ ...@@ -184,7 +184,7 @@
color: rgb(123, 194, 245); color: rgb(123, 194, 245);
} }
=======.customerDialogBox.add-box .add-tit { .customerDialogBox.add-box .add-tit {
display: flex; display: flex;
justify-content: space-between; justify-content: space-between;
align-items: center; align-items: center;
......
src/components/guestManagement/guestManagement.vue
View file @ c3375518
...@@ -137,7 +137,9 @@ ...@@ -137,7 +137,9 @@
</el-table-column> </el-table-column>
<el-table-column label="状态" sortable v-if="queryType[36].show" show-overflow-tooltip> <el-table-column label="状态" sortable v-if="queryType[36].show" show-overflow-tooltip>
<template slot-scope="scope"> <template slot-scope="scope">
<span :style="{color:scope.row.TOrderState==1?'gray':(scope.row.TOrderState==2?'':'red')}">
{{scope.row.TOrderState==1?"未成交":(scope.row.TOrderState==2?"成交":scope.row.TOrderState==3?"多次成交":'')}} {{scope.row.TOrderState==1?"未成交":(scope.row.TOrderState==2?"成交":scope.row.TOrderState==3?"多次成交":'')}}
</span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column prop="BirthdayAddress" label="出生地点" sortable v-if="queryType[28].show" <el-table-column prop="BirthdayAddress" label="出生地点" sortable v-if="queryType[28].show"
......
src/components/guestManagement/ticketOrder.vue
View file @ c3375518
...@@ -179,6 +179,15 @@ ...@@ -179,6 +179,15 @@
margin-bottom: 20px; margin-bottom: 20px;
letter-spacing: 2px; letter-spacing: 2px;
} }
.Credentials-box{
display: flex;
flex-wrap: wrap;
}
.Credentials-box .el-image{
width: 100px;
height: 100px;
margin-right: 20px;
}
</style> </style>
<template> <template>
<el-dialog :visible.sync="dialogTableVisible" <el-dialog :visible.sync="dialogTableVisible"
...@@ -192,7 +201,7 @@ ...@@ -192,7 +201,7 @@
</div> </div>
<div class="form-box" v-if="show"> <div class="form-box" v-if="show">
<el-form :model="form" ref="form" class="MyEditForm" :rules="rules"> <el-form :model="form" ref="form" class="MyEditForm" :rules="rules">
<p class="form-box-tit" v-if="name!='操作日志'"><span class="radius"></span> <p class="form-box-tit" v-if="name!='操作日志'&&name!='凭据图'"><span class="radius"></span>
{{name!='修改出票状态'?' 基本信息':' 上传'+text+'凭证'}}</p> {{name!='修改出票状态'?' 基本信息':' 上传'+text+'凭证'}}</p>
<el-row :gutter="30" v-if="name=='新建机票订单'||name=='编辑机票订单'"> <el-row :gutter="30" v-if="name=='新建机票订单'||name=='编辑机票订单'">
<el-col :span="8"> <el-col :span="8">
...@@ -313,6 +322,15 @@ ...@@ -313,6 +322,15 @@
</el-col> </el-col>
</el-row> </el-row>
</el-form> </el-form>
<div v-if="name=='凭据图'" class="Credentials-box">
<el-image v-for="(items,index) in obj.TicketVoucherList" :key="index"
:src="domainManager().ViittoFileUrl+items">
</el-image>
<el-image v-for="(items,index) in obj.CancelVoucherList" :key="index"
:src="domainManager().ViittoFileUrl+items">
</el-image>
</div>
<div v-if="name=='操作日志'"> <div v-if="name=='操作日志'">
<div v-for="(item,index) in logData" :key="index"> <div v-for="(item,index) in logData" :key="index">
<div class="form-box-log"> <div class="form-box-log">
...@@ -454,12 +472,15 @@ export default { ...@@ -454,12 +472,15 @@ export default {
}, },
obj:{ obj:{
handler(val, oldVal) { handler(val, oldVal) {
if(this.name=='操作日志'){
this.getList() this.getList()
}
}, },
deep: true, deep: true,
} }
}, },
mounted() { mounted() {
console.log(this.obj,'----')
this.form.GuestId = this.GuestId this.form.GuestId = this.GuestId
if(this.name=="编辑机票订单"){ if(this.name=="编辑机票订单"){
this.form = { this.form = {
...@@ -487,10 +508,13 @@ export default { ...@@ -487,10 +508,13 @@ export default {
if(this.name=='编辑订单金额'){ if(this.name=='编辑订单金额'){
this.width="600px" this.width="600px"
} }
if(this.name=='凭据图'){
this.width="600px"
}
let $this = this; let $this = this;
setTimeout(() => { setTimeout(() => {
$this.dialogTableVisible = true; $this.dialogTableVisible = true;
}, 50); },50);
}, },
methods: { methods: {
// 获取业务员 // 获取业务员
......
src/views/index.vue
View file @ c3375518
...@@ -345,6 +345,12 @@ ...@@ -345,6 +345,12 @@
$this.obj = obj; $this.obj = obj;
$this.dialogTicketOrderVisible = true; $this.dialogTicketOrderVisible = true;
}); });
this.MsgBus.$on("CredentialsOrderTicketOrderBoxOpen", function (GuestId, obj) {
$this.dialogTicketOrderVisibleName = "凭据图";
$this.GuestId = GuestId;
$this.obj = obj;
$this.dialogTicketOrderVisible = true;
});
this.MsgBus.$on("closeTicketOrderDialogBox", function () { this.MsgBus.$on("closeTicketOrderDialogBox", function () {
$this.dialogTicketOrderVisible = false; $this.dialogTicketOrderVisible = false;
this.$emit("getList"); this.$emit("getList");
......
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