Skip to content

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

页面修改

parent 1f814fa1
Show whitespace changes
Inline Side-by-side
Showing with 590 additions and 605 deletions
src/components/LeaderManagement/CarDetails.vue
View file @ 6b148482
<template>
<div class="flexOne" style="min-width: 1200px;">
......@@ -30,7 +29,6 @@
<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>
......@@ -55,15 +53,11 @@
<p v-if="item.ReimburseList.SettlementType==1">现金支付</p>
<p v-if="item.ReimburseList.SettlementType==2">公司结算</p>
</td>
<td >
<td>
<div v-if="item.ReimburseList.VoucherPicList.length">
<div v-for="(vou, vouIndex) in item.ReimburseList.VoucherPicList" :key="vouIndex">
<el-image
style="width: 20px;height: 20px;"
:src="vou.url"
:preview-src-list="subItem.listUrl">
<el-image style="width: 20px;height: 20px;" :src="vou.url" :preview-src-list="item.listUrl">
</el-image>
<!-- <img @click="openImg(vou.url)" style="width: 20px;height: 20px;" :src="vou.url" alt=""> -->
</div>
</div>
<div v-else>
......@@ -82,13 +76,13 @@
</template>
<script>
import payURL from "../commonPage/payURL.vue";
import moment from "moment";
export default {
import payURL from "../commonPage/payURL.vue";
import moment from "moment";
export default {
data() {
return {
msg: {
TCIDs:''
TCIDs: ''
},
dataList: [],
......@@ -96,40 +90,46 @@ export default {
total: 0,
currentPage: 1,
showID: -1,
companyList:[],
employeeList:[],
urrencyTypeObj:{},
companyList: [],
employeeList: [],
urrencyTypeObj: {},
};
},
components: {},
created() {
let userInfo = this.getLocalStorage();
this.msg.TCIDs=this.$route.query.TCIDs?this.$route.query.TCIDs:"";
this.msg.date=this.$route.query.date?this.$route.query.date:"";
this.msg.TCIDs = this.$route.query.TCIDs ? this.$route.query.TCIDs : "";
this.msg.date = this.$route.query.date ? this.$route.query.date : "";
this.financeinfo_post_GetList();
},
methods: {
financeinfo_post_GetList(){ // 币种类型
this.apipost('financeinfo_post_GetList',{Name:''},res=>{
if(res.data.resultCode==1){
financeinfo_post_GetList() { // 币种类型
this.apipost('financeinfo_post_GetList', {
Name: ''
}, res => {
if (res.data.resultCode == 1) {
let data = res.data.data;
data.map(item => {
this.urrencyTypeObj[0]="不限";
this.urrencyTypeObj[item.ID]=item.Name;
this.urrencyTypeObj[0] = "不限";
this.urrencyTypeObj[item.ID] = item.Name;
});
}else{
} else {
}
},err=>{})
}, err => {})
},
goUrl: function(name, path, id) {
goUrl: function (name, path, id) {
this.$router.push({
name: path,
query: { id: id, blank: "y", tab: name }
query: {
id: id,
blank: "y",
tab: name
}
});
},
openImg(src){
openImg(src) {
window.open(src, "_blank");
},
handleCurrentChange(val) {
......@@ -141,47 +141,44 @@ export default {
this.currentPage = 1;
},
getList() {
this.loading = true;
this.apipost('dmcstatistics_post_GetNewLeaderPayMoneyStatics', this.msg, res => {
this.loading=false;
if(res.data.resultCode == 1) {
this.loading = false;
if (res.data.resultCode == 1) {
this.dataList = [];
let data=res.data.data.BusList;
if(this.msg.date!='all'){
let data = res.data.data.BusList;
if (this.msg.date != 'all') {
data.forEach(item => {
if(item.UseTime==this.msg.date){
if (item.UseTime == this.msg.date) {
this.dataList.push(item);
}
});
}else{
this.dataList=data;
} else {
this.dataList = data;
}
this.dataList.forEach(x => {
x.ScenicStatisticsList.forEach(y=>{
y.listUrl = []
y.ReimburseList.VoucherPicList&&y.ReimburseList.VoucherPicList.forEach(z=>{
y.listUrl.push(z.url)
})
x.listUrl = [];
if (x.ReimburseList && x.ReimburseList.VoucherPicList && x.ReimburseList.VoucherPicList.length >
0) {
x.ReimburseList.VoucherPicList.forEach(z => {
x.listUrl.push(z.url)
})
}
});
} else {
this.Error(res.data.message);
}
}, err => {})
},
},
mounted() {
this.getList();
}
};
};
</script>
<style scoped>
.groupTourOrderSearchTable {
.groupTourOrderSearchTable {
width: 100%;
min-width: 1500px;
font-size: 14px;
......@@ -189,9 +186,9 @@ export default {
border-bottom: 1px solid #cccccc;
border-right: 1px solid #cccccc;
/* border-collapse: collapse; */
}
}
.groupTourOrderSearchTable tr th {
.groupTourOrderSearchTable tr th {
background: #e6e6e6;
height: 30px;
font-size: 12px;
......@@ -199,37 +196,36 @@ export default {
text-indent: 15px;
border-top: 1px solid #cccccc;
border-left: 1px solid #cccccc;
}
}
.groupTourOrderSearchTable tr {
.groupTourOrderSearchTable tr {
background: #fff;
text-align: left;
}
}
.groupTourOrderSearchTable tr td {
.groupTourOrderSearchTable tr td {
padding: 8px;
border-top: 1px solid #cccccc;
border-left: 1px solid #cccccc;
}
}
.groupTourOrderSearchTable tr td p {
.groupTourOrderSearchTable tr td p {
line-height: 20px;
}
}
.groupTourOrderSearchTable .dowloadSpan:hover {
.groupTourOrderSearchTable .dowloadSpan:hover {
text-decoration: underline;
cursor: pointer;
}
}
.groupTourOrderSearchTable span.personNo {
.groupTourOrderSearchTable span.personNo {
text-decoration: underline;
cursor: pointer;
}
}
.groupTourOrderSearchTable span.personNo:hover {
.groupTourOrderSearchTable span.personNo:hover {
font-weight: bold;
color: #e95252;
}
}
</style>
src/components/LeaderManagement/DinningDetails.vue
View file @ 6b148482
<template>
<div class="flexOne" style="min-width: 1200px;">
......@@ -64,10 +63,7 @@
<td v-if="childIndex==0" :rowspan="subItem.ReimburseList.ReimburseDetailsList.length">
<div v-if="subItem.ReimburseList.VoucherPicList.length">
<div v-for="(vou, vouIndex) in subItem.ReimburseList.VoucherPicList" :key="vouIndex">
<el-image
style="width: 20px;height: 20px;"
:src="vou.url"
:preview-src-list="subItem.listUrl">
<el-image style="width: 20px;height: 20px;" :src="vou.url" :preview-src-list="subItem.listUrl">
</el-image>
<!-- <img @click="openImg(vou.url)" style="width: 20px;height: 20px;" :src="vou.url" alt=""> -->
</div>
......@@ -84,36 +80,30 @@
</template>
</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 {
export default {
data() {
return {
msg: {
TCIDs:''
TCIDs: ''
},
dataList: [],
loading: false,
total: 0,
currentPage: 1,
showID: -1,
companyList:[],
employeeList:[],
urrencyTypeObj:{},
companyList: [],
employeeList: [],
urrencyTypeObj: {},
};
},
components: {},
created() {
let userInfo = this.getLocalStorage();
this.msg.TCIDs=this.$route.query.TCIDs?this.$route.query.TCIDs:"";
this.msg.date=this.$route.query.date?this.$route.query.date:"";
this.msg.TCIDs = this.$route.query.TCIDs ? this.$route.query.TCIDs : "";
this.msg.date = this.$route.query.date ? this.$route.query.date : "";
this.financeinfo_post_GetList();
},
methods: {
......@@ -142,23 +132,29 @@ export default {
})
return this.moneyFormat(totalPrice)
},
financeinfo_post_GetList(){ // 币种类型
this.apipost('financeinfo_post_GetList',{Name:''},res=>{
if(res.data.resultCode==1){
financeinfo_post_GetList() { // 币种类型
this.apipost('financeinfo_post_GetList', {
Name: ''
}, res => {
if (res.data.resultCode == 1) {
let data = res.data.data;
data.map(item => {
this.urrencyTypeObj[0]="不限";
this.urrencyTypeObj[item.ID]=item.Name;
this.urrencyTypeObj[0] = "不限";
this.urrencyTypeObj[item.ID] = item.Name;
});
}else{
} else {
}
},err=>{})
}, err => {})
},
goUrl: function(name, path, id) {
goUrl: function (name, path, id) {
this.$router.push({
name: path,
query: { id: id, blank: "y", tab: name }
query: {
id: id,
blank: "y",
tab: name
}
});
},
handleCurrentChange(val) {
......@@ -169,58 +165,60 @@ export default {
this.msg.pageIndex = 1;
this.currentPage = 1;
},
openImg(src){
openImg(src) {
window.open(src, "_blank");
},
getList() {
this.loading = true;
this.apipost('dmcstatistics_post_GetNewLeaderPayMoneyStatics', this.msg, res => {
this.loading=false;
if(res.data.resultCode == 1) {
this.loading = false;
if (res.data.resultCode == 1) {
this.dataList = [];
let data=res.data.data.DiningList;
if(this.msg.date!='all'){
let data = res.data.data.DiningList;
if (this.msg.date != 'all') {
data.forEach(item => {
if(item.UseTimeStr==this.msg.date){
if (item.UseTimeStr == this.msg.date) {
this.dataList.push(item);
}
});
}else{
this.dataList=data;
} else {
this.dataList = data;
}
this.dataList.forEach(x => {
x.ScenicStatisticsList.forEach(y=>{
y.listUrl = []
y.ReimburseList.VoucherPicList&&y.ReimburseList.VoucherPicList.forEach(z=>{
x.DiningSummaryList.forEach(y => {
y.listUrl = [];
if (y.ReimburseList && y.ReimburseList.VoucherPicList && y.ReimburseList.VoucherPicList
.length > 0) {
y.ReimburseList.VoucherPicList.forEach(z => {
y.listUrl.push(z.url)
})
}
})
});
} else {
this.Error(res.data.message);
}
}, err => {})
},
},
mounted() {
this.getList();
}
};
};
</script>
<style scoped>
.numSpan{
.numSpan {
display: inline-block;
width:60px;
}
.widthSpan{
width: 60px;
}
.widthSpan {
display: inline-block;
width: 45px;
}
.groupTourOrderSearchTable {
}
.groupTourOrderSearchTable {
width: 100%;
min-width: 1500px;
font-size: 14px;
......@@ -228,9 +226,9 @@ export default {
border-bottom: 1px solid #cccccc;
border-right: 1px solid #cccccc;
/* border-collapse: collapse; */
}
}
.groupTourOrderSearchTable tr th {
.groupTourOrderSearchTable tr th {
background: #e6e6e6;
height: 30px;
font-size: 12px;
......@@ -238,37 +236,36 @@ export default {
text-indent: 15px;
border-top: 1px solid #cccccc;
border-left: 1px solid #cccccc;
}
}
.groupTourOrderSearchTable tr {
.groupTourOrderSearchTable tr {
background: #fff;
text-align: left;
}
}
.groupTourOrderSearchTable tr td {
.groupTourOrderSearchTable tr td {
padding: 8px;
border-top: 1px solid #cccccc;
border-left: 1px solid #cccccc;
}
}
.groupTourOrderSearchTable tr td p {
.groupTourOrderSearchTable tr td p {
line-height: 20px;
}
}
.groupTourOrderSearchTable .dowloadSpan:hover {
.groupTourOrderSearchTable .dowloadSpan:hover {
text-decoration: underline;
cursor: pointer;
}
}
.groupTourOrderSearchTable span.personNo {
.groupTourOrderSearchTable span.personNo {
text-decoration: underline;
cursor: pointer;
}
}
.groupTourOrderSearchTable span.personNo:hover {
.groupTourOrderSearchTable span.personNo:hover {
font-weight: bold;
color: #e95252;
}
}
</style>
src/components/LeaderManagement/leaderPayHotelDetail.vue
View file @ 6b148482
......@@ -20,8 +20,9 @@
</tr>
<template v-for='(item,index) in dataList'>
<template v-if="item.ReimburseList && item.ReimburseList.ReimburseDetailsList.length">
<tr v-for="(childItem,childIndex) in item.ReimburseList.ReimburseDetailsList" >
<td v-if="childIndex==0" :rowspan="item.ReimburseList.ReimburseDetailsList.length">{{item.CheckInDateStr}}</td>
<tr v-for="(childItem,childIndex) in item.ReimburseList.ReimburseDetailsList">
<td v-if="childIndex==0" :rowspan="item.ReimburseList.ReimburseDetailsList.length">{{item.CheckInDateStr}}
</td>
<td v-if="childIndex==0" :rowspan="item.ReimburseList.ReimburseDetailsList.length">
{{item.HotelName}}
</td>
......@@ -43,7 +44,7 @@
<span v-else-if="item.PayStyle === 3">预付</span>
<span v-else-if="item.PayStyle === 6">公司合团支付</span>
<span v-else></span>
</br>
<br />
<span v-show="item.PayStyle==6">付款团号：{{item.PayTypeTCNUM}}</span>
</td>
<td v-if="childIndex==0" :rowspan="item.ReimburseList.ReimburseDetailsList.length">
......@@ -52,12 +53,9 @@
<td v-if="childIndex==0" :rowspan="item.ReimburseList.ReimburseDetailsList.length">
<div v-if="item.ReimburseList.VoucherPicList.length">
<div v-for="(vou, vouIndex) in item.ReimburseList.VoucherPicList" :key="vouIndex">
<el-image
style="width: 20px;height: 20px;"
:src="vou.url"
:preview-src-list="subItem.listUrl">
<el-image style="width: 20px;height: 20px;" :src="vou.url" :preview-src-list="item.listUrl">
</el-image>
<!-- <img @click="openImg(vou.url)" style="width: 20px;height: 20px;" :src="vou.url" alt=""> -->
</div>
</div>
<div v-else>
......@@ -72,14 +70,13 @@
<tr v-else>
<td colspan="9">暂无数据</td>
</tr>
</template>
</table>
</div>
</template>
<script>
export default {
export default {
data() {
return {
loading: true,
......@@ -87,8 +84,11 @@ export default {
currencyList: [],
};
},created(){
this.apipost("financeinfo_post_GetList", {Name: ""}, res=>{
},
created() {
this.apipost("financeinfo_post_GetList", {
Name: ""
}, res => {
if (res.data.resultCode === 1) {
let data = res.data.data;
this.currencyList = data
......@@ -103,45 +103,46 @@ export default {
filters: {},
methods: {
getCurrencyStr: function(id){
for(let i = 0; i < this.currencyList.length; i++) {
getCurrencyStr: function (id) {
for (let i = 0; i < this.currencyList.length; i++) {
if (this.currencyList[i].ID == id) {
return this.currencyList[i].Name
}
}
},
openImg(src){
openImg(src) {
window.open(src, "_blank");
},
//获取数据
getList(TCIDs, date) {
this.loading = true;
this.apipost(
"dmcstatistics_post_GetNewLeaderPayMoneyStatics",
{TCIDs: TCIDs},
"dmcstatistics_post_GetNewLeaderPayMoneyStatics", {
TCIDs: TCIDs
},
res => {
this.loading = false;
if (res.data.resultCode === 1) {
let data = res.data.data.HotelOrderListReport;
let dataList = [];
if(date!=='all') {
data.map(x=>{
if (x.UseTimeStr == date){
if (date !== 'all') {
data.map(x => {
if (x.UseTimeStr == date) {
dataList.push(...x.HotelOrderList)
}
})
} else {
data.map(x=>{
data.map(x => {
dataList.push(...x.HotelOrderList)
})
}
dataList.forEach(x => {
x.ScenicStatisticsList.forEach(y=>{
y.listUrl = []
y.ReimburseList.VoucherPicList&&y.ReimburseList.VoucherPicList.forEach(z=>{
y.listUrl.push(z.url)
})
x.listUrl = [];
if (x.ReimburseList && x.ReimburseList.VoucherPicList && x.ReimburseList.VoucherPicList) {
x.ReimburseList.VoucherPicList.forEach(z => {
y.listUrl.push(z.url);
})
}
});
this.dataList = dataList;
} else {
......@@ -152,5 +153,6 @@ export default {
);
},
}
};
};
</script>
src/components/LeaderManagement/otherDetails.vue
View file @ 6b148482
<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'>
......@@ -19,12 +17,8 @@
<td>
<div v-if="item.VoucherPicList.length">
<div v-for="(vou, vouIndex) in item.VoucherPicList" :key="vouIndex">
<el-image
style="width: 20px;height: 20px;"
:src="vou.url"
:preview-src-list="subItem.listUrl">
<el-image style="width: 20px;height: 20px;" :src="vou.url" :preview-src-list="item.listUrl">
</el-image>
<!-- <img @click="openImg(vou.url)" style="width: 20px;height: 20px;" :src="vou.url" alt=""> -->
</div>
</div>
<div v-else>
......@@ -38,38 +32,33 @@
</tr>
</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 {
export default {
data() {
return {
msg: {
TCIDs:''
TCIDs: ''
},
dataList: [],
loading: false,
total: 0,
currentPage: 1,
showID: -1,
companyList:[],
employeeList:[],
urrencyTypeObj:{},
companyList: [],
employeeList: [],
urrencyTypeObj: {},
};
},
components: {},
created() {
let userInfo = this.getLocalStorage();
this.msg.TCIDs=this.$route.query.TCIDs?this.$route.query.TCIDs:"";
this.msg.date=this.$route.query.date?this.$route.query.date:"";
this.msg.TCIDs = this.$route.query.TCIDs ? this.$route.query.TCIDs : "";
this.msg.date = this.$route.query.date ? this.$route.query.date : "";
},
methods: {
openImg(src){
openImg(src) {
window.open(src, "_blank");
},
handleCurrentChange(val) {
......@@ -80,58 +69,57 @@ export default {
this.msg.pageIndex = 1;
this.currentPage = 1;
},
openImg(src){
openImg(src) {
window.open(src, "_blank");
},
getList() {
this.loading = true;
this.apipost('dmcstatistics_post_GetNewLeaderPayMoneyStatics', this.msg, res => {
this.loading=false;
if(res.data.resultCode == 1) {
this.loading = false;
if (res.data.resultCode == 1) {
this.dataList = [];
let data=res.data.data.OtherOrderInfo.OtherList;
if(this.msg.date!='all'){
let data = res.data.data.OtherOrderInfo.OtherList;
if (this.msg.date != 'all') {
data.forEach(item => {
if(item.UseTimeStr==this.msg.date){
if (item.UseTimeStr == this.msg.date) {
this.dataList.push(item);
}
});
}else{
this.dataList=data;
} else {
this.dataList = data;
}
this.dataList.forEach(x => {
x.ScenicStatisticsList.forEach(y=>{
y.listUrl = []
y.ReimburseList.VoucherPicList&&y.ReimburseList.VoucherPicList.forEach(z=>{
y.listUrl.push(z.url)
})
x.listUrl = [];
if (x.VoucherPicList && x.VoucherPicList.length > 0) {
x.VoucherPicList.forEach(z => {
x.listUrl.push(z.url)
})
}
});
} else {
this.Error(res.data.message);
}
}, err => {})
},
},
mounted() {
this.getList();
}
};
};
</script>
<style scoped>
.numSpan{
.numSpan {
display: inline-block;
width:60px;
}
.widthSpan{
width: 60px;
}
.widthSpan {
display: inline-block;
width: 45px;
}
.groupTourOrderSearchTable {
}
.groupTourOrderSearchTable {
width: 100%;
min-width: 1500px;
font-size: 14px;
......@@ -139,9 +127,9 @@ export default {
border-bottom: 1px solid #cccccc;
border-right: 1px solid #cccccc;
/* border-collapse: collapse; */
}
}
.groupTourOrderSearchTable tr th {
.groupTourOrderSearchTable tr th {
background: #e6e6e6;
height: 30px;
font-size: 12px;
......@@ -149,37 +137,36 @@ export default {
text-indent: 15px;
border-top: 1px solid #cccccc;
border-left: 1px solid #cccccc;
}
}
.groupTourOrderSearchTable tr {
.groupTourOrderSearchTable tr {
background: #fff;
text-align: left;
}
}
.groupTourOrderSearchTable tr td {
.groupTourOrderSearchTable tr td {
padding: 8px;
border-top: 1px solid #cccccc;
border-left: 1px solid #cccccc;
}
}
.groupTourOrderSearchTable tr td p {
.groupTourOrderSearchTable tr td p {
line-height: 20px;
}
}
.groupTourOrderSearchTable .dowloadSpan:hover {
.groupTourOrderSearchTable .dowloadSpan:hover {
text-decoration: underline;
cursor: pointer;
}
}
.groupTourOrderSearchTable span.personNo {
.groupTourOrderSearchTable span.personNo {
text-decoration: underline;
cursor: pointer;
}
}
.groupTourOrderSearchTable span.personNo:hover {
.groupTourOrderSearchTable span.personNo:hover {
font-weight: bold;
color: #e95252;
}
}
</style>
src/components/TravelContractDetail.vue
View file @ 6b148482
......@@ -1024,7 +1024,6 @@
}
}).catch(err => {})
},
// 生成pdf
toContractPDF: function (title) {
let urlObj = this.domainManager();
......@@ -1156,5 +1155,4 @@
this.getShow(TID);
}
};
</script>
\ No newline at end of file
src/components/TravelContractNew.vue
View file @ 6b148482
......@@ -305,9 +305,12 @@
<input type="button" class="TCbtn-info" v-if="CtObj.status==1" @click="goUrl()" value="预览">
<input type="button" class="TCbtn-info" v-if="CtObj.auditContract==2" @click="getinvalid()" value="作废">
<input type="button" class="TCbtn-info" @click="dialogVisible=true,getGuestList()" value="复制合同" />
<input type="button" v-if="CtObj.auditContract!=2" class="btn-warning" @click="submitForm('CtObj')"
value="保存" />
<template v-if="CtObj.auditContract!=2">
<input type="button" class="btn-warning" @click="submitForm('CtObj')" value="保存" />
</template>
<template v-if="CurrentUserInfo.EmployeeId==615">
<input type="button" class="btn-warning" @click="submitForm('CtObj')" value="保存(S)" />
</template>
</div>
</div>
<el-form label-width="180px" :model="CtObj" :rules="rules" ref="CtObj">
......@@ -1552,8 +1555,10 @@
this.GetTrip(0, this.msg.TCID);
}
if (this.CtObj.auditContract == 2) {
if (this.CurrentUserInfo.EmployeeId != 615) {
this.goContract()
}
}
} else {
this.Error(res.data.message);
}
......
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