Skip to content

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

页面修改

parent 25420239
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 4310 additions and 3748 deletions
src/components/FinancialModule/ReportForm/EasyReport.vue
View file @ 2f307dee
......@@ -911,7 +911,6 @@ export default {
}
if(rowIndex<15){
console.log(rowData.ZhaiYao,'----11111111111')
if(BranchId == 1245){
that.$router.push({ name: "TeamRevenueReport",query:{"StartTime":startDate,"EndTime":endDate,BranchId:BranchId,OutBranchId:BranchId,StandardCurrencyId,blank:'y',tab:"营收报表"} })
}else if(rowData.ZhaiYao=="联运收入"){
......
src/components/FinancialModule/addReceivablesDocuments.vue
View file @ 2f307dee
......@@ -1743,13 +1743,6 @@
}, res => {
if (res.data.resultCode == 1) {
this.GetCostTypeList = res.data.data;
// let ids = res.data.data.forEach(x=> {
// if(x.ID==1546){
// console.log(x,'==========')
// return x.ID
// }
// })
if (type) {
this.msg.detailList.forEach(x => {
this.GetCostTypeList.forEach(y => {
......
src/components/FinancialModule/components/UserCredit.vue
View file @ 2f307dee
<style>
@import url('../../../assets/css/domestic/TicketingModule.css');
.sanjiao-box{
position: relative;
.sanjiao-box {
position: relative;
}
.sanjiao-box .Receipt_table td {
padding: 0 10px;
}
.hover_text span {
cursor: pointer;
text-decoration: underline;
}
.sanjiao-box .Receipt_table td{
padding: 0 10px;
}
.hover_text span{
cursor: pointer;
text-decoration: underline;
}
.czBillModule td{
text-align: center!important;
padding:6px 0!important;
}
._tit2{
.czBillModule td {
text-align: center !important;
padding: 6px 0 !important;
}
._tit2 {
border: none !important;
}
</style>
<template>
<div class="m_TicketingModule" v-if="DataList&&DataList.length>0">
<div>
<div class="_tit">
<span class="_text">预存客户</span>
<!-- <div>
}
</style>
<template>
<div class="m_TicketingModule" v-if="DataList&&DataList.length>0">
<div>
<div class="_tit">
<span class="_text">预存客户</span>
<!-- <div>
<span class="_btn" v-if="tableShow" @click="tableShow=false">收起 <i class="iconfont icon-gengduo _rotate"></i> </span>
<span class="_btn" v-else @click="tableShow=true">展开 <i class="iconfont icon-gengduo"></i> </span>
</div> -->
<div>
<span class="_btn" @click="goPrestorageManagement">查看更多</span>
</div>
</div>
<div v-show="tableShow" class="sanjiao-box _padding_20_15">
<div>
<span class="_btn" @click="goPrestorageManagement">查看更多</span>
</div>
</div>
<div v-show="tableShow" class="sanjiao-box _padding_20_15">
<table class="singeRowTable" style="border:1px solid #E6E6E6;" cellspacing="0" cellpadding="0">
<tr>
<th>客户</th>
<th>联系人/电话</th>
<th>已存入</th>
<th>待存入</th>
<th>退款</th>
<th>已使用</th>
<th>期末余额</th>
</tr>
<tr class="_color_b" v-for="(item,index) in DataList" :key="index">
<td>{{item.CustomerName}}</td>
<td>{{ item.Contact+'/'+item.ContactNumber }}</td>
<td>{{item.Income}}</td>
<td>{{item.WaitIncome}}</td>
<td>{{item.Refund}}</td>
<td>{{item.UseMoney}}</td>
<td>{{item.DepositMoney}}({{item.DepositCurrencyName}})</td>
</tr>
</table>
</div>
</div>
</div>
</template>
<table class="singeRowTable" style="border:1px solid #E6E6E6;" cellspacing="0" cellpadding="0">
<tr>
<th>客户</th>
<th>联系人/电话</th>
<th>已存入</th>
<th>待存入</th>
<th>退款</th>
<th>已使用</th>
<th>期末余额</th>
</tr>
<tr class="_color_b" v-for="(item,index) in DataList" :key="index">
<td>{{item.CustomerName}}</td>
<td>{{ item.Contact+'/'+item.ContactNumber }}</td>
<td>{{item.Income}}</td>
<td>{{item.WaitIncome}}</td>
<td>{{item.Refund}}</td>
<td>{{item.UseMoney}}</td>
<td>{{item.DepositMoney}}({{item.DepositCurrencyName}})</td>
</tr>
</table>
</div>
</div>
</div>
</template>
<script>
export default {
props:["GetDetail"],
data(){
return{
loading: true,
cdtotal: 0,
ybtotal: 0,
tableShow: true,
DataList: [],
msg:{
pageIndex: 1,
pageSize: 10,
RemitterName: '',
ClientIdStr: '',
QStartDate: '',
QEndDate: '',
}
}
},
watch:{
GetDetail:{
<script>
export default {
props: ["GetDetail"],
data() {
return {
loading: true,
cdtotal: 0,
ybtotal: 0,
tableShow: true,
DataList: [],
msg: {
pageIndex: 1,
pageSize: 10,
RemitterName: '',
ClientIdStr: '',
QStartDate: '',
QEndDate: '',
}
}
},
watch: {
GetDetail: {
handler(val, oldVal) {
if(this.GetDetail&&this.GetDetail.OtherType==74&&this.GetDetail.ReFinanceId){
if (this.GetDetail && this.GetDetail.OtherType == 74 && this.GetDetail.ReFinanceId) {
this.msg.ClientIdStr = this.GetDetail.ReFinanceId
}else if(this.GetDetail&&this.GetDetail.DepositCustomerId){
} else if (this.GetDetail && this.GetDetail.DepositCustomerId) {
this.msg.ClientIdStr = this.GetDetail.DepositCustomerId
}
this.GetFinanceDepositPageList();
......@@ -91,41 +97,46 @@
deep: true,
immediate: true,
}
},created(){
},
created() {
},mounted(){
},
mounted() {
},
methods:{
goPrestorageManagement(){
this.$router.push(
{ name: 'prestoreList',
query:{
// ClientIdStr:this.msg.ClientIdStr,
blank:'y',tab:'客户预存管理'
}
},
methods: {
goPrestorageManagement() {
this.$router.push({
name: 'prestoreList',
query: {
// ClientIdStr:this.msg.ClientIdStr,
blank: 'y',
tab: '客户预存管理'
}
)
})
},
goDetail(id){
this.$router.push(
{ name: 'FinancialDocumentsDetail',
query:{"id":id,blank:'y',tab:'单据详情'}
goDetail(id) {
this.$router.push({
name: 'FinancialDocumentsDetail',
query: {
"id": id,
blank: 'y',
tab: '单据详情'
}
)
})
},
// 客户存储余额列表
GetFinanceDepositPageList(){
GetFinanceDepositPageList() {
this.apipost('Financial_post_GetFinanceDepositPageList',
this.msg,res=>{
this.loading = false
if(res.data.resultCode == 1) {
console.log(res.data.data.pageData)
this.DataList = res.data.data.pageData;
}
})
this.msg, res => {
this.loading = false
if (res.data.resultCode == 1) {
this.DataList = res.data.data.pageData;
}
})
},
}
}
</script>
}
</script>
src/components/SalesModule/enrollTotal.vue
View file @ 2f307dee
......@@ -617,8 +617,7 @@
<span style="color: red;">{{ item.unionRemark }}</span>
</div>
<div v-if="item.flightName||item.backFlightName">
联运信息：<span style="color: red">已配联运{{item.configNum}}人,{{item.airticketUnionNotes}}2
联运信息：<span style="color: red">已配联运{{item.configNum}}人,{{item.airticketUnionNotes}}
<span v-if="item.isSure==1" style="color:rgb(71, 191, 140)">【OK】</span> <span v-else>【暂定】</span>
</span>
<template v-if="item.flightName">
......
src/components/Ticketing/TicketTransport.vue
View file @ 2f307dee
......@@ -28,7 +28,7 @@
}
.DT_rightList .DT_Table {
width: 1600px;
width: 1700px;
border-collapse: collapse;
}
......@@ -119,6 +119,9 @@
<th width="120">
确认状态
</th>
<th width="120">
适用旅客
</th>
</tr>
</thead>
<template v-if="UnionList&&UnionList.length>0">
......@@ -198,6 +201,9 @@
<el-option :key="1" :value="1" label="确认"></el-option>
</el-select>
</td>
<td rowspan="2">
{{item.GuestNameInfo}}
</td>
</tr>
<tr>
<td>返程</td>
......@@ -231,7 +237,7 @@
</td>
</tr>
<tr>
<td colspan="14" style="text-align:left;font-weight:bold;color:red;">
<td colspan="15" style="text-align:left;font-weight:bold;color:red;">
&nbsp;订单备注:{{item.Remarks}} <br />
&nbsp;联运备注:{{item.UnionRemark}}
</td>
......@@ -240,7 +246,7 @@
</template>
<tbody v-else>
<tr>
<td colspan="14">
<td colspan="15">
暂无配置联运信息
</td>
</tr>
......@@ -321,7 +327,6 @@
},
res => {
this.loading = false;
console.log("res", res.data);
if (res.data.resultCode == 1) {
var array = res.data.data;
if (array != null && array.length > 0) {
......@@ -404,6 +409,11 @@
item.FlightList = [];
item.BackFlightList = [];
});
if (this.UnionList && this.UnionList.length > 0) {
this.UnionList.forEach(item => {
item.GuestIds = "";
});
}
let msg = {
SaveData: this.UnionList,
TCID: this.TCID
......
src/components/TravelManager/TravelList/TravelControlList.vue
View file @ 2f307dee
......@@ -1011,7 +1011,6 @@
<el-dropdown-item v-else @click.native="goToOpenTravel('TravelManager6',item.ID,0)">
{{$t('Operation.Op_xilieModyfi')}}
</el-dropdown-item>
<el-dropdown-item v-if="item.TeamType!=3"
@click.native="goTonowTeam('TravelManager2',item.ID,item.TCID,item.TCNUM)">
{{$t('Operation.Op_dangtuanModify')}}
......@@ -1027,9 +1026,17 @@
style="background:#67c23a; border-color:#67c23a">
{{$t('Operation.Op_advertising')}}&nbsp;{{item.AdvertCount}}
</el-button>
<el-button v-if="item.LineID==14||item.LineID==118" @click.native='PushMessage(item)' type="primary"
style="background:#00C6FF; border-color:#00C6FF;">推送消息
</el-button>
<template v-if="item.LineID==14||item.LineID==118">
<el-button v-if="item.IsPush==0" @click.native='PushMessage(item)' type="primary"
style="background:#00C6FF; border-color:#00C6FF;">推送消息
</el-button>
<el-button v-else @click.native='PushMessage(item)' type="primary"
style="background:red !important; ">已推送
</el-button>
</template>
<el-button @click="ckOPremark(item)" type="primary" style="background:#F16C3C; border-color:#F16C3C">
{{$t('Operation.Op_remark')}}
</el-button>
......@@ -1534,6 +1541,7 @@
this.apipost("travel_post_PushTravelPriceToQYWork", pMsg, res => {
if (res.data.resultCode == 1) {
this.Success(res.data.message);
this.getControlList();
} else {
this.Error(res.data.message);
}
......
src/components/dmc/manager/dmcTotalTable.vue
View file @ 2f307dee
......@@ -193,7 +193,6 @@
{{outItem.NewCombinationNum}}
</td>
<td style="position: relative">
{{item.OutBranchName}}
<div v-if="item.IsSetOut&&item.IsSetOut==1" style="color:red;font-weight:bold;">
(取消发团)
......@@ -250,6 +249,9 @@
<td>
<div class="link">
<p @click="goUrlT('productQuery',item.TCNUMS,'产品查询')">{{item.TCNUMS}}<br />({{item.TCID}})</p>
<div v-if="item.IsSetOut&&item.IsSetOut==1" style="color:red;font-weight:bold;">
(取消发团)
</div>
</div>
</td>
<td style="color: #47BF8C;white-space: nowrap;">
......@@ -334,7 +336,8 @@
</div>
</td>
<td>
<div class="fz16 fbold linkspan" @click="goUrl([131,14, 90].includes(item.LineId) ? 'roomReservationsDetails' : 'roomReservationsDetailsNew',item,outItem,'订房详情')">
<div class="fz16 fbold linkspan"
@click="goUrl([131,14, 90].includes(item.LineId) ? 'roomReservationsDetails' : 'roomReservationsDetailsNew',item,outItem,'订房详情')">
<span style="color: #4BCA81;" v-if="item.HotelResult==1">√</span>
<span class="colorE95252" v-else>{{item.HotelResult=='-1'?"x":"O"}}</span>
</div>
......@@ -703,7 +706,7 @@
},
methods: {
showDialog(ConfigId, OfferId) {
if(!OfferId) {
if (!OfferId) {
return
}
this.dialog = {
......@@ -820,7 +823,9 @@
}, err => {})
},
getLineList() {
this.apipost("line_post_GetList", {LineDirection: 2}, res => {//
this.apipost("line_post_GetList", {
LineDirection: 2
}, res => { //
if (res.data.resultCode == 1) {
this.queryCommonData.LineList = res.data.data;
this.queryCommonData.PlaceList = []
......@@ -1234,7 +1239,7 @@
}
var userInfo = this.getLocalStorage();
if (userInfo.RB_Group_id == this.QjGroupId()) {
// this.msg.LineId = 14;
// this.msg.LineId = 14;
}
this.getLineList();
......
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