Skip to content

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

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

parents 0fd3dd7d 94ef7c5d
Hide whitespace changes
Inline Side-by-side
Showing with 154 additions and 49 deletions
src/components/FinancialModule/addFinancialProcess.vue
View file @ be4d839d
......@@ -330,6 +330,15 @@
<el-radio @change="RadioShow" v-model="addMsg.IsShow" :label="1">{{$t('pub.yes')}}</el-radio>
<el-radio @change="RadioShow" v-model="addMsg.IsShow" :label="2">{{$t('pub.no')}}</el-radio>
</el-form-item>
<el-form-item v-show="addMsg.IsShow==2" label="可显示部门">
<el-select filterable multiple v-model='addMsg.ShowDepartmentList' class="w200" style="max-height:100px;overflow:hidden" size="small">
<el-option v-for='item in DepartmentList'
:label='item.DepartmentName'
:value='item.DepartmentID'
:key='item.DepartmentID'>
</el-option>
</el-select>
</el-form-item>
<el-form-item v-show="addMsg.IsShow==2" label="可显示人">
<el-select filterable multiple v-model='addMsg.ShowEmployeeList' class="w200" style="max-height:100px;overflow:hidden" size="small">
<el-option v-for='item in EmployeeList'
......@@ -534,6 +543,7 @@ export default {
components: { Treeselect },
data(){
return{
DepartmentList:[],
EmployeeList:[],
Auditshow:false,
accListShow: true,
......@@ -555,6 +565,7 @@ export default {
},
IsShow: 1,
ShowEmployeeList:[],
ShowDepartmentList:[],
},
AuditUserList:{
EmName:'',
......@@ -726,12 +737,33 @@ export default {
this.getFinancialFlowTemplate_post_GetNodeList();
this.getRole()
this.getEmployeeList();
this.getDepartment();
},
methods:{
//根据多公司获取部门
getDepartment() {
let msg= {
RB_Group_Id: '0',
RB_Branch_Id: '-1',
Status: '0',
};
this.apipost(
"department_get_GetListByBranchIds",
msg,
res => {
if (res.data.resultCode == 1) {
this.DepartmentList = res.data.data;
}
},
err => {}
);
},
RadioShow(val){
console.log(val);
if(val==1){
this.addMsg.ShowEmployeeList=[];
this.addMsg.ShowDepartmentList=[];
}
},
getEmployeeList () {
......@@ -802,6 +834,8 @@ export default {
this.addMsg.IsUploadPic = data.IsUploadPic;
this.addMsg.IsShow = data.IsShow;
this.addMsg.ShowEmployeeList = data.ShowEmployeeList;
this.addMsg.ShowDepartmentList = data.ShowDepartmentList;
if (data.list && data.list[0] !== -1) {
this.accListMsg = data.list;
......
src/components/SalesVisa/VisaProductEditOrder.vue
View file @ be4d839d
......@@ -501,7 +501,6 @@ export default {
{
name: 'ChoiceAddFinancialDocuments',
query:{
'Type':1,
'path':'SaleOrderModule',
'companyID':obj.rB_Branch_Id,
'blank':'y',
......
src/components/Ticketing/TicketAmiba.vue
View file @ be4d839d
......@@ -98,26 +98,57 @@
</td>
</tr>
</table>
<!-- -->
<el-dialog
custom-class="w400"
width="1000px"
title="设置团队散客机票利润"
:visible.sync="AmibaDialog"
center
:before-close="closeChangeMachie"
>
<el-form :model="addMsg" :rules="rules" ref="addMsg" label-width="130px">
<el-form-item label="散客机票数量" prop="IndividualTicketNum">
<el-form-item style="display:inline-block" label="散客机票数量" prop="IndividualTicketNum">
<el-input v-model="addMsg.IndividualTicketNum" @keyup.native="checkInteger(addMsg,'IndividualTicketNum')" class="w180"/>
</el-form-item>
<el-form-item label="散客机票利润" prop="IndividualTicketMoney">
<el-form-item style="display:inline-block" label="散客机票利润" prop="IndividualTicketMoney">
<el-input v-model="addMsg.IndividualTicketMoney" @keyup.native="checkPrice(addMsg,'IndividualTicketMoney')" class="w180"/>
</el-form-item>
<el-form-item label="绑定财务单据">
<el-select multiple :placeholder="$t('pub.pleaseSel')" class='multiple_input w180' v-model="addMsg.FrIdList">
<el-option v-for="item in FrList" :key="item" :label="item" :value="item">
</el-option>
</el-select>
</el-form-item>
<div>绑定财务单据</div>
<table v-loading="checkLoad" class="singeRowTable myDocumentsTable" border="0" cellspacing="0" cellpadding="0">
<tr>
<th><input v-model="isCkedAll" type="checkbox" @click='checkedAll()' /></th>
<th>单号</th>
<th>所属公司</th>
<th>单据类型</th>
<th>费用类型</th>
<th>交易方式</th>
<th>金额</th>
<th>付款对象</th>
<th>制单人员</th>
</tr>
<tr v-for="(item,index) in FrIdList" :key="index+5000">
<td>
<input type="checkbox" :value="item.FrID" v-model="checkList" @change="ckeckedOne">
</td>
<td>{{item.FrID}}</td>
<td>{{item.BranchName}}</td>
<td>{{item.TypeName}}</td>
<td>
<p v-for="(i,index) in item.CostTypeList" :key="index+1000">{{i}} </p>
</td>
<td>
<span v-for="(i,index) in item.TradeWayList" :key="index+2000">{{i.Alias}} <span v-if="item.TradeWayList[0]">{{item.TradeWayList[0].TypeName}}</span></span>
</td>
<td>
<p>{{item.Type==1?'应收':'应付'}}：<span>{{item.Money}}</span></p>
<p>{{item.Type==1?'实收':'实付'}}：<span>{{item.PayMoney}}</span></p>
</td>
<td>{{item.RemitterName}}</td>
<td>{{item.EmName}}</td>
</tr>
</table>
</el-form>
<div slot="footer" class="dialog-footer">
<button class="hollowFixedBtn"
......@@ -133,6 +164,10 @@
export default {
data() {
return {
checkLoad:false,
checkAllList:[],
checkList:[],
isCkedAll: false,
dataList: [],
loading:false,
//总成本
......@@ -158,6 +193,7 @@
IndividualTicketMoney:'',
FrIdList:[]
},
FrIdList:[],
pickerBeginDateBefore: {
disabledDate: time => {
if (this.queryMsg.EndTime == null) {
......@@ -197,6 +233,22 @@
this.getList()
},
methods: {
ckeckedOne() { //单选
if(this.checkList.length < this.checkAllList.length) {
this.isCkedAll = false
} else {
this.isCkedAll = true
}
},
checkedAll() { //全选
if(this.isCkedAll == true) {
this.checkList = [];
} else {
this.checkAllList.forEach(item => {
this.checkList.push(item)
})
}
},
getList() { //获取列表数据
this.loading = true;
this.apipost("sellorder_post_GetAirTicketSettlement", this.queryMsg, res => {
......@@ -247,13 +299,17 @@
this.addMsg.IndividualTicketNum = item.IndividualTicketNum;
this.addMsg.IndividualTicketMoney = item.IndividualTicketMoney;
this.addMsg.FrIdList = item.FrIdList;
this.FrList=[];
this.checkAllList=[];
this.checkLoad=true;
this.apipost("Financial_post_GetFinanceALLList", msg, res => {
this.checkLoad=false;
if (res.data.resultCode == 1) {
let dataList = res.data.data;
dataList.forEach(x=>{
this.FrList.push(x.FrID);
this.checkAllList.push(x.FrID);
})
this.FrIdList= res.data.data;
} else {
this.Error(res.data.message);
}
......@@ -264,6 +320,13 @@
//提交创建、修改表单
this.$refs[addMsg].validate(valid => {
if (valid) {
this.addMsg.FrIdList=this.checkList;
if(this.addMsg.IndividualTicketNum+this.addMsg.IndividualTicketMoney>0){
if(this.addMsg.FrIdList.length==0){
this.Error("至少选择一条单据");
return;
}
}
this.addAmibaInfo();
} else {
return false;
......
src/components/busManagement/busStatistics.vue
View file @ be4d839d
......@@ -76,10 +76,11 @@
</div>
</td>
<td>
<el-popover width="750" trigger="click" popper-class="Bus_HotelPop">
<commonHotelInfo :HotelObj="item.CommonReport.PriceHotelResult" :showHotelObj="showHotelObj"></commonHotelInfo>
<div slot="reference" class="w80" style="cursor:pointer;text-decoration:underline;">酒店信息</div>
</el-popover>
<el-popover width="750" trigger="click" popper-class="Bus_HotelPop">
<commonHotelInfo :HotelObj="item.CommonReport.PriceHotelResult" :showHotelObj="showHotelObj">
</commonHotelInfo>
<div slot="reference" class="w80" style="cursor:pointer;text-decoration:underline;">酒店信息</div>
</el-popover>
</td>
<td>
<div class="w120">
......@@ -145,19 +146,22 @@
<div class="w80">{{item.GuideName}}</div>
</td>
<td>
<div class="w80">{{item.CommonReport.BusPlanListReport[0].BusPlanOrderList[0].MainBusTypeStr}} </div>
<div class="w80">
<template v-if="item.CommonReport&&item.CommonReport.BusPlanListReport&&item.CommonReport.BusPlanListReport.length>0&&item.CommonReport.BusPlanListReport[0].BusPlanOrderList&&item.CommonReport.BusPlanListReport[0].BusPlanOrderList[0]">
{{item.CommonReport.BusPlanListReport[0].BusPlanOrderList[0].MainBusTypeStr}}
</template>
</div>
</td>
<td v-for="(x,ww) in item.CommonReport.BusPlanListReport" style="vertical-align: top;">
<div class="w100">
<template v-for="(childItem,childIndex) in x.BusPlanOrderList">
<template v-if="x.BusPlanOrderList" v-for="(childItem,childIndex) in x.BusPlanOrderList">
<p class="pDateStyle" v-if="childIndex==0"> {{childItem.PlanDateStr}}</p>
<p class="pDateStyle">
{{(childItem.AirportPickUpStr!=""?childItem.AirportPickUpStr:"") }}
<span style="color: #4BCA81;" v-if="(childItem.AirportPickUpStr!='')">√</span>
<span style="color: #E95252;" v-else>X</span>
<template v-if="x.BusPlanOrderList.length>1 && x.BusPlanOrderList.length-1!=childIndex">
<br />
<br />
</template>
</p>
</template>
......@@ -232,10 +236,10 @@
colspanTotal: 0,
isCha: 0,
boxHeight: 0,
showHotelObj:{
showPrice:true,
showPay:true,
showZhan:true
showHotelObj: {
showPrice: true,
showPay: true,
showZhan: true
}
}
},
......@@ -255,11 +259,13 @@
GetTotalPrice(obj) { //车费总价
let totalPrice = 0;
obj.forEach(busInfo => {
busInfo.BusPlanOrderList.forEach(subItem => {
if (subItem.CostPrice != undefined) {
totalPrice += subItem.CostPrice;
}
});
if (busInfo.BusPlanOrderList) {
busInfo.BusPlanOrderList.forEach(subItem => {
if (subItem.CostPrice != undefined) {
totalPrice += subItem.CostPrice;
}
});
}
});
return totalPrice;
},
......@@ -286,23 +292,27 @@
let DayNum = 0;
obj.forEach((busInfo, index) => {
if (index == 0) {
busInfo.BusPlanOrderList.forEach(subItem => {
if (subItem.AirportPickUpStr != "") {
jieji += subItem.AirportPickUpStr + ",";
} else {
jieji += "接机,";
}
});
if (busInfo.BusPlanOrderList) {
busInfo.BusPlanOrderList.forEach(subItem => {
if (subItem.AirportPickUpStr != "") {
jieji += subItem.AirportPickUpStr + ",";
} else {
jieji += "接机,";
}
});
}
} else if (index == (obj.length - 1)) {
busInfo.BusPlanOrderList.forEach(subItem => {
if (subItem.AirportPickUpStr != "") {
songji += subItem.AirportPickUpStr + ",";
} else {
songji += "送机,";
}
});
if (busInfo.BusPlanOrderList) {
busInfo.BusPlanOrderList.forEach(subItem => {
if (subItem.AirportPickUpStr != "") {
songji += subItem.AirportPickUpStr + ",";
} else {
songji += "送机,";
}
});
}
} else {
DayNum += 1;
}
......@@ -397,7 +407,6 @@
if (res.data.resultCode == 1) {
this.total = res.data.data.count;
this.DataList = res.data.data.pageData.data;
console.log("this.datalist",this.DataList);
this.thLengthTitle = [];
this.colspanTotal = res.data.data.pageData.columnsCount + 13;
for (let i = 1; i <= res.data.data.pageData.columnsCount; i++) {
......@@ -429,13 +438,11 @@
"-" +
myDate.getDate();
this.msg.StartDate = nowDate;
//this.msg.StartDate = '2019-08-12';
let width = window.innerWidth - 50;
let height = window.innerHeight - 65 - 210;
this.boxHeight = height;
this.offsetwidth = width;
// this.msg.CombinationNum = 'JVS0422OTC-NHA';
// this.msg.StartDate = "2019-04-20";
this.getList();
this.getLineTeamList();
},
......@@ -538,8 +545,10 @@
.busStatistics_tripDetails table tr._color_666 th {
padding: 9px 15px;
}
.Bus_HotelPop{
.Bus_HotelPop {
overflow: auto;
max-height: 350px;
}
</style>
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