Skip to content

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

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

parents f43950bc 14da459a
Hide whitespace changes
Inline Side-by-side
Showing with 447 additions and 129 deletions
src/assets/css/main.less
View file @ a4923bbf
...@@ -12,6 +12,7 @@ ...@@ -12,6 +12,7 @@
// 盒子宽高 // 盒子宽高
.size(@w, @h) { width: @w; height: @h; } .size(@w, @h) { width: @w; height: @h; }
.min-size(@min-w,@h) { min-width: @min-w; height: @h;}
// 最小尺寸, 兼容IE6 // 最小尺寸, 兼容IE6
.min-width(@min-w) { min-width: @min-w; _width: @min-w; } .min-width(@min-w) { min-width: @min-w; _width: @min-w; }
......
src/components/FinancialModule/PlatformAccount.vue
View file @ a4923bbf
...@@ -571,6 +571,7 @@ export default { ...@@ -571,6 +571,7 @@ export default {
isReady: false, isReady: false,
multipleSort: false, multipleSort: false,
loading: true, loading: true,
CompanySelect:[],
msg: { msg: {
pageIndex: 1, pageIndex: 1,
pageSize: 15, pageSize: 15,
...@@ -769,12 +770,12 @@ export default { ...@@ -769,12 +770,12 @@ export default {
filters: [{}], filters: [{}],
type: "text" type: "text"
}; };
let companyList = []; // let companyList = [];
this.CompanyList.forEach(x => { this.CompanyList.forEach(x => {
let item = {}; let item = {};
item.label = x.BName; item.label = x.BName;
item.value = x.Id; item.value = x.Id;
companyList.push(item); this.CompanySelect.push(item);
}); });
let allName = { let allName = {
field: "allName", field: "allName",
...@@ -784,9 +785,9 @@ export default { ...@@ -784,9 +785,9 @@ export default {
columnAlign: "left", columnAlign: "left",
isResize: true, isResize: true,
filterMultiple: false, filterMultiple: false,
filters: companyList, filters: this.CompanySelect,
result: "", result: "",
type: "select" type: "select",
// isFrozen:true // isFrozen:true
}; };
let Accountholder = { let Accountholder = {
...@@ -959,6 +960,9 @@ export default { ...@@ -959,6 +960,9 @@ export default {
}, },
filterMethod(filters) { filterMethod(filters) {
this.msg.Alias = filters.Alias; this.msg.Alias = filters.Alias;
if(filters.allName=='__all__'){
filters.allName='-1'
}
this.msg.RB_Branch_Id = filters.allName; this.msg.RB_Branch_Id = filters.allName;
this.msg.SettlementType = this.msg.SettlementType =
filters.Commission.length == 1 ? filters.Commission[0] : 0; filters.Commission.length == 1 ? filters.Commission[0] : 0;
...@@ -1422,11 +1426,17 @@ export default { ...@@ -1422,11 +1426,17 @@ export default {
}, },
mounted() { mounted() {
this.msg.pageSize = this.calcPageSize(40); this.msg.pageSize = this.calcPageSize(40);
this.getList();
this.getAccountTypeList();
let userInfo = this.getLocalStorage(); let userInfo = this.getLocalStorage();
this.getCompanyMsg.RB_Group_Id = userInfo.RB_Group_id; //集团ID this.getCompanyMsg.RB_Group_Id = userInfo.RB_Group_id; //集团ID
this.getCompanyList(); var branchId = userInfo.RB_Branch_id;
if(branchId==0||branchId==49){
this.getCompanyList();
}else{
this.msg.RB_Branch_Id = branchId;
}
this.getList();
this.initColums();
this.getAccountTypeList();
this.getFinancialList(); this.getFinancialList();
this.getfinanceinfoList(); this.getfinanceinfoList();
}, },
......
src/components/FinancialModule/ReportForm/TeamRevenueReport.vue
View file @ a4923bbf
...@@ -527,13 +527,31 @@ tr._item_list td:last-child { ...@@ -527,13 +527,31 @@ tr._item_list td:last-child {
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="4"> <el-col :span="4">
<el-form-item label="是否联运"> <el-form-item label="是否联运：">
<el-select v-model="msg.Is_Transport" filterable class="w150"> <el-select v-model="msg.Is_Transport" filterable class="w150">
<el-option value="-1" label="不限"></el-option> <el-option value="-1" label="不限"></el-option>
<el-option value="1" label="是"></el-option> <el-option value="1" label="是"></el-option>
<el-option value="0" label="否"></el-option> <el-option value="0" label="否"></el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>
</el-col>
<el-col :span="4">
<el-form-item label="领队类型：">
<el-select v-model="msg.LeaderType" filterable class="w150" @change="GetLeaderList()">
<el-option :value="0" label="请选择"></el-option>
<el-option :value="1" label="领队"></el-option>
<el-option :value="2" label="领兼导"></el-option>
<el-option :value="3" label="导游"></el-option>
</el-select>
</el-form-item>
</el-col>
<el-col :span="4">
<el-form-item label="领队/导游：">
<el-select v-model="msg.LeaderId" filterable class="w150">
<el-option :label="$t('pub.unlimitedSel')" :value="0"></el-option>
<el-option v-for="item in LeaderList" :label='item.Name' :value='item.ID' :key='item.ID'></el-option>
</el-select>
</el-form-item>
</el-col> </el-col>
<el-col :span="4" v-if="userId==1||userId==5"> <el-col :span="4" v-if="userId==1||userId==5">
<el-button @click="msg.Is_Open=0,SetTravelClose()" type="danger" size="small" round :loading="btnloading">开启团队收支</el-button> <el-button @click="msg.Is_Open=0,SetTravelClose()" type="danger" size="small" round :loading="btnloading">开启团队收支</el-button>
...@@ -815,7 +833,9 @@ export default { ...@@ -815,7 +833,9 @@ export default {
Type: 1, Type: 1,
QueryCondition: "-1", QueryCondition: "-1",
DataType: "1", DataType: "1",
Is_Transport:'-1' Is_Transport:'-1',
LeaderId:0,
LeaderType:0
}, },
getCompanyMsg: { getCompanyMsg: {
// 公司 // 公司
...@@ -838,6 +858,7 @@ export default { ...@@ -838,6 +858,7 @@ export default {
multipleSort: false, multipleSort: false,
kaiqiZzBox: false, kaiqiZzBox: false,
KaiqiZzTime: [], KaiqiZzTime: [],
LeaderList: [],
kaiqiZzTitle: "", kaiqiZzTitle: "",
kaiqiZzLoading: false, kaiqiZzLoading: false,
kaiqiZzMsg: { kaiqiZzMsg: {
...@@ -920,6 +941,28 @@ export default { ...@@ -920,6 +941,28 @@ export default {
isFrozen: true, isFrozen: true,
componentName: "TCNUMJump" componentName: "TCNUMJump"
}, },
{
field: "LeaderName",
title: "领队",
width: 60,
titleAlign: "left",
columnAlign: "left",
isResize: true,
result: [],
type: "select",
isFrozen: true
},
{
field: "GuideName",
title: "导游",
width: 60,
titleAlign: "left",
columnAlign: "left",
isResize: true,
result: [],
type: "select",
isFrozen: true
},
{ {
field: "Is_Transport", field: "Is_Transport",
title: "是否有联运支出", title: "是否有联运支出",
...@@ -1570,6 +1613,23 @@ export default { ...@@ -1570,6 +1613,23 @@ export default {
} }
}) })
}, },
//获取领队和导游
GetLeaderList() {
this.LeaderList=[];
this.msg.LeaderId=0;
let msg = {
Type: this.msg.LeaderType,
}
this.apipost(
'leader_post_GetList', msg,
res => {
if (res.data.resultCode == 1) {
this.LeaderList = res.data.data;
}
},
err => {}
)
},
getLineTeamList(lineId,PlaceId) { getLineTeamList(lineId,PlaceId) {
......
src/components/Hotel/roomReservationsDetails.vue
View file @ a4923bbf
...@@ -412,13 +412,18 @@ ...@@ -412,13 +412,18 @@
x.HotelOrderList.forEach(y => { x.HotelOrderList.forEach(y => {
y.isShowPop = false; y.isShowPop = false;
}) })
}) });
this.list[this.findex].HotelOrderList[this.childIndex].Address = ckedObj.Address; this.list[this.findex].HotelOrderList[this.childIndex].Address = ckedObj.Address;
this.list[this.findex].HotelOrderList[this.childIndex].NewHotelName = ckedObj.Name; this.list[this.findex].HotelOrderList[this.childIndex].NewHotelName = ckedObj.Name;
this.list[this.findex].HotelOrderList[this.childIndex].Tel = ckedObj.Tel; this.list[this.findex].HotelOrderList[this.childIndex].Tel = ckedObj.Tel;
this.list[this.findex].HotelOrderList[this.childIndex].NewHotelId = ckedObj.ID; this.list[this.findex].HotelOrderList[this.childIndex].NewHotelId = ckedObj.ID;
this.list[this.findex].HotelOrderList[this.childIndex].PayStyle = ckedObj.PayStyle; this.list[this.findex].HotelOrderList[this.childIndex].PayStyle = ckedObj.PayStyle;
this.list[this.findex].HotelOrderList[this.childIndex].PayStyleExt = ckedObj.PayStyle; this.list[this.findex].HotelOrderList[this.childIndex].PayStyleExt = ckedObj.PayStyle;
this.list[this.findex].HotelOrderList[this.childIndex].OrderDetailsList.forEach(subItem=>{
subItem.UnitPrice=ckedObj.CostPrice;
subItem.RebateRatio=ckedObj.RebateRatio;
});
this.calculationPrice(this.list[this.findex].HotelOrderList[this.childIndex]);
}, },
getChildHotel(index, subIndex) { getChildHotel(index, subIndex) {
this.findex = index; this.findex = index;
......
src/components/SalesVisa/VisaShouSun.vue
View file @ a4923bbf
...@@ -302,7 +302,7 @@ ...@@ -302,7 +302,7 @@
</div> </div>
<el-dialog custom-class='w600' title="修改订单收损金额" :visible.sync="shousunDialog" center> <el-dialog custom-class='w600' title="修改订单收损金额" :visible.sync="shousunDialog" center>
<commonShouSun ref="childShou" :Type="3" @closeShouSun="closeShouSunDialog"></commonShouSun> <commonShouSun ref="childShou" :Type="3" @closeShouSun="closeShouSunDialog" @getList="getList"></commonShouSun>
</el-dialog> </el-dialog>
</div> </div>
...@@ -355,7 +355,7 @@ ...@@ -355,7 +355,7 @@
IsOneDay: '-1', IsOneDay: '-1',
IsLeaderOrder:1, IsLeaderOrder:1,
LossType:2, LossType:2,
LossStatus:0 LossStatus:2
}, },
//收损设置下拉 //收损设置下拉
shouSunSelect:[{ shouSunSelect:[{
......
src/components/Ticketing/TicketShouSun.vue
View file @ a4923bbf
...@@ -355,7 +355,7 @@ ...@@ -355,7 +355,7 @@
IsOneDay: '-1', IsOneDay: '-1',
IsLeaderOrder:1, IsLeaderOrder:1,
LossType:1, LossType:1,
LossStatus:0 LossStatus:2
}, },
//收损设置下拉 //收损设置下拉
shouSunSelect:[{ shouSunSelect:[{
......
src/components/TravelManager/TravelList/RegistrationList.vue
View file @ a4923bbf
...@@ -1495,6 +1495,8 @@ ...@@ -1495,6 +1495,8 @@
<input type="button" class="normalBtn" <input type="button" class="normalBtn"
@click="goTeamBalance(ConfigData.Config.TCID,ConfigData.Config.OutBranchId)" value="团报" /> @click="goTeamBalance(ConfigData.Config.TCID,ConfigData.Config.OutBranchId)" value="团报" />
<input type="button" class="normalBtn"
@click="goAmoebaDetail(ConfigData.Config.LtName,ConfigData.Config.TCNUM,ConfigData.Config.TCID)" value="阿米巴结算表" />
<input type="button" class="normalBtn" @click="getOrderInfo()" <input type="button" class="normalBtn" @click="getOrderInfo()"
:value="'出团通知书('+(SetNoticeMsg.OutNotice==1?'OK':'暂定')+')'" /> :value="'出团通知书('+(SetNoticeMsg.OutNotice==1?'OK':'暂定')+')'" />
<input type="button" @click="CancelLeader" v-if="ConfigData.Leader!=null&&ConfigData.Leader.LeaderId>0" <input type="button" @click="CancelLeader" v-if="ConfigData.Leader!=null&&ConfigData.Leader.LeaderId>0"
...@@ -1683,6 +1685,7 @@ ...@@ -1683,6 +1685,7 @@
<div v-if="OrderDataList.IsUpdateOrderCommission" <div v-if="OrderDataList.IsUpdateOrderCommission"
@click='EwMsg.OrderId = item.OrderId, EwMsg.ExtraRewardMoney = item.ExtraRewardMoney,EwMsg.ExtraDeductMoney=item.ExtraDeductMoney, OrderMoneyDialog = true'> @click='EwMsg.OrderId = item.OrderId, EwMsg.ExtraRewardMoney = item.ExtraRewardMoney,EwMsg.ExtraDeductMoney=item.ExtraDeductMoney, OrderMoneyDialog = true'>
设置额外金额</div> 设置额外金额</div>
<div @click="SetShouSunClick(item.OrderId)">设置收损金额</div>
<div @click='deleteItem(item)'>删除</div> <div @click='deleteItem(item)'>删除</div>
</div> </div>
<el-button slot="reference" type="primary" <el-button slot="reference" type="primary"
...@@ -1932,7 +1935,7 @@ ...@@ -1932,7 +1935,7 @@
<div @click="toTrip(childItem)">出团通知书({{SetNoticeMsg.OutNotice==1?'OK':'暂定'}})</div> <div @click="toTrip(childItem)">出团通知书({{SetNoticeMsg.OutNotice==1?'OK':'暂定'}})</div>
<div v-if="userId==1" @click="getSalerInfo(childItem)">修改业务员</div> <div v-if="userId==1" @click="getSalerInfo(childItem)">修改业务员</div>
<div @click="transfer(childItem)">订单转团</div> <div @click="transfer(childItem)">订单转团</div>
<div @click="OrderLoading=true,OrderLossInfo(childItem)">订单收损</div> <div @click="OrderLoading=true,OrderLossInfo(childItem)" style="display:none;">订单收损</div>
<div <div
@click='zhuanLoading = true,OPRemarkMsg.OrderId = childItem.OrderId,OPRemarkMsg.OP_Remarks=childItem.OP_Remarks'> @click='zhuanLoading = true,OPRemarkMsg.OrderId = childItem.OrderId,OPRemarkMsg.OP_Remarks=childItem.OP_Remarks'>
OP备注</div> OP备注</div>
...@@ -1950,6 +1953,7 @@ ...@@ -1950,6 +1953,7 @@
<div v-if="OrderDataList.IsUpdateOrderCommission" <div v-if="OrderDataList.IsUpdateOrderCommission"
@click='EwMsg.OrderId = childItem.OrderId, EwMsg.ExtraRewardMoney = childItem.ExtraRewardMoney,EwMsg.ExtraDeductMoney=childItem.ExtraDeductMoney, OrderMoneyDialog = true'> @click='EwMsg.OrderId = childItem.OrderId, EwMsg.ExtraRewardMoney = childItem.ExtraRewardMoney,EwMsg.ExtraDeductMoney=childItem.ExtraDeductMoney, OrderMoneyDialog = true'>
设置额外金额</div> 设置额外金额</div>
<div @click="SetShouSunClick(childItem.OrderId)">设置收损金额</div>
<div @click="lianyunFY(childItem)">联运返佣</div> <div @click="lianyunFY(childItem)">联运返佣</div>
<div v-if="childItem.OrderState=='1'||childItem.OrderState=='2'||childItem.OrderState=='3'" <div v-if="childItem.OrderState=='1'||childItem.OrderState=='2'||childItem.OrderState=='3'"
@click='deleteItem(childItem)'> @click='deleteItem(childItem)'>
...@@ -2272,6 +2276,7 @@ ...@@ -2272,6 +2276,7 @@
<div v-if="OrderDataList.IsUpdateOrderCommission" <div v-if="OrderDataList.IsUpdateOrderCommission"
@click='EwMsg.OrderId = item.OrderId, EwMsg.ExtraRewardMoney = item.ExtraRewardMoney,EwMsg.ExtraDeductMoney=item.ExtraDeductMoney, OrderMoneyDialog = true'> @click='EwMsg.OrderId = item.OrderId, EwMsg.ExtraRewardMoney = item.ExtraRewardMoney,EwMsg.ExtraDeductMoney=item.ExtraDeductMoney, OrderMoneyDialog = true'>
设置额外金额</div> 设置额外金额</div>
<div @click="SetShouSunClick(item.OrderId)">设置收损金额</div>
<div v-if="item.OrderState=='2'||item.OrderState=='3'" @click='deleteItem(item)'>删除</div> <div v-if="item.OrderState=='2'||item.OrderState=='3'" @click='deleteItem(item)'>删除</div>
</div> </div>
...@@ -2564,6 +2569,10 @@ ...@@ -2564,6 +2569,10 @@
</div> </div>
</el-dialog> </el-dialog>
<el-dialog custom-class='w600' title="修改订单收损金额" :visible.sync="shousunDialog" center>
<commonShouSun ref="childShou" :Type="1" @closeShouSun="closeShouSunDialog" @getList="getList"></commonShouSun>
</el-dialog>
<el-dialog custom-class='passgenrDialog' title="航班列表" :visible.sync="outerVisible" center> <el-dialog custom-class='passgenrDialog' title="航班列表" :visible.sync="outerVisible" center>
<table border="0" cellspacing="0" cellpadding="0" class="singeRowTable"> <table border="0" cellspacing="0" cellpadding="0" class="singeRowTable">
...@@ -2677,6 +2686,7 @@ ...@@ -2677,6 +2686,7 @@
<script> <script>
import tripDownLoadCommon from "../../commonPage/TripDownLoadCommon.vue"; import tripDownLoadCommon from "../../commonPage/TripDownLoadCommon.vue";
import updateSalesMan from "../../commonPage/updateSalesMan.vue"; import updateSalesMan from "../../commonPage/updateSalesMan.vue";
import commonShouSun from "../../commonPage/commonShouSun.vue";
export default { export default {
data() { data() {
return { return {
...@@ -2685,6 +2695,8 @@ ...@@ -2685,6 +2695,8 @@
addMsg_form: {}, addMsg_form: {},
IsUpdateOrderMoney: false, IsUpdateOrderMoney: false,
outerVisible: false, outerVisible: false,
//收损金额
shousunDialog:false,
//弹窗 //弹窗
OrderLoading: false, OrderLoading: false,
...@@ -3085,16 +3097,26 @@ ...@@ -3085,16 +3097,26 @@
}, },
components: { components: {
tripDownLoadCommon: tripDownLoadCommon, tripDownLoadCommon: tripDownLoadCommon,
updateSalesMan: updateSalesMan updateSalesMan: updateSalesMan,
commonShouSun: commonShouSun
}, },
methods: { methods: {
closeShouSunDialog(){
this.shousunDialog=false;
},
//点击设置收损
SetShouSunClick(OrderId){
this.shousunDialog=true;
this.$nextTick(()=>{
this.$refs.childShou.getShouSunList(OrderId);
})
},
FyongLossOk: function () { FyongLossOk: function () {
let msg = { let msg = {
OrderId: this.lianyunFYId, OrderId: this.lianyunFYId,
IsBackStatus: this.IsBackStatus IsBackStatus: this.IsBackStatus
} }
this.apipost('sellorder_post_SetOrderUnionBackMoney', msg, res=>{ this.apipost('sellorder_post_SetOrderUnionBackMoney', msg, res=>{
console.log(res)
if (res.data.resultCode === 1) { if (res.data.resultCode === 1) {
this.$message.success(res.data.message) this.$message.success(res.data.message)
this.getList() this.getList()
...@@ -3105,7 +3127,6 @@ ...@@ -3105,7 +3127,6 @@
}, null) }, null)
}, },
lianyunFY: function (item) { lianyunFY: function (item) {
console.log(item)
this.FyongLoading = true this.FyongLoading = true
this.IsBackStatus = item.IsBackUnionMoney this.IsBackStatus = item.IsBackUnionMoney
this.lianyunFYId = item.OrderId this.lianyunFYId = item.OrderId
...@@ -4754,6 +4775,19 @@ ...@@ -4754,6 +4775,19 @@
} }
}); });
}, },
//跳转至阿米巴结算详情
goAmoebaDetail(LtName,TCNUM,TCID){
this.$router.push({
name: "AmoebaDetail",
query: {
LtName:LtName,
TCNUM:TCNUM,
TCID: TCID,
blank: "y",
tab: "阿米巴结算详情"
}
});
},
//跳转到旅客名单 //跳转到旅客名单
goToPassenger(item) { goToPassenger(item) {
this.$router.push({ this.$router.push({
...@@ -4947,7 +4981,6 @@ ...@@ -4947,7 +4981,6 @@
let maxPeopleNum = (Number(this.addMsg.ManNum) + Number(this.addMsg.ChirdNoNeedBedNum) + Number(this.addMsg.ChirdNeedBedNum) + Number(this.addMsg.OldPeopleNum) + Number(this.addMsg.AirticketNum) ) let maxPeopleNum = (Number(this.addMsg.ManNum) + Number(this.addMsg.ChirdNoNeedBedNum) + Number(this.addMsg.ChirdNeedBedNum) + Number(this.addMsg.OldPeopleNum) + Number(this.addMsg.AirticketNum) )
this.Unit_PriceList = []; this.Unit_PriceList = [];
console.log(this.Unit_PriceList)
this.apipost('sellorder_post_GetLessPrice', { this.apipost('sellorder_post_GetLessPrice', {
"TCID": this.addMsg.TCID, "TCID": this.addMsg.TCID,
"MaxPeopleNum": maxPeopleNum "MaxPeopleNum": maxPeopleNum
......
src/components/busManagement/BusApportionManagement.vue
View file @ a4923bbf
<style> <style>
.BusedHeight { .BusedHeight {
display: block !important; display: block !important;
height: 450px; height: 550px;
} }
.FinaceItem span{ .FinaceItem span{
display: inline-block; display: inline-block;
...@@ -318,6 +318,13 @@ ...@@ -318,6 +318,13 @@
</el-form-item> </el-form-item>
</el-col> </el-col>
</el-row> </el-row>
<el-row>
<el-col :span="8" :gutter="35">
<el-form-item label="制单备注">
<el-input v-model="addMsg.Remark" type="textarea" rows="2" placeholder="请输入"></el-input>
</el-form-item>
</el-col>
</el-row>
<el-row> <el-row>
<el-col :span="4" :gutter="35"> <el-col :span="4" :gutter="35">
<el-form-item label="团队编号"> <el-form-item label="团队编号">
...@@ -464,6 +471,7 @@ export default { ...@@ -464,6 +471,7 @@ export default {
f_rate:'', f_rate:'',
ClientID:0, ClientID:0,
PayDate:'', PayDate:'',
Remark:'',
VorList:[] VorList:[]
}, },
dataList: [], dataList: [],
...@@ -715,6 +723,7 @@ export default { ...@@ -715,6 +723,7 @@ export default {
f_rate:'', f_rate:'',
ClientID:0, ClientID:0,
PayDate:'', PayDate:'',
Remark:'',
VorList:[] VorList:[]
}; };
this.Year = ''; this.Year = '';
......
src/components/busManagement/BusInfo.vue
View file @ a4923bbf
...@@ -378,7 +378,7 @@ ...@@ -378,7 +378,7 @@
<template slot-scope="scope"> <template slot-scope="scope">
<div v-for="subItem in scope.row.BusPlanOrderList" class="comBTM"> <div v-for="subItem in scope.row.BusPlanOrderList" class="comBTM">
<el-input v-model="subItem.CostPrice" @keyup.native="checkPrice(subItem,'CostPrice')" <el-input v-model="subItem.CostPrice" @keyup.native="checkPrice(subItem,'CostPrice')"
placeholder="请输入成本价" :disabled="isShowBtn==1?true:false" class="w135"></el-input> placeholder="请输入成本价" class="w135"></el-input>
</div> </div>
</template> </template>
</el-table-column> </el-table-column>
......
src/components/commonPage/comCheckHotel.vue
View file @ a4923bbf
...@@ -73,8 +73,10 @@ ...@@ -73,8 +73,10 @@
<el-tab-pane :label="item.ProvinceName" v-for="(item,index) in dataList" :key="item.subCode"> <el-tab-pane :label="item.ProvinceName" v-for="(item,index) in dataList" :key="item.subCode">
<div class="clearfix comCheckHotel"> <div class="clearfix comCheckHotel">
<div class="comCk_list" v-for="(subItem,subIndex) in item.HotelList"> <div class="comCk_list" v-for="(subItem,subIndex) in item.HotelList">
<input type="checkbox" v-model="subItem.isChecked" @click="getCheck(item.HotelList,subIndex)"/> <!-- "'comCheckHotel'+index+subIndex+''" -->
{{subItem.Name}}<span class="cm_Inventory">{{subItem.Inventory}}</span> <input :id="'H'+index+'_'+subIndex" type="checkbox" v-model="subItem.isChecked" @click="getCheck(item.HotelList,subIndex)"/>
<label :for="'H'+index+'_'+subIndex" style="cursor: pointer">{{subItem.Name}}</label>
<span class="cm_Inventory">{{subItem.Inventory}}</span>
<span class="ck_goUrl" @click="goUrl(subItem.ID)">新增库存</span> <span class="ck_goUrl" @click="goUrl(subItem.ID)">新增库存</span>
</div> </div>
</div> </div>
...@@ -150,6 +152,9 @@ ...@@ -150,6 +152,9 @@
ckHotelObj.Name = this.ckedHotel.Name; ckHotelObj.Name = this.ckedHotel.Name;
ckHotelObj.PayStyle = this.ckedHotel.PayStyle; ckHotelObj.PayStyle = this.ckedHotel.PayStyle;
ckHotelObj.Tel = this.ckedHotel.Tel; ckHotelObj.Tel = this.ckedHotel.Tel;
ckHotelObj.RebateRatio=this.ckedHotel.RebateRatio;
ckHotelObj.RebateCount=this.ckedHotel.RebateCount;
ckHotelObj.CostPrice=this.ckedHotel.CostPrice;
} }
this.$emit("childHotel", ckHotelObj); this.$emit("childHotel", ckHotelObj);
}, },
......
src/components/commonPage/commonHotelInfo.vue
View file @ a4923bbf
...@@ -54,45 +54,80 @@ ...@@ -54,45 +54,80 @@
</template> </template>
</td> </td>
<td v-if="showHotelObj.showZhan"> <td v-if="showHotelObj.showZhan">
{{hotelSubItem.SureTimeStr}} {{hotelSubItem.SureTimeStr}}
</td> </td>
</tr> </tr>
</template> </template>
<tfoot v-if="showHotelObj.showBtnList"> <template v-if="HotelObj&&HotelObj.length>0">
<tr> <tfoot>
<td colspan="8" style="padding:10px 0"> <tr style="display:none;">
<input type="button" class="normalBtn" value="确定" style="display:none;" /> <td>
<input type="button" class="normalBtn" value="暂定" style="display:none;" /> 开团时间:
<input type="button" class="normalBtn" value="下载" @click="DownLoadShouPeiShu()" /> </td>
</td> <td>
</tr> {{HotelObj[0].PriceCreateDateStr}}</td>
</tfoot> <td>
吃房时间:
</td>
<td>
{{HotelObj[0].UseHotelTimeStr}}
</td>
<td>
操作时间:
</td>
<td>
{{HotelObj[0].DMCNumCreateTimeStr}}
</td>
<td>
操作时间:
</td>
<td>
{{HotelObj[0].ShouPeiStatusTimeStr}}
</td>
</tr>
<template v-if="showHotelObj.showBtnList">
<tr>
<td colspan="8" style="padding:10px 0">
<input type="button" class="normalBtn" :value="HotelObj[0].ShouPeiStatus==0?'手配书(确定)':'手配书(暂定)'"
v-if="showHotelObj.ShowShouPeiStatus" @click="subSetShouPeiShu(HotelObj[0].ShouPeiStatus)" />
<input type="button" class="normalBtn" value="下载" @click="DownLoadShouPeiShu()" />
</td>
</tr>
</template>
</tfoot>
</template>
</table> </table>
</template> </template>
<script> <script>
export default { export default {
props: ["HotelObj", "showHotelObj","TCID","DMCNum","TCNUM"], props: ["HotelObj", "showHotelObj", "TCID", "DMCNum", "TCNUM"],
data() { data() {
return { return {
loading:false, loading: false,
}; };
}, },
methods: { methods: {
DownLoadShouPeiShu() { DownLoadShouPeiShu() {
this.loading = true; this.loading = true;
let qMsg = { let qMsg = {
TCID:this.TCID TCID: this.TCID
}; };
let fileName = "手配书【"+this.DMCNum+"】" + this.$commonUtils.getCurrentDate() + ".xls"; let fileName = "手配书【" + this.DMCNum + "】" + this.$commonUtils.getCurrentDate() + ".xls";
this.GetLocalFile("hotel_SPS_DownLoad", qMsg, fileName, this.GetLocalFile("hotel_SPS_DownLoad", qMsg, fileName,
res => { res => {
this.loading = false; this.loading = false;
}); });
},
//子组件调用父组件方法
subSetShouPeiShu(ShouPeiStatus) {
var that = this;
var str="是否将手配书设置成"+(ShouPeiStatus==0?"【确定】":"【暂定】")+"?";
this.Confirm(str, function () {
that.$emit('SetShouPeiShu');
});
} }
}, },
mounted() { mounted() {}
}
}; };
</script> </script>
src/components/commonPage/commonShouSun.vue
View file @ a4923bbf
...@@ -4,15 +4,41 @@ ...@@ -4,15 +4,41 @@
} }
.totalShouSan{ .totalShouSan{
position: absolute; position: absolute;
right:60px; left:20px;
font-size:14px; font-size:14px;
top:15px; top:15px;
} }
.cmShouLastTd{
padding:10px 0;
position:relative;
text-align:right;
padding:20px 20px 20px 0;
}
.totalRemarkSpan{
position: absolute;
left:20px;
top:40px;
font-size:12px;
color:#E95252;
}
.comShouSunTable{
width: 100%;
border-collapse: collapse;
}
.comShouSunTable tr{
height:40px;
}
.comShouSunTable tr td{
font-size: 12px;
border: 1px solid #e5e5e5;
background-color: #fff;
text-align: center;
}
</style> </style>
<template> <template>
<div> <div>
<table width="100%" border="0" cellspacing="0" cellpadding="0" class="singeRowTable"> <table width="100%" border="0" cellspacing="0" cellpadding="0" class="comShouSunTable">
<tr> <tr>
<td colspan="4"> <td colspan="4">
op收损设置人数： op收损设置人数：
...@@ -76,12 +102,15 @@ ...@@ -76,12 +102,15 @@
</tr> </tr>
<tfoot> <tfoot>
<tr> <tr>
<td style="padding:10px 0;position:relative;" colspan="4"> <td class="cmShouLastTd" colspan="4" style="text-align:right">
<input type="button" class="normalBtn" @click="closeDialog()" value="取消" />
<input type="button" class="normalBtn" @click="setShouSun()" value="保存" />
<span class="totalShouSan"> <span class="totalShouSan">
收损总额：<span class="TotalShouSun">{{totalSun}}</span> 收损总额：<span class="TotalShouSun">{{totalSun}}</span>
</span> </span>
<span class="totalRemarkSpan">
注：只有全部金额都设置完成才会更新订单应收金额
</span>
<input type="button" class="normalBtn" @click="closeDialog()" value="取消" />
<input type="button" class="normalBtn" @click="setShouSun()" value="保存" />
</td> </td>
</tr> </tr>
</tfoot> </tfoot>
...@@ -152,6 +181,8 @@ ...@@ -152,6 +181,8 @@
if (res.data.resultCode == 1) { if (res.data.resultCode == 1) {
this.Success(res.data.message); this.Success(res.data.message);
this.closeDialog(); this.closeDialog();
this.$emit("getList");
this.MsgBus.$emit('comMsgTips')
} else { } else {
this.Error(res.data.message); this.Error(res.data.message);
} }
......
src/components/commonPage/commonTeamInfo.vue
View file @ a4923bbf
...@@ -3,7 +3,7 @@ ...@@ -3,7 +3,7 @@
</style> </style>
<template> <template>
<div class="trip-box-commonTeam"> <div class="trip-box-commonTeam" v-loading="loading">
<div class="item-title"> <div class="item-title">
<span class="t">{{tripList.length}}日行程</span> <span class="t">{{tripList.length}}日行程</span>
<span> <span>
...@@ -34,7 +34,8 @@ export default { ...@@ -34,7 +34,8 @@ export default {
props: ["subConfig"], props: ["subConfig"],
data() { data() {
return { return {
tripList: [] tripList: [],
loading:false
}; };
}, },
components: { components: {
...@@ -47,14 +48,17 @@ export default { ...@@ -47,14 +48,17 @@ export default {
mounted() {}, mounted() {},
methods: { methods: {
GetTrip(id) { GetTrip(id) {
this.tripList=[];
if (id !== undefined) { if (id !== undefined) {
//根据ID 获取行程内容 //根据ID 获取行程内容
this.loading=true;
this.apipost( this.apipost(
"b2b_get_GetB2BTravelInfoNoDes", "b2b_get_GetB2BTravelInfoNoDes",
{ {
configId: id configId: id
}, },
res => { res => {
this.loading=false;
if (res.data.resultCode == 1) { if (res.data.resultCode == 1) {
this.tripList = res.data.data.dayList; this.tripList = res.data.data.dayList;
this.init(); this.init();
......
src/components/confirmationOrderDownLoad.vue
View file @ a4923bbf
...@@ -15,6 +15,8 @@ ...@@ -15,6 +15,8 @@
<div class="trip_cover" v-show="pdfLoading" v-loading="pdfLoading"></div> <div class="trip_cover" v-show="pdfLoading" v-loading="pdfLoading"></div>
<input type="button" style="width: auto !important;" class="travelControlTripBtn" value="下载电脑版PDF" <input type="button" style="width: auto !important;" class="travelControlTripBtn" value="下载电脑版PDF"
@click="toPDF(orderMsg.startDate + orderMsg.lineteamName+orderMsg.dayNum+'日游')" /> @click="toPDF(orderMsg.startDate + orderMsg.lineteamName+orderMsg.dayNum+'日游')" />
<input type="button" style="width: auto !important;display:none; " class="travelControlTripBtn" value="下载电脑版PDF2"
@click="toPDF_V2(orderMsg.startDate + orderMsg.lineteamName+orderMsg.dayNum+'日游')" />
<input type="button" style="width: auto !important;" class="travelControlTripBtn" value="下载手机版WORD" <input type="button" style="width: auto !important;" class="travelControlTripBtn" value="下载手机版WORD"
@click="gernalFeature(0)" /> @click="gernalFeature(0)" />
<input type="button" style="width: auto !important;" class="travelControlTripBtn" value="下载电脑版WORD" <input type="button" style="width: auto !important;" class="travelControlTripBtn" value="下载电脑版WORD"
...@@ -63,6 +65,9 @@ ...@@ -63,6 +65,9 @@
<p class="pkey">返回日期</p> <p class="pkey">返回日期</p>
<p class="pvalue">{{orderMsg.endDate}}</p> <p class="pvalue">{{orderMsg.endDate}}</p>
</td> </td>
<td rowspan="2">
<!-- <img :src="WeiXinShareImgSrc" /> -->
</td>
</tr> </tr>
<tr> <tr>
<td class="essential-item"> <td class="essential-item">
...@@ -613,6 +618,8 @@ ...@@ -613,6 +618,8 @@
export default { export default {
data() { data() {
return { return {
//微信分享图片
WeiXinShareImgSrc:"",
//下拉框默认值 //下拉框默认值
defaultSelectValue: 0, defaultSelectValue: 0,
//航空公司下拉 //航空公司下拉
...@@ -669,6 +676,7 @@ ...@@ -669,6 +676,7 @@
mounted() { mounted() {
this.orderId = this.$route.query.orderId; this.orderId = this.$route.query.orderId;
this.isopOperation = this.$route.query.isopOperation; this.isopOperation = this.$route.query.isopOperation;
this.getWxCode();
this.init(); this.init();
this.initAirlines() this.initAirlines()
setTimeout(() => { setTimeout(() => {
...@@ -676,78 +684,23 @@ ...@@ -676,78 +684,23 @@
}, 2000) }, 2000)
}, },
methods: { methods: {
//获取微信二维码
getWxCode: function () {
this.apipost('survey_post_GetSurveyWeiXinShare', {
TCID: this.$route.query.tcid
}, res => {
console.log("生成二维码",res.data);
if (res.data.resultCode == 1) {
this.WeiXinShareImgSrc=res.data.data;
}
}, err => {})
},
gernalFeature(isPc) { gernalFeature(isPc) {
this.pdfLoading = true; this.pdfLoading = true;
let tcid = this.$route.query.tcid; let tcid = this.$route.query.tcid;
let UploadUrl = this.domainManager().UploadUrl let UploadUrl = this.domainManager().UploadUrl
let _this = this let _this = this
if (this.showType >= 4) { // 判断是否为行程特色 if (this.showType >= 4) { // 判断是否为行程特色
// var apiurl = this.domainManager().UploadUrl + '/Upload/GetImage?filePath=Feature/' + tcid;
// this.$http.post(apiurl).then(res => {
// let msg = res.data
// if (msg.ResultCode === 1 && _this.vshowC) { // 已经存在文件 直接调用下载
// _this.ToWord(_this.orderMsg.startDate + _this.orderMsg.lineteamName + _this.orderMsg.dayNum +
// '日游', isPc)
// } else if (document.querySelector("#gernalCanvas")) { // 不存在图片保存图片后下载
// if (document.querySelector("#gernalCanvas").querySelectorAll('img').length === 0) {
// _this.ToWord(_this.orderMsg.startDate + _this.orderMsg.lineteamName + _this.orderMsg.dayNum +
// '日游', isPc)
// return
// }
// let cName = ''
// if (_this.showType == 4) {
// cName = '.feature-box'
// } else if (_this.showType > 4) {
// cName = '.travle_page'
// }
// if (cName != '') {
// let allNum = 1
// document.querySelectorAll(cName).forEach((x, index) => {
// html2Canvas(x, {
// useCORS: true,
// scale: 0.7,
// backgroundColor: '#FFFFFF',
// }).then((canvas) => {
// if (canvas) {
// var context = canvas.getContext('2d')
// context.mozImageSmoothingEnabled = false
// context.webkitImageSmoothingEnabled = false
// context.msImageSmoothingEnabled = false
// context.imageSmoothingEnabled = false
// var image = new Image();
// image.src = canvas.toDataURL("image/png");
// $.ajax({
// url: UploadUrl +
// '/Upload/UploadBase64?fileType=1&fileLimit=5&&filePath=Feature/' + tcid,
// type: "POST",
// data: {
// myfile: image.src,
// fileIndex: index
// },
// datatype: "jsonP",
// success: function (data) {
// },
// error: function () {
// }
// });
// if (allNum !== document.querySelectorAll(cName).length) {
// allNum += 1
// } else {
// _this.ToWord(_this.orderMsg.startDate + _this.orderMsg.lineteamName + _this.orderMsg
// .dayNum + '日游', isPc)
// }
// }
// });
// });
// }
// } else {
// _this.ToWord(_this.orderMsg.startDate + _this.orderMsg.lineteamName + _this.orderMsg.dayNum +
// '日游', isPc)
// }
// }, null)
_this.ToWord(_this.orderMsg.startDate + _this.orderMsg.lineteamName + _this.orderMsg.dayNum + _this.ToWord(_this.orderMsg.startDate + _this.orderMsg.lineteamName + _this.orderMsg.dayNum +
'日游', isPc) '日游', isPc)
} else { } else {
...@@ -937,6 +890,75 @@ ...@@ -937,6 +890,75 @@
}) })
}, },
// 生成pdf
toPDF_V2: function (title) {
this.pdfLoading = true
let pageData = document.getElementById('pdfNode').innerHTML
let urlObj = this.domainManager();
let msg = {
configId: this.$route.query.configId,
cityId: this.$route.query.cityId,
tcid: this.$route.query.tcid,
orderId: this.$route.query.orderId,
FileName: title,
//是否显示基础信息
isShowBase: this.vshowA ? 1 : 0,
//是否显示航班
isShowFlight: this.vshowB ? 1 : 0,
//是否显示行程特色
isShowFeature: this.vshowC ? 1 : 0,
//自费、费用包含、费用不含
isShowFee: this.vshowE ? 1 : 0,
//购物说明，购物安排
isShowShop: this.vshowF ? 1 : 0,
//重要提示、温馨提示 [订单须知]
isShowTip: this.vshowG ? 1 : 0,
//是否显示同行备注
isShowB2B: this.vshowI ? 1 : 0,
//是否显示行程
isShowTrip: this.vshowD ? 1 : 0,
//是否显示标题
isShowTitle: this.vshowL ? 1 : 0,
//是否显示旅客名单
isShowGuest: this.vshowM ? 1 : 0,
//是否显示紧急联系人
isShowMan: this.vshowLLR ? 1 : 0,
//是否显示团号
isShowTCNUM: this.vshowTCNUM ? 1 : 0,
//是否显示行程图片
isShowTripImage: this.vshowK ? 1 : 0,
//是否显示签证信息
isShowVisa: this.vshowH ? 1 : 0,
//isPc是否PC下载
isPc: 2,
//模板参数
templateId: this.showType,
};
this.$http({
headers: {
'Content-Type': 'application/json'
},
method: 'post',
url: urlObj.DomainUrl + '/api/file/GetWebHtmlTwo_V2',
data: {
"msg": msg
}
}).then(res => {
if (res.data.resultCode === 1) {
let sign = title
const a = document.createElement('a');
a.setAttribute('download', '');
a.setAttribute('href', urlObj.DomainUrl + '/api/file/DownloadFileForPdf?fileName=' + sign +
'.pdf&&fPath=' + res.data.data);
a.click();
} else {
this.$message.error('PDF获取失败');
}
this.pdfLoading = false
}).catch(err => {
})
},
ToWord: function (title, isPc) { ToWord: function (title, isPc) {
let msg = { let msg = {
configId: this.$route.query.configId, configId: this.$route.query.configId,
......
src/components/dmc/manager/dmcShouSun.vue
View file @ a4923bbf
...@@ -302,7 +302,7 @@ ...@@ -302,7 +302,7 @@
</div> </div>
<el-dialog custom-class='w600' title="修改订单收损金额" :visible.sync="shousunDialog" center> <el-dialog custom-class='w600' title="修改订单收损金额" :visible.sync="shousunDialog" center>
<commonShouSun ref="childShou" :Type="4" @closeShouSun="closeShouSunDialog"></commonShouSun> <commonShouSun ref="childShou" :Type="4" @closeShouSun="closeShouSunDialog" @getList="getList"></commonShouSun>
</el-dialog> </el-dialog>
</div> </div>
...@@ -354,7 +354,7 @@ ...@@ -354,7 +354,7 @@
IsOneDay: '-1', IsOneDay: '-1',
IsLeaderOrder:1, IsLeaderOrder:1,
LossType:3, LossType:3,
LossStatus:0 LossStatus:2
}, },
//收损设置下拉 //收损设置下拉
shouSunSelect:[{ shouSunSelect:[{
......
src/components/dmc/manager/dmcTotalTable.vue
View file @ a4923bbf
...@@ -292,7 +292,7 @@ ...@@ -292,7 +292,7 @@
v-if="item.LineId==14 && item.CommonReport.PriceHotelResult && item.CommonReport.PriceHotelResult.length>0"> v-if="item.LineId==14 && item.CommonReport.PriceHotelResult && item.CommonReport.PriceHotelResult.length>0">
<el-popover width="750" trigger="click" popper-class="TC_HotelPop"> <el-popover width="750" trigger="click" popper-class="TC_HotelPop">
<commonHotelInfo :HotelObj="item.CommonReport.PriceHotelResult" :showHotelObj="showHotelObj" <commonHotelInfo :HotelObj="item.CommonReport.PriceHotelResult" :showHotelObj="showHotelObj"
:TCID="item.TCID" :DMCNum="item.DMCNum" :TCNUM="item.TCNUMS"></commonHotelInfo> :TCID="item.TCID" :DMCNum="item.DMCNum" :TCNUM="item.TCNUMS" @SetShouPeiShu="SetShouPeiShu(item.TCID,item.ShouPeiStatus)"></commonHotelInfo>
<span slot="reference" class="price" style="cursor:pointer;text-decoration:underline;">酒店信息</span> <span slot="reference" class="price" style="cursor:pointer;text-decoration:underline;">酒店信息</span>
</el-popover> </el-popover>
</p> </p>
...@@ -433,7 +433,8 @@ ...@@ -433,7 +433,8 @@
<tr> <tr>
<td colspan="22" style="text-align: left!important;padding:0 20px;"> <td colspan="22" style="text-align: left!important;padding:0 20px;">
<div class="link"> <div class="link">
<p @click="goUrlT('productQuery',item.TCNUMS,'产品查询')" style="padding-top:4px;">{{item.Titles}}</p> <!-- <p @click="goUrlT('productQuery',item.TCNUMS,'产品查询')" style="padding-top:4px;">{{item.Titles}}</p> -->
<p @click="getJourney(item.ConfigID,item.Titles)" style="padding-top:4px;">{{item.Titles}}</p>
<div v-if="outItem.StaticsReportList[index].DMCNum && outItem.StaticsReportList[index].DMCNum!=''" <div v-if="outItem.StaticsReportList[index].DMCNum && outItem.StaticsReportList[index].DMCNum!=''"
class="colorE95252" style="padding-top:5px;">地接备注团号:{{outItem.StaticsReportList[index].DMCNum}} class="colorE95252" style="padding-top:5px;">地接备注团号:{{outItem.StaticsReportList[index].DMCNum}}
</div> </div>
...@@ -468,11 +469,16 @@ ...@@ -468,11 +469,16 @@
</tripDownLoadCommon> </tripDownLoadCommon>
</el-dialog> </el-dialog>
<el-dialog custom-class='ComTeamPlan_info_box' :title="tripTitle" :visible.sync="teamVisible" center>
<commonTeamInfo ref="comTeam"></commonTeamInfo>
</el-dialog>
</div> </div>
</template> </template>
<script> <script>
import tripDownLoadCommon from "../../commonPage/TripDownLoadCommon.vue"; import tripDownLoadCommon from "../../commonPage/TripDownLoadCommon.vue";
import commonHotelInfo from "../../commonPage/commonHotelInfo.vue"; import commonHotelInfo from "../../commonPage/commonHotelInfo.vue";
import commonTeamInfo from "../../commonPage/commonTeamInfo.vue";
export default { export default {
data() { data() {
return { return {
...@@ -480,6 +486,8 @@ ...@@ -480,6 +486,8 @@
currentPage: 1, currentPage: 1,
total: 0, total: 0,
travelControlTripLayerShow: false, travelControlTripLayerShow: false,
tripTitle:'',
teamVisible: false,
msg: { msg: {
StartDate: '', StartDate: '',
EndDate: '', EndDate: '',
...@@ -544,7 +552,8 @@ ...@@ -544,7 +552,8 @@
showPrice: true, showPrice: true,
showPay: true, showPay: true,
showZhan: true, showZhan: true,
showBtnList: true showBtnList: true,
ShowShouPeiStatus:true,//显示手配置暂定确定按钮
}, },
pickerBeginDateBefore: { pickerBeginDateBefore: {
disabledDate: time => { disabledDate: time => {
...@@ -582,9 +591,18 @@ ...@@ -582,9 +591,18 @@
}, },
components: { components: {
tripDownLoadCommon, tripDownLoadCommon,
commonHotelInfo commonHotelInfo,
commonTeamInfo
}, },
methods: { methods: {
getJourney(id, title) {
var that = this;
this.tripTitle = title;
this.$nextTick(() => {
that.$refs.comTeam.GetTrip(id);
});
that.teamVisible = true;
},
openChart(obj) { openChart(obj) {
this.MsgBus.$emit('openChat', { this.MsgBus.$emit('openChat', {
account: obj.CreateByAccount, account: obj.CreateByAccount,
...@@ -878,6 +896,24 @@ ...@@ -878,6 +896,24 @@
err => {} err => {}
) )
}, },
//更新手配书状态
SetShouPeiShu(TCID,ShouPeiStatus)
{
var msg=
{
TCID:TCID,
ShouPeiStatus:(ShouPeiStatus==0?1:0)
};
this.apipost('dmcstatistics_post_SetPriceShouPeiShuService', msg, res => {
if (res.data.resultCode == 1) {
this.$message.success(res.data.message);
this.getList();
} else {
this.$message.error(res.data.message);
}
}, err => {})
}
}, },
mounted() { mounted() {
let myDate = new Date(); let myDate = new Date();
......
src/components/index.vue
View file @ a4923bbf
...@@ -6,19 +6,28 @@ ...@@ -6,19 +6,28 @@
<!-- <i class="iconfont icon-logo"></i> --> <!-- <i class="iconfont icon-logo"></i> -->
</div> </div>
<div class="nav-middle"> <div class="nav-middle">
<ul class="clearfix" :style="{width:`${allWindowWidth}px`}"> <ul class="clearfix comIndexUl" :style="{width:`${allWindowWidth}px`}">
<li v-for="(item,index) in menuList" v-if="item.MenuUrl!='' && index<=maxLength" :class="{active:item.MenuId==chosenIndex}" @click="goUrl(item.MenuUrl,item.MenuId,index)" > <li v-for="(item,index) in menuList" v-if="item.MenuUrl!='' && index<=maxLength" :class="{active:item.MenuId==chosenIndex}" @click="goUrl(item.MenuUrl,item.MenuId,index)" >
<span class="big_tittle"><i :class="[fontPub,item.icon]" ></i>{{item.MenuName}}</span> <span class="big_tittle"><i :class="[fontPub,item.icon]" ></i>
{{item.MenuName}}
<span class="MenuConfirm" v-if="item.fatherCount>0">{{item.fatherCount}}</span>
</span>
<div class="hoverNote"></div> <div class="hoverNote"></div>
<!--<div :class="{menuList_son:item.ChildMenu.length>=1}" :style="{width:item.ChildMenu.length>=1 ? ((item.ChildMenu.length*160) + 'px') : '0',left: item.ChildMenu.length>1 ? '-50%' : '0'}" @click.stop>--> <!--<div :class="{menuList_son:item.ChildMenu.length>=1}" :style="{width:item.ChildMenu.length>=1 ? ((item.ChildMenu.length*160) + 'px') : '0',left: item.ChildMenu.length>1 ? '-50%' : '0'}" @click.stop>-->
<div :class="{menuList_son:item.ChildMenu.length>=1}" :style="{width:item.ChildMenu.length>=1 ? '1300px' : '0',left:'50px'}" @click.stop> <div :class="{menuList_son:item.ChildMenu.length>=1}" :style="{width:item.ChildMenu.length>=1 ? '1300px' : '0',left:'50px'}" @click.stop>
<div class="menuList_son_item" @mousemove.stop @mouseout.stop> <div class="menuList_son_item" @mousemove.stop @mouseout.stop>
<div v-for="(son, sIndex) in item.ChildMenu" style="width: 150px;margin-right: 20px"> <div v-for="(son, sIndex) in item.ChildMenu" style="width: 150px;margin-right: 20px">
<p class="menuList_son_one_tittle">{{son.MenuName}}</p> <p class="menuList_son_one_tittle">
{{son.MenuName}}
<span class="MenuConfirm" v-if="son.childCount>0">{{son.childCount}}</span>
</p>
<div v-for="(grand, gIndex) in son.NewChildMenu" class="menuList_tittle_box"> <div v-for="(grand, gIndex) in son.NewChildMenu" class="menuList_tittle_box">
<p v-if="grand.GCode !== '默认'" class="menuList_son_two_tittle">{{grand.GCode}}</p> <p v-if="grand.GCode !== '默认'" class="menuList_son_two_tittle">{{grand.GCode}}</p>
<template v-for="(grandSon, gsIndex) in grand.list"> <template v-for="(grandSon, gsIndex) in grand.list">
<p @click.stop="goUrl(grandSon.MenuUrl,grandSon.MenuId,gsIndex)" class="menuList_son_three_tittle"><i :class="[fontPub,JSON.parse(grandSon.MenuStyle).icon ? JSON.parse(grandSon.MenuStyle).icon : 'icon-guanli2']" ></i>{{grandSon.MenuName}}</p> <p @click.stop="goUrl(grandSon.MenuUrl,grandSon.MenuId,gsIndex)" class="menuList_son_three_tittle"><i :class="[fontPub,JSON.parse(grandSon.MenuStyle).icon ? JSON.parse(grandSon.MenuStyle).icon : 'icon-guanli2']" ></i>
{{grandSon.MenuName}}
<span class="MenuConfirm" v-if="grandSon.Count>0">{{grandSon.Count}}</span>
</p>
</template> </template>
</div> </div>
</div> </div>
...@@ -1327,6 +1336,14 @@ export default { ...@@ -1327,6 +1336,14 @@ export default {
this.MsgBus.$on('openChat',function(obj){ this.MsgBus.$on('openChat',function(obj){
that.lt(obj) that.lt(obj)
}); });
//调用初始化信息提示
this.MsgBus.$on('comMsgTips',function(){
that.getNumber();
});
setInterval(function(){
that.getNumber();
},600000)
const permissionNow = Notification.requestPermission(); const permissionNow = Notification.requestPermission();
var hiddenProperty = var hiddenProperty =
"hidden" in document "hidden" in document
...@@ -1373,6 +1390,7 @@ export default { ...@@ -1373,6 +1390,7 @@ export default {
//获取版本 //获取版本
this.getVersion(); this.getVersion();
this.getMenu(); this.getMenu();
// this.getNumber();
this.setCheckMenu(); this.setCheckMenu();
this.getDynamic(); this.getDynamic();
...@@ -3220,8 +3238,47 @@ export default { ...@@ -3220,8 +3238,47 @@ export default {
x.icon = menuStyle.icon; x.icon = menuStyle.icon;
x.color = menuStyle.color; x.color = menuStyle.color;
this.menuList.push(x); this.menuList.push(x);
} }
}); });
this.getNumber();
},
getNumber(){
this.menuList.forEach(x=>{
x.fatherCount=0;
x.ChildMenu.forEach(y=>{
y.childCount=0;
})
})
this.apipost("sellorder_post_GetMenuInformationList",{},res => {
if (res.data.resultCode == 1) {
let dataList = res.data.data;
dataList.forEach(item=>{
this.menuList.forEach(x=>{
x.ChildMenu.forEach(y=>{
y.NewChildMenu.forEach(z=>{
z.list.forEach(j=>{
if(j.MenuId==item.MenuId){
j.Count = item.Count;
y.childCount +=j.Count;
}
})
})
})
})
})
this.menuList.forEach(x=>{
x.ChildMenu.forEach(y=>{
x.fatherCount+=y.childCount;
})
})
this.$forceUpdate();
} else {
this.Error(res.data.message);
}
},
err => {}
);
}, },
//设置菜单选中 //设置菜单选中
setCheckMenu() { setCheckMenu() {
...@@ -3859,7 +3916,7 @@ export default { ...@@ -3859,7 +3916,7 @@ export default {
z-index: 2019128; z-index: 2019128;
} }
.nav-middle ul li { .nav-middle ul li {
.size(100px, 100%); .min-size(100px, 100%);
.fz(14px); .fz(14px);
.center(text-x); .center(text-x);
.hover-bg(#f1f1f1); .hover-bg(#f1f1f1);
...@@ -4278,4 +4335,15 @@ export default { ...@@ -4278,4 +4335,15 @@ export default {
margin-bottom: 0 !important; margin-bottom: 0 !important;
height: 850px; height: 850px;
} }
.MenuConfirm{
display: inline-block;
width:15px;
height:15px;
font-size:12px;
text-align: center;
border-radius: 50%;
background-color: #E95252;
color:#fff;
line-height: 15px;
}
</style> </style>
src/components/systemManagement/lineManagement.vue
View file @ a4923bbf
...@@ -640,8 +640,8 @@ input[type="number"] { ...@@ -640,8 +640,8 @@ input[type="number"] {
</tr> </tr>
</table> </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')"/> <input type="button" class="normalBtn" @click="isShowTwo=false" :value="$t('pub.cancelBtn')"/>
<input type="button" class="normalBtn saveCompanyBtn" @click="saveCompany()" :value="$t('pub.saveBtn')"/>
</div> </div>
<el-pagination background @current-change="handleCurrentChange" :current-page.sync="currentPage" <el-pagination background @current-change="handleCurrentChange" :current-page.sync="currentPage"
layout="total,prev, pager, next, jumper" :page-size=msg.pageSize :total=total> layout="total,prev, pager, next, jumper" :page-size=msg.pageSize :total=total>
...@@ -845,8 +845,6 @@ export default { ...@@ -845,8 +845,6 @@ export default {
this.addMsg.LineDirection = getInfo.lineDirection; this.addMsg.LineDirection = getInfo.lineDirection;
this.addMsg.BackgroundImage = getInfo.BackgroundImage; this.addMsg.BackgroundImage = getInfo.BackgroundImage;
this.addMsg.BroadsideImage = getInfo.BroadsideImage; this.addMsg.BroadsideImage = getInfo.BroadsideImage;
console.log("this.addMsg.BackgroundImage",getInfo)
}, },
deletelist(lineID) { deletelist(lineID) {
var that = this; var that = this;
...@@ -993,13 +991,13 @@ export default { ...@@ -993,13 +991,13 @@ export default {
let ckedJoinEmployee = []; let ckedJoinEmployee = [];
item.selectOpIdArr.forEach(x => { item.selectOpIdArr.forEach(x => {
ckedJoinEmployee.push({ ckedJoinEmployee.push({
EmployeeId: x, employeeId: x,
employeeName: "", employeeName: "",
}); });
}); });
ckedJoinEmployee.forEach(x => { ckedJoinEmployee.forEach(x => {
item.employeeList.forEach(y => { item.employeeList.forEach(y => {
if (x.EmployeeId === y.EmployeeId) { if (x.employeeId === y.EmployeeId) {
x.employeeName = y.EmName; x.employeeName = y.EmName;
} }
}); });
...@@ -1114,12 +1112,13 @@ export default { ...@@ -1114,12 +1112,13 @@ export default {
x.joinEmployee.forEach(y => { x.joinEmployee.forEach(y => {
var opBranch = { var opBranch = {
rB_Branch_id: x.rB_Branch_id, rB_Branch_id: x.rB_Branch_id,
EmployeeId: y.EmployeeId EmployeeId: y.employeeId
}; };
lineBranchOPList.push(opBranch); lineBranchOPList.push(opBranch);
}); });
} }
}); });
let msg = { let msg = {
lineId: this.upLineId, lineId: this.upLineId,
lineBranchList: lineBranchList, lineBranchList: lineBranchList,
......
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