Commit eb72ca93 authored by liudong1993's avatar liudong1993

1 单项机票

parent d97a0bd6
...@@ -457,7 +457,7 @@ ...@@ -457,7 +457,7 @@
} }
.orderop div { .orderop div {
width: 100px; width: 60px;
height: 50%; height: 50%;
display: flex; display: flex;
justify-content: center; justify-content: center;
...@@ -608,15 +608,17 @@ ...@@ -608,15 +608,17 @@
</div> </div>
</div> </div>
<div class="c9e fz12"> <div class="c9e fz12">
<span>{{$t('objFill.guestinfor')}}{{ item.GuestName }}<template v-if="item.MobilePhone">/{{ item.MobilePhone }}</template> </span> <span v-if="userInfo.SimpleEasy==1">供应商:{{ item.SupplierModel.SupplierName+'/'+item.SupplierModel.CompanyPhone }} </span>
<span v-else>{{$t('objFill.guestinfor')}}{{ item.GuestName }}<template v-if="item.MobilePhone">/{{ item.MobilePhone }}</template> </span>
<template v-if="item.ContractNum&&item.ContractNum.length>0"> <template v-if="item.ContractNum&&item.ContractNum.length>0">
<template v-for="(sItem,sIndex) in item.ContractNum"> <template v-for="(sItem,sIndex) in item.ContractNum">
<a @click="GoToContract(item,sItem.Id)" style="color:blue;cursor:pointer">{{sItem.ContractNum}}</a> <a @click="GoToContract(item,sItem.Id)" style="color:blue;cursor:pointer">{{sItem.ContractNum}}</a>
</template> </template>
</template> </template>
<a v-else style="color:blue;cursor:pointer" @click="GoToContract(item,0)">{{$t('objFill.chujinghet')}}</a> <!-- <a v-else style="color:blue;cursor:pointer" @click="GoToContract(item,0)">{{$t('objFill.chujinghet')}}</a> -->
</div> </div>
<div class="row c9e fz12"> <div class="row c9e fz12">
<span class="mr" v-if="userInfo.SimpleEasy==1">OP:{{ item.AppointOPList.map(x=>x.OPName).join(',') }}</span>
<span class="mr" v-if="item.LureEmpName">{{$t('objFill.yinliuren')}}:{{ item.CreateByName }}</span> <span class="mr" v-if="item.LureEmpName">{{$t('objFill.yinliuren')}}:{{ item.CreateByName }}</span>
<span>{{$t('visaT.sale')}}:</span> <span>{{$t('visaT.sale')}}:</span>
<span class="mr"> <span class="mr">
...@@ -674,6 +676,11 @@ ...@@ -674,6 +676,11 @@
{{ scope.row.IncomeMoney }} {{ scope.row.IncomeMoney }}
</template> </template>
</el-table-column> </el-table-column>
<el-table-column :label="$t('fnc.shouxufei')">
<template slot-scope="scope">
{{ scope.row.TaxMoney }}
</template>
</el-table-column>
<el-table-column :label="$t('fnc.ztjine')"> <el-table-column :label="$t('fnc.ztjine')">
<template slot-scope="scope"> <template slot-scope="scope">
{{ scope.row.PlatformMoney }} {{ scope.row.PlatformMoney }}
...@@ -684,14 +691,14 @@ ...@@ -684,14 +691,14 @@
{{ scope.row.BackMoney }} {{ scope.row.BackMoney }}
</template> </template>
</el-table-column> </el-table-column>
<el-table-column :label="$t('hotel.hotel_cost')"> <el-table-column label="应付">
<template slot-scope="scope"> <template slot-scope="scope">
{{ scope.row.PayMoney }} {{ scope.row.Meet }}
</template> </template>
</el-table-column> </el-table-column>
<el-table-column :label="$t('fnc.shouxufei')"> <el-table-column :label="$t('hotel.hotel_cost')">
<template slot-scope="scope"> <template slot-scope="scope">
{{ scope.row.TaxMoney }} {{ scope.row.PayMoney }}
</template> </template>
</el-table-column> </el-table-column>
<el-table-column :label="$t('op.Tocollected')"> <el-table-column :label="$t('op.Tocollected')">
...@@ -712,7 +719,7 @@ ...@@ -712,7 +719,7 @@
</div> </div>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column :label="$t('salesModule.TicketStatus')" style="background:#EAEAEA"> <!-- <el-table-column :label="$t('salesModule.TicketStatus')" style="background:#EAEAEA">
<template slot-scope="scope"> <template slot-scope="scope">
<span @click="scope.row.TicketStatusName!='无需机票'?modifyStatus(scope.row):''" class="cp tatusText" :class="item.TicketStatus==1?'grey': <span @click="scope.row.TicketStatusName!='无需机票'?modifyStatus(scope.row):''" class="cp tatusText" :class="item.TicketStatus==1?'grey':
(scope.row.TicketStatus==2?'success': (scope.row.TicketStatus==2?'success':
...@@ -722,8 +729,8 @@ ...@@ -722,8 +729,8 @@
{{item.TicketStatusName}} {{item.TicketStatusName}}
</span> </span>
</template> </template>
</el-table-column> </el-table-column> -->
<el-table-column :label="$t('visa.v_qianzhengst')" style="background:#EAEAEA"> <!-- <el-table-column :label="$t('visa.v_qianzhengst')" style="background:#EAEAEA">
<template slot-scope="scope"> <template slot-scope="scope">
<span @click="scope.row.VisaStatus=='1'?AmendVisa(scope.row):''" class="tatusText" :class="scope.row.VisaStatus==1?'grey'+' cursor-pointer': <span @click="scope.row.VisaStatus=='1'?AmendVisa(scope.row):''" class="tatusText" :class="scope.row.VisaStatus==1?'grey'+' cursor-pointer':
(scope.row.VisaStatus==2?'success': (scope.row.VisaStatus==2?'success':
...@@ -733,9 +740,19 @@ ...@@ -733,9 +740,19 @@
<i v-if="scope.row.VisaStatus==2" class="c3FC4FF cursor-pointer el-icon-document-checked" <i v-if="scope.row.VisaStatus==2" class="c3FC4FF cursor-pointer el-icon-document-checked"
@click="CheckOutDetails(scope.row)"></i> @click="CheckOutDetails(scope.row)"></i>
</template> </template>
</el-table-column> </el-table-column> -->
<template slot="append" v-if="item.Remark"> <template slot="append" v-if="userInfo.SimpleEasy==1">
<div style="padding:10px;color:#f1416c"><ul style="display: flex; flex-wrap: wrap;">旅客名单:
<li v-for="(mitem,mindex) in item.OrderGuestList" :key="mindex" style="margin-left:10px"><el-tag size="mini">{{mitem.Name}}</el-tag></li>
</ul></div>
</template>
<template slot="append">
<div style="padding:10px;color:#f1416c">{{$t('objFill.v101.busManagement.kehubeiz')}}{{item.Remark}}</div> <div style="padding:10px;color:#f1416c">{{$t('objFill.v101.busManagement.kehubeiz')}}{{item.Remark}}</div>
<div style="padding:10px;color:#f1416c" v-if="item.OPRemark||pagesTitle=='OP'">
OP{{$t('fnc.beizhu')}}{{item.OPRemark}}
<i v-if="pagesTitle=='OP'" class="el-icon-edit cursor-pointer c059FF6 mx" @click="editRemark(item)"></i>
</div>
</template> </template>
</el-table> </el-table>
</div> </div>
...@@ -743,36 +760,55 @@ ...@@ -743,36 +760,55 @@
<div class="column px15 bgf5 radius5 flex-g pa relative"> <div class="column px15 bgf5 radius5 flex-g pa relative">
<div class="fz12">{{$t('objFill.collectiondocument')}}</div> <div class="fz12">{{$t('objFill.collectiondocument')}}</div>
<div class="row wrap orderNo fz12 py"> <div class="row wrap orderNo fz12 py">
<span class="cursor-pointer radius5 mr px5" :class="{'bgD9F3FF':x.Status==0,'bgFAEAED':x.Status==1,'bjFFF3E0':x.Status==2, <span class="cursor-pointer radius5 mr px5" :class="{'bgD9F3FF':x.Status==1&&x.Is_Cashier==0,'bgFAEAED':x.Status==1&&x.Is_Cashier==1,'bjFFF3E0':x.Status==2,
'c3FC4FF':x.Status==0,'cF1416C':x.Status==1,'cff9800':x.Status==2}" 'c3FC4FF':x.Status==1&&x.Is_Cashier==0,'cF1416C':x.Status==1&&x.Is_Cashier==1,'cff9800':x.Status==2}"
v-for="(x, i) in item.IncomeFinance" @click="openDetails(x)" :key="i+20000">{{ x.FrID }}</span> v-for="(x, i) in item.IncomeFinance" @click="openDetails(x)" :key="i+20000">{{ x.FrID }}</span>
<span v-if="item.IncomeFinance.length == 0" class="c9e fz12"> <span v-if="item.IncomeFinance.length == 0" class="c9e fz12">
{{$t('objFill.nocollectiondocument')}} {{$t('objFill.nocollectiondocument')}}
</span> </span>
</div> </div>
<el-tooltip v-if="(item.OrderStatus == 1 || item.OrderStatus == 3 || item.OrderStatus == 4)&&pagesTitle=='销售'" class="item" effect="dark" :content="$t('objFill.preparedocument')" placement="top">
<i class="absolute right20 bottom20 el-icon-circle-plus cursor-pointer c059FF6"
@click="makeAdocument(item, 0, 1)"
></i>
</el-tooltip>
</div> </div>
<div class="column px15 bgf5 radius5 ml flex-g pa relative"> <div class="column px15 bgf5 radius5 ml flex-g pa relative">
<div class="fz12">{{$t('objFill.refundreceipt')}}</div> <div class="fz12">{{$t('objFill.refundreceipt')}}</div>
<div class="row wrap orderNo fz12 py"> <div class="row wrap orderNo fz12 py">
<span class="cursor-pointer radius5 mr px5" :class="{'bgD9F3FF':x.Status==0,'bgFAEAED':x.Status==1,'bjFFF3E0':x.Status==2, <span class="cursor-pointer radius5 mr px5" :class="{'bgD9F3FF':x.Status==1&&x.Is_Cashier==0,'bgFAEAED':x.Status==1&&x.Is_Cashier==1,'bjFFF3E0':x.Status==2,
'c3FC4FF':x.Status==0,'cF1416C':x.Status==1,'cff9800':x.Status==2}" v-for="(x, i) in item.BackFinance" 'c3FC4FF':x.Status==1&&x.Is_Cashier==0,'cF1416C':x.Status==1&&x.Is_Cashier==1,'cff9800':x.Status==2}" v-for="(x, i) in item.BackFinance"
@click="openDetails(x)" :key="i+30000">{{ x.FrID }}</span> @click="openDetails(x)" :key="i+30000">{{ x.FrID }}</span>
<span v-if="item.BackFinance.length == 0" class="c9e fz12"> <span v-if="item.BackFinance.length == 0" class="c9e fz12">
{{$t('objFill.norefundreceipt')}} {{$t('objFill.norefundreceipt')}}
</span> </span>
</div> </div>
<el-tooltip v-if="(item.OrderStatus == 1 || item.OrderStatus == 3 || item.OrderStatus == 4)&&pagesTitle=='销售'" class="item" effect="dark" :content="$t('objFill.preparedocument')" placement="top">
<i class="absolute right20 bottom20 el-icon-circle-plus cursor-pointer c059FF6"
@click="makeAdocument(item, 0, 2)"
></i>
</el-tooltip>
</div> </div>
<div class="column px15 bgf5 radius5 ml flex-g pa relative"> <div class="column px15 bgf5 radius5 ml flex-g pa relative">
<div class="fz12">{{$t('objFill.costdocument')}}</div> <div class="fz12">{{$t('objFill.costdocument')}}</div>
<div class="row wrap orderNo fz12 py"> <div class="row wrap orderNo fz12 py">
<span class="cursor-pointer radius5 mr px5" :class="{'bgD9F3FF':x.Status==0,'bgFAEAED':x.Status==1,'bjFFF3E0':x.Status==2, <span class="cursor-pointer radius5 mr px5" :class="{'bgD9F3FF':x.Status==1&&x.Is_Cashier==0,'bgFAEAED':x.Status==1&&x.Is_Cashier==1,'bjFFF3E0':x.Status==2,
'c3FC4FF':x.Status==0,'cF1416C':x.Status==1,'cff9800':x.Status==2}" v-for="(x, i) in item.PayFinance" 'c3FC4FF':x.Status==1&&x.Is_Cashier==0,'cF1416C':x.Status==1&&x.Is_Cashier==1,'cff9800':x.Status==2}" v-for="(x, i) in item.PayFinance"
@click="openDetails(x)" :key="i+40000">{{ x.FrID }}</span> @click="openDetails(x)" :key="i+40000">{{ x.FrID }}</span>
<span v-if="item.PayFinance.length == 0" class="c9e fz12"> <span v-if="item.PayFinance.length == 0" class="c9e fz12">
{{$t('objFill.nocostdocument')}} {{$t('objFill.nocostdocument')}}
</span> </span>
</div> </div>
<div class="item absolute right20 bottom20" v-if="(item.OrderStatus == 1 || item.OrderStatus == 3 || item.OrderStatus == 4) && pagesTitle == 'OP'">
<el-tooltip class="" effect="dark" :content="$t('objFill.preparedocument')" placement="top">
<i class="el-icon-circle-plus cursor-pointer c059FF6"
@click="makeAdocument(item, 0, 3)"></i>
</el-tooltip>
<el-tooltip class="" effect="dark" :content="$t('objFill.balanceout')" placement="top">
<i class="el-icon-circle-plus cursor-pointer c3FC4FF"
@click="isOffset(item, 0, 3,null)"></i>
</el-tooltip>
</div>
</div> </div>
<div class="column px15 bgf5 radius5 ml flex-g pa relative"> <div class="column px15 bgf5 radius5 ml flex-g pa relative">
<div class="fz12">{{$t('objFill.invoicedocument')}}</div> <div class="fz12">{{$t('objFill.invoicedocument')}}</div>
...@@ -803,6 +839,48 @@ ...@@ -803,6 +839,48 @@
</div> </div>
</div> </div>
</div> </div>
<div v-if="item.OrderStatus !=2" class="row-c wrap justify-c px15 bgE8F5E9 radius5 ml fz12 orderop pa20 flex-s">
<div v-if="item.OrderStatus == 1" class="row-c cursor-pointer radius5 cancel py5"
@click="UpdateAirTicket(item)">
<i v-loading="loading0"></i>
<span class="cF1416C">修改</span>
</div>
<div
v-if="
item.OrderStatus == 1 &&
item.IncomeList&&item.IncomeList.length == 0 &&
item.RefundList&&item.RefundList.length == 0 &&
item.CostList&&item.CostList.length == 0" class="row-c cursor-pointer radius5 cancel py5"
@click="cancelAirOrder(item)"
>
<i v-loading="loading0"></i>
<span class="cF1416C">{{$t('sm.exitOrder')}}</span>
</div>
<div v-if="item.OrderStatus == 1 && pagesTitle=='OP'" class="row-c cursor-pointer radius5 confirm py5" @click="SetAirTicketFinish(item, 1)">
<i v-loading="loading1"></i>
<span class="c20C997">完结</span>
</div>
<div v-if="(item.OrderStatus == 3|| item.OrderStatus == 4)&& pagesTitle=='OP'" class="row-c cursor-pointer radius5 confirm py5" @click="SetAirTicketFinish(item, 2)">
<i v-loading="loading1"></i>
<span class="c20C997">收损完结</span>
</div>
<div v-if="item.OrderStatus == 1||item.OrderStatus == 5" class="row-c cursor-pointer radius5 change1 py5" @click="SetAirTicketLoss(item)">
<i v-loading="loading2"></i>
<span class="c20C997">{{$t('fnc.shousun')}}</span>
</div>
<div v-if="item.OrderStatus == 3||item.OrderStatus == 4||item.OrderStatus == 5||item.OrderStatus == 6" class="row-c cursor-pointer radius5 change1 py5" @click="SetAirTicketMoney(item)">
<i v-loading="loading2"></i>
<span class="c20C997">修改金额</span>
</div>
<!-- 申请发票 -->
<ApplyFoInvoice v-if="userInfo.EmployeeId==item.EnterID && pagesTitle=='销售'" :obj="item" :type="4"></ApplyFoInvoice>
<div class="row-c cursor-pointer radius5 change1 py5" @click="GetAirTicketLog(item)">
<i v-loading="loading2"></i>
<span class="c20C997">操作日志</span>
</div>
</div>
</div> </div>
<div class="mt mb20 bgf5 pa15 row-c" v-if="item.CancelRemark"> <div class="mt mb20 bgf5 pa15 row-c" v-if="item.CancelRemark">
<div style="font-size:16px;font-weight:bold;font-family: pingfangR;">{{$t('objFill.groundsforcancellation')}}:</div> <div style="font-size:16px;font-weight:bold;font-family: pingfangR;">{{$t('objFill.groundsforcancellation')}}:</div>
...@@ -847,20 +925,51 @@ ...@@ -847,20 +925,51 @@
</el-row> </el-row>
</div> </div>
</el-dialog> </el-dialog>
<!-- op备注 -->
<el-dialog custom-class='addCompany' :title="pagesTitle=='销售'?$t('objFill.bianjikehubz'):$t('objFill.bianjiopbz')" :visible.sync="isShowRemark" center width="400px"
:close-on-press-escape="false" :close-on-click-modal="false">
<el-row class="flex" style="margin-top: 10px;">
<el-col>
<span style="display: block;margin-bottom: 10px;">{{$t('pub.pubRemark')}}:</span>
<span>
<el-input type="textarea" :rows="4" v-model="postMsg.Remark">
</el-input>
</span>
</el-col>
</el-row>
<div slot="footer" class="dialog-footer">
<button class="hollowFixedBtn" @click="isShowRemark = false">{{$t('pub.cancelBtn')}}</button> &nbsp;
<button class="normalBtn" type="primary" @click="submitEditRemark">{{$t('pub.sureBtn')}}</button>
</div>
</el-dialog>
<offset :isShow="cdState" :obj="queryObj" @close="cdState=false"></offset> <offset :isShow="cdState" :obj="queryObj" @close="cdState=false"></offset>
<!-- 添加机票订单 -->
<div v-if="dialogTicketOrderVisible">
<ticketOrderDialog :name="dialogTicketOrderVisibleName" :ID="TicketOrderID" :GuestId="GuestId" :obj="editObj" type="1" @closeDialog="dialogTicketOrderVisible=false" @getlist="getlist"></ticketOrderDialog>
</div>
</div> </div>
</template> </template>
<script> <script>
import offset from '../../public/offset.vue'; import offset from '../../public/offset.vue';
import ApplyFoInvoice from '../../public/ApplyFoInvoice';
import commissionDialog from "../../FinancialModule/TradeCommission/commissionDialog" import commissionDialog from "../../FinancialModule/TradeCommission/commissionDialog"
import ticketOrderDialog from './ticketOrderDialog.vue';
export default { export default {
components: { components: {offset,commissionDialog,ticketOrderDialog,ApplyFoInvoice},
offset,
commissionDialog
},
props: ["OrderList", "pagesTitle"], props: ["OrderList", "pagesTitle"],
data() { data() {
return { return {
postMsg:{OrderId:0,Type:1,Remark:''},
isShowRemark:false,
GuestId:0,
TicketOrderID:0,
editObj:{},
dialogTicketOrderVisible:false,
dialogTicketOrderVisibleName:'',
queryObj: null, queryObj: null,
cdState: false, cdState: false,
copyId: 0, copyId: 0,
...@@ -982,6 +1091,10 @@ ...@@ -982,6 +1091,10 @@
} }
}, },
methods: { methods: {
getlist(){
this.$emit('getlist')
this.dialogTicketOrderVisible=false
},
//合同跳转 //合同跳转
GoToContract(item, id) { GoToContract(item, id) {
this.OpenNewPage('/TravelContractNew', { this.OpenNewPage('/TravelContractNew', {
...@@ -1174,12 +1287,11 @@ ...@@ -1174,12 +1287,11 @@
Type: type, Type: type,
crmOrderObj: JSON.stringify(data) crmOrderObj: JSON.stringify(data)
}; };
this.$store.commit("ChoiceAddFinancialDocuments"); if(num==2){
this.$router.push({ query.searchTitle='溢收团费退款';
path: "/ChoiceAddFinancialDocuments", }else if(num ==3 && this.cdState == false){
query query.portTypeId= 1;
}); }
return
this.queryObj = query this.queryObj = query
if (!Offset) { if (!Offset) {
this.$store.commit("ChoiceAddFinancialDocuments"); this.$store.commit("ChoiceAddFinancialDocuments");
...@@ -1255,7 +1367,7 @@ ...@@ -1255,7 +1367,7 @@
} }
}, },
// 销售取消订单 // 销售取消订单
cancelOrder() { cancelAirOrder(row) {
let that = this let that = this
if (this.loading0) return; if (this.loading0) return;
that.$confirm(this.$t('objFill.shifouquxiaodd'), this.$t('tips.tips'), { that.$confirm(this.$t('objFill.shifouquxiaodd'), this.$t('tips.tips'), {
...@@ -1264,22 +1376,21 @@ ...@@ -1264,22 +1376,21 @@
type: 'warning' type: 'warning'
}).then(() => { }).then(() => {
this.loading0 = true this.loading0 = true
this.apipost("ticket_post_CancelSaleTicketOrder", { this.crmapipost(
OrderId: this.cancelOrderId, "/api/Order/SetGuestOrderState",
IsOPCancel: this.Title != '销售' ? 1 : 0, {
Remark: this.cancelRemark OrderId: row.OrderId,
}, Type: "1",
res => { },
this.loading0 = false (res) => {
if (res.data.resultCode == 1) { if (res.data.resultCode == 1) {
this.Success(res.data.message); this.Success(res.data.message);
this.$emit("success"); this.$emit("success");
} else { }else{
this.Error(res.data.message); this.Error(res.data.message);
}
} }
}).catch(err => { );
this.loading0 = false
})
}).catch(() => { }).catch(() => {
this.loading0 = false this.loading0 = false
}) })
...@@ -1430,7 +1541,106 @@ ...@@ -1430,7 +1541,106 @@
} }
//设置table的行高 //设置table的行高
// this.tableHeight = h; // this.tableHeight = h;
} },
UpdateAirTicket(row){
this.dialogTicketOrderVisibleName = "编辑机票订单";
this.GuestId = 0;
this.editObj = row;
this.dialogTicketOrderVisible = true;
},
SetAirTicketLoss(row){
this.dialogTicketOrderVisibleName = "订单收损";
this.GuestId = 0;
this.editObj = row;
this.dialogTicketOrderVisible = true;
},
SetAirTicketMoney(row){
this.dialogTicketOrderVisibleName = "编辑订单金额";
this.GuestId = 0;
this.editObj = row;
this.dialogTicketOrderVisible = true;
},
SetAirTicketFinish(row,type){
if(type==1){
let tips = '一旦确认订单完结,你将无法对订单执行任何操作,包括订单相关的财务单据。'
this.$confirm(tips, '提示', {
confirmButtonText: '确定',
cancelButtonText: '取消',
type: 'warning'
}).then(() => {
this.apipost('ticket_post_SetOrderFinish', {
OrderId: row.OrderId,
}, res => {
if (res.data.resultCode == 1) {
this.Success(res.data.message);
this.$emit("getlist");
}else{
this.$message.warning(res.data.message);
}
})
}).catch(() => {
this.emptyMore()
this.$message({
type: 'info',
message: '已取消'
});
});
}else{
let tips = '一旦确认订单收损完结,你将无法对订单执行任何操作,包括订单相关的财务单据。'
this.$confirm(tips, '提示', {
confirmButtonText: '确定',
cancelButtonText: '取消',
type: 'warning'
}).then(() => {
this.apipost('ticket_post_SetOrderLossFinish', {
OrderId: row.OrderId,
}, res => {
if (res.data.resultCode == 1) {
this.Success(res.data.message);
this.$emit("getlist");
}else{
this.$message.warning(res.data.message);
}
})
}).catch(() => {
this.emptyMore()
this.$message({
type: 'info',
message: '已取消'
});
});
}
},
GetAirTicketLog(row){
this.dialogTicketOrderVisibleName = "操作日志";
this.GuestId = 0;
this.editObj = row;
this.dialogTicketOrderVisible = true;
},
editRemark(item){
this.postMsg.OrderId = item.OrderId
this.postMsg.Remark = this.pagesTitle=='销售'?item.Remark:item.OPRemark
this.isShowRemark = true
},
submitEditRemark(){
if(!this.postMsg.Remark){
this.$message.error(this.$t('objFill.opbeizhunonull'));
return
}
this.apipost('ticket_post_SetAirOrderRemark', {
OrderId: this.postMsg.OrderId,
Type: this.pagesTitle=='销售'?1:2,
Remark: this.postMsg.Remark
}, res => {
if (res.data.resultCode == 1) {
this.isShowRemark = false
this.$emit('getlist')
this.$forceUpdate();
} else {
this.Error(res.data.message);
}
})
},
}, },
mounted() { mounted() {
this.userInfo = this.getLocalStorage(); this.userInfo = this.getLocalStorage();
......
...@@ -53,7 +53,7 @@ ...@@ -53,7 +53,7 @@
<div class="HotelWorkList" @click="showWarningSearch=false"> <div class="HotelWorkList" @click="showWarningSearch=false">
<div class="query-box HotelWorkInput" style="border-bottom: none;"> <div class="query-box HotelWorkInput" style="border-bottom: none;">
<ul> <ul>
<li> <!-- <li>
<span> <span>
<em>{{$t('OrderList.search.status')}}</em> <em>{{$t('OrderList.search.status')}}</em>
<el-select v-model="msg.OrderStatus" class="w200 HworkInput"> <el-select v-model="msg.OrderStatus" class="w200 HworkInput">
...@@ -61,7 +61,7 @@ ...@@ -61,7 +61,7 @@
<el-option v-for="item in OrderStatusList" :key="item.Id" :label="item.Name" :value="item.Id"></el-option> <el-option v-for="item in OrderStatusList" :key="item.Id" :label="item.Name" :value="item.Id"></el-option>
</el-select> </el-select>
</span> </span>
</li> </li> -->
<li v-if="Title!='销售'"> <li v-if="Title!='销售'">
<span> <span>
<em>{{$t('visa.v_yewuyuan')}}</em> <em>{{$t('visa.v_yewuyuan')}}</em>
...@@ -73,7 +73,7 @@ ...@@ -73,7 +73,7 @@
</el-select> </el-select>
</span> </span>
</li> </li>
<li v-if="Title!='销售'"> <!-- <li v-if="Title!='销售'">
<span> <span>
<em>{{$t('objFill.yinliuren')}}</em> <em>{{$t('objFill.yinliuren')}}</em>
<el-select filterable v-model='msg.CreateBy' class="w200"> <el-select filterable v-model='msg.CreateBy' class="w200">
...@@ -83,7 +83,7 @@ ...@@ -83,7 +83,7 @@
</el-option> </el-option>
</el-select> </el-select>
</span> </span>
</li> </li> -->
<li> <li>
<span> <span>
<em>{{$t('hotel.hotel_OrderStates')}}</em> <em>{{$t('hotel.hotel_OrderStates')}}</em>
...@@ -110,11 +110,11 @@ ...@@ -110,11 +110,11 @@
class="w200" /> class="w200" />
</span> </span>
</li> </li>
<li> <!-- <li>
<span><em>{{$t('ground.CustomerName')}}</em> <span><em>{{$t('ground.CustomerName')}}</em>
<el-input clearable v-model="msg.GuestName" :placeholder="$t('ground.CustomerName')" class="w200" /> <el-input clearable v-model="msg.GuestName" :placeholder="$t('ground.CustomerName')" class="w200" />
</span> </span>
</li> </li> -->
<li> <li>
<span> <span>
<em>{{$t('objFill.baomingshijian')}}</em> <em>{{$t('objFill.baomingshijian')}}</em>
...@@ -137,58 +137,17 @@ ...@@ -137,58 +137,17 @@
</span> </span>
</li> </li>
<li> <li>
<span>
<em @click.stop="showWarningSearch=true" style="margin-top: 10px;cursor: pointer;"> {{$t('visa.v_gjchaxun')}} <i
class="el-icon-caret-bottom"></i></em>
<el-popover width="300" v-model="showWarningSearch" trigger="click">
<div>
<div class="TC_queryTitle">{{$t('objFill.v101.jipgjcxun')}}</div>
<div class="clearfix">
<div class="TC_leftSearch">
<div>
<span>{{$t('salesModule.TicketStatus')}}</span>
<el-select v-model='msg.TicketStatus' class="w150">
<el-option :value="0" :label="$t('pub.unlimitedSel')"></el-option>
<el-option v-for='item in ticketingStatusList' :label='item.Name' :value='item.Id'
:key='item.Id'>
</el-option>
</el-select>
</div>
<div>
<span>{{$t('objFill.v101.chuqianzt')}}</span>
<el-select v-model='msg.VisaStatus' class="w150">
<el-option v-for='item in VisaList' :label='item.Name' :value='item.Id' :key='item.Id'>
</el-option>
</el-select>
</div>
<div>
<span>{{$t('objFill.wangjie')}}{{$t('salesModule.Time')}}</span> <span>{{$t('objFill.wangjie')}}{{$t('salesModule.Time')}}</span>
<!-- <el-date-picker style="height: 34px;width: 210px;" value-format="yyyy-MM-dd" v-model="Datelist" <StartDateLimit :clearable="true" :dateTime="Datelist" @change="(startDate,endDate)=>{Datelist=[startDate,endDate],getDates()}"></StartDateLimit>
type="daterange" :range-separator="$t('OrderList.zhi')" </li>
:start-placeholder="$t('OrderList.star')" :end-placeholder="$t('OrderList.end')" <li>
@change="getDates">
</el-date-picker> -->
<StartDateLimit :clearable="true" :dateTime="Datelist" @change="(startDate,endDate)=>{Datelist=[startDate,endDate],getDates()}" style="width: 210px;"></StartDateLimit>
</div>
<div>
<span>{{$t('objFill.v101.FinancialModule.chuxings')}}</span> <span>{{$t('objFill.v101.FinancialModule.chuxings')}}</span>
<el-input v-model='msg.StartCityName' style="width: 210px;"></el-input> <el-input v-model='msg.StartCityName'></el-input>
</div>
</div>
<div style="text-align: right;margin-top: 10px;">
<button class="normalBtn TC_SearchBtn"
@click.stop="GetList(),showWarningSearch=false">{{$t('pub.searchBtn')}}
</button>
</div>
</div>
</div>
</el-popover>
</span>
</li> </li>
<li> <li>
<input v-if="userInfo.SimpleEasy==1" type="button" class="normalBtn" value="新增机票" @click="AddAirTicket()" />
<input type="button" class="normalBtn" :value="$t('pub.searchBtn')" <input type="button" class="normalBtn" :value="$t('pub.searchBtn')"
@click.stop="msg.pageIndex=1,currentPage=1,GetList()" /> @click.stop="msg.pageIndex=1,currentPage=1,GetList()" />
</li> </li>
...@@ -252,25 +211,37 @@ ...@@ -252,25 +211,37 @@
</el-row> </el-row>
</div> </div>
<OrderList :pagesTitle="Title" :OrderList="OrderList" v-loading="loading" @success="msg.pageIndex=1,GetList()"> <OrderList :pagesTitle="Title" :OrderList="OrderList" v-loading="loading" @success="msg.pageIndex=1,GetList()" @getlist="GetList()">
</OrderList> </OrderList>
<div v-if="OrderList&&OrderList.length==0" style="text-align: center;padding: 100px;">{{$t('system.content_noData')}}</div> <div v-if="OrderList&&OrderList.length==0" style="text-align: center;padding: 100px;">{{$t('system.content_noData')}}</div>
<el-pagination v-if="OrderList&&OrderList.length>0" background @current-change="handleCurrentChange" <el-pagination v-if="OrderList&&OrderList.length>0" background @current-change="handleCurrentChange"
:current-page.sync="currentPage" layout="total,prev, pager, next, jumper" :page-size=msg.pageSize :total=total> :current-page.sync="currentPage" layout="total,prev, pager, next, jumper" :page-size=msg.pageSize :total=total>
</el-pagination> </el-pagination>
<!-- 添加机票订单 -->
<div v-if="dialogTicketOrderVisible">
<ticketOrderDialog :name="dialogTicketOrderVisibleName" :ID="TicketOrderID" :GuestId="GuestId" :obj="editObj" type="1" @closeDialog="dialogTicketOrderVisible=false" @getlist="GetList()"></ticketOrderDialog>
</div>
</div> </div>
</template> </template>
<script> <script>
import OrderList from './OrderList.vue'; import ticketOrderDialog from './ticketOrderDialog.vue';
import StartDateLimit from '../../public/StartDateLimit.vue'; import StartDateLimit from '../../public/StartDateLimit.vue';
import OrderList from './OrderList.vue';
export default { export default {
props: ['pagesTitle', 'dataObj'], props: ['pagesTitle', 'dataObj'],
components: { components: {
OrderList, OrderList,
StartDateLimit StartDateLimit,
ticketOrderDialog
}, },
data() { data() {
return { return {
GuestId:0,
TicketOrderID:0,
editObj:{},
dialogTicketOrderVisible:false,
dialogTicketOrderVisibleName:'',
showWarningSearch: false, showWarningSearch: false,
TotalMsg: null, TotalMsg: null,
MultipleChoiceList: [ //多选项目 MultipleChoiceList: [ //多选项目
...@@ -509,15 +480,14 @@ ...@@ -509,15 +480,14 @@
}, },
//获取酒店订单列表 //获取酒店订单列表
GetList() { GetList() {
this.loading = true this.loading = true
let url = "/api/Order/GetGuestOrderStatisticsPageList"
// 销售 OP // 销售 OP
if (this.pagesTitle == '销售') { if (this.pagesTitle == '销售') {
this.msg.IsMyOrder = '1' this.msg.IsMyOrder = '1'
} else { } else {
this.msg.IsMyOrder = '0' this.msg.IsMyOrder = '0'
} }
this.crmapipost(url, this.msg, this.apipost('ticket_post_GetAirOrderStatisticsPageList', this.msg,
res => { res => {
if (res.data.resultCode == 1) { if (res.data.resultCode == 1) {
let data = res.data.data.Data.pageData let data = res.data.data.Data.pageData
...@@ -657,6 +627,11 @@ ...@@ -657,6 +627,11 @@
//设置table的行高 //设置table的行高
this.tableHeight = h; this.tableHeight = h;
}, },
AddAirTicket(){
this.TicketOrderID=0;
this.dialogTicketOrderVisible=true;
this.dialogTicketOrderVisibleName="新建机票订单";
}
}, },
created() { created() {
if (this.$route.query.OrderId) { if (this.$route.query.OrderId) {
......
This source diff could not be displayed because it is too large. You can view the blob instead.
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