Skip to content

S
SuperMan
Commit ae051a2d authored by 黄奎's avatar 黄奎
Browse files
Options

Merge branch 'master' of http://gitlab.oytour.com/luochao/superman

parents 63b38032 030394df
Show whitespace changes
Inline Side-by-side
Showing with 684 additions and 1166 deletions
src/components/SalesModule/enrollTotal.vue
View file @ ae051a2d
...@@ -439,7 +439,6 @@ ...@@ -439,7 +439,6 @@
> >
<tr> <tr>
<th width="160">{{ $t("fnc.danhao") }}&{{ $t("visa.v_tuanhao") }}</th> <th width="160">{{ $t("fnc.danhao") }}&{{ $t("visa.v_tuanhao") }}</th>
<th width="60">引流人</th>
<th width="60">{{ $t("fnc.khxinxi") }}</th> <th width="60">{{ $t("fnc.khxinxi") }}</th>
<th width="70">{{ $t("salesModule.Type") }}</th> <th width="70">{{ $t("salesModule.Type") }}</th>
<th width="180"> <th width="180">
...@@ -559,6 +558,7 @@ ...@@ -559,6 +558,7 @@
: item.commissionSPeopleName : item.commissionSPeopleName
}} }}
</p> </p>
<p>引流人：{{ item.LureEmpName }}</p>
<p>{{ $t("hotel.hotel_StartTeam") }}：{{ item.startDate }}</p> <p>{{ $t("hotel.hotel_StartTeam") }}：{{ item.startDate }}</p>
<p v-if="item.tradeWay == 1">{{ item.platformOrder }}</p> <p v-if="item.tradeWay == 1">{{ item.platformOrder }}</p>
<!-- <p v-if="item.commissionMoney" style="color: red;"> <!-- <p v-if="item.commissionMoney" style="color: red;">
...@@ -605,7 +605,6 @@ ...@@ -605,7 +605,6 @@
查看报价单 查看报价单
</div> </div>
</td> </td>
<td> {{ item.LureEmpName }}</td>
<td> <td>
<p <p
class="over_ellipsis" class="over_ellipsis"
......
src/components/SalesModule/groupTourOrder.vue
View file @ ae051a2d
...@@ -1634,7 +1634,6 @@ ...@@ -1634,7 +1634,6 @@
<table class="groupTourOrderSearchTable" border="0" cellspacing="0" cellpadding="0" v-loading="loading"> <table class="groupTourOrderSearchTable" border="0" cellspacing="0" cellpadding="0" v-loading="loading">
<tr> <tr>
<th width="240">{{ $t("fnc.danhao") }}&{{ $t("visa.v_tuanhao") }}</th> <th width="240">{{ $t("fnc.danhao") }}&{{ $t("visa.v_tuanhao") }}</th>
<th width="120">引流人</th>
<th width="120">{{ $t("fnc.khxinxi") }}</th> <th width="120">{{ $t("fnc.khxinxi") }}</th>
<th width="70">{{ $t("salesModule.Type") }}</th> <th width="70">{{ $t("salesModule.Type") }}</th>
<th width="150"> <th width="150">
...@@ -1703,6 +1702,7 @@ ...@@ -1703,6 +1702,7 @@
<p class="fz12 over_ellipsis" style="width: 100%"> <p class="fz12 over_ellipsis" style="width: 100%">
{{ item.commissionSPeopleName }} {{ item.commissionSPeopleName }}
</p> </p>
<p>引流人：{{ item.LureEmpName }}</p>
<p style="min-width: 180px"> <p style="min-width: 180px">
{{ $t("hotel.hotel_StartTeam") }}：{{ item.startDate }} {{ $t("hotel.hotel_StartTeam") }}：{{ item.startDate }}
</p> </p>
...@@ -1746,7 +1746,6 @@ ...@@ -1746,7 +1746,6 @@
查看报价单 查看报价单
</div> </div>
</td> </td>
<td>{{ item.LureEmpName }}</td>
<td> <td>
<p class="fz12 over_ellipsis" style="width: 120px" :title="item.contactName"> <p class="fz12 over_ellipsis" style="width: 120px" :title="item.contactName">
{{ item.contactName }} {{ item.contactName }}
...@@ -2625,7 +2624,7 @@ ...@@ -2625,7 +2624,7 @@
QEndDate: "", QEndDate: "",
PayStatus: "-1", PayStatus: "-1",
IsAirTicket: "2", IsAirTicket: "2",
IsOneDay: 0, IsOneDay: 0
}, },
checkedObj: {}, checkedObj: {},
//返回数据 //返回数据
...@@ -4785,6 +4784,9 @@ ...@@ -4785,6 +4784,9 @@
this.userId = this.getLocalStorage().EmployeeId; this.userId = this.getLocalStorage().EmployeeId;
if (this.$route.query.id) { if (this.$route.query.id) {
this.msg.tempOrderId = this.$route.query.id; this.msg.tempOrderId = this.$route.query.id;
}else if(this.$route.query.crmOrderObj){
let crmOrderObj = JSON.parse(this.$route.query.crmOrderObj)
this.msg.tempOrderId = crmOrderObj.OrderId
} else { } else {
this.msg.QStartDate = new Date().Format("yyyy-MM-dd"); this.msg.QStartDate = new Date().Format("yyyy-MM-dd");
} }
......
src/components/SalesModule/groupTourOrderOne.vue
View file @ ae051a2d
...@@ -1442,7 +1442,6 @@ ...@@ -1442,7 +1442,6 @@
<table class="groupTourOrderSearchTable" border="0" cellspacing="0" cellpadding="0" v-loading='loading'> <table class="groupTourOrderSearchTable" border="0" cellspacing="0" cellpadding="0" v-loading='loading'>
<tr> <tr>
<th width="240">{{$t('fnc.danhao')}}&{{$t('visa.v_tuanhao')}}</th> <th width="240">{{$t('fnc.danhao')}}&{{$t('visa.v_tuanhao')}}</th>
<th width="120">引流人</th>
<th width="120">{{$t('fnc.khxinxi')}}</th> <th width="120">{{$t('fnc.khxinxi')}}</th>
<th width="70">{{$t('salesModule.Type')}}</th> <th width="70">{{$t('salesModule.Type')}}</th>
<th width="150">{{$t('advmanager.v_xilie')}}&{{$t('advmanager.v_line')}}</th> <th width="150">{{$t('advmanager.v_xilie')}}&{{$t('advmanager.v_line')}}</th>
...@@ -1479,6 +1478,7 @@ ...@@ -1479,6 +1478,7 @@
<p class="fz12 over_ellipsis" style="width: 100%;text-decoration:underline;cursor:pointer;" <p class="fz12 over_ellipsis" style="width: 100%;text-decoration:underline;cursor:pointer;"
:title="item.alName" @click="goUrlX('产品查询','productQueryOne',item.tcid,item.tcnum)">{{item.tcnum}}</p> :title="item.alName" @click="goUrlX('产品查询','productQueryOne',item.tcid,item.tcnum)">{{item.tcnum}}</p>
<p class="fz12 over_ellipsis" style="width: 100%;">{{item.commissionSPeopleName}}</p> <p class="fz12 over_ellipsis" style="width: 100%;">{{item.commissionSPeopleName}}</p>
<p>引流人：{{ item.LureEmpName }}</p>
<p style="min-width: 180px;">{{$t('hotel.hotel_StartTeam')}}：{{item.startDate}}</p> <p style="min-width: 180px;">{{$t('hotel.hotel_StartTeam')}}：{{item.startDate}}</p>
<p>{{$t('restaurant.res_oderTime')}}：{{item.createDate}}</p> <p>{{$t('restaurant.res_oderTime')}}：{{item.createDate}}</p>
<p v-if="item.tradeWay ==1">{{item.platformOrder}}</p> <p v-if="item.tradeWay ==1">{{item.platformOrder}}</p>
...@@ -1487,7 +1487,6 @@ ...@@ -1487,7 +1487,6 @@
<p v-else-if="item.latestCommissionMoney" style="color:red"> <p v-else-if="item.latestCommissionMoney" style="color:red">
{{$t('salesModule.Commission')}}：{{item.latestCommissionMoney}}</p> {{$t('salesModule.Commission')}}：{{item.latestCommissionMoney}}</p>
</td> </td>
<td>{{ item.LureEmpName }}}</td>
<td> <td>
<p class="fz12 over_ellipsis" style="width: 120px;" :title="item.contactName">{{item.contactName}}</p> <p class="fz12 over_ellipsis" style="width: 120px;" :title="item.contactName">{{item.contactName}}</p>
<p class="fz12">{{item.contactMobile}}</p> <p class="fz12">{{item.contactMobile}}</p>
...@@ -4076,6 +4075,9 @@ ...@@ -4076,6 +4075,9 @@
this.userId = this.getLocalStorage().EmployeeId this.userId = this.getLocalStorage().EmployeeId
if (this.$route.query.id) { if (this.$route.query.id) {
this.msg.tempOrderId = this.$route.query.id this.msg.tempOrderId = this.$route.query.id
}else if(this.$route.query.crmOrderObj){
let crmOrderObj = JSON.parse(this.$route.query.crmOrderObj)
this.msg.tempOrderId = crmOrderObj.OrderId
} }
this.msg.QStartDate = new Date().Format('yyyy-MM-dd') this.msg.QStartDate = new Date().Format('yyyy-MM-dd')
......
src/components/SalesVisa/VisaProductEditOrder.vue
View file @ ae051a2d
...@@ -309,6 +309,12 @@ ...@@ -309,6 +309,12 @@
<el-input class='w220' v-model='msg.VisaTCNUM' :placeholder="$t('pub.pleaseImport')"></el-input> <el-input class='w220' v-model='msg.VisaTCNUM' :placeholder="$t('pub.pleaseImport')"></el-input>
</span> </span>
</li> </li>
<li>
<span>
<em>订单ID</em>
<el-input class='w220' v-model='msg.OrderId' placeholder="请输入订单ID"></el-input>
</span>
</li>
<li> <li>
<span> <span>
<em>{{$t('hotel.product_name')}}</em> <em>{{$t('hotel.product_name')}}</em>
...@@ -493,7 +499,7 @@ ...@@ -493,7 +499,7 @@
Name: '', Name: '',
VisaTCNUM: '', VisaTCNUM: '',
VisaOrderStatus: '0', VisaOrderStatus: '0',
OrderId: '' OrderId: 0
}, },
addMsg: { addMsg: {
Id: 0, Id: 0,
......
src/components/SalesVisa/VisaProductEditOrderOP.vue
View file @ ae051a2d
...@@ -309,6 +309,12 @@ ...@@ -309,6 +309,12 @@
<el-input class='w220' v-model='msg.VisaTCNUM' :placeholder="$t('pub.pleaseImport')"></el-input> <el-input class='w220' v-model='msg.VisaTCNUM' :placeholder="$t('pub.pleaseImport')"></el-input>
</span> </span>
</li> </li>
<li>
<span>
<em>订单ID</em>
<el-input class='w220' v-model='msg.OrderId' placeholder="请输入订单ID"></el-input>
</span>
</li>
<li> <li>
<span> <span>
<em>{{$t('hotel.product_name')}}</em> <em>{{$t('hotel.product_name')}}</em>
...@@ -511,7 +517,7 @@ ...@@ -511,7 +517,7 @@
VisaOrderStatus: '0', VisaOrderStatus: '0',
CreateBy: 0, CreateBy: 0,
RB_Branch_Id: -1, RB_Branch_Id: -1,
OrderId: '' OrderId: 0
}, },
addMsg: { addMsg: {
Id: 0, Id: 0,
......
src/components/SalesVisa/VisaProductEditOrderQZ.vue
View file @ ae051a2d
...@@ -300,589 +300,22 @@ ...@@ -300,589 +300,22 @@
</style> </style>
<template> <template>
<div class="page_MyCustomer"> <VisaProductEditOrderOP></VisaProductEditOrderOP>
<div class="query-box" style="border:none">
<ul>
<li>
<span>
<em>{{$t('fnc.danhao')}}</em>
<el-input class='w220' v-model='msg.VisaTCNUM' :placeholder="$t('pub.pleaseImport')"></el-input>
</span>
</li>
<li>
<span>
<em>{{$t('hotel.product_name')}}</em>
<el-input class='w220' v-model='msg.Name' :placeholder="$t('pub.pleaseImport')"></el-input>
</span>
</li>
<!-- <li>
<span>
<em>送签日期</em><el-date-picker v-model='msg.SendStartDate' class='w135' value-format="yyyy-MM-dd" type="date"></el-date-picker>-<el-date-picker v-model='msg.SendEndDate' class='w135' value-format="yyyy-MM-dd" type="date"></el-date-picker>
</span>
</li> -->
<li>
<span>
<em>订单状态</em>
<el-select v-model='msg.VisaOrderStatus'>
<el-option label="不限" value="0" key='0'></el-option>
<el-option label="正常" value="1" key='1'></el-option>
<el-option label="取消" value="2" key='2'></el-option>
<el-option label="待付款" value="3" key='3'></el-option>
</el-select>
</span></li>
<li>
<span>
<em>业务员</em>
<el-select filterable v-model='msg.CreateBy'>
<el-option :value="0" label="不限"></el-option>
<el-option v-for='item in EmployeeList'
:label='item.EmName'
:value='item.EmployeeId'
:key='item.EmployeeId'>
</el-option>
</el-select>
</span>
</li>
<li>
<span>
<em>公司</em>
<el-select filterable class="w217" v-model="msg.RB_Branch_Id"
:placeholder="$t('pub.pleaseSel')">
<el-option :value="-1" label="不限"></el-option>
<el-option v-for="item in layerCompanyList" :label="item.BName" :value="item.Id" :key="item.Id">
</el-option>
</el-select>
</span>
</li>
<li>
<span>
<em>{{$t('fnc.bmriqi')}}</em>
<el-date-picker v-model='msg.StartDate' class='w135' value-format="yyyy-MM-dd" type="date"></el-date-picker>
-<el-date-picker v-model='msg.EndDate' class='w135' value-format="yyyy-MM-dd" type="date"></el-date-picker>
</span>
</li>
<li>
<button class="hollowFixedBtn" @click="getList()">{{$t('pub.searchBtn')}}</button>
<!-- <button class="normalBtn" @click="addShow=true">添加</button> -->
</li>
</ul>
</div>
<div style="display: flex;justify-content: end;margin-bottom: 10px;">
<p><span class="groupTourOrderByTuan_ico"><i style="background-color:#3FC4FF"></i><span>{{$t('fnc.yidadan')}}</span></span>
<span class="groupTourOrderByTuan_ico"><i style="background-color:#F1416C"></i><span>{{$t('fnc.yhcnyshenhe')}}</span></span>
<span class="groupTourOrderByTuan_ico"><i style="background-color:#ff9800"></i><span>{{$t('fnc.ytongguo')}}</span></span></p>
</div>
<visaOrderList :pagesTitle="pagesTitle" :OrderList="dataList" v-loading="loading" @success="getList"> </visaOrderList>
<el-pagination background @current-change="handleCurrentChange" :current-page.sync="currentPage"
layout="total,prev, pager, next, jumper" :page-size="this.msg.pageSize" :total="total">
</el-pagination>
<div class="_mc_edit _scrollbar" :class="addShow==true?'edHeight':''">
<p class="_tit">{{$t('salesModule.UpOrder')}}
<span class="fr">
<button class="hollowFixedBtn" type="button" @click="cancelEdit()">{{$t('pub.cancelBtn')}}</button>
<button type="button" class="normalBtn" @click="saveVisa()">{{$t('pub.saveBtn')}}</button>
</span>
</p>
<el-form class="_info_box clearfix" :model="addMsg" :rules="rules" ref="addMsg" label-width="120px">
<el-row :gutter="20">
<el-col :span="4">
<el-form-item :label="$t('hotel.product_name')" prop="Name">
<el-input v-model="addMsg.Name" :placeholder="$t('pub.pleaseImport')" :disabled="true"></el-input>
</el-form-item>
</el-col>
<el-col :span="4">
<el-form-item :label="$t('Airticket.Air_Number')" prop="PeopleNum">
<el-input @keyup.native="checkInteger(addMsg,'PeopleNum')" min="1" v-model="addMsg.PeopleNum"
:placeholder="$t('pub.pleaseImport')" maxlength="20" :disabled="updateRemarksStatus"></el-input>
</el-form-item>
</el-col>
<el-col :span="4">
<el-form-item :label="$t('salesModule.CustomerType')">
<el-select v-model="addMsg.ClientType" :disabled="updateRemarksStatus" size=mini>
<el-option :label="$t('salesModule.Trade')" value="1"></el-option>
<el-option :label="$t('Operation.Op_direct')" value="2"></el-option>
</el-select>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item :label="$t('pub.pubRemark')">
<el-input v-model="addMsg.Remark" type="textarea" maxlength="500" :placeholder="$t('pub.pleaseImport')">
</el-input>
</el-form-item>
</el-col>
<el-col :span="4">
</el-col>
</el-row>
<el-row :gutter="20" v-if='visaManagementId>0'>
<el-col :span="4">
<el-form-item :label="$t('visaT.rujingtime')" prop="EnterCountryTime">
<el-date-picker value-format="yyyy-MM-dd" class='w170' v-model='addMsg.EnterCountryTime' type="date"
:disabled="updateRemarksStatus"></el-date-picker>
</el-form-item>
</el-col>
<el-col :span="4">
<el-form-item :label="$t('visaT.chujingtime')" prop="LeaveCountryTime">
<el-date-picker value-format="yyyy-MM-dd" class='w170' v-model='addMsg.LeaveCountryTime' type="date"
:disabled="updateRemarksStatus"></el-date-picker>
</el-form-item>
</el-col>
<el-col :span="4">
<el-form-item :label="$t('visaT.cfAirport')" prop="DepartAirport">
<el-select v-model="addMsg.DepartAirport" filterable size=mini @change="getFilghtForAir(1)"
:disabled="updateRemarksStatus">
<el-option v-for="item in ChinaAirportList" :key="item.ID" :label="item.Name" :value="item.ID">
</el-option>
</el-select>
</el-form-item>
</el-col>
<el-col :span="4">
<el-form-item :label="$t('visaT.Portofentry')" prop="EnterCountryPort">
<el-select v-model="addMsg.EnterCountryPort" filterable size=mini @change="getFilghtForAir(1)"
:disabled="updateRemarksStatus">
<el-option v-for="item in JapanAirportList" :key="item.ID" :label="item.Name" :value="item.ID">
</el-option>
</el-select>
</el-form-item>
</el-col>
<el-col :span="4">
<el-form-item :label="$t('visaT.Inboundflights')" prop="EnterCountryFlight">
<el-select v-model="addMsg.EnterCountryFlight" filterable size=mini :disabled="updateRemarksStatus">
<el-option v-for="item in FilghtForAirIn" :key="item.ID" :label="item.Flight_number" :value="item.ID">
</el-option>
</el-select>
</el-form-item>
</el-col>
<el-col :span="4">
</el-col>
</el-row>
<el-row :gutter="20" v-if='visaManagementId>0'>
<el-col :span="4">
<el-form-item :label="$t('visaT.fhjichang')" prop="GetBackAirport">
<el-select v-model="addMsg.GetBackAirport" filterable size=mini @change="getFilghtForAir(2)"
:disabled="updateRemarksStatus">
<el-option v-for="item in ChinaAirportList" :key="item.ID" :label="item.Name" :value="item.ID">
</el-option>
</el-select>
</el-form-item>
</el-col>
<el-col :span="4">
<el-form-item :label="$t('visaT.Exitport')" prop="LeaveCountryPort">
<el-select v-model="addMsg.LeaveCountryPort" filterable size=mini @change="getFilghtForAir(2)"
:disabled="updateRemarksStatus">
<el-option v-for="item in JapanAirportList" :key="item.ID" :label="item.Name" :value="item.ID">
</el-option>
</el-select>
</el-form-item>
</el-col>
<el-col :span="4">
<el-form-item :label="$t('visaT.Outboundflight')" prop="LeaveCountryFlight">
<el-select v-model="addMsg.LeaveCountryFlight" filterable size=mini :disabled="updateRemarksStatus">
<el-option v-for="item in FilghtForAirOut" :key="item.ID" :label="item.Flight_number" :value="item.ID">
</el-option>
</el-select>
</el-form-item>
</el-col>
</el-row>
</el-form>
</div>
</div>
</template> </template>
<script> <script>
import visaOrderList from './components/visaOrderList.vue'; import VisaProductEditOrderOP from './VisaProductEditOrderOP.vue';
export default { export default {
components: { visaOrderList }, components: { VisaProductEditOrderOP },
data() { data() {
return { return {
pagesTitle: 'OP', pagesTitle: 'OP',
userInfo: {},
qjGroupId: -1,
F_InvoiceManagement: false,
F_Finance_Create: false,
msg: {
pageIndex: 1,
pageSize: 12,
StartDate: '',
EndDate: '',
SendStartDate: '',
SendEndDate: '',
Name: '',
VisaTCNUM: '',
VisaOrderStatus: '0',
CreateBy: 0,
RB_Branch_Id: -1,
},
addMsg: {
Id: 0,
Remark: '',
VisaId: '',
Name: "",
PeopleNum: '',
EnterCountryTime: '',
LeaveCountryTime: '',
DepartAirport: '',
GetBackAirport: '',
EnterCountryPort: '',
LeaveCountryPort: '',
EnterCountryFlight: '',
LeaveCountryFlight: '',
VisaPlanId: 0,
DepartDate: '',
ClientType: ''
},
rules: {
PeopleNum: [{
required: true,
message: "请输入人数",
trigger: "blur"
}],
//DepartDate:[{required: true, message: "请输入出发日期", trigger: "blur"}],
EnterCountryTime: [{
required: true,
message: "请输入入境日期",
trigger: "blur"
}],
LeaveCountryTime: [{
required: true,
message: "请输入出境日期",
trigger: "blur"
}]
},
updateRemarksStatus: false,
SendStartDate: '',
visaManagementId: 0,
VisaApplyForTypeEnum: [],
JapanAirportList: [],
ChinaAirportList: [],
countryList: [],
MarriageType: [],
VisaDeparturesType: [],
VisaDutyTypeEnum: [],
VisaIdentityTypeEnum: [],
FilghtForAirIn: [],
FilghtForAirOut: [],
dataList: [],
EmployeeList: [],
loading: false,
total: 0,
addShow: false,
currentPage: 1,
EmployeeList:[],
employeeMsg:{ // 员工
GroupId:'',
BranchId:-1,
DepartmentId:0,
PostId:0,
IsLeave:0,
},
layerCompanyList:[]
} }
}, },
methods: { methods: {
getCompany() {
this.apipost(
"admin_get_BranchGetList",
this.getCompanyMsg,
res => {
if (res.data.resultCode == 1) {
this.layerCompanyList = res.data.data;
} else {}
},
err => {}
);
},
getEmployee() { //员工
let userInfo=this.getLocalStorage();
this.employeeMsg.GroupId = userInfo.RB_Group_id;
this.apipost('admin_get_EmployeeGetList', this.employeeMsg, res => {
if(res.data.resultCode == 1) {
this.EmployeeList = res.data.data;
}
}, err => {})
},
GetSupperOrderEditAuth() {
var actionCode = this.$AuthCode.F_InvoiceManagement;
this.CheckUserAuth(actionCode, res => {
if (res.data.resultCode == 1 && res.data.data == 1) {
this.F_InvoiceManagement = true;
}
});
var actionCodeNew = this.$AuthCode.F_Finance_Create;
this.CheckUserAuth(actionCodeNew, res => {
if (res.data.resultCode == 1 && res.data.data == 1) {
this.F_Finance_Create = true;
}
});
}, },
goUrlFinance(name, path, id, tcmun) {
this.$router.push({
name: path,
query: {
id: id,
tcmun: tcmun,
blank: 'y',
tab: name
}
});
},
goIisDetail: function (id) { // 跳转发票详情页面
this.$router.push({
name: 'invoicesManagerDetail',
query: {
id: id,
noDetail: 1,
InvoiceApplyType: 2,
blank: "y",
}
});
},
// 申请发票
goUrlAdd: function (path, OrderId, TCID, customerId, InvoiceApplyType) {
this.$router.push({
name: path,
query: {
OrderId: OrderId,
TCID: TCID,
customerId: customerId ? customerId : 0,
InvoiceApplyType: InvoiceApplyType,
blank: "y",
}
});
},
goUrl2(path, id, name) {
this.$router.push({
name: path,
query: {
id: id,
blank: 'y',
tab: name
}
});
},
getChinaAirportList() { // 获取国内机场
let msg = {
City_id: 0,
Country_id: 2,
TrafficType: 1,
}
this.apipost('airport_post_GetList', msg, res => {
if (res.data.resultCode == 1) {
this.ChinaAirportList = res.data.data
} else {
this.$message.error(res.data.message)
}
}, err => {})
},
getJapanAirportList() { // 获取日本机场
let msg = {
City_id: 0,
Country_id: 651,
TrafficType: 1,
}
this.apipost('airport_post_GetList', msg, res => {
if (res.data.resultCode == 1) {
this.JapanAirportList = res.data.data
} else {
this.$message.error(res.data.message)
}
}, err => {})
},
FilghtForAir(data, type) {
this.apipost('dmc_get_visa_GetFilghtForAir', data, res => {
if (res.data.resultCode == 1) {
if (type == 1) {
this.FilghtForAirIn = res.data.data
} else {
this.FilghtForAirOut = res.data.data
}
} else {
this.$message.error(res.data.message)
}
}, err => {})
},
getFilghtForAir(type) { // 根据机场获取航班号
let msg = {
StartAirId: 0,
EndAirId: 0,
}
if (type == 1) {
if (this.addMsg.DepartAirport && this.addMsg.EnterCountryPort) {
msg.StartAirId = this.addMsg.DepartAirport
msg.EndAirId = this.addMsg.EnterCountryPort
this.FilghtForAir(msg, type)
}
} else {
if (this.addMsg.GetBackAirport && this.addMsg.LeaveCountryPort) {
msg.StartAirId = this.addMsg.LeaveCountryPort
msg.EndAirId = this.addMsg.GetBackAirport
this.FilghtForAir(msg, type)
}
}
},
goUrl(obj) {
let TCIDARR = [];
if (obj.tcid) {
TCIDARR.push(obj.tcid)
}
let orderObj = {
OrderID: obj.id,
OrderSource: 10,
Obj: {},
SourceID: obj.visaId,
TCIDList: TCIDARR
}
this.$router.push({
name: 'ChoiceAddFinancialDocuments',
query: {
'path': 'SaleOrderModule',
'companyID': obj.rB_Branch_Id,
'visaType': true,
'blank': 'y',
'orderObj': JSON.stringify(orderObj)
}
});
},
goUrlT(obj) {
this.$router.push({
name: 'VisaGuestList',
query: {
'id': obj.id,
}
});
},
cancelOrder(obj) {
this.$confirm('是否取消?', '提示', {
confirmButtonText: '确定',
cancelButtonText: '取消',
type: 'warning'
}).then(() => {
this.apipost('dmc_post_visa_SetOrderCancel', {
OrderId: obj.id
}, res => {
if (res.data.resultCode == 1) {
this.$message.success('取消成功！');
this.getList()
} else {
this.$message.error(res.data.message);
}
}, err => {})
}).catch(() => {
this.$message.info('已取消！');
});
},
getList() { // 获取列表数据
this.loading = true;
this.apipost('dmc_get_visa_GetAdminVisaOrderList', this.msg, res => {
if (res.data.resultCode == 0) {
this.loading = false;
this.dataList = []
} else {
this.dataList = res.data.data.pageData;
this.total = res.data.data.count;
this.loading = false;
}
}, err => {})
},
getDetail(obj, updateRStatus) {
this.SendStartDate = obj.sendStartDate
this.updateRemarksStatus = updateRStatus;
this.visaManagementId = obj.visaManagementId
this.addMsg.VisaId = obj.visaId
this.addMsg.Id = obj.id
this.addShow = true
this.apipost('dmc_get_visa_GetOrderByVisaId', {
visaId: obj.visaId,
visaOrderId: obj.id
}, res => {
if (res.data.resultCode == 1) {
let x = res.data.data
this.addMsg.Name = x[0].Name
this.addMsg.PeopleNum = x[0].PeopleNum
this.addMsg.Remark = x[0].Remark
this.addMsg.EnterCountryTime = x[0].EnterCountryTime
this.addMsg.LeaveCountryTime = x[0].LeaveCountryTime
this.addMsg.DepartAirport = x[0].DepartAirport
this.addMsg.GetBackAirport = x[0].GetBackAirport
this.addMsg.EnterCountryPort = x[0].EnterCountryPort
this.addMsg.LeaveCountryPort = x[0].LeaveCountryPort
this.getFilghtForAir(1)
this.getFilghtForAir(2)
this.addMsg.EnterCountryFlight = x[0].EnterCountryFlight
this.addMsg.LeaveCountryFlight = x[0].LeaveCountryFlight
this.addMsg.VisaPlanId = x[0].VisaPlanId
//this.addMsg.DepartDate=x[0].DepartDate
this.addMsg.ClientType = x[0].ClientType.toString()
}
}, err => {})
},
saveVisa() { // 保存
this.$refs['addMsg'].validate((valid) => {
if (valid) {
this.apipost('dmc_get_visa_SetVisaOrder', this.addMsg, res => {
if (res.data.resultCode == 1) {
this.addMsg = {
Remark: '',
VisaId: '',
Name: "",
PeopleNum: '',
EnterCountryTime: '',
LeaveCountryTime: '',
DepartAirport: '',
GetBackAirport: '',
EnterCountryPort: '',
LeaveCountryPort: '',
EnterCountryFlight: '',
LeaveCountryFlight: '',
VisaPlanId: 0,
DepartDate: ''
}
this.$message.success(res.data.message)
this.addShow = false
this.getList()
} else {
this.$message.error(res.data.message)
}
}, err => {})
} else {
return false;
}
});
},
cancelEdit() { // 取消新增
this.addShow = false
this.addMsg = {
Name: '',
Remark: '',
VisaId: '',
Name: "",
PeopleNum: '',
}
this.resetForm('addMsg')
},
resetForm(formName) { // 重置表单
this.$refs[formName].resetFields();
},
handleCurrentChange(val) {
this.msg.pageIndex = val;
this.getList();
},
},
mounted() { mounted() {
this.qjGroupId = this.QjGroupId();
this.userInfo = this.getLocalStorage();
this.getEmployee()
this.getList()
this.getCompany()
this.getChinaAirportList()
this.getJapanAirportList()
this.GetSupperOrderEditAuth();
} }
} }
......
src/components/SingleAirTicket/components/OrderList.vue
View file @ ae051a2d
...@@ -527,8 +527,8 @@ ...@@ -527,8 +527,8 @@
'el-icon-alarm-clock c20C997': item.OrderStatus == 1, 'el-icon-alarm-clock c20C997': item.OrderStatus == 1,
'el-icon-check cblack': item.OrderStatus == 2, 'el-icon-check cblack': item.OrderStatus == 2,
'el-icon-warning cff9800': item.OrderStatus == 3, 'el-icon-warning cff9800': item.OrderStatus == 3,
'el-icon-refresh cF1416C': item.OrderStatus == 4, 'el-icon-coin cF1416C': item.OrderStatus == 4,
'el-icon-check cblack': item.OrderStatus == 5, 'el-icon-refresh cF1416C': item.OrderStatus == 5,
'el-icon-refresh cF1416C': item.OrderStatus == 6 'el-icon-refresh cF1416C': item.OrderStatus == 6
}" }"
> >
...@@ -631,7 +631,7 @@ ...@@ -631,7 +631,7 @@
@click="CheckOutDetails(scope.row)"></i> @click="CheckOutDetails(scope.row)"></i>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column <!-- <el-table-column
label="操作" label="操作"
min-width="70" min-width="70"
style="background:#EAEAEA" style="background:#EAEAEA"
...@@ -640,7 +640,7 @@ ...@@ -640,7 +640,7 @@
<input type="button" class="normalBtn" value="查看" <input type="button" class="normalBtn" value="查看"
@click="goDetails(scope.row)" /> @click="goDetails(scope.row)" />
</template> </template>
</el-table-column> </el-table-column> !-->
<template slot="append" v-if="item.Remark"> <template slot="append" v-if="item.Remark">
<div style="padding:10px;color:#f1416c">客户备注：{{item.Remark}}</div> <div style="padding:10px;color:#f1416c">客户备注：{{item.Remark}}</div>
</template> </template>
...@@ -780,47 +780,6 @@ ...@@ -780,47 +780,6 @@
</div> </div>
</div> </div>
</div> </div>
<div
v-if="item.OrderStatus > 0 && item.OrderStatus < 4 && item.OrderStatus!=3"
class="column justify-c px15 bgE8F5E9 radius5 ml fz12 orderop pa20 flex-s"
>
<div
v-if="
item.OrderStatus == 1 &&
item.IncomeList.length == 0 &&
item.RefundList.length == 0 &&
item.CostList.length == 0 && item.OrderSource!=1
"
class="row-c cursor-pointer radius5 cancel py5"
@click="clickRightButtom(item, 0)"
>
<i v-loading="msg.OrderId==item.OrderId&&loading0"></i>
<span class="cF1416C">取消订单</span>
</div>
<div
v-if="item.OrderStatus == 1&&pagesTitle!='销售'&&item.OrderSource!=1"
class="row-c cursor-pointer radius5 confirm py5"
@click="clickRightButtom(item, 1)"
>
<i v-loading="msg.OrderId==item.OrderId&&loading1"></i>
<span class="c20C997">确认订单</span>
</div>
<div
v-if="item.OrderStatus == 1&&pagesTitle=='销售'"
class="row-c cursor-pointer radius5 change py5"
@click="goRoomDetails(item, '变更订单')"
>
<span class="c059FF6">订单变更</span>
</div>
<div
v-if="item.OrderStatus > 1"
class="row-c cursor-pointer radius5 change1 py5"
@click="clickRightButtom(item, 2)"
>
<i v-loading="msg.OrderId==item.OrderId&&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;">取消理由：</div> <div style="font-size:16px;font-weight:bold;font-family: pingfangR;">取消理由：</div>
......
src/components/SingleAirTicket/components/TicketOrder.vue
View file @ ae051a2d
...@@ -68,16 +68,67 @@ ...@@ -68,16 +68,67 @@
</el-select> </el-select>
</span> </span>
</li> </li>
<li>
<span>
<em>出票状态</em>
<el-select v-model='msg.TicketStatus' class="w200">
<el-option :value="0" label="不限"></el-option>
<el-option v-for='item in ticketingStatusList'
:label='item.Name'
:value='item.Id'
:key='item.Id'>
</el-option>
</el-select>
</span>
</li>
<li>
<span>
<em>出签状态</em>
<el-select v-model='msg.VisaStatus' class="w200">
<el-option v-for='item in VisaList'
:label='item.Name'
:value='item.Id'
:key='item.Id'>
</el-option>
</el-select>
</span>
</li>
<li>
<span>
<em>订单状态</em>
<el-select v-model='msg.OrderStatus' class="w200">
<el-option :value="0" label="不限"></el-option>
<el-option v-for='item in OrderStatusList'
:label='item.Name'
:value='item.Id'
:key='item.Id'>
</el-option>
</el-select>
</span>
</li>
<li>
<span>
<em>收款状态</em>
<el-select v-model='msg.Q_IsCollect' class="w200">
<el-option v-for='item in QIsCollectList'
:label='item.Name'
:value='item.Id'
:key='item.Id'>
</el-option>
</el-select>
</span>
</li>
<li> <li>
<span><em>{{$t('OrderList.search.orderNum')}}</em> <span><em>{{$t('OrderList.search.orderNum')}}</em>
<el-input clearable type="Number" v-model="msg.OrderNo" :placeholder="$t('OrderList.search.orderNum')" class="w200"/> <el-input clearable type="Number" v-model="msg.OrderNo" :placeholder="$t('OrderList.search.orderNum')" class="w200"/>
</span> </span>
</li> </li>
<!-- <li> <li>
<span><em>订单ID</em> <span><em>订单ID</em>
<el-input clearable type="Number" v-model="msg.OrderId" placeholder="订单ID" class="w200"/> <el-input clearable type="Number" v-model="msg.OrderId" placeholder="订单ID" class="w200"/>
</span> </span>
</li> --> </li>
<!-- <li> <!-- <li>
<span><em>电话</em> <span><em>电话</em>
<el-input clearable v-model="msg.Mobile" placeholder="电话" class="w200"/> <el-input clearable v-model="msg.Mobile" placeholder="电话" class="w200"/>
...@@ -116,15 +167,51 @@ ...@@ -116,15 +167,51 @@
</el-date-picker> </el-date-picker>
</span> </span>
</li> </li>
<li>
<span>
<em @click="showWarningSearch=true">高级查询</em>
<el-popover width="260" v-model="showWarningSearch" trigger="click">
<div>
<div class="TC_queryTitle">高级查询</div>
<div class="clearfix">
<div class="TC_leftSearch">
<div>
<span>{{$t('system.query_airCompanyName')}}</span>
<!-- <el-select v-model="msg.AirTicketId" filterable :placeholder="$t('system.ph_buxian')"
class="w150">
<el-option :label="$t('system.ph_buxian')" :value="queryCommonData.SelectDefaultValue">
</el-option>
<el-option v-for="item in queryCommonData.AirlineList" :key="item.AirLineId"
:label="item.AlName" :value="item.AirLineId"></el-option>
</el-select> -->
<el-date-picker
class="w150"
style="height: 34px;"
value-format="yyyy-MM-dd"
v-model="Datelist"
type="daterange"
:range-separator="$t('OrderList.zhi')"
:start-placeholder="$t('OrderList.star')"
:end-placeholder="$t('OrderList.end')" @change="getDates">
</el-date-picker>
</div>
</div>
</div>
<button class="normalBtn TC_SearchBtn"
@click="GetList(),showWarningSearch=false">{{$t('pub.searchBtn')}}
</button>
</div>
</el-popover>
</span>
</li>
<li> <li>
<input type="button" class="normalBtn" :value="$t('pub.searchBtn')" @click="msg.pageIndex=1,currentPage=1,GetList()" /> <input type="button" class="normalBtn" :value="$t('pub.searchBtn')" @click="msg.pageIndex=1,currentPage=1,GetList()" />
</li> </li>
</ul> </ul>
</div> </div>
<!-- 统计版块 --> <!-- 统计版块 -->
<div class="groupTourOrder_count"> <div class="groupTourOrder_count" v-if="TotalMsg">
<el-row :gutter="20"> <el-row :gutter="20">
<el-col :span="5" class="groupTourOrder_count_col"> <el-col :span="5" class="groupTourOrder_count_col">
<div class="groupTourOrder_count_item HT_total"> <div class="groupTourOrder_count_item HT_total">
...@@ -152,10 +239,10 @@ ...@@ -152,10 +239,10 @@
<span>{{$t('restaurant.res_Number')}}</span> <span>{{$t('restaurant.res_Number')}}</span>
</div> </div>
<p> <p>
<span class="groupTourOrder_count_green">{{$t('op.TotalRoomNum')}}： <span class="groupTourOrder_count_green">报名数：
{{TotalMsg.NorNumber}} {{TotalMsg.NorNumber}}
</span> </span>
<span class="color_red_order">{{$t('op.CanCelRoomNum')}}： <span class="color_red_order">取消数：
{{TotalMsg.CancelNum}} {{TotalMsg.CancelNum}}
</span> </span>
</p> </p>
...@@ -213,6 +300,7 @@ ...@@ -213,6 +300,7 @@
components: { OrderList }, components: { OrderList },
data() { data() {
return { return {
showWarningSearch: false,
TotalMsg: null, TotalMsg: null,
MultipleChoiceList: [ //多选项目 MultipleChoiceList: [ //多选项目
{ {
...@@ -242,24 +330,6 @@ ...@@ -242,24 +330,6 @@
//默认高度 //默认高度
tableHeight: 0, tableHeight: 0,
msg:{ msg:{
// pageIndex: 1,
// pageSize: 5,
// OrderType: '1',
// OrderId: '',
// OrderNo: '',
// SurName: '',
// Name: '',
// OrderStatus: 0,
// StartTime: '',
// EndTime: '',
// OrderSTime: '',
// OrderETime: '',
// ProductName: '',
// Mobile: '',//电话
// IsSelectSale: 1,
// EnterID: 0,//业务员
pageIndex: 1, pageIndex: 1,
pageSize: 15, pageSize: 15,
OrderId: "", //订单id OrderId: "", //订单id
...@@ -268,9 +338,9 @@ ...@@ -268,9 +338,9 @@
StartCityName: "", //出发城市 StartCityName: "", //出发城市
EndCityName: "", //到达城市 EndCityName: "", //到达城市
EnterID: "", //业务员id EnterID: "", //业务员id
TicketStatus: "0", //出票状态 TicketStatus: 0, //出票状态
VisaStatus: "0", //出签状态 VisaStatus: "0", //出签状态
OrderStatus: "0", //订单状态 OrderStatus: 0, //订单状态
Q_IsCollect: "0", //收款状态 Q_IsCollect: "0", //收款状态
StartTime: "", StartTime: "",
EndTime: "", EndTime: "",
...@@ -308,6 +378,18 @@ ...@@ -308,6 +378,18 @@
PostId:0, PostId:0,
IsLeave:0, IsLeave:0,
}, },
OrderStatusList: [],
QIsCollectList: [
{ Name: "不限", Id: "0" },
{ Name: "已收齐", Id: "1" },
{ Name: "未收齐", Id: "2" },
],
ticketingStatusList: [],
VisaList: [
{ Name: "不限", Id: "0" },
{ Name: "未出签", Id: "1" },
{ Name: "已出签", Id: "2" },
],
}; };
}, },
watch: { watch: {
...@@ -324,6 +406,26 @@ ...@@ -324,6 +406,26 @@
} }
}, },
methods: { methods: {
// 获取出票状态枚举
GetTicketStatusEnumList() {
this.crmapipost("/api/Order/GetTicketStatusEnumList", {}, (res) => {
if (res.data.resultCode == 1) {
this.ticketingStatusList = res.data.data;
} else {
this.$message.error(res.data.message);
}
});
},
// 获取订单状态枚举
GetOrderStatusEnumList() {
this.crmapipost("/api/Order/GetOrderStatusEnumList", {}, (res) => {
if (res.data.resultCode == 1) {
this.OrderStatusList = res.data.data;
} else {
this.$message.error(res.data.message);
}
});
},
getEmployee() { //员工 getEmployee() { //员工
this.apipost('admin_get_EmployeeGetList', this.employeeMsg, res => { this.apipost('admin_get_EmployeeGetList', this.employeeMsg, res => {
if(res.data.resultCode == 1) { if(res.data.resultCode == 1) {
...@@ -383,12 +485,12 @@ ...@@ -383,12 +485,12 @@
//获取酒店订单列表 //获取酒店订单列表
GetList() { GetList() {
this.loading = true this.loading = true
let url let url = "/api/Order/GetGuestOrderStatisticsPageList"
// 销售 OP // 销售 OP
if(this.pagesTitle=='销售'){ if(this.pagesTitle=='销售'){
url = "/api/Order/GetGuestOrderStatisticsPageList" this.msg.IsMyOrder = '1'
}else{ }else{
// url = "CarSingle_post_GetAdminCarOrderPageList" this.msg.IsMyOrder = '0'
} }
this.crmapipost(url, this.msg, this.crmapipost(url, this.msg,
res => { res => {
...@@ -555,6 +657,8 @@ ...@@ -555,6 +657,8 @@
if(this.Title!='销售'){ if(this.Title!='销售'){
this.getEmployee() this.getEmployee()
} }
this.GetOrderStatusEnumList()
this.GetTicketStatusEnumList()
this.Datelist = this.getyMDOne() this.Datelist = this.getyMDOne()
this.userInfo = this.getLocalStorage(); this.userInfo = this.getLocalStorage();
this.GetList(); this.GetList();
...@@ -572,4 +676,3 @@ ...@@ -572,4 +676,3 @@
<style> <style>
</style> </style>
\ No newline at end of file
src/router/config.js
View file @ ae051a2d
...@@ -2118,6 +2118,14 @@ export default { ...@@ -2118,6 +2118,14 @@ export default {
title: '单机票订单' title: '单机票订单'
}, },
}, },
{
path: '/CRMTicketOrderOP', //crm单项机票订单
name: 'CRMTicketOrderOP',
component: resolve => require(['@/components/SingleAirTicket/TicketOrderOP'], resolve),
meta: {
title: '单机票订单'
},
},
{ {
path: '/CharterAddEditVehicle', //新增/编辑团订 path: '/CharterAddEditVehicle', //新增/编辑团订
name: 'CharterAddEditVehicle', name: 'CharterAddEditVehicle',
......
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