Skip to content

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

no message

parent 3938e9bc
Hide whitespace changes
Inline Side-by-side
Showing with 308 additions and 147 deletions
src/App.vue
View file @ 1b3f93c2
...@@ -26,7 +26,7 @@ export default { ...@@ -26,7 +26,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_tcs57r3ak3a.css"; @import "//at.alicdn.com/t/font_1627123_ipry94iiny.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/guestManagement/Agreement.vue
View file @ 1b3f93c2
...@@ -45,18 +45,21 @@ ...@@ -45,18 +45,21 @@
<template> <template>
<div class="Business"> <div class="Business">
<div class="add-Enclosure"> <div class="add-Enclosure">
<el-row :gutter="12"> <el-row :gutter="14">
<el-col :span="8"> <el-col :span="8">
<el-input size="mini" placeholder="输入订单ID" v-model="msg.OrderId" label="订单ID" <el-input size="mini" placeholder="输入订单ID" v-model="msg.OrderId" label="订单ID"
@keyup.enter.native="getList"></el-input> @keyup.enter.native="getList"></el-input>
</el-col> </el-col>
<el-col :span="4"> <el-col :span="6">
<el-select size="mini" width="200" v-model="msg.TicketStatus" placeholder="请选择" <div style="display: flex;flex-direction: row;align-items: center;">
@change="getList"> <span class="font-size-12" style="padding-right: 10px;flex-shrink: 0;">状态：</span>
<el-option <el-select size="mini" width="200" v-model="msg.TicketStatus" placeholder="请选择"
v-for="item in ticketingStatusList" @change="getList">
:key="item.Id" :label="item.Name" :value="item.Id"></el-option> <el-option
</el-select> v-for="item in ticketingStatusList"
:key="item.Id" :label="item.Name" :value="item.Id"></el-option>
</el-select>
</div>
</el-col> </el-col>
<el-col :span="4"> <el-col :span="4">
<el-select size="mini" width="200" v-model="msg.OrderStatus" placeholder="请选择" <el-select size="mini" width="200" v-model="msg.OrderStatus" placeholder="请选择"
...@@ -114,25 +117,23 @@ ...@@ -114,25 +117,23 @@
</el-table-column> </el-table-column>
<el-table-column <el-table-column
label="实收" label="实收"
show-overflow-tooltip> width="120">
<template slot-scope="scope"> <template slot-scope="scope">
{{scope.row.IncomeMoney}}<i @click="makeAdocument(scope.row,1)" class="iconfont iconjia- numIcon"></i> {{scope.row.IncomeMoney}}<i v-if="scope.row.OrderStatus!=1" @click="makeAdocument(scope.row,1)" class="iconfont iconjia- numIcon"></i>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column <el-table-column
label="退款" label="退款"
show-overflow-tooltip> width="120">
<template slot-scope="scope"> <template slot-scope="scope">
<!-- v-if="scope.row.OrderStatus!=1" --> {{scope.row.BackMoney}}<i v-if="scope.row.OrderStatus!=1" @click="makeAdocument(scope.row,2)" class="iconfont iconjia- numIcon"></i>
{{scope.row.BackMoney}}<i @click="makeAdocument(scope.row,2)" class="iconfont iconjia- numIcon"></i>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column <el-table-column
label="成本" label="成本"
show-overflow-tooltip> width="120">
<template slot-scope="scope"> <template slot-scope="scope">
<!-- v-if="scope.row.OrderStatus!=1" --> {{scope.row.PayMoney}}<i v-if="scope.row.OrderStatus!=1" @click="makeAdocument(scope.row,3)" class="iconfont iconjia- numIcon"></i>
{{scope.row.PayMoney}}<i @click="makeAdocument(scope.row,3)" class="iconfont iconjia- numIcon"></i>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column <el-table-column
...@@ -175,31 +176,32 @@ ...@@ -175,31 +176,32 @@
label="客户需求" label="客户需求"
show-overflow-tooltip> show-overflow-tooltip>
</el-table-column> </el-table-column>
<el-table-column <el-table-column
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.IncomeFinance" :key="index"
{{item?item:''}} :class="item.Status==1?'income_1':'income_2'">
{{item.FrID}}
</p> </p>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column <el-table-column
label="收入单据" label="退款单据"
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.BackFinance" :key="index">
:class="item.Status==1?'income_1':'income_2'">
{{item.FrID}} {{item.FrID}}
</p> </p>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column <el-table-column
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.PayFinance" :key="index">
{{item?item:''}} {{item.FrID}}
</p> </p>
</template> </template>
</el-table-column> </el-table-column>
...@@ -211,11 +213,15 @@ ...@@ -211,11 +213,15 @@
<el-table-column <el-table-column
fixed="right" fixed="right"
label="操作" label="操作"
show-overflow-tooltip> width="100">
<template slot-scope="scope"> <template slot-scope="scope">
<div class="item-but-box"> <div class="item-but-box">
<el-tooltip
class="item-but" effect="dark" content="编辑订单" placement="top">
<i class="iconfont iconwenbenbianji cp" @click="editOrder(scope.row)"></i>
</el-tooltip>
<el-tooltip <el-tooltip
v-if="scope.row.TicketStatus==1&&scope.row.OrderStatus==1" v-if="scope.row.TicketStatus==1&&scope.row.OrderStatus==1&&!scope.row.IncomeFinance&&!scope.row.BackFinance&&!scope.row.PayFinance"
class="item-but" effect="dark" content="取消订单" placement="top"> class="item-but" effect="dark" content="取消订单" placement="top">
<i class="iconfont iconquxiao cp" @click="cancelOrder(scope.row)"></i> <i class="iconfont iconquxiao cp" @click="cancelOrder(scope.row)"></i>
</el-tooltip> </el-tooltip>
...@@ -258,7 +264,8 @@ export default { ...@@ -258,7 +264,8 @@ export default {
OrderStatus:"1", OrderStatus:"1",
StartCityName: "", StartCityName: "",
EndCityName: "", EndCityName: "",
EnterID: "" EnterID: "",
userInfo:{}
}, },
total:0 total:0
}; };
...@@ -272,7 +279,7 @@ export default { ...@@ -272,7 +279,7 @@ export default {
}, },
}, },
mounted() { mounted() {
this.userInfo = this.getLocalStorage();
this.getList(); this.getList();
this.GetTicketStatusEnumList() this.GetTicketStatusEnumList()
let $this = this let $this = this
...@@ -281,29 +288,46 @@ export default { ...@@ -281,29 +288,46 @@ export default {
}); });
}, },
methods: { methods: {
// 验证操作员
ValidateOperator(){
let tips = '您没有操作权限'
this.$confirm('此订单'+tips+'!', '提示', {
confirmButtonText: '确定',
cancelButtonText: '取消',
type: 'warning'
}).then(() => {
}).catch(() => {
});
},
// 制作单据 // 制作单据
makeAdocument(row,num){ makeAdocument(row,num){
let type if(this.userInfo.EmName!=row.EnterName){
type = num==1? 1:2 // 1收款 2退款 3成本 this.ValidateOperator()
let href
let url
if(this.isOnline()){
url = 'http://yx.oytour.com/#/'
}else{ }else{
url = 'http://www.test.com:8080/#/' let type
type = num==1? 1:2 // 1收款 2退款 3成本
let href
let url
if(this.isOnline()){
url = 'http://yx.oytour.com/#/'
}else{
url = 'http://www.test.com:8080/#/'
}
let data = [
{
path:'ChoiceAddFinancialDocuments',
type: type,
OtherType: 55,
ReFinanceId: row.OrderId,
ReFinanceId2: num,
GuestId: row.GuestId
}
]
href = url+'automaticLogin?token='+this.getLocalStorage().token+'&data=' + JSON.stringify(data)
window.open(href);
} }
let data = [
{
path:'ChoiceAddFinancialDocuments',
type: type,
OtherType: 55,
ReFinanceId: row.OrderId,
ReFinanceId2: num,
GuestId: row.GuestId
}
]
href = url+'automaticLogin?token='+this.getLocalStorage().token+'&data=' + JSON.stringify(data)
window.open(href);
}, },
// 操作日志 // 操作日志
operationLog(row){ operationLog(row){
...@@ -312,81 +336,132 @@ export default { ...@@ -312,81 +336,132 @@ export default {
}, },
// 修改出票状态 // 修改出票状态
modifyStatus(row){ modifyStatus(row){
if(row.OrderStatus==2){ if(this.userInfo.EmName!=row.EnterName){
let tips = '该订单已取消，不能修改出票状态' this.ValidateOperator()
}else{
if(row.OrderStatus==2){
let tips = '该订单已取消，不能修改出票状态'
this.$confirm(tips, '提示', {
confirmButtonText: '确定',
cancelButtonText: '取消',
type: 'warning'
}).then(() => {
}).catch(() => {
});
}else{
if(row.TicketStatus==3){
return
}else if(row.TicketStatus==4){
return
}else{
let $this = this;
this.MsgBus.$emit("reviseTicketOrderBoxOpen", $this.ID, row, true);
}
}
}
},
// 取消订单
cancelOrder(row){
if(this.userInfo.EmName!=row.EnterName){
this.ValidateOperator()
}else{
let tips = '此操作将取消该订单，是否继续取消?'
this.$confirm(tips, '提示', { this.$confirm(tips, '提示', {
confirmButtonText: '确定', confirmButtonText: '确定',
cancelButtonText: '取消', cancelButtonText: '取消',
type: 'warning' type: 'warning'
}).then(() => { }).then(() => {
this.apipost('/api/Order/SetGuestOrderState', {
OrderId: row.OrderId,
Type: '1',
}, res=>{
if (res.data.resultCode == 1) {
this.$message.success(res.data.message);
this.getList()
}
})
}).catch(() => { }).catch(() => {
this.$message({
type: 'info',
message: '已取消'
});
}); });
}
},
// 编辑订单
editOrder(row){
if(this.userInfo.EmName!=row.EnterName){
this.ValidateOperator()
}else{ }else{
if(row.TicketStatus==4){ if(row.TicketStatus==1&&row.OrderStatus==1){
return
}else{
let $this = this; let $this = this;
this.MsgBus.$emit("reviseTicketOrderBoxOpen", $this.ID, row, true); this.MsgBus.$emit("editOrderTicketOrderBoxOpen", $this.ID, row, true);
}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(() => {
}).catch(() => {
});
} }
} }
},
// 取消订单
cancelOrder(row){
let tips = '此操作将取消该订单，是否继续取消?'
this.$confirm(tips, '提示', {
confirmButtonText: '确定',
cancelButtonText: '取消',
type: 'warning'
}).then(() => {
this.apipost('/api/Order/SetGuestOrderState', {
OrderId: row.OrderId,
Type: '1',
}, res=>{
if (res.data.resultCode == 1) {
this.$message.success(res.data.message);
this.getList()
}
})
}).catch(() => {
this.$message({
type: 'info',
message: '已取消'
});
});
}, },
// 编辑订单金额 // 编辑订单金额
editOrderAmount(row){ editOrderAmount(row){
if(row.TicketStatus==1&&row.OrderStatus==1){ if(this.userInfo.EmName!=row.EnterName){
let $this = this; this.ValidateOperator()
this.MsgBus.$emit("editTicketOrderBoxOpen", $this.ID, row, true);
}else{ }else{
let tips = '' if(row.TicketStatus==1&&row.OrderStatus==1){
if(row.TicketStatus==2&&row.OrderStatus==1){ let $this = this;
tips = '已出票' this.MsgBus.$emit("editTicketOrderBoxOpen", $this.ID, row, true);
} }else{
if(row.TicketStatus==3&&row.OrderStatus==1){ let tips = ''
tips = '航班熔断' if(row.TicketStatus==2&&row.OrderStatus==1){
} tips = '已出票'
if(row.TicketStatus==4&&row.OrderStatus==1){ }
tips = '用户取消航班' if(row.TicketStatus==3&&row.OrderStatus==1){
} tips = '航班熔断'
if(row.OrderStatus==2){ }
tips = '已取消' if(row.TicketStatus==4&&row.OrderStatus==1){
tips = '用户取消航班'
}
if(row.OrderStatus==2){
tips = '已取消'
}
this.$confirm('此订单'+tips+'，无法编辑订单金额?', '提示', {
confirmButtonText: '确定',
cancelButtonText: '取消',
type: 'warning'
}).then(() => {
}).catch(() => {
});
} }
this.$confirm('此订单'+tips+'，无法编辑订单金额?', '提示', {
confirmButtonText: '确定',
cancelButtonText: '取消',
type: 'warning'
}).then(() => {
}).catch(() => {
});
} }
}, },
openDetails(scope) { openDetails(scope) {
console.log(scope.row.ID); console.log(scope.row.ID);
......
src/components/guestManagement/customerInfoBox.vue
View file @ 1b3f93c2
...@@ -82,7 +82,6 @@ ...@@ -82,7 +82,6 @@
<p>{{detailsData.SurName + detailsData.Name}}</p> <p>{{detailsData.SurName + detailsData.Name}}</p>
</div> </div>
<div class="right" v-if="!hiddenMenu"> <div class="right" v-if="!hiddenMenu">
{{detailsData.IsCreate}}
<el-button class="crm-btn query-btn" @click="editCust">编辑</el-button> <el-button class="crm-btn query-btn" @click="editCust">编辑</el-button>
<el-dropdown @command="handleCommand" style="top: 1px;" v-if="detailsData.IsCreate==1"> <el-dropdown @command="handleCommand" style="top: 1px;" v-if="detailsData.IsCreate==1">
<el-button class="crm-btn crm-btn-more easy-btn margin-right0"> <el-button class="crm-btn crm-btn-more easy-btn margin-right0">
......
src/components/guestManagement/finance.vue
View file @ 1b3f93c2
...@@ -45,26 +45,32 @@ ...@@ -45,26 +45,32 @@
<template> <template>
<div class="Business"> <div class="Business">
<div class="add-Enclosure"> <div class="add-Enclosure">
<el-row :gutter="12"> <el-row :gutter="14">
<el-col :span="8"> <el-col :span="8">
<el-input size="mini" placeholder="输入单号" v-model="msg.FrID" label="单号" <el-input size="mini" placeholder="输入单号" v-model="msg.FrID" label="单号"
@keyup.enter.native="getList"></el-input> @keyup.enter.native="getList"></el-input>
</el-col> </el-col>
<el-col :span="4"> <el-col :span="6">
<el-select size="mini" width="200" v-model="msg.Type" placeholder="请选择" <div style="display: flex;flex-direction: row;align-items: center;">
@change="getList"> <span class="font-size-12" style="padding-right: 10px;flex-shrink: 0;">单据类型：</span>
<el-option <el-select size="mini" width="200" v-model="msg.Type" placeholder="请选择"
v-for="item in DocumentTypeList" @change="getList">
:key="item.Id" :label="item.Name" :value="item.Id"></el-option> <el-option
</el-select> v-for="item in DocumentTypeList"
:key="item.Id" :label="item.Name" :value="item.Id"></el-option>
</el-select>
</div>
</el-col> </el-col>
<el-col :span="4"> <el-col :span="6">
<el-select size="mini" width="200" v-model="msg.Status" placeholder="请选择" <div style="display: flex;flex-direction: row;align-items: center;">
@change="getList"> <span class="font-size-12" style="padding-right: 10px;flex-shrink: 0;">订单状态：</span>
<el-option <el-select size="mini" width="200" v-model="msg.Status" placeholder="请选择"
v-for="item in ApprovalStatusList" @change="getList">
:key="item.Id" :label="item.Name" :value="item.Id"></el-option> <el-option
</el-select> v-for="item in ApprovalStatusList"
:key="item.Id" :label="item.Name" :value="item.Id"></el-option>
</el-select>
</div>
</el-col> </el-col>
</el-row> </el-row>
</div> </div>
...@@ -85,6 +91,13 @@ ...@@ -85,6 +91,13 @@
<p @click="openDetails(scope.row)" class="font-color-link cp">{{scope.row.FrID}}</p> <p @click="openDetails(scope.row)" class="font-color-link cp">{{scope.row.FrID}}</p>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column
label="单据类型"
show-overflow-tooltip :width="80">
<template slot-scope="scope">
<p>{{scope.row.Type==1?'收入':(scope.row.Type==2?'支出':'不限')}}</p>
</template>
</el-table-column>
<el-table-column <el-table-column
fixed fixed
label="费用类型" label="费用类型"
...@@ -95,28 +108,38 @@ ...@@ -95,28 +108,38 @@
</p> </p>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column
label="单据类型"
show-overflow-tooltip :width="80">
<template slot-scope="scope">
<p>{{scope.row.Type==1?'收入':(scope.row.Type==2?'支出':'不限')}}</p>
</template>
</el-table-column>
<el-table-column <el-table-column
label="金额" label="金额"
show-overflow-tooltip> show-overflow-tooltip
width="120">
<template slot-scope="scope"> <template slot-scope="scope">
<p>应付：{{scope.row.Money}}</p> <p>{{scope.row.Type==1?'应收：':(scope.row.Type==2?'应付：':'')}}{{scope.row.Money}}</p>
<p>实收：{{scope.row.PayMoney}}</p> <p>{{scope.row.Type==1?'实收：':(scope.row.Type==2?'实付：':'')}}{{scope.row.PayMoney}}</p>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column <el-table-column
label="付款对象" label="付款对象"
show-overflow-tooltip> show-overflow-tooltip
width="120">
<template slot-scope="scope"> <template slot-scope="scope">
{{scope.row.Type==2?scope.row.ClientTypeName+'：':'汇款人：'}}{{scope.row.RemitterName}} {{scope.row.Type==2?scope.row.ClientTypeName+'：':'汇款人：'}}{{scope.row.RemitterName}}
</template> </template>
</el-table-column> </el-table-column>
<el-table-column
label="交易方式"
show-overflow-tooltip :width="200">
<template slot-scope="scope">
<div class="_TradeWayList"
v-for="(item,index) in scope.row.TradeWayList"
:key="index"
style="line-height: normal !important;padding: 5px 10px;background-color: #EEEEEE;border-radius: 4px;margin: 10px 0;width:230px">
<p><span style="font-weight: bold;color:#333333">{{item.Alias}}</span>
<span class="_bank_name" style="height:20px;;display: inline-block;background-color: #333333;color: white;padding: 2px 4px;border-radius: 4px;margin-left:10px;margin-letf:10px">{{scope.row.TradeWayList[0].TypeName}}</span><span style="height:20px;display: inline-block;background-color: #333333;color: white;padding: 2px 4px;border-radius: 4px;margin-left:10px;" :style="{'background-color':item.AccountType=='私'?'#2AAEF2':'#FF9C01'}">{{item.AccountType==""?'无':item.AccountType}}</span> </p>
<p style="color:#333333">{{item.BankNo}}</p>
</div>
</template>
</el-table-column>
<el-table-column <el-table-column
label="制单人员" label="制单人员"
show-overflow-tooltip :width="80"> show-overflow-tooltip :width="80">
......
src/components/guestManagement/guestManagement.vue
View file @ 1b3f93c2
...@@ -60,6 +60,14 @@ ...@@ -60,6 +60,14 @@
</el-select> </el-select>
</el-popover> </el-popover>
</el-col> </el-col>
<el-col :span="4">
<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="100" v-model="msg.Q_TOrderState" @change="getList">
<el-option v-for="(item,index) in transactionStatusList" :key="index" :label="item.Name" :value="item.Id"> </el-option>
</el-select>
</div>
</el-col>
<el-col :span="4"> <el-col :span="4">
<el-button icon="iconfont iconshaixuan" class="crm-btn query-btn crm-btn-mini margin-right0" <el-button icon="iconfont iconshaixuan" class="crm-btn query-btn crm-btn-mini margin-right0"
@click="MsgBus.$emit('sceneBoxShow', 5)">高级筛选</el-button> @click="MsgBus.$emit('sceneBoxShow', 5)">高级筛选</el-button>
...@@ -115,12 +123,21 @@ ...@@ -115,12 +123,21 @@
</el-table-column> </el-table-column>
<el-table-column prop="TraveNum" label="参团数" sortable v-if="queryType[4].show" show-overflow-tooltip> <el-table-column prop="TraveNum" label="参团数" sortable v-if="queryType[4].show" show-overflow-tooltip>
</el-table-column> </el-table-column>
<el-table-column prop="TOrderNum" label="机票数" sortable v-if="queryType[34].show" show-overflow-tooltip>
</el-table-column>
<el-table-column prop="TOrderMoney" label="机票金额" sortable v-if="queryType[35].show" show-overflow-tooltip>
</el-table-column>
<el-table-column prop="OrderCount" label="订单交易数" sortable v-if="queryType[24].show" <el-table-column prop="OrderCount" label="订单交易数" sortable v-if="queryType[24].show"
show-overflow-tooltip> show-overflow-tooltip>
</el-table-column> </el-table-column>
<el-table-column prop="OrderMoney" label="交易金额" sortable v-if="queryType[25].show" <el-table-column prop="OrderMoney" label="交易金额" sortable v-if="queryType[25].show"
show-overflow-tooltip> show-overflow-tooltip>
</el-table-column> </el-table-column>
<el-table-column label="状态" sortable v-if="queryType[36].show" show-overflow-tooltip>
<template slot-scope="scope">
{{scope.row.TOrderState==1?"未成交":(scope.row.TOrderState==2?"成交":scope.row.TOrderState==3?"多次成交":'')}}
</template>
</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"
show-overflow-tooltip> show-overflow-tooltip>
</el-table-column> </el-table-column>
...@@ -267,6 +284,12 @@ ...@@ -267,6 +284,12 @@
}, },
data() { data() {
return { return {
transactionStatusList:[
{Name:"全部",Id:"0"},
{Name:"未成交",Id:"1"},
{Name:"成交",Id:"2"},
{Name:"多次成交",Id:"3"},
],
ruleList: [], ruleList: [],
queryType2: [{ queryType2: [{
label: "客户名称", label: "客户名称",
...@@ -464,7 +487,16 @@ ...@@ -464,7 +487,16 @@
}, { }, {
label: "微信号", label: "微信号",
show: true, show: true,
}, ], }, {
label: "机票数",
show: true,
}, {
label: "机票金额",
show: true,
}, {
label: "状态",
show: true,
},],
CustomerId: 0, CustomerId: 0,
CustomerIdStr: "", CustomerIdStr: "",
transferVisible: false, transferVisible: false,
...@@ -490,6 +522,7 @@ ...@@ -490,6 +522,7 @@
WhereType: -1, WhereType: -1,
OrderBy: "", OrderBy: "",
ID: 36, ID: 36,
Q_TOrderState:"0"
}, },
total: 0, total: 0,
WhereTypeList: [{ WhereTypeList: [{
......
src/components/guestManagement/ticketOrder.vue
View file @ 1b3f93c2
...@@ -190,7 +190,7 @@ ...@@ -190,7 +190,7 @@
<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!='操作日志'"><span class="radius"></span>
{{name!='修改出票状态'?' 基本信息':' 上传'+text+'凭证'}}</p> {{name!='修改出票状态'?' 基本信息':' 上传'+text+'凭证'}}</p>
<el-row :gutter="30" v-if="name=='新建机票订单'"> <el-row :gutter="30" v-if="name=='新建机票订单'||name=='编辑机票订单'">
<el-col :span="8"> <el-col :span="8">
<div class="MyEditForm-item"> <div class="MyEditForm-item">
<el-form-item label="预计人数" prop="GuestCount"> <el-form-item label="预计人数" prop="GuestCount">
...@@ -214,7 +214,7 @@ ...@@ -214,7 +214,7 @@
</el-col> </el-col>
</el-row> </el-row>
<el-row :gutter="30" v-if="name=='新建机票订单'||name=='编辑订单金额'"> <el-row :gutter="30" v-if="name=='新建机票订单'||name=='编辑订单金额'||name=='编辑机票订单'">
<el-col :span="8"> <el-col :span="8">
<div class="MyEditForm-item"> <div class="MyEditForm-item">
<el-form-item label="报价金额" prop="Money"> <el-form-item label="报价金额" prop="Money">
...@@ -223,10 +223,10 @@ ...@@ -223,10 +223,10 @@
</div> </div>
</el-col> </el-col>
</el-row> </el-row>
<el-row v-if="name=='新建机票订单'||name=='编辑订单金额'"> <el-row v-if="name=='新建机票订单'||name=='编辑订单金额'||name=='编辑机票订单'">
<el-col :span="24"> <el-col :span="24">
<div class="MyEditForm-item label-pad-left"> <div class="MyEditForm-item label-pad-left">
<el-form-item v-if="name=='新建机票订单'" label="备注"> <el-form-item v-if="name=='新建机票订单'||name=='编辑机票订单'" label="备注">
<el-input type="textarea" placeholder="订单备注" v-model="form.Remark"></el-input> <el-input type="textarea" placeholder="订单备注" v-model="form.Remark"></el-input>
</el-form-item> </el-form-item>
<el-form-item v-if="name=='编辑订单金额'" label="备注" prop="Remark"> <el-form-item v-if="name=='编辑订单金额'" label="备注" prop="Remark">
...@@ -432,6 +432,17 @@ export default { ...@@ -432,6 +432,17 @@ export default {
}, },
mounted() { mounted() {
this.form.GuestId = this.GuestId this.form.GuestId = this.GuestId
if(this.name=="编辑机票订单"){
this.form = {
GuestId: this.GuestId,
OrderId: this.obj.OrderId,
GuestCount: this.obj.GuestCount,
StartCityName: this.obj.StartCityName,
EndCityName: this.obj.EndCityName,
Money: this.obj.Money,
Remark: this.obj.Remark,
}
}
if(this.obj.TicketStatus==1){ if(this.obj.TicketStatus==1){
this.text = '出票' this.text = '出票'
} }
...@@ -542,14 +553,28 @@ export default { ...@@ -542,14 +553,28 @@ export default {
}, },
// 新增订单 // 新增订单
addData() { addData() {
let data = { let data
OrderId: this.form.OrderId, if(this.name=='新建机票订单'){
GuestId: this.form.GuestId, data = {
GuestCount: this.form.GuestCount, OrderId: this.form.OrderId,
StartCityName: this.form.StartCityName, GuestId: this.form.GuestId,
EndCityName: this.form.EndCityName, GuestCount: this.form.GuestCount,
Money: this.form.Money, StartCityName: this.form.StartCityName,
Remark: this.form.Remark, EndCityName: this.form.EndCityName,
Money: this.form.Money,
Remark: this.form.Remark,
}
}
if(this.name=='编辑机票订单'){
data = {
OrderId: this.form.OrderId,
GuestId: this.form.GuestId,
GuestCount: this.form.GuestCount,
StartCityName: this.form.StartCityName,
EndCityName: this.form.EndCityName,
Money: this.form.Money,
Remark: this.form.Remark,
}
} }
this.apipost("/api/Order/SetGuestOrderInfo", data, (res) => { this.apipost("/api/Order/SetGuestOrderInfo", data, (res) => {
if (res.data.resultCode == 1) { if (res.data.resultCode == 1) {
...@@ -565,7 +590,7 @@ export default { ...@@ -565,7 +590,7 @@ export default {
}, },
submitForm(addMsg) { submitForm(addMsg) {
//提交创建、修改表单 //提交创建、修改表单
if(this.name=='新建机票订单'){ if(this.name=='新建机票订单'||this.name=='编辑机票订单'){
this.$refs[addMsg].validate((valid) => { this.$refs[addMsg].validate((valid) => {
if (valid) { if (valid) {
this.addData(); this.addData();
......
src/views/index.vue
View file @ 1b3f93c2
...@@ -321,6 +321,12 @@ ...@@ -321,6 +321,12 @@
$this.obj = obj; $this.obj = obj;
$this.dialogTicketOrderVisible = true; $this.dialogTicketOrderVisible = true;
}); });
this.MsgBus.$on("editOrderTicketOrderBoxOpen", function (GuestId, obj) {
$this.dialogTicketOrderVisibleName = "编辑机票订单";
$this.GuestId = GuestId;
$this.obj = obj;
$this.dialogTicketOrderVisible = true;
});
this.MsgBus.$on("reviseTicketOrderBoxOpen", function (GuestId, obj) { this.MsgBus.$on("reviseTicketOrderBoxOpen", function (GuestId, obj) {
$this.dialogTicketOrderVisibleName = "修改出票状态"; $this.dialogTicketOrderVisibleName = "修改出票状态";
$this.GuestId = GuestId; $this.GuestId = GuestId;
......
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