Skip to content

S
SuperMan
Commit 0bcad647 authored by 吴春's avatar 吴春
Browse files
Options

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

parents 71ca7eef 775853e4
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 4446 additions and 238 deletions
src/components/Complaints/AddComplaints.vue
View file @ 0bcad647
......@@ -226,7 +226,7 @@
</ul>
</div>
<div v-if="userInfo.SimpleEasy==1">
<div v-if="userInfo.SimpleEasy&&userInfo.SimpleEasy==1">
<p>{{$t('fnc.scfujian')}}<span class="_addUpload_tips">{{$t('tips.wjdxbncgsz')}}</span></p>
<div class="_addUpload_box clearfix">
......
src/components/Complaints/ComplaintsDetail.vue
View file @ 0bcad647
......@@ -418,7 +418,7 @@
<p v-if="item.Level!=0">
{{item.Description}}
</p>
<template v-if="userInfo.SimpleEasy==1">
<template v-if="userInfo.SimpleEasy&&userInfo.SimpleEasy==1">
<div class="_addUpload_box _addUpload_box_btm clearfix" v-if="item.FileDataList.length>0">
<p>{{$t('objFill.fj')}}</p>
<template v-for="(file,fIndex) in item.FileDataList">
......@@ -512,7 +512,7 @@
</el-select>
</td>
</tr>
<tr v-if="userInfo.SimpleEasy==1"><td> <p>{{$t('fnc.scfujian')}}</p>
<tr v-if="userInfo.SimpleEasy&&userInfo.SimpleEasy==1"><td> <p>{{$t('fnc.scfujian')}}</p>
<p class="_addUpload_tips">{{$t('tips.wjdxbncgsz')}}</p></td><td>
<div>
......
src/components/FinancialModule/HandFee/HandFeeStatistics.vue
View file @ 0bcad647
......@@ -25,6 +25,14 @@
</el-select>
</el-form-item>
</el-col>
<el-col :span="4">
<el-form-item label="收入类型">
<el-select filterable v-model='msg.ImportType' class="">
<el-option label='手配+R' :value='1' :key='1'></el-option>
<el-option label='转账手续费' :value='2' :key='2'></el-option>
</el-select>
</el-form-item>
</el-col>
<el-col :span="4">
<el-form-item :label="$t('sm.company')">
<el-select filterable v-model='msg.RB_Branch_Id'>
......@@ -67,7 +75,7 @@
</el-form-item>
</el-col>
<template v-if="heightQueryBox"></template>
<el-col :span="6">
<el-col :span="5">
<el-form-item :label="$t('fnc.zdriqi')">
<!-- <el-date-picker class="h34" @change="timeAdd(1)" v-model="productionDate" type="daterange"
value-format="yyyy-MM-dd">
......@@ -75,14 +83,14 @@
<StartDateLimit :clearable="false" :dateTime="productionDate" @change="(startDate,endDate)=>{msg.sDate=startDate,msg.eDate=endDate}"></StartDateLimit>
</el-form-item>
</el-col>
<el-col :span="6">
<el-col :span="5">
<el-form-item :label="$t('fnc.jiaoyiriqi')">
<el-date-picker class="h34" v-model="transactionDate" @change="timeAdd(3)" type="daterange"
value-format="yyyy-MM-dd">
</el-date-picker>
</el-form-item>
</el-col>
<el-col :span="6">
<el-col :span="5">
<el-form-item :label="$t('scen.sc_ftTime')">
<el-date-picker class="h34" v-model="missionDate" @change="timeAdd(4)" type="daterange"
value-format="yyyy-MM-dd">
......@@ -293,6 +301,7 @@
Status: '-1', //状态
KingdeeBranchId: 0, //当前登录人的公司
HandFeeFrId: 0,
ImportType:1
},
isRB_Depart_Id: false,
getCompanyMsg: { // 公司
......
src/components/SalesModule/components/addOrder.vue
View file @ 0bcad647
......@@ -623,9 +623,9 @@
</el-col>
<el-col :span="6">
<el-form-item :label="$t('salesModule.SingleFM')">
<el-radio v-model="addMsg.OneSex" label="1">{{ $t("pub.man") }}
<el-radio v-model="addMsg.OneSex" :label="Number(1)">{{ $t("pub.man") }}
</el-radio>
<el-radio v-model="addMsg.OneSex" label="2">{{ $t("pub.woman") }}
<el-radio v-model="addMsg.OneSex" :label="Number(2)">{{ $t("pub.woman") }}
</el-radio>
</el-form-item>
</el-col>
......@@ -1502,7 +1502,6 @@
ID: s.supplierId,
Name: s.supplierName,
})
console.log(this.deepFirstLetterToLower(newVal.guestList),'=====')
setTimeout(() => {
let obj = JSON.parse(JSON.stringify(this.addMsg))
......@@ -1511,6 +1510,7 @@
OrderId: newVal.orderId,// 订单号
Meet: newVal.meet,// 成本
Remarks: newVal.remarks,// 订单备注
UnionRemark: newVal.unionRemark,
Mobile: newVal.mobile,// 联系手机号
DisplaySupplierId: s.supplierId,
SupplierId: s.supplierId,// 供应商id
......@@ -1522,8 +1522,10 @@
CompanyPhone: s.companyPhone,// 电话
OpeningBank: s.openingBank,// 开户行
BankNo: s.bankNo,// 开户账号
AppointOPList: newVal.appointOPList,// op 格式：([1,2,3])
GuestList: this.deepFirstLetterToLower(newVal.guestList),// 旅客名单
AppointOPList: newVal.appointOPList.map(item => {
return item.opId
}),// op 格式：([1,2,3])
GuestList: [],// 旅客名单
FinalPriceTips: newVal.finalPriceTips,// 尾款提醒设置
......@@ -1547,13 +1549,26 @@
TripleRoomNum: newVal.tripleRoomNum,
VisaNum: newVal.visaNum,
SafeNum: newVal.safeNum,
OneSexNum: newVal.oneSexNum,
OneSex: newVal.oneSex,
PredictRoomNum: newVal.predictRoomNum,
YSeatNum: newVal.ySeatNum,
ESeatNum: newVal.eSeatNum,
FSeatNum: newVal.fSeatNum,
WordPath: newVal.wordPath,//附件
};
newVal.guestList.forEach(item => {
this.addMsg.GuestList.push({
Birthday: item.birthday,// 生日
Name: item.userName,// 名称
IdCard: item.idCard,// 身份证号
PassportNo: item.passportNo,// 护照号
PassportIssued: item.passportIssued,// 护照签发日期
PassportExpiry: item.passportExpiry,// 护照有效期
Tel: item.tel,// 联系电话
})
})
console.log(newVal,'=======')
},1000)
}
}
......
src/components/SalesModule/components/editOPRemarks.vue 0 → 100644
View file @ 0bcad647
This diff is collapsed.
src/components/SalesModule/components/groupOrder.vue
View file @ 0bcad647
......@@ -297,6 +297,18 @@
<el-tooltip effect="dark" :content="$t('pub.more')" placement="top-start" style="float: left">
<el-popover width="100" trigger="hover">
<div class="groupTourOrder_more">
<div @click="
goTeamBalance(
'TeamBalancePayment',
item.tcid,
item.outBranchId
)
">
{{ $t("Operation.Op_shouzhiDetail") }}
</div>
<div v-if="isOP" @click="getRemarks(item,1)">
修改op备注
</div>
<div @click="goUrlT('confirmationOrder', item.orderId)">
{{ $t("salesModule.QRH")
}}{{
......@@ -417,6 +429,7 @@
">
{{ $t("salesModule.LookTourse") }}
</div>
</div>
<el-button slot="reference" type="primary" style="
background: #297bef;
......@@ -453,6 +466,10 @@
<span v-if="item.photoNum > 0">（{{ $t("salesModule.NoPhoto") }} {{ item.photoNum
}}{{ $t("salesModule.Fen") }}）</span>
</span>
<span class="RL-remarkTitle" v-if="item.appointOPList.length > 0">OP:</span>
<span class="RL-redType RL-remarkCon" v-if="item.appointOPList.length > 0">
<span v-for="childItem in item.appointOPList" style="color: blue;margin-right: 5px">{{ childItem.opName }}</span>
</span>
<p v-if="item.cancelGuestList.length > 0">
<span class="">{{ $t("salesModule.CancelOrder") }}:</span>
<span class="RL-redType RL-remarkCon">
......@@ -712,7 +729,8 @@ import PriceDetail from '../../orderCommon/PriceDetail.vue';
export default {
name: 'groupOrder',
mixins: [userMixin],
props: ['list','orderList','logList','redBagList','qjGroupId','isShow','showID','TransferMission','isEditOrderCreate'],
props: ['list','orderList','logList','redBagList','qjGroupId','isShow',
'showID','TransferMission','isEditOrderCreate','isOP'],
components: {
payurlItem: payURL,
payurlItem1: payURL1,
......@@ -725,8 +743,6 @@ export default {
data() {
return {
dataList: [],
showType: 1,
selectedSpotData: null,
}
},
......@@ -753,6 +769,18 @@ export default {
},
methods: {
goTeamBalance(path,id, OutBranchId) {
this.$router.push({
name: path,
query: {
id: id,
OutBranchId: OutBranchId,
IsHaveAuth: true,
blank: "y",
tab: "团队收支明细",
},
});
},
goIisDetail (id) {
this.$emit('goIisDetail', id)
},
......@@ -813,8 +841,8 @@ export default {
getLogDetail(obj) {
this.$emit('getLogDetail', obj)
},
getRemarks(obj) {
this.$emit('getRemarks', obj)
getRemarks(obj,type) {
this.$emit('getRemarks', obj,type)
},
getDetail(obj) {
this.$emit('getDetail', obj)
......
src/components/SalesModule/groupTourOrder.vue
View file @ 0bcad647
......@@ -1647,7 +1647,7 @@
</el-popover>
</li>
<li>
<input v-if="userInfo.SimpleEasy==1" type="button" class="hollowFixedBtn" :value="$t('pub.addBtn')" @click="addOrders"/>
<input v-if="userInfo.SimpleEasy&&userInfo.SimpleEasy==1" type="button" class="hollowFixedBtn" :value="$t('pub.addBtn')" @click="addOrders"/>
<input type="button" class="hollowFixedBtn" :value="$t('pub.searchBtn')" @click="
getList();
resetPageIndex();
......@@ -1774,9 +1774,10 @@
</div>
<!-- 表格 -->
<div style="width: 100%; height: auto; overflow-x: auto" class="ownScrollbarStyle" v-loading="loading">
<groupOrder v-if="userInfo.SimpleEasy==1" :list="list" :orderList="orderList"
<groupOrder v-if="userInfo.SimpleEasy&&userInfo.SimpleEasy==1" :list="list" :orderList="orderList"
:logList="logList" :redBagList="redBagList" :qjGroupId="qjGroupId" :isShow="isShow"
:showID="showID" :TransferMission="TransferMission" :isEditOrderCreate="isEditOrderCreate"
:isOP="isOP"
@goIisDetail="goIisDetail" @goUrlTS="goUrlTS" @goContract="goContract"
@goSingleContract="goSingleContract" @goProtocol="goProtocol" @goDisclaimer="goDisclaimer"
@goInvetig="goInvetig" @SpecialAPP="SpecialAPP" @deleteItem="deleteItem"
......@@ -2707,6 +2708,9 @@
<addOrder v-if="visible&&showType==1" :isDrawerMode="true"
:details="selectedSpotData"
@close="close" @save-success="handleSaveSuccess"></addOrder>
<editOPRemarks v-if="visible&&showType==2" :isDrawerMode="true"
:details="selectedSpotData"
@close="close" @save-success="handleSaveSuccess"></editOPRemarks>
</template>
</pinkDrawer>
</div>
......@@ -2726,6 +2730,7 @@
import addOrder from './components/addOrder.vue';
import addConfig from "./components/addConfig.js";
import groupOrder from "./components/groupOrder.vue";
import editOPRemarks from "./components/editOPRemarks.vue";
export default {
data() {
return {
......@@ -3065,7 +3070,8 @@
LessRule: [],
LessNPrice: 0,
LessNAvgPrice: 0,
DealDiscountMoney: 0
DealDiscountMoney: 0,
isOP: 0,
};
},
components: {
......@@ -3080,6 +3086,7 @@
pinkDrawer,
addOrder,
groupOrder,
editOPRemarks,
},
filters: {
priceFormat(value) {
......@@ -3099,6 +3106,15 @@
SQcheckdAll(val) {
this.checkdAll(val);
},
'$router': {
handler(val) {
if(this.$route.query.isOP) this.isOP = this.$route.query.isOP
else this.isOP = 0
this.getList();
this.getCount()
}
}
},
computed: {
// 抽屉配置
......@@ -3108,6 +3124,7 @@
},
methods: {
addOrders() {
this.selectedSpotData = null
this.$refs.addOrders.openDrawer();
},
handleSaveSuccess() {
......@@ -3944,7 +3961,13 @@
childByValue(data) {
this.showID = data;
},
getRemarks(obj) {
getRemarks(obj,type) {
if(type&&type==1&&this.userInfo.SimpleEasy&&this.userInfo.SimpleEasy==1){
this.showType = 2
this.selectedSpotData = obj;
this.$refs.addOrders.openDrawer(obj);
return;
}
// 华国豪5-5新增
if (moment().format("YYYY-MM-DD") >= obj.startDate) {
// 该团目前已是结团状态，不能随意修改备注信息，若强行修改备注，将会计入个人考核，是否确定修改备注信息？
......@@ -3976,7 +3999,7 @@
}
},
getDetail(obj) {
if(this.userInfo.SimpleEasy==1){
if(this.userInfo.SimpleEasy&&this.userInfo.SimpleEasy==1){
this.OperationType = 1
this.showType = 1
obj.OperationType = 1
......@@ -5487,6 +5510,8 @@
}
},
mounted() {
if(this.$route.query.isOP) this.isOP = this.$route.query.isOP
else this.isOP = 0
this.qjGroupId = this.QjGroupId();
this.GetEditOrderCreateByAuth();
let userInfo = this.getLocalStorage();
......
src/components/SingleAirTicket/components/TicketOrder.vue
View file @ 0bcad647
......@@ -53,7 +53,7 @@
<div class="HotelWorkList" @click="showWarningSearch=false">
<div class="query-box HotelWorkInput" style="border-bottom: none;">
<ul>
<li>
<!-- <li>
<span>
<em>{{$t('OrderList.search.status')}}</em>
<el-select v-model="msg.OrderStatus" class="w200 HworkInput">
......@@ -61,7 +61,7 @@
<el-option v-for="item in OrderStatusList" :key="item.Id" :label="item.Name" :value="item.Id"></el-option>
</el-select>
</span>
</li>
</li> -->
<li v-if="Title!='销售'">
<span>
<em>{{$t('visa.v_yewuyuan')}}</em>
......@@ -73,7 +73,7 @@
</el-select>
</span>
</li>
<li v-if="Title!='销售'">
<!-- <li v-if="Title!='销售'">
<span>
<em>{{$t('objFill.yinliuren')}}</em>
<el-select filterable v-model='msg.CreateBy' class="w200">
......@@ -83,7 +83,7 @@
</el-option>
</el-select>
</span>
</li>
</li> -->
<li>
<span>
<em>{{$t('hotel.hotel_OrderStates')}}</em>
......@@ -110,11 +110,11 @@
class="w200" />
</span>
</li>
<li>
<!-- <li>
<span><em>{{$t('ground.CustomerName')}}</em>
<el-input clearable v-model="msg.GuestName" :placeholder="$t('ground.CustomerName')" class="w200" />
</span>
</li>
</li> -->
<li>
<span>
<em>{{$t('objFill.baomingshijian')}}</em>
......@@ -137,58 +137,17 @@
</span>
</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>
<!-- <el-date-picker style="height: 34px;width: 210px;" 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> -->
<StartDateLimit :clearable="true" :dateTime="Datelist" @change="(startDate,endDate)=>{Datelist=[startDate,endDate],getDates()}" style="width: 210px;"></StartDateLimit>
</div>
<div>
<StartDateLimit :clearable="true" :dateTime="Datelist" @change="(startDate,endDate)=>{Datelist=[startDate,endDate],getDates()}"></StartDateLimit>
</li>
<li>
<span>{{$t('objFill.v101.FinancialModule.chuxings')}}</span>
<el-input v-model='msg.StartCityName' style="width: 210px;"></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>
<el-input v-model='msg.StartCityName'></el-input>
</li>
<li>
<input v-if="userInfo.SimpleEasy&&userInfo.SimpleEasy==1" type="button" class="normalBtn" value="新增机票" @click="AddAirTicket()" />
<input type="button" class="normalBtn" :value="$t('pub.searchBtn')"
@click.stop="msg.pageIndex=1,currentPage=1,GetList()" />
</li>
......@@ -252,25 +211,37 @@
</el-row>
</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>
<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"
:current-page.sync="currentPage" layout="total,prev, pager, next, jumper" :page-size=msg.pageSize :total=total>
</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>
</template>
<script>
import OrderList from './OrderList.vue';
import ticketOrderDialog from './ticketOrderDialog.vue';
import StartDateLimit from '../../public/StartDateLimit.vue';
import OrderList from './OrderList.vue';
export default {
props: ['pagesTitle', 'dataObj'],
components: {
OrderList,
StartDateLimit
StartDateLimit,
ticketOrderDialog
},
data() {
return {
GuestId:0,
TicketOrderID:0,
editObj:{},
dialogTicketOrderVisible:false,
dialogTicketOrderVisibleName:'',
showWarningSearch: false,
TotalMsg: null,
MultipleChoiceList: [ //多选项目
......@@ -509,15 +480,14 @@
},
//获取酒店订单列表
GetList() {
this.loading = true
let url = "/api/Order/GetGuestOrderStatisticsPageList"
this.loading = true
// 销售 OP
if (this.pagesTitle == '销售') {
this.msg.IsMyOrder = '1'
} else {
this.msg.IsMyOrder = '0'
}
this.crmapipost(url, this.msg,
this.apipost('ticket_post_GetAirOrderStatisticsPageList', this.msg,
res => {
if (res.data.resultCode == 1) {
let data = res.data.data.Data.pageData
......@@ -657,6 +627,11 @@
//设置table的行高
this.tableHeight = h;
},
AddAirTicket(){
this.TicketOrderID=0;
this.dialogTicketOrderVisible=true;
this.dialogTicketOrderVisibleName="新建机票订单";
}
},
created() {
if (this.$route.query.OrderId) {
......
src/components/SingleAirTicket/components/ticketOrderDialog.vue 0 → 100644
View file @ 0bcad647
This source diff could not be displayed because it is too large. You can view the blob instead.
src/components/TravelManager/TravelList/TeamBalancePayment.vue
View file @ 0bcad647
......@@ -939,8 +939,11 @@
<template v-if="IsHaveAuth">
<input type="button" :value="$t('Operation.Op_visaPrice')" class="hollowFixedBtn TeamAddBtn" v-show="ishowBtn" @click="goUrlVisa" />
<input type="button" :value="$t('objFill.tuanduizr')" class="hollowFixedBtn TeamAddBtn" v-show="ishowBtn" @click="TDZR" />
<input v-if="groupId!=2" type="button" :value="$t('pub.addBtn')" class="hollowFixedBtn TeamAddBtn" v-show="ishowBtn" @click="AddOutDetail(3)" />
<span style="float:right" v-if="groupId==2">{{$t('objFill.zhuyi')}}：{{$t('objFill.feiqianzfcbzd')}} &nbsp;</span>
<template v-if="userInfo.SimpleEasy&&userInfo.SimpleEasy==1">
<input type="button" class="normalBtn TeamAddBtn" :value="$t('objFill.precharge')" @click="isOffset(14,2)" />
<input type="button" :value="$t('pub.addBtn')" class="hollowFixedBtn TeamAddBtn" v-show="ishowBtn" @click="AddOutDetail(3)" />
</template>
<span style="float:right" v-else>{{$t('objFill.zhuyi')}}：{{$t('objFill.feiqianzfcbzd')}} &nbsp;</span>
</template>
</div>
<div class="clearfix TB_PrintDiv">
......@@ -2111,10 +2114,15 @@
</div>
</el-dialog>
<offset :isShow="cdState" :obj="queryObj" @close="cdState=false"></offset>
</div>
</template>
<script>
import { userMixin } from "../../common/mixins/userMixin.js";
import offset from '../../public/offset.vue';
export default {
mixins: [userMixin],
components: { offset },
data() {
return {
draftList: [],//我的草稿数据
......@@ -2244,10 +2252,62 @@
dataDocList: [],
EditBtn: false,
ActionMenuCode: '',
groupId:2
groupId:2,
queryObj: {},
cdState: false,
};
},
methods: {
isOffset(_orderSource, _type){
if(this.OutBranchId>0){
this.goUrlYFKCD(_orderSource, _type,'Offset')
}else{
this.$message({
message: '出团公司为空,不能冲抵',
type: 'warning'
})
}
},
goUrlYFKCD(_orderSource, _type,Offset) {
let Handmsg = {
OtherType: 7,
ReFinanceId: 0,
Rate: 0,
TCNUM: '',
czState: true,
}
let TCIDARR = []
let id = [];
TCIDARR.push(this.TCID)
let orderObj = {
OrderID: 0,
OrderSource: _orderSource,
Obj: {},
SourceID: this.TCID,
TCIDList: TCIDARR,
// LineId : ''
}
id = id.length > 0 ? JSON.stringify(id) : null;
// 冲抵
if(Offset){
orderObj.TCIDList = [this.TCID]
let query = {
'czmsg': Handmsg,
'Type': _type,
'path': 'teamRevenueExpenditure',
'companyID': this.OutBranchId,
'blank': 'y',
'orderObj': JSON.stringify(orderObj),
'OrderSource': _orderSource,
'searchTitle': '分摊'
};
this.queryObj = query
this.cdState = true
return
}
},
Financial_post_GetPageList(){
let msg = {
pageIndex: 1,
......
src/components/TravelManager/TravelList/TravelControlList.vue
View file @ 0bcad647
......@@ -587,74 +587,82 @@
</p>
<el-popover width="900" trigger="click" popper-class="TC_tripDetails">
<table width="100%" border="0" cellspacing="0" cellpadding="0">
<tr class="_color_666" style="text-align: center">
<th width="60">{{ $t("Airticket.Air_segment") }}</th>
<th width="80">{{ $t("system.query_flightNum") }}</th>
<th width="150">{{ $t("system.ph_flightTime") }}</th>
<th width="80">{{ $t("system.query_arrivalTime") }}</th>
<th width="100">{{ $t("system.query_stopCity") }}</th>
</tr>
<tr v-for="(fItem, fIndex) in item.flightList" :key="fIndex" style="text-align: center">
<td class="_d_name _color_666">
<span v-if="fIndex == 0">{{ $t("Airticket.Air_go") }}</span>
<span v-else-if="fIndex == item.flightList.length - 1">{{
<template v-for="(nItem,newIndex) in item.newFlightList">
<tr class="_color_666" style="text-align: center" :key="`hf_`+newIndex">
<th width="60">{{ $t("Airticket.Air_segment") }}</th>
<th width="80">{{ $t("system.query_flightNum") }}</th>
<th width="150">{{ $t("system.ph_flightTime") }}</th>
<th width="80">{{ $t("system.query_arrivalTime") }}</th>
<th width="100">{{ $t("system.query_stopCity") }}</th>
</tr>
<tr v-for="(fItem, fIndex) in nItem.flightList" :key="`hd_`+newIndex+`d_`+fIndex" style="text-align: center">
<td class="_d_name _color_666">
<span v-if="fIndex == 0">{{ $t("Airticket.Air_go") }}</span>
<span v-else-if="fIndex == item.flightList.length - 1">{{
$t("Airticket.Air_returnTrip")
}}</span>
<span
v-else-if="fIndex > 0 && fIndex != item.flightList.length - 1">{{ $t("Airticket.Air_transit") }}</span>
</td>
<td>
<div>{{ fItem.Flight_number }}</div>
<div style="margin-top: 5px">{{ fItem.AlName }}</div>
</td>
<td>
<div>{{ fItem.FlightDate }} {{ fItem.Departure_time }}</div>
<div style="margin-top: 5px">
<span v-if="fItem.DIATA">({{ fItem.DIATA }})</span>
{{ fItem.dName }}
</div>
</td>
<td>
<div>
{{ fItem.FlightArrivalTime }} {{ fItem.Arrival_time }}
</div>
<div style="margin-top: 5px">
<span v-if="fItem.AIATA">({{ fItem.AIATA }})</span>
{{ fItem.aName }}
</div>
</td>
<td>
<template
v-if="fItem.StopoverIATA">({{ fItem.StopoverIATA }})</template>{{ fItem.StopoverName }}
</td>
</tr>
<span
v-else-if="fIndex > 0 && fIndex != item.flightList.length - 1">{{ $t("Airticket.Air_transit") }}</span>
</td>
<td>
<div>{{ fItem.Flight_number }}</div>
<div style="margin-top: 5px">{{ fItem.AlName }}</div>
</td>
<td>
<div>{{ fItem.FlightDate }} {{ fItem.Departure_time }}</div>
<div style="margin-top: 5px">
<span v-if="fItem.DIATA">({{ fItem.DIATA }})</span>
{{ fItem.dName }}
</div>
</td>
<td>
<div>
{{ fItem.FlightArrivalTime }} {{ fItem.Arrival_time }}
</div>
<div style="margin-top: 5px">
<span v-if="fItem.AIATA">({{ fItem.AIATA }})</span>
{{ fItem.aName }}
</div>
</td>
<td>
<template
v-if="fItem.StopoverIATA">({{ fItem.StopoverIATA }})</template>{{ fItem.StopoverName }}
</td>
</tr>
</template>
</table>
<div class="FlightDiv-TCL" slot="reference">
<template v-if="item.UseFlightType == 0">
<div v-for="subItem in item.flightList" slot="reference" :key="subItem.subCode"
class="TCL-flighInfoList">
<span class="travelnowrap">
<span class="TCL-FlightNumber">{{
<template v-for="(nItem,newIndex) in item.newFlightList">
<div v-for="(subItem) in nItem.flightList" slot="reference" :key="`f_`+newIndex+`_`+subItem.ID"
class="TCL-flighInfoList">
<span class="travelnowrap">
<span class="TCL-FlightNumber">{{
subItem.Flight_number
}}</span>
<span><template v-if="subItem.DIATA">({{ subItem.DIATA }})</template>
<template v-else>({{ subItem.dName }})</template></span>
{{ subItem.DepartureName }}
{{
<span><template v-if="subItem.DIATA">({{ subItem.DIATA }})</template>
<template v-else>({{ subItem.dName }})</template></span>
{{ subItem.DepartureName }}
{{
subItem.StopoverName == ""
? ""
: "-(" + subItem.StopoverIATA + ")" + subItem.StopoverName
}}
<template v-if="subItem.ArrivalCityName">
<span v-if="subItem.AIATA"> -({{ subItem.AIATA }}) </span>
<span v-else>-</span>
{{ subItem.ArrivalCityName }}
<template v-if="!subItem.DIATA">({{ subItem.aName }})</template>
</template>
<span v-if="subItem.FlightState == 1" class="TCL-greenType">【OK】</span>
<span v-else class="TCL-redType">【{{ $t("visa.v_zanding") }}】</span>
</span>
</div>
<template v-if="subItem.ArrivalCityName">
<span v-if="subItem.AIATA"> -({{ subItem.AIATA }}) </span>
<span v-else>-</span>
{{ subItem.ArrivalCityName }}
<template v-if="!subItem.DIATA">({{ subItem.aName }})</template>
</template>
<span v-if="subItem.FlightState == 1" class="TCL-greenType">【OK】</span>
<span v-else class="TCL-redType">【{{ $t("visa.v_zanding") }}】</span>
</span>
</div>
<template v-if="newIndex!=item.newFlightList.length-1">
<div slot="reference" class="TCL-flighInfoList" style="border-bottom:1px solid #e5e5e5">
</div>
</template>
</template>
</template>
<template v-else>
<div v-for="subItem in item.flightList" slot="reference" :key="subItem.subCode"
......@@ -1660,7 +1668,7 @@
</el-dropdown-item>
<el-dropdown-item @click.native="CopyTripAndFeature(item,3)">
机票转团
</el-dropdown-item>
</el-dropdown-item>
<el-dropdown-item @click.native="ckChangePrice(item,1)">
价格变更
</el-dropdown-item>
......
src/components/TravelManager/TravelList/TravelControlListSale.vue
View file @ 0bcad647
......@@ -450,49 +450,100 @@
<p class="TCLflight_GO">
<i class="iconfont icon-hangban1"></i>{{$t('visa.v_hangban')}}
</p>
<el-popover width="900" trigger="click" popper-class="TC_tripDetails">
<el-popover width="900" trigger="click" popper-class="TC_tripDetails">
<table width="100%" border="0" cellspacing="0" cellpadding="0">
<tr class="_color_666" style="text-align:center;">
<th width="60">{{$t('Airticket.Air_segment')}}</th>
<th width="80">{{$t('system.query_flightNum')}}</th>
<th width="150">{{$t('system.ph_flightTime')}}</th>
<th width="80">{{$t('system.query_arrivalTime')}}</th>
<th width="100">{{$t('system.query_stopCity')}}</th>
</tr>
<tr v-for="(ds,din) in item.flightList" :key="din" style="text-align:center;">
<td class="_d_name _color_666">
<span v-if="din==0">{{$t('Airticket.Air_go')}}</span>
<span v-else-if="din==item.flightList.length-1">{{$t('Airticket.Air_returnTrip')}}</span>
<span
v-else-if="din>0 && din!=item.flightList.length-1">{{$t('Airticket.Air_transit')}}</span>
</td>
<td>
<div>{{ds.Flight_number}}</div>
<div style="margin-top:5px;">{{ds.AlName}}</div>
</td>
<td>
<div>{{ds.FlightDate}} {{ds.Departure_time}}</div>
<div style="margin-top:5px;">{{ds.dName}}</div>
</td>
<td>
<div>{{ds.FlightArrivalTime}} {{ds.Arrival_time}}</div>
<div style="margin-top:5px;">{{ds.aName}}</div>
</td>
<td>{{ds.StopoverName}}</td>
</tr>
<template v-for="(nItem,newIndex) in item.newFlightList">
<tr class="_color_666" style="text-align: center" :key="`hf_`+newIndex">
<th width="60">{{ $t("Airticket.Air_segment") }}</th>
<th width="80">{{ $t("system.query_flightNum") }}</th>
<th width="150">{{ $t("system.ph_flightTime") }}</th>
<th width="80">{{ $t("system.query_arrivalTime") }}</th>
<th width="100">{{ $t("system.query_stopCity") }}</th>
</tr>
<tr v-for="(fItem, fIndex) in nItem.flightList" :key="`hd_`+newIndex+`d_`+fIndex" style="text-align: center">
<td class="_d_name _color_666">
<span v-if="fIndex == 0">{{ $t("Airticket.Air_go") }}</span>
<span v-else-if="fIndex == item.flightList.length - 1">{{
$t("Airticket.Air_returnTrip")
}}</span>
<span
v-else-if="fIndex > 0 && fIndex != item.flightList.length - 1">{{ $t("Airticket.Air_transit") }}</span>
</td>
<td>
<div>{{ fItem.Flight_number }}</div>
<div style="margin-top: 5px">{{ fItem.AlName }}</div>
</td>
<td>
<div>{{ fItem.FlightDate }} {{ fItem.Departure_time }}</div>
<div style="margin-top: 5px">
<span v-if="fItem.DIATA">({{ fItem.DIATA }})</span>
{{ fItem.dName }}
</div>
</td>
<td>
<div>
{{ fItem.FlightArrivalTime }} {{ fItem.Arrival_time }}
</div>
<div style="margin-top: 5px">
<span v-if="fItem.AIATA">({{ fItem.AIATA }})</span>
{{ fItem.aName }}
</div>
</td>
<td>
<template
v-if="fItem.StopoverIATA">({{ fItem.StopoverIATA }})</template>{{ fItem.StopoverName }}
</td>
</tr>
</template>
</table>
<div class="FlightDiv-TCL" slot="reference">
<div v-for="subItem in item.flightList" slot="reference" :key="subItem.subCode"
class="TCL-flighInfoList">
<span class="travelnowrap">
<span class="TCL-FlightNumber">{{subItem.Flight_number}}</span>
{{subItem.DepartureName}}
{{subItem.StopoverName==""?"":"-"+subItem.StopoverName}}
{{subItem.ArrivalCityName==""?"":"-"+subItem.ArrivalCityName}}
<span v-if="subItem.FlightState==1" class="TCL-greenType">【OK】</span>
<span v-else class="TCL-redType">【{{$t('visa.v_zanding')}}】</span>
</span>
</div>
<template v-if="item.UseFlightType == 0">
<template v-for="(nItem,newIndex) in item.newFlightList">
<div v-for="(subItem) in nItem.flightList" slot="reference" :key="`f_`+newIndex+`_`+subItem.ID"
class="TCL-flighInfoList">
<span class="travelnowrap">
<span class="TCL-FlightNumber">{{
subItem.Flight_number
}}</span>
<span><template v-if="subItem.DIATA">({{ subItem.DIATA }})</template>
<template v-else>({{ subItem.dName }})</template></span>
{{ subItem.DepartureName }}
{{
subItem.StopoverName == ""
? ""
: "-(" + subItem.StopoverIATA + ")" + subItem.StopoverName
}}
<template v-if="subItem.ArrivalCityName">
<span v-if="subItem.AIATA"> -({{ subItem.AIATA }}) </span>
<span v-else>-</span>
{{ subItem.ArrivalCityName }}
<template v-if="!subItem.DIATA">({{ subItem.aName }})</template>
</template>
<span v-if="subItem.FlightState == 1" class="TCL-greenType">【OK】</span>
<span v-else class="TCL-redType">【{{ $t("visa.v_zanding") }}】</span>
</span>
</div>
<template v-if="newIndex!=item.newFlightList.length-1">
<div slot="reference" class="TCL-flighInfoList" style="border-bottom:1px solid #e5e5e5">
</div>
</template>
</template>
</template>
<template v-else>
<div v-for="subItem in item.flightList" slot="reference" :key="subItem.subCode"
class="TCL-flighInfoList">
<span class="travelnowrap">
<span class="TCL-FlightNumber">{{
subItem.Flight_number
}}</span>
{{ subItem.aName }} {{ subItem.Departure_time }}
-
{{ subItem.dName }} {{ subItem.Arrival_time }}
<span v-if="subItem.FlightState == 1" class="TCL-greenType">【OK】</span>
<span v-else class="TCL-redType">【{{ $t("visa.v_zanding") }}】</span>
</span>
</div>
</template>
</div>
</el-popover>
</div>
......
src/components/cruiseShip/list/cruiseShipInfo.vue
View file @ 0bcad647
......@@ -427,8 +427,9 @@
<div class="flexOne changInfo" :class="{ 'drawer-mode': isDrawerMode }">
<!-- 正常内容 -->
<div class="resource-content clearfix">
<!-- :disabled="addMsg.OrderId>0&&(activeTab=='basic'||activeTab=='contact')" -->
<el-form :model="addMsg" :rules="rules" class="h-full" ref="addMsg" label-width="120px"
:disabled="addMsg.OrderId>0&&(activeTab=='basic'||activeTab=='contact')">
>
<div class="hotel-form-container h-full">
<el-tabs v-model="activeTab" type="border-card" class="hotel-tabs">
<el-tab-pane label="基础资料" name="basic">
......@@ -682,7 +683,8 @@
</el-dialog>
<div class="btn-list">
<div class="btn-actions">
<button v-if="!addMsg.OrderId" class="save-Btn" @click="submitForm('addMsg')" :disabled="isSaving">
<!-- v-if="!addMsg.OrderId" -->
<button class="save-Btn" @click="submitForm('addMsg')" :disabled="isSaving">
<i v-if="isSaving" class="el-icon-loading" style="margin-right: 4px;"></i>
{{ isSaving ? '' : $t('pub.saveBtn') }}
</button>
......
src/components/cruiseShip/list/cruiseShipListConfig.js
View file @ 0bcad647
......@@ -54,7 +54,7 @@ export const spotListConfig = {
prop: 'CouponsName',
minWidth: 150,
fixed: 'left',
type: 'link',
// type: 'link',
slotName: 'CouponsName',
filter: {
type: 'input',
......
src/components/cruiseShip/list/cruiseShipOrderList.vue
View file @ 0bcad647
......@@ -20,11 +20,11 @@
@add-click="addSpot"
>
<!-- 插槽 -->
<template slot="CouponsName" slot-scope="{ row }">
<!-- <template slot="CouponsName" slot-scope="{ row }">
<span class="name-link" @click="editSpot(row)">
{{ row.CouponsName }}
</span>
</template>
</template> -->
<template slot="profit" slot-scope="{ row }">
{{ row.Income-row.CostMoney-row.Refund>0?(row.Income-row.CostMoney-row.Refund).toFixed(2):'-' }}
</template>
......@@ -114,6 +114,12 @@
<!-- <el-button type="text" size="mini" @click="manageData(row)">邮轮</el-button> -->
<!-- <el-button type="text" size="mini" @click="editSpot(row)">编辑</el-button> -->
<div class="row">
<span v-if="row.OrderStatus == 2"
class="c059FF6 mr-xs pointer"
@click="editSpot(row)"
>{{$t('pub.edit')}}</span>
<span v-if="row.OrderStatus == 1 && row.IncomeList.length == 0 && row.RefundList.length == 0 && row.CostList.length == 0"
class="delete-btn mr-xs pointer"
@click="cancelOrder(row)"
......@@ -124,7 +130,7 @@
@click="clickOperation(row,3)"
>{{$t('fnc.shousun')}}</span>
<!-- v-if="row.OrderStatus>1&&!row.OrderStatus!=3&&!row.OrderStatus!=4&&isOP&&userInfo.ActionMenuCode.indexOf('is_correlationOP') != -1" -->
<span
<!-- <span
class="c059FF6 mr-xs pointer"
@click="clickOperation(row,4)"
>{{$t('pub.edit')}}OP</span>
......@@ -132,7 +138,7 @@
<span v-if="row.OrderStatus!=3"
class="c059FF6 mr-xs pointer"
@click="clickOperation(row,5)"
>{{$t('pub.edit')}}{{$t('fnc.a_zongjine')}}</span>
>{{$t('pub.edit')}}{{$t('fnc.a_zongjine')}}</span> -->
<ApplyFoInvoice class="pointer" v-if="userInfo&&userInfo.RB_Group_id==2&&userInfo.EmployeeId==row.EnterID"
:obj="row" :type="7"></ApplyFoInvoice>
......
src/components/orderCommon/order-remark.vue
View file @ 0bcad647
......@@ -49,13 +49,13 @@
</el-row>
<template v-if="postMsg.TeamType!=2">
<el-row :gutter="20">
<el-col :span="2">
<el-col :span="2" v-if="userInfo.SimpleEasy!=1">
<el-form-item :label="$t('salesModule.IsLianYn')">
<el-checkbox v-model="postMsg.IsIntermodal" :true-label="1" :false-label="0">
</el-checkbox>
</el-form-item>
</el-col>
<el-col :span="22">
<el-col :span="userInfo.SimpleEasy!=1?22:24">
<el-form-item :label="$t('objFill.liangyunbeizhu')">
<el-input v-model="postMsg.UnionRemark" type="textarea" maxlength="500">
</el-input>
......@@ -67,8 +67,10 @@
</div>
</template>
<script>
import { userMixin } from "../common/mixins/userMixin.js";
export default {
props: ["remarksMsg"],
mixins: [userMixin],
data() {
return {
RemarksRules: {
......
src/router/config.js
View file @ 0bcad647
......@@ -3646,6 +3646,14 @@ export default {
title: '跟团游订单'
},
},
{ // 销售 跟团游订单
path: '/groupTourOrderOP',
name: 'groupTourOrderOP',
component: resolve => require(['@/components/SalesModule/groupTourOrder'], resolve),
meta: {
title: '跟团游订单OP'
},
},
{ // 销售 特价申请函
path: '/SpecialList',
name: 'SpecialList',
......
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