Skip to content

S
SuperMan
Commit 19653a75 authored by 王悦's avatar 王悦
Browse files
Options

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

parents 2641d8c3 313b3517
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 3779 additions and 3430 deletions
src/components/Complaints/ComplaintsDetail.vue
View file @ 19653a75
......@@ -202,11 +202,15 @@
<ul>
<li><span>线路：</span>{{PriceInfo.LineName}}</li>
<li><span>系列：</span>{{PriceInfo.LtName}}</li>
<li><span>团队编号：</span><a>{{PriceInfo.TCID}}</a></li>
<li><span>团队编号：</span><a style="text-decoration:underline;cursor:pointer;"
@click="goTeamBalancePayment('团队收支','TeamBalancePayment',PriceInfo.TCID,PriceInfo.OutBranchId)">{{PriceInfo.TCID}}</a>
</li>
<li><span>行程天数：</span>{{PriceInfo.DayNum}}</li>
<li><span>出发日期：</span>{{PriceInfo.StartDate}}</li>
<li><span>返回日期：</span>{{PriceInfo.BackDate}}</li>
<li><span>订单号：</span><a>{{PriceInfo.OrderId}}</a></li>
<li><span>订单号：</span><a style="text-decoration:underline;cursor:pointer;"
@click="goEnrollTotal('报名统计','enrollTotal',PriceInfo.OrderId)">{{PriceInfo.OrderId}}</a>
</li>
<li><span>业务员：</span>{{PriceInfo.Salesman}}</li>
<li><span>线控：</span>{{PriceInfo.DriveByWire}}</li>
<li><span>操作OP：</span>{{PriceInfo.OpName}}</li>
......@@ -231,7 +235,7 @@
<span>已赔金额：</span>{{getBackMoney()}}
</li>
<li
v-if="ComplainInfo.DisposeStatus===4&&getLocalStorage().EmployeeId===ComplainDetial[ComplainDetial.length-1].CreateBy">
v-if="ComplainInfo.DisposeStatus===4&&(getLocalStorage().EmployeeId===ComplainDetial[ComplainDetial.length-1].CreateBy||authority.indexOf('S_Complain_Finance')!=-1)">
<span>单据详情：</span>
<span v-for="compensation in ComplainCompensation" class="CD_dealResult" href="javascript:void(0)"
@click="setFinance(compensation)">{{compensation.CompensateMoney}}</span>
......@@ -444,7 +448,8 @@
ishowBtn: true,
showAppendMoney: false,
CompensateMoney: 0,//赔偿金额
ComplainCompensation: []//赔款列表
ComplainCompensation: [],//赔款列表
authority: [],
}
},
methods: {
......@@ -604,13 +609,13 @@
})
} else if (compensation.FinanceID > 0) {
this.$router.push({
name: "FinancialDocumentsDetail",
name: 'FinancialDocumentsDetail',
query: {
id: compensation.FinanceID,
blank: 'y',
tab: "单据详情"
tab: '单据详情'
}
});
})
}
},
......@@ -727,6 +732,26 @@
})
return money
},
goEnrollTotal (name, path, orderId) {
this.$router.push({
name: path,
query: {orderId: orderId, blank: 'y', tab: name}
})
},
goTeamBalancePayment (name, path, id, outBranchId) {
this.$router.push({
name: path,
query: {id: id, outBranchId: outBranchId, blank: 'y', tab: name}
})
},
initAuthor() {
let msg = {
MenuUrl: "/ChoiceAddFinancialDocuments"
};
this.apipost("admin_get_GetActionCodeForUrlAndUser", msg, r => {
this.authority = r.data.data;
});
},
},
mounted () {
this.queryMsg.ID = this.$route.query.id
......@@ -734,6 +759,7 @@
this.getEnumeration()
this.getEmployeeList()
this.getDetial()
this.initAuthor();
}
}
......
src/components/FinancialModule/addReceivablesDocuments.vue
View file @ 19653a75
......@@ -969,7 +969,7 @@ export default {
this.GetDetail.walist.forEach(x=>{
if (x.Type===1){
AccList.forEach(y=>{
if(y.Name === '私帐账户' || y.Name === '公帐账户' || y.Name==='微信支付宝'){
if(y.Name === '私帐账户' || y.Name === '公帐账户' || y.Name==='微信支付宝' || y.Name==='虚拟账户'){
newAccList.push(y)
}
})
......
src/components/FinancialModule/sellCommissionRules.vue
View file @ 19653a75
......@@ -63,7 +63,7 @@
</el-form-item>
</el-col>
<el-col :span="5" :gutter="20">
<el-form-item label="提成比例：" prop="CommissionVariable">
<el-form-item label="提成比例：" prop="CommissionVariable">
<el-input
v-model="addMsg.CommissionVariable"
type="int"
......
src/components/SalesModule/customerTransfer.vue
View file @ 19653a75
......@@ -786,6 +786,9 @@
this.getEmployee()
},
getEmployee() {
this.employeeMsg.departmentId=0
this.employeeMsg.RB_Group_id=this.getLocalStorage().RB_Group_id
this.employeeMsg.RB_Branch_id=-1
this.apipost('app_get_company_employee', this.employeeMsg, res => {
if(res.data.resultCode == 1) {
if(!this.isSelLayer)
......
src/components/SalesModule/enrollTotal.vue
View file @ 19653a75
......@@ -152,7 +152,7 @@
<th width="130">单号&团号</th>
<th width="60">客户信息</th>
<th width="70">类型</th>
<th width="180">系列&线路</th>
<th width="180">系列&线路</th>
<th width="100">人数/机位数</th>
<th width="80">单价</th>
<th width="80">成交单价</th>
......@@ -588,6 +588,11 @@
this.msg.QStartDate = nowDay;
this.msg.QEndDate = nowDay;
}
if (this.$route.query.orderId) {
this.msg.tempOrderId = this.$route.query.orderId;
this.msg.QStartDate = "";
this.msg.QEndDate = "";
}
this.getList();
}
};
......
src/components/SalesModule/planeTicketInquiry.vue
View file @ 19653a75
......@@ -1462,12 +1462,12 @@
<el-col :span="2">
<span class="_lian_style" v-if="item.IsSetUnion==1">联</span>
<div class="_oll_img_box">
<span class="TICK_Code PingFangSC">编号：{{item.ID}}</span>
<span class="TICK_Code PingFangSC" style="left:35px;">编号：{{item.ID}}</span>
<img v-if="!item.AirlineUrl" class="_oll_img" :src="defaultImg">
<img v-else class="_oll_img" :src="item.AirlineUrl" :onerror="defaultImg">
<img v-else class="_oll_img" :src="item.AirlineUrl" :onerror="defaultImg" style="margin-left:30px;">
</div>
</el-col>
<el-col :span="2" class="vmiddle" style="width:85px;">
<el-col :span="3" class="vmiddle">
<div class="_oll_info">
<el-tooltip class="item" effect="dark" :content="item.AirlineName" placement="top-start" popper-class="max-w250">
<p class="_oll_tit">{{item.AirlineName}}</p>
......@@ -1475,7 +1475,7 @@
<span class="_oll_adrr">{{item.FreightSpaceStr}}</span>
</div>
</el-col>
<el-col :span="4" class="vmiddle">
<el-col :span="5" class="vmiddle">
<div class="FlightDivDetails">
<div class="_flightList" v-for="subItem in item.flightList">
<span class="FlightNumber">{{subItem.Flight_number}}</span>
......@@ -1544,78 +1544,7 @@
</div>
</div>
</el-col>
<el-col :span="3" class="vmiddle">
<div class="TK_raduis">
<ul>
<!--一定-->
<li v-if="item.FirstDeposit!=''">
<div @click="goFinacePage(item,1)" :class="getClass(item.FirstDepositStatus)">
<el-tooltip effect="dark" :content="item.FirstDeposit" placement="top" popper-class="max-w250">
<span>1</span>
</el-tooltip>
</div>
<div class="FinaDetailContent">
<span v-if="item.FirstAuditList!=null" v-for="childItem in item.FirstAuditList">
<span class="FinaceDanList" @click="goFinaceDetails(childItem.FinaceId)">{{childItem.FinaceId}}</span>
</span>
</div>
</li>
<!--二定-->
<li v-if="item.SecondDeposit!=''">
<div @click="goFinacePage(item,2)" :class="getClass(item.SecondDepositStatus)">
<el-tooltip effect="dark" :content="item.SecondDeposit" placement="top" popper-class="max-w250">
<span>2</span>
</el-tooltip>
</div>
<div class="FinaDetailContent">
<span v-if="item.SecondAuditList!=null" v-for="childItem in item.SecondAuditList">
<span class="FinaceDanList" @click="goFinaceDetails(childItem.FinaceId)">{{childItem.FinaceId}}</span>
</span>
</div>
</li>
<!--三定-->
<li v-if="item.ThirdDeposit!=''">
<div @click="goFinacePage(item,3)" :class="getClass(item.ThirdDepositStatus)">
<el-tooltip effect="dark" :content="item.ThirdDeposit" placement="top" popper-class="max-w250">
<span>3</span>
</el-tooltip>
</div>
<div class="FinaDetailContent">
<span v-if="item.ThirdAuditList!=null" v-for="childItem in item.ThirdAuditList">
<span class="FinaceDanList" @click="goFinaceDetails(childItem.FinaceId)">{{childItem.FinaceId}}</span>
</span>
</div>
</li>
<!--四定-->
<li v-if="item.FourthDeposit!=''">
<div @click="goFinacePage(item,4)" :class="getClass(item.FourthDepositStatus)">
<el-tooltip effect="dark" :content="item.FourthDeposit" placement="top" popper-class="max-w250">
<span>4</span>
</el-tooltip>
</div>
<div class="FinaDetailContent">
<span v-if="item.FourthAuditList!=null" v-for="childItem in item.FourthAuditList">
<span class="FinaceDanList" @click="goFinaceDetails(childItem.FinaceId)">{{childItem.FinaceId}}</span>
</span>
</div>
</li>
<!--尾款-->
<li v-if="item.FinalPayment!=''">
<div @click="goFinacePage(item,5)" :class="getClass(item.FinalPaymentStatus)">
<el-tooltip effect="dark" :content="item.FinalPayment" placement="top" popper-class="max-w250">
<span>尾</span>
</el-tooltip>
</div>
<div class="FinaDetailContent">
<span v-if="item.FinalAuditList!=null" v-for="childItem in item.FinalAuditList">
<span class="FinaceDanList" @click="goFinaceDetails(childItem.FinaceId)">{{childItem.FinaceId}}</span>
</span>
</div>
</li>
</ul>
</div>
</el-col>
<el-col :span="1" class="vmiddle">
<el-col :span="2" class="vmiddle">
<div class="TMA_raduis">
<ul style="padding:0;">
<li class="_head" style="display:block">
......@@ -1626,13 +1555,13 @@
</ul>
</div>
</el-col>
<el-col :span="2" class="vmiddle">
<el-col :span="3" class="vmiddle">
<div class="_jztime">
<p class="PingFangSC">{{item.TicketDeadlineStr}}</p>
<p class="_text">{{$t('Airticket.Air_deadTicketTime')}}</p>
</div>
</el-col>
<el-col :span="3" class="vmiddle">
<el-col :span="1" class="vmiddle">
<el-button-group size="mini">
<el-tooltip class="item" effect="dark" content="立即下单" placement="top-start">
<el-button type="primary" icon="iconfont icon-fukuan1" @click="goBuy(item)"></el-button>
......@@ -1642,16 +1571,13 @@
</el-row>
<el-row :gutter="0">
<el-col :span="16">
<el-col :span="24">
<div class="TCID_cont PingFangSC">
团期：
<span v-show="item.TCIDList.length==0">暂无</span>
<span class="Ticket_TCID" style="display:inline-block;margin-right: 10px;cursor: pointer;" v-for="(subItem, subIndex) in item.TravelInfo" :key="subIndex" @click="goUrlP(subItem.TCID)">{{subItem.TCNUM}}({{subItem.TCID}})</span>
</div>
</el-col>
<el-col :span="8">
<div class="TCID_cont">PNR：{{item.PNR}}</div>
</el-col>
</el-row>
</li>
</ul>
......@@ -2303,33 +2229,6 @@
}
return FeeTypeName;
},
//跳转财务付款单
goFinacePage(item, type) {
var TCID = 0;
if (item.TCIDList != null && item.TCIDList.length > 0) {
TCID = item.TCIDList[0];
}
let orderObj = {
OrderID: null,
OrderSource: 4,
TCID: null,
Obj: {
Type: type
},
SourceID: item.ID,
TCIDList: item.TCIDList
};
this.$router.push({
name: "ChoiceAddFinancialDocuments",
query: {
Type: 2,
companyID: -1,
path: "TicketFinace",
blank: "y",
orderObj: JSON.stringify(orderObj)
}
});
},
//导入
getImport(command) {
this.importType = command;
......
src/components/SalesModule/productQuery.vue
View file @ 19653a75
......@@ -740,7 +740,7 @@
<p><span>当前余位</span><i :style="item.SurplusSeat<0?'color: red':''">{{item.SurplusSeat}}</i></p>
<p><span>已报入</span><i>{{item.Seat==''?"0":item.Seat}}人</i>(占位：{{item.Occupied}}人)</p>
<p><span>候补</span>
<em v-if='item.IsSubstitution==1'>可以候补</em>
<em v-if='item.IsSubstitution==1'>可以候补（候补{{item.SubstitutionCount}}人）</em>
<em v-if='item.IsSubstitution!=1' style="color: #E95252;">本团拒绝候补</em>
</p>
</div>
......
src/components/ShoppingStore/ShoppingStore.vue
View file @ 19653a75
......@@ -602,7 +602,7 @@
</tr>
<tr v-for="(item,index) in importData" :key="item.subCode">
<td :class="{'redType':item.TCIDExist==-1}">
<el-input v-model="item.TCID" class="w150"></el-input>
<el-input v-model="item.TCNUM" class="w150"></el-input>
</td>
<td :class="{'redType':item.ShoppingNameExist==-1}">
<el-select clearable class="w150" v-model='item.ShoppingID' filterable :placeholder="$t('hotel.hotel_area')">
......@@ -651,8 +651,6 @@
</el-upload>
</el-dialog>
</div>
</template>
<script>
......@@ -1036,9 +1034,9 @@
);
},
//导游名称
getGuider() {
getLeaderAndGuide() {
let msg = {
Type: 2
Type: 0
};
this.apipost(
"leader_post_GetList",
......@@ -1046,23 +1044,6 @@
res => {
if (res.data.resultCode == 1) {
this.guidList = res.data.data;
} else {
this.Error(res.data.message);
}
},
err => {}
);
},
//领队名称
getLeader() {
let msg = {
Type: 1
};
this.apipost(
"leader_post_GetList",
msg,
res => {
if (res.data.resultCode == 1) {
this.leaderList = res.data.data;
} else {
this.Error(res.data.message);
......@@ -1071,6 +1052,7 @@
err => {}
);
},
showTip2(index) {
this.importData[index].infoShow = true;
},
......@@ -1179,8 +1161,7 @@
this.getList();
this.getType();
this.getShopList();
this.getGuider();
this.getLeader();
this.getLeaderAndGuide();
this.getDownList();
}
};
......
src/components/index.vue
View file @ 19653a75
......@@ -959,6 +959,7 @@ export default {
firstMenuList:[],
allSsionList:[],
allWindowWidth: '',
SetTimeout: null,
};
},
filters: {
......@@ -3494,6 +3495,18 @@ export default {
padding: 20px 0 20px 20px;
height: auto;
// transition: all .5s linear .5s;
animation:ttt .5s forwards;
}
@keyframes ttt {
0%{
opacity:0;
}
66%{
opacity:0;
}
100%{
opacity:1;
}
}
.nav-middle ul li .menuList_son{
position: fixed;
......
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