Skip to content

S
SuperMan
Commit c1cfb22e authored by 华国豪's avatar 华国豪 🙄
Browse files
Options

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

parents 14e1efc5 e7b59a05
Expand all Show whitespace changes
Inline Side-by-side
Showing with 1962 additions and 2291 deletions
src/components/FinancialModule/BasicDocuments.vue
View file @ c1cfb22e
......@@ -1277,7 +1277,6 @@ export default {
}
},
addList: function (type, index) {
console.log(this.payMsgList[index])
if (type) {
if (this.payMsgList[index].AccountId==='') return
if (this.payMsgList[index].Type==='') return
......@@ -1846,15 +1845,15 @@ export default {
})
}
this.GetDetail = data;
console.log(" this.GetDetail", this.GetDetail)
let AuditSteps=this.GetDetail.AuditSteps;
let ChuNaShenHe = false
for(let i = 0; i < AuditSteps.length; i++) {
if(AuditSteps[i].NextStep==1 && AuditSteps[i].SpecialNode==2 && AuditSteps[i].Status==1){
ChuNaShenHe = true
this.Ststus = 1;
item.AuditRecordList.forEach(audit=>{
if(AuditSteps[i].AuditStatus==2){
AuditSteps[i].AuditRecordList.forEach(audit=>{
if(audit.AuditStatus==2){
this.Ststus=0;
return
}
......@@ -1874,13 +1873,15 @@ export default {
// }
// })
if (ChuNaShenHe && this.GetDetail.DijieBathFinanceList.length >= 0 ) {
this.otherTable = false
} else if (!ChuNaShenHe && this.GetDetail.DijieBathFinanceList.length < 1 ) {
if (this.GetDetail.DijieBathFinanceList.length > 0 ) {
if(ChuNaShenHe){
this.otherTable = false
} else if (!ChuNaShenHe && this.GetDetail.DijieBathFinanceList.length >0 ) {
}else{
this.otherTable = true
}
} else if (this.GetDetail.DijieBathFinanceList.length < 1 ) {
this.otherTable = false
}
this.OrderID = this.GetDetail.OrderID;
this.OrderSource = this.GetDetail.OrderSource;
this.SourceID = this.GetDetail.SourceID;
......@@ -1917,7 +1918,6 @@ export default {
// this.$router.push({name:data.URL+'1',query:{'SourceID':this.SourceID,'Callback':this.Callback,id:this.ID}});
// }
}
console.log(this.GetDetail,'getdetail');
}
}, err => {})
},
......
src/components/FinancialModule/CapitalAllocationDetail.vue
View file @ c1cfb22e
......@@ -304,7 +304,10 @@
<th width="110">{{$t('fnc.jine')}}</th>
<th width="90">{{$t('hotel.hotel_Currency')}}</th>
<th width="85">{{$t('hotel.hotel_CurrentRate')}}</th>
<th>汇兑收益</th>
<th>{{$t('fnc.bwbjine')}}</th>
</tr>
<tr>
<td>{{item.TypeName}}</td>
......@@ -314,7 +317,12 @@
<td>{{item.OriginalMoney}}</td>
<td>{{item.CurrencyName}}</td>
<td>{{item.Rate}}</td>
<td>
<span v-if="item.IsExChange==1">是</span>
<span v-if="item.IsExChange==0">否</span>
</td>
<td>{{item.Money}}</td>
</tr>
</table>
<div class="clearfix Ca_comLinediv">
......@@ -356,6 +364,7 @@
<th width="110">{{$t('fnc.jine')}}</th>
<th width="90">{{$t('hotel.hotel_Currency')}}</th>
<th width="85">{{$t('hotel.hotel_CurrentRate')}}</th>
<th>汇兑损失</th>
<th>{{$t('fnc.bwbjine')}}</th>
</tr>
<tr>
......@@ -366,6 +375,10 @@
<td>{{item.OriginalMoney}}</td>
<td>{{item.CurrencyName}}</td>
<td>{{item.Rate}}</td>
<td>
<span v-if="item.IsExChange==1">是</span>
<span v-if="item.IsExChange==0">否</span>
</td>
<td>{{item.Money}}</td>
</tr>
</table>
......@@ -637,6 +650,7 @@ export default {
this.apipost('Financial_get_GetFundTransfer', this.msg, res => {
if(res.data.resultCode == 1) {
this.dataList = res.data.data;
console.log("this.dataList",this.dataList)
this.GetDetail = JSON.parse(JSON.stringify(this.dataList));
this.GetDetail.AuditSteps = [];
if(this.dataList.Status==2){
......
src/components/FinancialModule/addCapitalAllocation.vue
View file @ c1cfb22e
......@@ -208,7 +208,12 @@
value-format="yyyy-MM-dd">
</el-date-picker>
<span class="_lable">{{$t('hotel.hotel_remark')}}：</span>
<el-input v-model="item.Description" type="textarea" class="w300 _border_b_1"></el-input>
<el-input v-model="item.Description" type="textarea" class="w250 _border_b_1"></el-input>
<span class="_lable">汇兑收益：</span>
<el-select v-model='item.IsExChange' class="w100 _border_b_1">
<el-option label='是' :value='1' :key='1'></el-option>
<el-option label='否' :value='0' :key='0'></el-option>
</el-select>
<div class="_add_btn">
<span @click="initMsg(1)">{{$t('fnc.tianjia')}}</span>
<span @click="deleteItem(1, index)">{{$t('system.table_delete')}}</span>
......@@ -300,7 +305,12 @@
value-format="yyyy-MM-dd">
</el-date-picker>
<span class="_lable">{{$t('hotel.hotel_remark')}}：</span>
<el-input v-model="item.Description" type="textarea" class="w300 _border_b_1"></el-input>
<el-input v-model="item.Description" type="textarea" class="w250 _border_b_1"></el-input>
<span class="_lable">汇兑损失：</span>
<el-select v-model='item.IsExChange' class="w100 _border_b_1">
<el-option label='是' :value='1' :key='1'></el-option>
<el-option label='否' :value='0' :key='0'></el-option>
</el-select>
<div class="_add_btn">
<span @click="initMsg(2)">{{$t('fnc.tianjia')}}</span>
<span @click="deleteItem(2, index)">{{$t('system.table_delete')}}</span>
......@@ -418,9 +428,12 @@ export default {
this.loading = true
this.apipost('Financial_get_GetFundTransfer', {ID: id}, res=>{
if(res.data.resultCode==1){
let data = res.data.data
this.inList = data.SBankList
this.outList = data.FBankList
let data = res.data.data;
this.inList = data.SBankList;
this.outList = data.FBankList;
this.msg.FrID = data.FrID
this.msg.TemplateId = data.TemplateId
this.msg.Status = data.Status
......@@ -445,11 +458,17 @@ export default {
}, null)
},
AddFinancial: function () {
this.loading = true
this.msg.BankList.push(...this.inList,...this.outList)
let c = this.inList.concat(this.outList);
this.msg.BankList=c;
this.msg.BankList.forEach(x=>{
delete x.shouAccNumList
})
// return;
this.apipost('Financial_post_SetFundTransfer', this.msg, res=>{
if(res.data.resultCode==1){
this.$message.success(res.data.message);
......@@ -469,11 +488,13 @@ export default {
if (type===1) {
let OriginalMoney = (this.inList[index].OriginalMoney && !isNaN(this.inList[index].OriginalMoney)) ? parseFloat(this.inList[index].OriginalMoney) : 0
let Rate = (this.inList[index].Rate && !isNaN(this.inList[index].Rate)) ? parseFloat(this.inList[index].Rate) : 0
this.inList[index].Money = OriginalMoney*Rate
this.inList[index].Money =Math.round(OriginalMoney*Rate*100)/100;
} else {
let OriginalMoney = (this.outList[index].OriginalMoney && !isNaN(this.outList[index].OriginalMoney)) ? parseFloat(this.outList[index].OriginalMoney) : 0
let Rate = (this.outList[index].Rate && !isNaN(this.outList[index].Rate)) ? parseFloat(this.outList[index].Rate) : 0
this.outList[index].Money = OriginalMoney*Rate
// this.outList[index].Money = OriginalMoney*Rate
this.outList[index].Money =Math.round(OriginalMoney*Rate*100)/100;
}
},
clearItem: function (type, index) {
......@@ -543,7 +564,8 @@ export default {
AllotType: 1,
Sort: '',
allName: '',
vorcherInos: []
vorcherInos: [],
IsExChange:0,
})
},
initOnList: function () {
......@@ -561,7 +583,9 @@ export default {
AllotType: 2,
Sort: '',
allName: '',
vorcherInos: []
vorcherInos: [],
IsExChange:0,
})
},
initMsg: function (t) {
......
src/components/FinancialModule/addFinancialDocuments.vue
View file @ c1cfb22e
......@@ -180,7 +180,7 @@
<span>{{BillSonName}}</span>
</p>
<p class="_yewudanju" v-if="OrderSource==8">{{$t('hotel.order_Number')}}：<span @click="msg.OrderID>0?jumpPage('RegistrationList',GetDetail,8):''">{{msg.OrderID==0?$t('fnc.no'):msg.OrderID}}</span></p>
<div class="rb_top_row _r_mb5">
<!-- <div class="rb_top_row _r_mb5">
<el-radio-group v-model="msg.IsPublic" @change="IsPublicChange" class="_IsPublic">
<el-radio :label="1" v-if='msg.TemplateId!==36 && msg.TemplateId!==37 && msg.TemplateId!==43 && msg.TemplateId!==48'>{{$t('fnc.gongzhang')}}</el-radio>
<el-radio :label="0" v-if='msg.TemplateId!==36 && msg.TemplateId!==37 && msg.TemplateId!==43 && msg.TemplateId!==48'>{{$t('fnc.sizhang')}}</el-radio>
......@@ -190,11 +190,23 @@
<el-radio :label="5" v-if='msg.TemplateId!==36 && msg.TemplateId!==37 && msg.TemplateId!==43 && msg.TemplateId!==48'>{{$t('fnc.ptxnzhanghu')}}</el-radio>
<el-radio :label="6" v-if='msg.TemplateId!==36 && msg.TemplateId!==37 && msg.TemplateId!==43 && msg.TemplateId!==48'>{{$t('fnc.djxnzhanghu')}}</el-radio>
<el-radio :label="7" v-if='msg.TemplateId!==36 && msg.TemplateId!==37 && msg.TemplateId!==43 && msg.TemplateId!==48'>{{$t('fnc.szxiangdi')}}</el-radio>
<!-- <el-radio :label="3">资金池</el-radio> -->
</el-radio-group>
</div>
</div> -->
<div class="rb_top_row _r_mb5">
<p >{{$t('fnc.fkduixiang')}}：
<el-select filterable v-model='msg.IsPublic' placeholder="付款类型" @change="IsPublicChange" class="w135 _border_b_1">
<el-option :label="$t('fnc.gongzhang')" :value='1' :key='1' v-if='msg.TemplateId!==36 && msg.TemplateId!==37 && msg.TemplateId!==43 && msg.TemplateId!==48'></el-option>
<el-option :label="$t('fnc.sizhang')" :value='0' :key='0' v-if='msg.TemplateId!==36 && msg.TemplateId!==37 && msg.TemplateId!==43 && msg.TemplateId!==48'></el-option>
<el-option :label="$t('fnc.rmbxianjin')" :value='2' :key='2' v-if='msg.TemplateId!==36 && msg.TemplateId!==37 && msg.TemplateId!==43 && msg.TemplateId!==48'></el-option>
<el-option :label="$t('fnc.wbxianjin')" :value='3' :key='3' v-if='msg.TemplateId!==36 && msg.TemplateId!==37 && msg.TemplateId!==48'></el-option>
<el-option :label="$t('fnc.zjinchi')" :value='4' :key='4' v-if='msg.TemplateId===36 || msg.TemplateId===37 || msg.TemplateId===48'></el-option>
<el-option :label="$t('fnc.ptxnzhanghu')" :value='5' :key='5' v-if='msg.TemplateId!==36 && msg.TemplateId!==37 && msg.TemplateId!==43 && msg.TemplateId!==48'></el-option>
<el-option :label="$t('fnc.djxnzhanghu')" :value='6' :key='6' v-if='msg.TemplateId!==36 && msg.TemplateId!==37 && msg.TemplateId!==43 && msg.TemplateId!==48'></el-option>
<el-option :label="$t('fnc.szxiangdi')" :value='7' :key='7' v-if='msg.TemplateId!==36 && msg.TemplateId!==37 && msg.TemplateId!==43 && msg.TemplateId!==48'></el-option>
</el-select>
<el-select filterable v-model='msg.ClientType' :placeholder="$t('fnc.khleixing')" @change="financeinfo_post_GetClientAccountList(msg.ClientType)" class="w135 _border_b_1">
<el-option v-for='item in ClientTypeList'
:label='item.Name'
......
src/components/SalesModule/groupTourOrder.vue
View file @ c1cfb22e
......@@ -59,14 +59,11 @@
border-bottom: 2px solid #333;
}
.groupTourOrderSearchTable tbody {}
.groupTourOrderSearchTable tr th {
background: #e6e6e6;
height: 30px;
font-size: 12px;
text-align: left;
text-indent: 15px;
text-align: center;
border-top: 1px solid #cccccc;
border-left: 1px solid #cccccc;
}
......@@ -2362,6 +2359,10 @@
}, err => {})
},
deleteItem(obj) {
if(obj.isCanClear==1){
this.Error('OP已确认订单，如需取消请联系当团OP！');
return;
}
this.$confirm('是否取消?', '提示', {
confirmButtonText: '确定',
cancelButtonText: '取消',
......@@ -3555,6 +3556,7 @@
this.loading = false
this.total = res.data.data.count
this.list = res.data.data.pageData;
console.log(this.list,'list');
} else {
this.$message.error(res.data.message)
}
......
src/components/SalesModule/groupTourOrderByTuan.vue
View file @ c1cfb22e
......@@ -40,9 +40,6 @@
border-right: 1px solid #cccccc;
border-collapse: collapse;
}
.groupTourOrderSearchTable tr {
/* border-bottom: 2px solid #333; */
}
.groupTourOrderSearchTable tbody tr:last-child {
border-bottom: 2px solid #333;
}
......@@ -2791,6 +2788,10 @@ export default {
},
deleteItem(obj) {
if(obj.isCanClear==1){
this.Error('OP已确认订单，如需取消请联系当团OP！');
return;
}
this.$confirm("是否取消?", "提示", {
confirmButtonText: "确定",
cancelButtonText: "取消",
......@@ -4052,7 +4053,7 @@ submitYSZEForm(){
//单机票
this.seat.SingleAirTicketCount=res.data.data.pageData.singleAirTicketCount;
} else {
this.$message.error(res.data.message);
this.Error(res.data.message);
}
},
err => {}
......
src/components/TravelManager/TravelList/RegistrationList.vue
View file @ c1cfb22e
......@@ -396,6 +396,7 @@
.groupTourOrder_tickets_black {
color: #000000;
text-decoration: underline;
display: inline-block;
}
.RegistrationList {
......@@ -880,6 +881,23 @@
margin: 5px;
text-align: center;
}
.rgsureBtn{
color: #fff;
padding: 0 15px;
height: 25px;
background: #297BEF;
border: 1px solid #297BEF;
cursor: pointer;
border-radius: 15px;
margin-left: 10px;
}
.rgsureBtn:hover{
background-color: #297BEF;
}
.rgComTips{
text-align:left;font-size:12px;
margin-left:10px;
}
</style>
<template>
......@@ -1400,14 +1418,6 @@
</el-select>
</el-form-item>
</el-col>
<el-col :span="4">
<el-form-item label="是否清位">
<el-select v-model='addMsg.IsCanClear' :placeholder="$t('pub.pleaseSel')">
<el-option label='可清位' :value='0' :key='0'></el-option>
<el-option label='不可清位' :value='1' :key='1'></el-option>
</el-select>
</el-form-item>
</el-col>
</el-row>
<el-row :gutter="20">
<el-col :span="4">
......@@ -1737,13 +1747,13 @@
<p class="RL-redType RL-remarkCon">{{item.Remarks}}</p>
</div>
</td>
<td colspan="5" class="groupTourOrder_remarks" style="height: 40px;">
<td colspan="6" class="groupTourOrder_remarks" style="height: 40px;">
<div class="clearfix RL-MARK">
<span class="RL-opremarkTitle">OP备注:</span>
<p class="RL-redType RL-remarkCon">{{item.OP_Remarks ? item.OP_Remarks : '无'}}</p>
</div>
</td>
<td colspan="5" style="height: 40px;cursor: pointer;"
<td colspan="4" style="height: 40px;cursor: pointer;"
@click="goUrlSFD('SalesFinancialDetail', '销售财务单据', item)">
<div>
<span>财务单据：</span>
......@@ -2006,13 +2016,23 @@
</div>
</td>
<td colspan="5" class="groupTourOrder_remarks" style="height: 40px;">
<div class="clearfix RL-MARK">
<td colspan="6" style="height: 40px;">
<div class="clearfix RL-MARK" style="width:75%;float:left;">
<span class="RL-opremarkTitle">OP备注:</span>
<span class="RL-redType RL-remarkCon">{{childItem.OP_Remarks ? childItem.OP_Remarks : '无'}}</span>
<span class="RL-redType RL-remarkCon" style="width:80%;display:inline-block;">{{childItem.OP_Remarks ? childItem.OP_Remarks : '无'}}</span>
</div>
<div style="float:right;" v-if="childItem.IsCanClear==0">
<input type="button" value="确认订单" class="rgsureBtn" @click="clearSeat(childItem,1)" style="display:block;"/>
<div class="rgComTips">该订单<span style="color:red;">未确认</span>会</div>
<div class="rgComTips">被系统自动清位</div>
</div>
<div style="float:right;" v-else>
<input type="button" value="取消确认" class="normalBtn" @click="clearSeat(childItem,2)" style="display:block;padding:0 15px;height:25px;"/>
<div class="rgComTips">该订单<span style="color:green">已确认</span>不</div>
<div class="rgComTips">会被系统清位</div>
</div>
</td>
<td colspan="5" style="height: 40px;cursor: pointer;"
<td colspan="4" style="height: 40px;cursor: pointer;"
@click="goUrlSFD('SalesFinancialDetail', '销售财务单据', childItem)">
<div>
<span>财务单据：</span>
......@@ -2299,13 +2319,13 @@
</span>
</div>
</td>
<td colspan="5" class="groupTourOrder_remarks" style="height: 40px;">
<td colspan="6" class="groupTourOrder_remarks" style="height: 40px;">
<div class="clearfix RL-MARK">
<span class="RL-opremarkTitle">OP备注:</span>
<span class="RL-redType RL-remarkCon">{{item.OP_Remarks ? item.OP_Remarks : '无'}}</span>
</div>
</td>
<td colspan="5" style="height: 40px;cursor: pointer;"
<td colspan="4" style="height: 40px;cursor: pointer;"
@click="goUrlSFD('SalesFinancialDetail', '销售财务单据', item)">
<div>
<span>财务单据：</span>
......@@ -2776,7 +2796,6 @@
//订单归属【HK新加，报名清单页面修改使用】
CreateBy: 0,
RefuseVisaNum:0,//拒签人数
IsCanClear:0 //是否可清位
},
//行程下载使用
travelControlTripLayerShow: false,
......@@ -3118,7 +3137,6 @@
this.addMsg.ChirdNoNeedBedNum = (x.ChirdNum - x.ChirdNeedBedNum).toString();
this.addMsg.BabyNum = x.BabyNum.toString();
this.addMsg.RefuseVisaNum=x.RefuseVisaNum.toString();
this.addMsg.IsCanClear=x.IsCanClear;
this.IsChildrenTour = x.IsChildrenTour;
this.IsBirdDiscount = x.IsBirdDiscount;
......@@ -4307,6 +4325,7 @@
if (res.data.resultCode == 1) {
this.OrderDataList = res.data.data;
this.IsUpdateOrderMoney = res.data.data.IsUpdateOrderMoney
console.log(this.OrderDataList,'orderdatalist');
}
},
err => {}
......@@ -4726,6 +4745,27 @@
closeSalseDiv() {
this.showChangeSales = false;
},
//清位
clearSeat(item,type){
let msg={};
if(type==1){
msg.IsCanClear = 1;
msg.OrderId = item.OrderId
}else{
msg.IsCanClear = 0;
msg.OrderId = item.OrderId
}
this.apipost('sellorder_post_SetOrderIsCanClear',msg,
res => {
if (res.data.resultCode == 1) {
this.Success(res.data.message)
this.getList();
} else {
this.Error(res.data.message)
}
},
err => {})
}
},
mounted() {
let userInfo = this.getLocalStorage();
......
src/components/TravelManager/TravelList/TeamBalancePayment.vue
View file @ c1cfb22e
......@@ -1375,17 +1375,17 @@
getAllCont: function () {
let msg = {
TCID: this.TCID,
FrID: 0,
UpdateBy: '-1',
RB_Branch_Id: -1,
RB_Depart_Id: -2,
sDate: '',
eDate: '',
Status: '-1',
sTradeDate: '',
eTradeDate: '',
EmployeeId: 0,
ClientType: 0,
// FrID: 0,
// UpdateBy: '-1',
// RB_Branch_Id: -1,
// RB_Depart_Id: -2,
// sDate: '',
// eDate: '',
// Status: '-1',
// sTradeDate: '',
// eTradeDate: '',
// EmployeeId: 0,
// ClientType: 0,
}
this.apipost('Financial_post_GetHangingAccountTotalPrice', msg, res => {
if (res.data.resultCode === 1) {
......
src/components/TravelManager/TravelList/TravelControlList.vue
View file @ c1cfb22e
......@@ -484,6 +484,10 @@
<a style="corsor:pointer;"
:href="domainManager().ViittoFileUrl+item.WordPath">{{$t('Operation.Op_downLoadword')}}</a>
</p>
<p class="travelnowrap" v-if="item.ClearOrderHour>0">
<span>已设定清位</span>
<span class="TCL-greenType">{{item.ClearOrderHour}}小时</span>
</p>
</div>
</div>
<div class="el-col" style="width:190px;">
......
src/components/busManagement/BusInfo.vue
View file @ c1cfb22e
This diff is collapsed.
src/components/busManagement/busStatistics.vue
View file @ c1cfb22e
......@@ -10,6 +10,12 @@
</el-select>
</span>
</li>
<li>
<span>
<em>地接团号</em>
<el-input v-model='msg.CombinationNum'></el-input>
</span>
</li>
<li>
<span>
<em>团号</em>
......@@ -28,7 +34,6 @@
<el-option label='取消' value='1' key='1'></el-option>
</el-select>
</li>
<li>
<input type="button" class="normalBtn" value="查询" @click="getList();resetPageIndex()" />
</li>
......@@ -38,7 +43,8 @@
车辆状态&nbsp;&nbsp;&nbsp;已确定:<span style="color:#4BCA81 ;">√</span>未确定:<span
style="color: #ff6600;">O</span>未分配:<span style="color:#E95252 ;">X</span>
</div>
<div style="width: 100%; overflow-x: auto;padding-bottom: 10px; margin-top: 10px; " class="ownScrollbarStyle" :style="{height: boxHeight + 'px'}">
<div style="width: 100%; overflow-x: auto;padding-bottom: 10px; margin-top: 10px; " class="ownScrollbarStyle"
:style="{height: boxHeight + 'px'}">
<table border="0" cellspacing="1" cellpadding="0" class="busStatisticsTalbe" v-loading='loading'>
<tr>
<th class="w100">序号</th>
......@@ -57,7 +63,7 @@
<th width="80">配车天数</th>
<th width="120">操作</th>
</tr>
<tbody v-for="(outItem,outindex) in list" :class="{splitTrCss:outindex%2!=0}">
<tbody v-for="(outItem,outindex) in DataList" :class="{splitTrCss:outindex%2!=0}">
<template v-for="(item,index) in outItem.StaticsReportList">
<tr>
<td :rowspan="2*outItem.StaticsReportList.length" v-if='index==0'>
......@@ -137,18 +143,17 @@
<td v-for="(x,ww) in item.CommonReport.BusList" style="vertical-align: top;">
<div class="w100">
<p class="pDateStyle">{{x.PlanDateStr}}</p>
<p class="pDateStyle" v-if="ww==0">
<template v-for="childItem in x.DetailList">
{{childItem.AirportPickUpStr!=""?childItem.AirportPickUpStr:"接机"}}<br/>
<p class="pDateStyle">
<template v-for="(childItem,childIndex) in x.DetailList">
{{ (childItem.AirportPickUpStr!=""?childItem.AirportPickUpStr:"")+(childItem.UseTypeStr!=""?childItem.UseTypeStr:"") }}
<template v-if="x.DetailList.length>1 && x.DetailList.length-1!=childIndex"><br /></template>
</template>
<template v-if="x.OrderState>-1">
<br />
<span style="color: #4BCA81;"
v-if="(x.DetailList[0].AirportPickUpStr!='' ||x.DetailList[0].UseTypeStr!='')">√</span>
<span style="color: #E95252;" v-else>X</span>
</template>
</p>
<p class="pDateStyle" v-else-if="ww==item.CommonReport.BusList.length-1">
<template v-for="childItem in x.DetailList">
{{childItem.AirportPickUpStr!=""?childItem.AirportPickUpStr:"送机"}}<br/>
</template></p>
<p class="pDateStyle fbold fz16" v-else-if="x.AirportPickUp==0">
<span style="color: #E95252;" v-if="x.OrderState==-1">X</span>
<span style="color: #4BCA81;" v-else-if="x.OrderState>-1">√</span>
</p>
</div>
</td>
......@@ -172,7 +177,7 @@
<td :rowspan="2*outItem.StaticsReportList.length" v-if='index==0'>
<div class="w100 link">
<span @click="goUrlX('BusInfo',item,outItem,'车配信息')">详情</span>
<span @click="DownLoadFile(item,outItem.NewCombinationNum)">下载</span>
<span @click="GoDownLoad(outItem)">手配书</span>
</div>
</td>
</tr>
......@@ -210,12 +215,13 @@
LineteamId: "-1",
StartDate: '',
EndDate: '',
PriceStatus: "0"
PriceStatus: "0",
CombinationNum: ""
},
LineList: [],
LineTeamList: [],
thLengthTitle: [],
list: [],
DataList: [],
colspanTotal: 0,
isCha: 0,
boxHeight: 0,
......@@ -223,12 +229,7 @@
},
methods: {
DownLoadFile(item, NewCombinationNum) {
let msg = {
TCIDS: item.TCIDS
};
this.GetLocalFile("bus_get_NewDownLoadBusConfig", msg, "バス手配依頼書" + NewCombinationNum + ".xls");
},
getLineList() {
this.apipost("line_post_GetAllList", {}, res => {
if (res.data.resultCode == 1) {
......@@ -238,15 +239,31 @@
}
});
},
GetTotalPrice(obj, PeopleNum) { //车费总价
GetTotalPrice(obj) { //车费总价
let totalPrice = 0;
obj.forEach(busInfo => {
if (busInfo.CostPrice != undefined) {
totalPrice += busInfo.CostPrice * (Number(busInfo.TransferNum) + 1) * PeopleNum;
totalPrice += busInfo.CostPrice ;
}
});
return totalPrice;
},
//获取系列列表
getLineTeamList(lineId) {
this.LineTeamList = [];
this.apipost(
"team_post_GetList", {
lineID: 14,
isTOOP: 1
},
res => {
if (res.data.resultCode == 1) {
this.msg.LineteamId = "-1";
this.LineTeamList = res.data.data;
}
}
);
},
GetPeiChe(obj) { //配车信息
let jieji = "";
let songji = "";
......@@ -285,39 +302,21 @@
}
return allStr;
},
GetCheType(obj) { //车型信息
let jieji = "";
let DayNum = 0;
obj.forEach((busInfo, index) => {
if (busInfo.AirportPickUp == 0 && busInfo.OrderState > -1) {
if (jieji.length == 0) {
jieji = busInfo.ResultBusTypeStr
}
}
});
return jieji;
},
//获取系列列表
getLineTeamList(lineId) {
this.LineTeamList = [];
this.apipost(
"team_post_GetList", {
lineID: 14,
isTOOP: 1
},
res => {
if (res.data.resultCode == 1) {
this.msg.LineteamId = "-1";
this.LineTeamList = res.data.data;
}
GoDownLoad(item) {
this.$router.push({
name: "busHandBook",
query: {
"TCID": item.TCIDs,
blank: 'y',
tab: "手配依赖书"
}
);
})
},
goUrlX(path, obj, outItem, title) {
this.$router.push({
name: path,
query: {
"TCID": obj.TCIDS,
"TCID": outItem.TCIDs,
StartDate: obj.StartDateStr,
DayNum: obj.DayNum,
TotalNumber: obj.TotalSeat, //机位总数
......@@ -380,17 +379,17 @@
},
getList() {
this.loading = true
this.apipost('dmcstatistics_post_GetUniteCombinationNumService', this.msg, res => {
this.apipost('bus_Get_GetBusUniteCombinationNumService', this.msg, res => {
this.loading = false;
if (res.data.resultCode == 1) {
this.total = res.data.data.count;
this.list = res.data.data.pageData.data;
this.DataList = res.data.data.pageData.data;
this.thLengthTitle = [];
this.colspanTotal = res.data.data.pageData.columnsCount + 12;
for (let i = 1; i <= res.data.data.pageData.columnsCount; i++) {
this.thLengthTitle.push('第' + i + '天');
}
this.list.forEach(outItem => {
this.DataList.forEach(outItem => {
outItem.StaticsReportList.forEach(item => {
if (item.CommonReport.BusList.length < res.data.data.pageData.columnsCount) {
item.isCha = res.data.data.pageData.columnsCount - item.CommonReport.BusList.length;
......@@ -399,7 +398,7 @@
}
})
})
this.$forceUpdate()
this.$forceUpdate();
} else {
this.$message.error(res.data.message);
}
......@@ -415,11 +414,13 @@
"-" +
myDate.getDate();
this.msg.StartDate = nowDate;
let width = window.innerWidth - 50
let height = window.innerHeight - 65 - 210
console.log(height)
let width = window.innerWidth - 50;
let height = window.innerHeight - 65 - 210;
this.boxHeight = height;
this.offsetwidth = width
this.offsetwidth = width;
// this.msg.CombinationNum = 'JVS0422OTC-NHA';
// this.msg.StartDate = "2019-04-20";
this.getList();
this.getLineTeamList();
},
......
src/components/systemManagement/LessPriceManagement.vue
View file @ c1cfb22e
......@@ -264,6 +264,7 @@
//获取系列列表
getLineTeamList(subItem) {
if(subItem.LineId>0){
this.apipost("team_post_GetList", {
lineID: subItem.LineId,
isTOOP: 1
......@@ -272,6 +273,9 @@
subItem.LineTeamList = res.data.data;
}
});
}else{
subItem.LineTeamList=[];
}
},
getLineTeamListTwo(event,subItem){
if(event&&subItem.LineId>0){
......
src/components/systemManagement/lineManagement.vue
View file @ c1cfb22e
......@@ -551,6 +551,29 @@ input[type="number"] {
</div>
</td>
</tr>
<tr>
<td class="LM_Back" @click="closeOpTion()">负责OP</td>
<td v-for="item in getCompanyList" @click="closeOpTion()" :key="item.subCode">
<span class="joinDepart" v-if="!item.seletOpShow">{{item.joinEmployee | getJoinEmpName}}</span>
<el-select v-model="item.selectOpIdArr" multiple class='w160 multiple_input' filterable
@change="getOPSelected(item)"
:placeholder="$t('pub.pleaseSel')" v-if="item.seletOpShow">
<el-option
v-for="item in item.employeeList"
:key="item.EmployeeId"
:label="item.EmName"
:value="item.EmployeeId">
</el-option>
</el-select>
<span class="upFentan" v-if="item.selectOpIdArr.length>0"
@click.stop="getOPSelectList(item,item.rB_Branch_id)">{{$t('pub.updateMsg')}}</span>
<div v-if="item.showOpSet">
<span class="joinDepart">{{$t('Operation.Op_notInvoled')}}</span>
<span @click.stop="clickedOpSet(item)" class="setItem">{{$t('leader.leader_Set')}}</span>
</div>
</td>
</tr>
</table>
<input type="button" class="normalBtn saveCompanyBtn" @click="saveCompany()" :value="$t('pub.saveBtn')"/>
<input type="button" class="normalBtn" @click="isShowTwo=false" :value="$t('pub.cancelBtn')"/>
......@@ -759,8 +782,11 @@ export default {
this.getCompanyList.map(x => {
x.inputShow = false;
x.seletShow = false;
x.seletOpShow = false;
x.departMentList = "";
x.employeeList=[];
x.selectDepIdArr = [];
x.selectOpIdArr= [];
if (x.lossAllocation == null && x.inputShow == false) {
x.showSet = true;
} else {
......@@ -771,11 +797,21 @@ export default {
} else {
x.showSelectSet = false;
}
if(x.joinEmployee.length==0 && x.seletOpShow==false){
x.showOpSet = true;
}else{
x.showOpSet = false;
}
if (x.joinDepartment.length > 0) {
x.joinDepartment.forEach(y => {
x.selectDepIdArr.push(y.departmentId);
});
}
if (x.joinEmployee.length > 0) {
x.joinEmployee.forEach(y => {
x.selectOpIdArr.push(y.employeeId);
});
}
});
}
});
......@@ -803,6 +839,31 @@ export default {
});
this.getCompanyList = tempCompanyList;
},
getOPSelectList(item, RB_Branch_Id) {
var tempCompanyList = JSON.parse(JSON.stringify(this.getCompanyList));
tempCompanyList.forEach(x => {
if (x.rB_Branch_id == item.rB_Branch_id) {
x.seletOpShow = true;
let userInfo = this.getLocalStorage();
var RB_Group_id = userInfo.RB_Group_id;
let msg = {
GroupId: userInfo.RB_Group_id,
BranchId: item.rB_Branch_id,
DepartmentId: '-1',
PostId: '-1',
IsLeave: '0'
};
this.apipost("admin_get_EmployeeGetList", msg, res => {
if (res.data.resultCode == 1) {
x.employeeList = res.data.data;
}
});
}
});
this.getCompanyList = tempCompanyList;
},
getSelected(item) {
if (item.selectDepIdArr.length > 0) {
let joinDepartment = [];
......@@ -828,6 +889,29 @@ export default {
item.seletShow = false;
}
},
getOPSelected(item){
if (item.selectOpIdArr.length > 0) {
let ckedJoinEmployee = [];
item.selectOpIdArr.forEach(x => {
ckedJoinEmployee.push({
EmployeeId: x,
employeeName: "",
});
});
ckedJoinEmployee.forEach(x => {
item.employeeList.forEach(y => {
if (x.EmployeeId === y.EmployeeId) {
x.employeeName = y.EmName;
}
});
});
item.joinEmployee = ckedJoinEmployee;
} else {
item.joinEmployee = [];
item.showOpSet = true;
item.seletOpShow = false;
}
},
setInput(item) {
item.inputShow = false;
if (item.lossAllocation == null) {
......@@ -866,6 +950,30 @@ export default {
});
this.getCompanyList = tempCompanyList;
},
//点击设置OP开始设置
clickedOpSet(item){
var tempCompanyList = JSON.parse(JSON.stringify(this.getCompanyList));
tempCompanyList.forEach(x => {
if (x.rB_Branch_id == item.rB_Branch_id) {
let userInfo = this.getLocalStorage();
var RB_Group_id = userInfo.RB_Group_id;
let msg = {
GroupId: userInfo.RB_Group_id,
BranchId: item.rB_Branch_id,
DepartmentId: '-1',
PostId: '-1',
IsLeave: '0'
};
this.apipost("admin_get_EmployeeGetList", msg, res => {
if (res.data.resultCode == 1) {
x.employeeList = res.data.data;
}
});
(x.seletOpShow = true), (x.showOpSet = false);
}
});
this.getCompanyList = tempCompanyList;
},
clearInfo() {
this.addMsg = {
lineId: 0,
......@@ -891,6 +999,7 @@ export default {
},
saveCompany() {
var lineBranchList = [];
var lineBranchOPList = [];
this.getCompanyList.forEach(x => {
if (x.joinDepartment.length > 0) {
x.joinDepartment.forEach(y => {
......@@ -902,10 +1011,20 @@ export default {
lineBranchList.push(lineBranch);
});
}
if(x.joinEmployee.length>0){
x.joinEmployee.forEach(y => {
var opBranch = {
rB_Branch_id: x.rB_Branch_id,
EmployeeId: y.EmployeeId
};
lineBranchOPList.push(opBranch);
});
}
});
let msg = {
lineId: this.upLineId,
lineBranchList: lineBranchList
lineBranchList: lineBranchList,
lineBranchOPList: lineBranchOPList
};
this.apipost(
"line_Set_join_branch",
......@@ -964,6 +1083,14 @@ export default {
x.showSelectSet = true;
}
});
},
closeOpTion(){
this.getCompanyList.forEach(x => {
x.seletOpShow = false;
if (x.selectOpIdArr.length == 0) {
x.showOpSet = true;
}
});
}
},
mounted() {
......@@ -981,6 +1108,17 @@ export default {
returnStr = depName.join(",");
}
return returnStr;
},
getJoinEmpName:function(depList){
let returnStr = "";
if (depList.length > 0) {
let depName = [];
depList.forEach(x => {
depName.push(x.employeeName);
});
returnStr = depName.join(",");
}
return returnStr;
}
}
};
......
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