Skip to content

S
SuperMan
Commit ff67d13d authored by 黄奎's avatar 黄奎
Browse files
Options

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

parents 160234dc 69b9dbe0
Hide whitespace changes
Inline Side-by-side
Showing with 464 additions and 21 deletions
src/components/LeaderManagement/CarDetails.vue 0 → 100644
View file @ ff67d13d
<template>
<div class="flexOne" style="min-width: 1200px;">
<!-- 表格 -->
<div style="width: 100%; height: auto;min-height:500px;overflow-x: auto;margin-top:20px" class="ownScrollbarStyle">
<table class="groupTourOrderSearchTable" border="0" cellspacing="0" cellpadding="0" v-loading='loading'>
<tr class="title_tr">
<th>日期</th>
<th>司机</th>
<th>计划金额</th>
<th>车配号</th>
<th>车辆号</th>
<th>用车方式</th>
<th>出发地</th>
<th>目的地</th>
<th>金额</th>
<th>币种</th>
<th>支付方式</th>
<th>备注</th>
</tr>
<tr>
<td v-show="dataList.length==0" colspan="16" align="center">暂无数据</td>
</tr>
<tbody v-for="(item,index) in dataList" :key="index">
<tr>
<td>{{item.PlanDateStr}}</td>
<td>
<p class="fz12">姓名:{{item.DriverName}}</p>
<p class="fz12">电话号码:{{item.DriverTel}}</p>
</td>
<!-- <td><span @click="goUrl('散客机票','individualTicket',item.AirTicketId)" class="guest_num">{{item.AirTicketId}}</span></td> -->
<td>{{item.TotalPrice}}</td>
<td class="fz12">{{item.BusCode}}</td>
<td>{{item.BusNum}}</td>
<td class="fz12">{{item.AirportPickUpStr}}</td>
<td class="fz12">
<p v-for="(s,index) in item.ReimburseList.ReimburseDetailsList" :key="index+500">
{{s.StartPlace}}
</p>
</td>
<td class="fz12">
<p v-for="(s,index) in item.ReimburseList.ReimburseDetailsList" :key="index+700">
{{s.EndPlace}}
</p>
</td>
<td class="fz12">
<p v-for="(s,index) in item.ReimburseList.ReimburseDetailsList" :key="index+800">
{{s.UnitPrice}}
</p>
</td>
<td>{{item.ReimburseList.CurrencyId}}</td>
<td>
<p v-if="item.RefundStatus!=1">
<span v-if="item.RefundStatus==2">退款中</span>
<span v-if="item.RefundStatus==3">已退款</span>
</p>
</td>
</tr>
</tbody>
</table>
</div>
<!-- <el-pagination background @current-change="handleCurrentChange" :current-page.sync="currentPage"
layout="total,prev, pager, next, jumper" :page-size="msg.pageSize" :total="total"></el-pagination> -->
</div>
</template>
<script>
import payURL from "../commonPage/payURL.vue";
import moment from "moment";
export default {
data() {
return {
msg: {
TCIDs:''
},
dataList: [],
loading: false,
total: 0,
currentPage: 1,
showID: -1,
companyList:[],
employeeList:[],
urrencyTypeObj:{},
};
},
components: {},
created() {
let userInfo = this.getLocalStorage();
this.msg.TCIDs=this.$route.query.TCIDs?this.$route.query.TCIDs:"";
console.log("this.msg.TCIDs",this.msg.TCIDs)
this.financeinfo_post_GetList();
},
methods: {
financeinfo_post_GetList(){ // 币种类型
this.apipost('financeinfo_post_GetList',{Name:''},res=>{
if(res.data.resultCode==1){
let data = res.data.data;
console.log("data",data)
}else{
}
},err=>{})
},
// 退款操作
RefundPay(item) {
let orderObj = {
OrderID: item.Id, //订单号
OrderSource: 12, //12
Obj: {},
SourceID: item.AirTicketId, //机票id
TCIDList: []
};
this.$router.push({
name: "ChoiceAddFinancialDocuments",
query: {
Type: 2,
companyID: item.RB_Branch_Id, //公司id
path: "",
blank: "y",
orderObj: JSON.stringify(orderObj)
}
});
},
goUrl: function(name, path, id) {
this.$router.push({
name: path,
query: { id: id, blank: "y", tab: name }
});
},
handleCurrentChange(val) {
this.msg.pageIndex = val;
this.getList();
},
resetPageIndex() {
this.msg.pageIndex = 1;
this.currentPage = 1;
},
getList() {
this.loading = true;
this.apipost('dmcstatistics_post_GetNewLeaderPayMoneyStatics', this.msg, res => {
this.loading=false;
if(res.data.resultCode == 1) {
this.dataList = res.data.data.BusList;
console.log("this.dataList",this.dataList);
} else {
this.Error(res.data.message);
}
}, err => {})
},
// 结束日期不能大于开始日期
dataDui() {
if (this.msg.startDate > this.msg.endDate && this.msg.endDate !== "") {
this.$message.error("结束日期不能大于开始日期");
this.msg.endDate = "";
}
}
},
mounted() {
this.getList();
}
};
</script>
<style scoped>
.groupTourOrderSearchTable {
width: 100%;
min-width: 1500px;
font-size: 14px;
color: #333;
border-bottom: 1px solid #cccccc;
border-right: 1px solid #cccccc;
/* border-collapse: collapse; */
}
.groupTourOrderSearchTable tr th {
background: #e6e6e6;
height: 30px;
font-size: 12px;
text-align: left;
text-indent: 15px;
border-top: 1px solid #cccccc;
border-left: 1px solid #cccccc;
}
.groupTourOrderSearchTable tr {
background: #fff;
text-align: left;
}
.groupTourOrderSearchTable tr td {
padding: 8px;
border-top: 1px solid #cccccc;
border-left: 1px solid #cccccc;
}
.groupTourOrderSearchTable tr td p {
line-height: 20px;
}
.groupTourOrderSearchTable .dowloadSpan:hover {
text-decoration: underline;
cursor: pointer;
}
.groupTourOrderSearchTable span.personNo {
text-decoration: underline;
cursor: pointer;
}
.groupTourOrderSearchTable span.personNo:hover {
font-weight: bold;
color: #e95252;
}
</style>
src/components/LeaderManagement/leaderManagement.vue
View file @ ff67d13d
......@@ -497,7 +497,7 @@
</el-option>
</el-select>
</el-form-item>
<el-form-item :label="$t('system.table_sex')" prop="Sex" v-if="addMsg.LeaderGuidClass==0">
<el-form-item :label="$t('system.table_sex')" prop="Sex" >
<el-select v-model="addMsg.Sex" :placeholder="$t('leader.leader_Sex')" class="w210">
<el-option v-for='item in SexOptions' :key="item.value" :label="item.type" :value="item.value">
</el-option>
......@@ -591,7 +591,7 @@ export default {
},
addMsg: {
ID: "0",
Type: "",
Type: "3",
EmployeeId: "",
Surname: "",
Name: "",
......@@ -1072,7 +1072,7 @@ export default {
//初始化创建、修改表单数据
let newMsg = {
ID: "0",
Type: "",
Type: "3",
EmployeeId: "",
Surname: "",
Name: "",
......
src/components/LeaderManagement/leaderPayHotelDetail.vue 0 → 100644
View file @ ff67d13d
<style>
</style>
<template>
<div class="flexOne leaderPayHotelDetail">
<div class="clearfix"></div>
<table class="singeRowTable" border="0" cellspacing="0" cellpadding="0" v-loading="loading">
<tr>
<th width="600px">问题名称</th>
<th>类型</th>
<th>排序</th>
<th>是否显示</th>
<th width="120px">操作</th>
</tr>
<tr v-for="item in dataList">
<td>{{item.Title}}</td>
<td>{{getTypeName(item.SurveyType)}}</td>
<td>
{{item.Sort}}
</td>
<td>
{{item.IsShow === 1 ? '显示' : '不显示'}}
</td>
<td>
asd
</td>
</tr>
</table>
<div class="noDataNotice" v-if="dataList.length<1">
<i class="iconfont icon-kong"></i>
<p>{{$t("active.ld_noData")}}</p>
</div>
</div>
</template>
<script>
export default {
data() {
return {
loading: false,
dataList: [],
};
},
mounted() {
let TCIDs = this.$route.query.TCIDs;
let date = this.$route.query.date;
this.getList(TCIDs, date);
},
filters: {},
methods: {
//获取数据
getList(TCIDs) {
this.loading = true;
this.apipost(
"dmcstatistics_post_GetNewLeaderPayMoneyStatics",
{TCIDs: TCIDs},
res => {
this.loading = false;
if (res.data.resultCode === 1) {
this.dataList = res.data.data;
} else {
this.Error(res.data.message);
}
},
null
);
},
}
};
</script>
\ No newline at end of file
src/components/LeaderManagement/leaderPayTicketDetail.vue 0 → 100644
View file @ ff67d13d
<style>
</style>
<template>
<div class="flexOne leaderPayTicketDetail">
<div class="clearfix"></div>
<table class="singeRowTable" border="0" cellspacing="0" cellpadding="0" v-loading="loading">
<tr>
<th width="600px">问题名称</th>
<th>类型</th>
<th>排序</th>
<th>是否显示</th>
<th width="120px">操作</th>
</tr>
<tr v-for="item in dataList">
<td>{{item.Title}}</td>
<td>{{getTypeName(item.SurveyType)}}</td>
<td>
{{item.Sort}}
</td>
<td>
{{item.IsShow === 1 ? '显示' : '不显示'}}
</td>
<td>
asd
</td>
</tr>
</table>
<div class="noDataNotice" v-if="dataList.length<1">
<i class="iconfont icon-kong"></i>
<p>{{$t("active.ld_noData")}}</p>
</div>
</div>
</template>
<script>
export default {
data() {
return {
loading: false,
dataList: [],
};
},
mounted() {
let TCIDs = this.$route.query.TCIDs;
let date = this.$route.query.date;
this.getList(TCIDs, date);
},
filters: {},
methods: {
//获取数据
getList() {
this.loading = true;
this.apipost(
"dmcstatistics_post_GetNewLeaderPayMoneyStatics",
{TCIDs: TCIDs},
res => {
this.loading = false;
if (res.data.resultCode === 1) {
this.dataList = res.data.data;
} else {
this.Error(res.data.message);
}
},
null
);
},
}
};
</script>
\ No newline at end of file
src/components/activity/PersonnelManagement.vue
View file @ ff67d13d
......@@ -355,11 +355,11 @@ export default {
};
</script>
<style>
<style scoped>
.personTable .el-table--border::after, .personTable .el-table--group::after, .personTable .el-table::before{
/* .personTable .el-table--border::after, .personTable .el-table--group::after, .personTable .el-table::before{
background-color: transparent;
}
} */
.personTable .el-table--scrollable-y .el-table__body-wrapper::-webkit-scrollbar {
/*滚动条整体样式*/
width: 5px;
......@@ -370,19 +370,18 @@ export default {
background: #fff;
padding: 2px
}
.personTable .el-table--scrollable-y .el-table__body-wrapper::-webkit-scrollbar-thumb {
/*滚动条里面小方块*/
/* .personTable .el-table--scrollable-y .el-table__body-wrapper::-webkit-scrollbar-thumb {
height:4px;
width: 4px;
background:#6A0404;
border-radius:5px;
}
.personTable .el-table--scrollable-y .el-table__body-wrapper::-webkit-scrollbar-track {
} */
/* .personTable .el-table--scrollable-y .el-table__body-wrapper::-webkit-scrollbar-track {
-webkit-box-shadow: inset 0 0 2px #6A0404;
border-radius:5px;
background: transparent;
}
} */
/*
.personTable .el-table--striped .el-table__body tr.el-table__row--striped.current-row td,
.personTable .el-table__body tr.current-row>td,
.personTable .el-table__body tr.hover-row.current-row>td,
......@@ -401,7 +400,7 @@ export default {
.personTable .el-table tbody tr:hover td:first-child{
color:#fff!important;
background:rgba(193,39,45,0.5)
}
} */
.personTable .el-table tbody td:first-child{
background:rgba(255,255,255,0.5);
}
......
src/components/index.vue
View file @ ff67d13d
......@@ -899,7 +899,7 @@
</div>
<div style="text-align:center">
<p style="font-size:26px;color:#111111;margin:40px 0">第{{tsNumber}}期投诉案例分享已经发布</p>
<a @click="CloseTs" target="_blank" href="http://we.oytour.com:8110/?/article/11" style="font-size:18px;color:#E95252;cursor:pointer;text-decoration:underline">点击查看</a>
<a @click="CloseTs" target="_blank" href="http://we.oytour.com:8110/?/article/12" style="font-size:18px;color:#E95252;cursor:pointer;text-decoration:underline">点击查看</a>
</div>
</div>
</div>
......@@ -907,6 +907,7 @@
</template>
<script>
import util from "../utils";
import config from "../configs";
import pageUtil from "../utils/page";
......@@ -930,7 +931,7 @@ export default {
data() {
return {
tsState:false,
tsNumber:3,
tsNumber:4,
saleRnkShow: false,
dialogTitleNot: '',
outerVisibleNot: false,
......
src/components/leaderPay2.vue
View file @ ff67d13d
......@@ -127,7 +127,7 @@ input[type="number"] {
</table>
<table border="0" cellspacing="1" class="leaderPayTable leaderPayTable2">
<tr>
<th colspan="9" class="bgwhite">门票使用</th>
<th colspan="10" class="bgwhite">门票使用</th>
</tr>
<tr>
<th width="180">使用日期</th>
......@@ -139,6 +139,7 @@ input[type="number"] {
<th width="">预计总金额</th>
<th width="">实付金额</th>
<th width="100">备注</th>
<th width="40">操作</th>
</tr>
<template v-for='(item,index) in ScenicDataList'>
<template v-for="(subItem,subIndex) in item.data">
......@@ -178,6 +179,7 @@ input[type="number"] {
<td v-if="childIndex==0" :rowspan="subItem.TicketPriceList.length">
{{subItem.Remarks}}
</td>
<td v-if="childIndex==0" :rowspan="subItem.TicketPriceList.length"><span class="cursorpointer text-decoratio" @click="godetail('ticket', subItem)">明细</span></td>
</tr>
</template>
</template>
......@@ -225,7 +227,7 @@ input[type="number"] {
<table border="0" cellspacing="1" class="leaderPayTable leaderPayTable2">
<tr>
<th colspan="4" class="bgwhite">车辆使用</th>
<th colspan="5" class="bgwhite">车辆使用</th>
</tr>
<tr>
<th width="">使用日期</th>
......@@ -233,6 +235,7 @@ input[type="number"] {
<!-- <th width="">预计总金额</th>-->
<th width="">实付金额</th>
<th width="">备注</th>
<th width="40">操作</th>
</tr>
<template v-for='(item,index) in busDataList'>
<tr v-for='(item2,index2) in item.data'>
......@@ -249,13 +252,14 @@ input[type="number"] {
<td>
{{item2.Remarks}}
</td>
<td v-if="index2 ==0" :rowspan="item.data.length"><span class="cursorpointer text-decoratio" @click="godetail('bus', item2)">明细</span></td>
</tr>
</template>
</table>
<table border="0" cellspacing="1" class="leaderPayTable leaderPayTable2">
<tr>
<th colspan="10" class="bgwhite">餐食使用</th>
<th colspan="11" class="bgwhite">餐食使用</th>
</tr>
<tr>
<th width="180">使用日期</th>
......@@ -268,6 +272,7 @@ input[type="number"] {
<th width="">预计总金额</th>
<th width="">实付金额</th>
<th width="100">备注</th>
<th width="40">操作</th>
</tr>
<template v-for='(item,index) in DiningDataList'>
<template v-for='(subItem,subIndex) in item.data'>
......@@ -309,6 +314,7 @@ input[type="number"] {
<td v-if="childIndex==0" :rowspan="subItem.DiningPriceList.length">
{{subItem.Remarks}}
</td>
<td v-if="childIndex==0" :rowspan="subItem.DiningPriceList.length"><span class="cursorpointer text-decoratio" @click="godetail('dining', subItem)">明细</span></td>
</tr>
</template>
</template>
......@@ -356,7 +362,7 @@ input[type="number"] {
<table border="0" cellspacing="1" class="leaderPayTable leaderPayTable2">
<tr>
<th colspan="11" class="bgwhite">酒店使用</th>
<th colspan="12" class="bgwhite">酒店使用</th>
</tr>
<tr>
<th width="180">使用日期</th>
......@@ -370,6 +376,7 @@ input[type="number"] {
<th width="">预计总金额</th>
<th width="">实付金额</th>
<th width="100">备注</th>
<th width="40">操作</th>
</tr>
<template v-for='(item, index) in HotelDataList'>
<template v-for="(subItem,subIndex) in item.data">
......@@ -433,6 +440,7 @@ input[type="number"] {
<td v-if="childIndex==0" :rowspan="subItem.OrderDetailsList.length">
{{subItem.Remarks}}
</td>
<td v-if="childIndex==0" :rowspan="subItem.OrderDetailsList.length"><span class="cursorpointer text-decoratio" @click="godetail('hotel', subItem)">明细</span></td>
</tr>
</template>
</template>
......@@ -496,18 +504,20 @@ input[type="number"] {
value="保存"
class="leader2Btn"
@click="saveBZPrice()"
> -->
</th>
></th> -->
<th width="40">操作</th>
</tr>
<tr v-show="totalList.SelfPayingExpendTotalPrice>0">
<td>自费支出</td>
<td>0</td>
<td>{{moneyFormat(totalList.SelfPayingExpendTotalPrice)}}</td>
<td><span class="cursorpointer text-decoratio" @click="godetailAll('zifeizhi')">明细</span></td>
</tr>
<tr v-show="totalList.SelfPayingIncomeTotalPrice>0">
<td>自费收入</td>
<td>0</td>
<td>{{moneyFormat(totalList.SelfPayingIncomeTotalPrice)}}</td>
<td><span class="cursorpointer text-decoratio" @click="godetailAll('zifeishou')">明细</span></td>
</tr>
<!-- <tr v-show="totalList.IncomeTotalPrice>0">
<td>消费收入</td>
......@@ -519,11 +529,13 @@ input[type="number"] {
<td>其他费用</td>
<td>0</td>
<td>{{moneyFormat(totalList.ExpendTotalPrice-totalScenicPrice-totalTrafficPrice-totalDinnerPrice-totalHotelPrice)}}</td>
<td><span class="cursorpointer text-decoratio" @click="godetailAll('qitafeiyong')">明细</span></td>
</tr>
<tr v-show="totalScenicPrice>0">
<td>景点门票</td>
<td>{{moneyFormat(OtherTotalPrice)}}</td>
<td>{{moneyFormat(totalScenicPrice)}}</td>
<td><span class="cursorpointer text-decoratio" @click="godetailAll('ticket', childItem)">明细</span></td>
<!-- <td>
<el-input
size="mini"
......@@ -536,6 +548,7 @@ input[type="number"] {
<td>交通</td>
<td>{{moneyFormat(SelfPayingExpendTotalPrice)}}</td>
<td>{{moneyFormat(totalTrafficPrice)}}</td>
<td><span class="cursorpointer text-decoratio" @click="godetailAll('bus', childItem)">明细</span></td>
<!-- <td>
<el-input
size="mini"
......@@ -548,6 +561,7 @@ input[type="number"] {
<td>餐饮</td>
<td>{{moneyFormat(IncomeTotalPrice)}}</td>
<td>{{moneyFormat(totalDinnerPrice)}}</td>
<td><span class="cursorpointer text-decoratio" @click="godetailAll('dining', childItem)">明细</span></td>
<!-- <td>
<el-input
size="mini"
......@@ -560,6 +574,7 @@ input[type="number"] {
<td>酒店</td>
<td>{{moneyFormat(ExpendTotalPrice)}}</td>
<td>{{moneyFormat(totalHotelPrice)}}</td>
<td><span class="cursorpointer text-decoratio" @click="godetailAll('hotel', childItem)">明细</span></td>
<!-- <td>
<el-input
size="mini"
......@@ -921,6 +936,29 @@ export default {
};
},
methods: {
// 全部明细
godetailAll: function (){
},
// 明细
godetail: function (name, obj) {
let path = "", TCIDs = this.msg.TCIDs, date = '';
if (name == 'ticket') {
path = 'leaderPayTicketDetail'
date = obj.UseTimeStr
} else if (name === 'bus') {
} else if (name === 'dining') {
} else if (name === 'hotel') {
path = 'leaderPayHotelDetail'
date = obj.CheckInDateStr
}
let fullPath = `/${path}?TCIDs=${TCIDs}&date=${date}`;
let dom = document.querySelector("#blankLink");
dom.href = `http://${window.location.host}/#${fullPath}`;
dom.click();
},
// 稽核单据
ZhiDanJiHe: function(obj){
if(!obj.price) {
......
src/components/personalCenter/index.vue
View file @ ff67d13d
......@@ -104,6 +104,7 @@
<div class="per-tab">
<table>
<thead>
<th>编号</th>
<th>别名</th>
<!-- <th>户名</th> -->
<!-- <th>开户行</th>
......@@ -115,6 +116,7 @@
</thead>
<tbody>
<tr v-for="(item, index) in rList" :key="index">
<td class="bold">{{item.ID}}</td>
<td class="bold">{{item.Alias}}</td>
<!-- <td class="bold">{{item.OpeningBank}}</td>
<td>{{item.BackNo | PNumber}}</td> -->
......
src/components/systemManagement/Manfunds.vue
View file @ ff67d13d
......@@ -117,6 +117,12 @@
<div class="flexOne currentManage">
<div class="query-box">
<ul>
<li>
<span>
<em>编号</em>
<el-input onkeyup="value=value.replace(/[^\w\.\/]/ig,'')" v-model="msg.ID"></el-input>
</span>
</li>
<li>
<span>
<em>银行账户</em>
......@@ -190,6 +196,7 @@
<table class="po_content singeRowTable" style="border:1px solid #E6E6E6;" cellspacing="0" cellpadding="0" v-loading="loading">
<tr>
<th>编号</th>
<th>别名</th>
<th>户名</th>
<th>开户行</th>
......@@ -204,6 +211,7 @@
<th>操作</th>
</tr>
<tr v-for="(item,index) in DataList" :key="index">
<td>{{item.ID}}</td>
<td>{{item.Alias}}</td>
<td>{{item.AccountName}}</td>
<td>{{item.OpeningBank}}</td>
......@@ -321,6 +329,13 @@
this.getList();
},
methods: {
checkInt(obj){
// obj.value = obj.value.replace(/[^/d.]/g,"");
//必须保证第一位为数字而不是.
// obj.value = obj.value.replace(/^/./g,"");
},
AddR(item){
this.form.ID=item.ID;
this.form.AccountName=item.AccountName;
......
src/router/config.js
View file @ ff67d13d
......@@ -390,6 +390,14 @@ export default {
title: '导游报账详情'
},
},
{
path: '/CarDetails', //车辆报账详情
name: 'CarDetails',
component: resolve => require(['@/components/LeaderManagement/CarDetails'], resolve),
meta: {
title: '车辆报账详情'
},
},
{
path: '/positionManagement', //岗位管理
name: 'positionManagement',
......@@ -1384,6 +1392,20 @@ export default {
meta: {
title: '领队绩效'
},
}, {
path: '/leaderPayHotelDetail', //j酒店报账详情
name: 'leaderPayHotelDetail',
component: resolve => require(['@/components/LeaderManagement/leaderPayHotelDetail'], resolve),
meta: {
title: '领队绩效'
},
}, {
path: '/leaderPayTicketDetail', //j门票报账详情
name: 'leaderPayTicketDetail',
component: resolve => require(['@/components/LeaderManagement/leaderPayTicketDetail'], resolve),
meta: {
title: '领队绩效'
},
}, {
path: '/leaderChedule', //领队档期
name: 'leaderChedule',
......
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