Skip to content

S
SuperMan
Commit d24e51ad authored by 黄媛媛's avatar 黄媛媛
Browse files
Options

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

parents 618d5ab8 8095bf41
Show whitespace changes
Inline Side-by-side
Showing with 249 additions and 169 deletions
src/components/Buying/BuyingType.vue
View file @ d24e51ad
...@@ -231,13 +231,10 @@ export default { ...@@ -231,13 +231,10 @@ export default {
GoodsTypeList: [], GoodsTypeList: [],
rules: { rules: {
Name: [ Name: [
{ required: true, message: "请输入会员等级", trigger: "blur" } { required: true, message: "商品类型名称", trigger: "blur" }
], ],
Image: [ Image: [
{ required: true, message: "请上传图片", trigger: "blur" } { required: true, message: "请上传图片", trigger: "blur" }
],
ParentId: [
{ required: true, message: "请上传图片", trigger: "change" }
] ]
}, },
loading: false, loading: false,
......
src/components/FinancialModule/addReceivablesDocuments.vue
View file @ d24e51ad
...@@ -889,9 +889,11 @@ export default { ...@@ -889,9 +889,11 @@ export default {
this.shouxufei = res.data.data this.shouxufei = res.data.data
}, err => {}) }, err => {})
} else { } else {
if (!this.$route.query.edit){
this.msg.OriginalFee = 0 this.msg.OriginalFee = 0
this.msg.Fee = 0 this.msg.Fee = 0
} }
}
}, },
clearAccBank(){ // 选择账户类型清空数据 clearAccBank(){ // 选择账户类型清空数据
this.msg.BankList[0].Type = ''; this.msg.BankList[0].Type = '';
......
src/components/Ticketing/TicketManager.vue
View file @ d24e51ad
...@@ -1171,9 +1171,9 @@ ...@@ -1171,9 +1171,9 @@
} }
/*航班详情*/ /*航班详情*/
.TicketManager .FlightDivDetails { .TicketManager .FlightDivDetailsTM {
width: 100%; width: 100%;
overflow: auto; /* overflow: auto; */
} }
.TicketManager ._flightList { .TicketManager ._flightList {
...@@ -1198,7 +1198,7 @@ ...@@ -1198,7 +1198,7 @@
cursor: pointer; cursor: pointer;
} }
.FinaDetailContent { .FinaDetailContentTM {
/* height: 25px; */ /* height: 25px; */
/* overflow: auto; */ /* overflow: auto; */
} }
...@@ -1206,8 +1206,12 @@ ...@@ -1206,8 +1206,12 @@
.TicketManager .TK_raduis ul li { .TicketManager .TK_raduis ul li {
margin-left: 10px; margin-left: 10px;
float: left; float: left;
display: inline-block;
min-width: 35px;
}
.TicketManager .TK_raduis ul{
display: inline-block;
} }
.FinaceDanList { .FinaceDanList {
cursor: pointer; cursor: pointer;
} }
...@@ -1273,6 +1277,12 @@ ...@@ -1273,6 +1277,12 @@
text-align: center; text-align: center;
line-height: 20px; line-height: 20px;
} }
.MyTicketManager .TM_line{
width:100%;
height:1px;
border-bottom:1px dashed #d1d1d1;
margin:5px 0;
}
</style> </style>
<template> <template>
<div class="flexOne TicketManager MyTicketManager"> <div class="flexOne TicketManager MyTicketManager">
...@@ -1449,7 +1459,7 @@ ...@@ -1449,7 +1459,7 @@
</el-col> </el-col>
<el-col :span="4" class="vmiddle"> <el-col :span="4" class="vmiddle">
<div class="FlightDivDetails"> <div class="FlightDivDetailsTM">
<div class="_flightList" v-for="(subItem,subIndex) in item.flightList" :key="subIndex"> <div class="_flightList" v-for="(subItem,subIndex) in item.flightList" :key="subIndex">
<span class="FlightNumber">{{subItem.Flight_number}}</span> <span class="FlightNumber">{{subItem.Flight_number}}</span>
<span>{{subItem.FlightDate}} {{subItem.Departure_time}}</span> <span>{{subItem.FlightDate}} {{subItem.Departure_time}}</span>
...@@ -1553,8 +1563,8 @@ ...@@ -1553,8 +1563,8 @@
<template v-if="item.SellType==1"> <template v-if="item.SellType==1">
<el-col :span="4" class="vmiddle"> <el-col :span="4" class="vmiddle">
<div class="TK_raduis"> <div class="TK_raduis">
<ul> <ul>
<li style="margin:4px 0 0 0;min-width:10px;color:green;">收</li>
<!--一定--> <!--一定-->
<li v-if="item.FirstDeposit!=''"> <li v-if="item.FirstDeposit!=''">
<div @click="goFinacePage(item,1,1)" :class="getClass(item.FirstDepositStatus)"> <div @click="goFinacePage(item,1,1)" :class="getClass(item.FirstDepositStatus)">
...@@ -1562,8 +1572,8 @@ ...@@ -1562,8 +1572,8 @@
<span>1</span> <span>1</span>
</el-tooltip> </el-tooltip>
</div> </div>
<div class="FinaDetailContent"> <div class="FinaDetailContentTM">
<span v-if="item.FirstAuditList!=null" v-for="(childItem,childIndex) in item.FirstAuditList" :key="childIndex"> <span v-if="item.Revice_FirstAuditList!=null" v-for="(childItem,childIndex) in item.Revice_FirstAuditList" :key="childIndex">
<span class="FinaceDanList" @click="goFinaceDetails(childItem.FinaceId)">{{childItem.FinaceId}}</span> <span class="FinaceDanList" @click="goFinaceDetails(childItem.FinaceId)">{{childItem.FinaceId}}</span>
</span> </span>
</div> </div>
...@@ -1575,8 +1585,8 @@ ...@@ -1575,8 +1585,8 @@
<span>2</span> <span>2</span>
</el-tooltip> </el-tooltip>
</div> </div>
<div class="FinaDetailContent"> <div class="FinaDetailContentTM">
<span v-if="item.SecondAuditList!=null" v-for="(childItem,childIndex) in item.SecondAuditList" :key="childIndex"> <span v-if="item.Recive_SecondAuditList!=null" v-for="(childItem,childIndex) in item.Recive_SecondAuditList" :key="childIndex">
<span class="FinaceDanList" @click="goFinaceDetails(childItem.FinaceId)">{{childItem.FinaceId}}</span> <span class="FinaceDanList" @click="goFinaceDetails(childItem.FinaceId)">{{childItem.FinaceId}}</span>
</span> </span>
</div> </div>
...@@ -1588,8 +1598,8 @@ ...@@ -1588,8 +1598,8 @@
<span>3</span> <span>3</span>
</el-tooltip> </el-tooltip>
</div> </div>
<div class="FinaDetailContent"> <div class="FinaDetailContentTM">
<span v-if="item.ThirdAuditList!=null" v-for="(childItem,childIndex) in item.ThirdAuditList" :key="childIndex"> <span v-if="item.Recive_ThirdAuditList!=null" v-for="(childItem,childIndex) in item.Recive_ThirdAuditList" :key="childIndex">
<span class="FinaceDanList" @click="goFinaceDetails(childItem.FinaceId)">{{childItem.FinaceId}}</span> <span class="FinaceDanList" @click="goFinaceDetails(childItem.FinaceId)">{{childItem.FinaceId}}</span>
</span> </span>
</div> </div>
...@@ -1601,7 +1611,76 @@ ...@@ -1601,7 +1611,76 @@
<span>4</span> <span>4</span>
</el-tooltip> </el-tooltip>
</div> </div>
<div class="FinaDetailContent"> <div class="FinaDetailContentTM">
<span v-if="item.Recive_FourthAuditList!=null" v-for="(childItem,childIndex) in item.Recive_FourthAuditList" :key="childIndex">
<span class="FinaceDanList" @click="goFinaceDetails(childItem.FinaceId)">{{childItem.FinaceId}}</span>
</span>
</div>
</li>
<!--尾款-->
<li v-else-if="item.FinalPayment!=''">
<div @click="goCustomList('PassengerList',item, 5,'旅客名单')" :class="getClass(item.FinalPaymentStatus)">
<el-tooltip effect="dark" :content="item.FinalPayment" placement="top" popper-class="max-w250">
<span>尾</span>
</el-tooltip>
</div>
<div class="FinaDetailContentTM">
<span v-if="item.Revice_FinalAuditList!=null" v-for="(childItem,childIndex) in item.Revice_FinalAuditList" :key="childIndex">
<span class="FinaceDanList" @click="goFinaceDetails(childItem.FinaceId)">{{childItem.FinaceId}}</span>
</span>
</div>
</li>
</ul>
<div class="TM_line"></div>
<ul>
<li style="margin:4px 0 0 0;min-width:10px;color:red;">支</li>
<!--一定-->
<li v-if="item.FirstDeposit!=''">
<div @click="goFinacePage(item,1)" :class="getClass(item.FirstDepositStatus)">
<el-tooltip effect="dark" :content="item.FirstDeposit" placement="top" popper-class="max-w250">
<span>1</span>
</el-tooltip>
</div>
<div class="FinaDetailContentTM">
<span v-if="item.FirstAuditList!=null" v-for="(childItem,childIndex) in item.FirstAuditList" :key="childIndex">
<span class="FinaceDanList" @click="goFinaceDetails(childItem.FinaceId)">{{childItem.FinaceId}}</span>
</span>
</div>
</li>
<!--二定-->
<li v-if="item.SecondDeposit!=''">
<div @click="goFinacePage(item,2)" :class="getClass(item.SecondDepositStatus)">
<el-tooltip effect="dark" :content="item.SecondDeposit" placement="top" popper-class="max-w250">
<span>2</span>
</el-tooltip>
</div>
<div class="FinaDetailContentTM">
<span v-if="item.SecondAuditList!=null" v-for="(childItem,childIndex) in item.SecondAuditList" :key="childIndex">
<span class="FinaceDanList" @click="goFinaceDetails(childItem.FinaceId)">{{childItem.FinaceId}}</span>
</span>
</div>
</li>
<!--三定-->
<li v-if="item.ThirdDeposit!=''">
<div @click="goFinacePage(item,3)" :class="getClass(item.ThirdDepositStatus)">
<el-tooltip effect="dark" :content="item.ThirdDeposit" placement="top" popper-class="max-w250">
<span>3</span>
</el-tooltip>
</div>
<div class="FinaDetailContentTM">
<span v-if="item.ThirdAuditList!=null" v-for="(childItem,childIndex) in item.ThirdAuditList" :key="childIndex">
<span class="FinaceDanList" @click="goFinaceDetails(childItem.FinaceId)">{{childItem.FinaceId}}</span>
</span>
</div>
</li>
<!--四定-->
<li v-if="item.FourthDeposit!=''">
<div @click="goFinacePage(item,4)" :class="getClass(item.FourthDepositStatus)">
<el-tooltip effect="dark" :content="item.FourthDeposit" placement="top" popper-class="max-w250">
<span>4</span>
</el-tooltip>
</div>
<div class="FinaDetailContentTM">
<span v-if="item.FourthAuditList!=null" v-for="(childItem,childIndex) in item.FourthAuditList" :key="childIndex"> <span v-if="item.FourthAuditList!=null" v-for="(childItem,childIndex) in item.FourthAuditList" :key="childIndex">
<span class="FinaceDanList" @click="goFinaceDetails(childItem.FinaceId)">{{childItem.FinaceId}}</span> <span class="FinaceDanList" @click="goFinaceDetails(childItem.FinaceId)">{{childItem.FinaceId}}</span>
</span> </span>
...@@ -1614,7 +1693,7 @@ ...@@ -1614,7 +1693,7 @@
<span>尾</span> <span>尾</span>
</el-tooltip> </el-tooltip>
</div> </div>
<div class="FinaDetailContent"> <div class="FinaDetailContentTM">
<span v-if="item.FinalAuditList!=null" v-for="(childItem,childIndex) in item.FinalAuditList" :key="childIndex"> <span v-if="item.FinalAuditList!=null" v-for="(childItem,childIndex) in item.FinalAuditList" :key="childIndex">
<span class="FinaceDanList" @click="goFinaceDetails(childItem.FinaceId)">{{childItem.FinaceId}}</span> <span class="FinaceDanList" @click="goFinaceDetails(childItem.FinaceId)">{{childItem.FinaceId}}</span>
</span> </span>
...@@ -1624,6 +1703,7 @@ ...@@ -1624,6 +1703,7 @@
</div> </div>
</el-col> </el-col>
</template> </template>
<template v-else>
<el-col :span="4" class="vmiddle"> <el-col :span="4" class="vmiddle">
<div class="TK_raduis"> <div class="TK_raduis">
<ul> <ul>
...@@ -1634,7 +1714,7 @@ ...@@ -1634,7 +1714,7 @@
<span>1</span> <span>1</span>
</el-tooltip> </el-tooltip>
</div> </div>
<div class="FinaDetailContent"> <div class="FinaDetailContentTM">
<span v-if="item.FirstAuditList!=null" v-for="(childItem,childIndex) in item.FirstAuditList" :key="childIndex"> <span v-if="item.FirstAuditList!=null" v-for="(childItem,childIndex) in item.FirstAuditList" :key="childIndex">
<span class="FinaceDanList" @click="goFinaceDetails(childItem.FinaceId)">{{childItem.FinaceId}}</span> <span class="FinaceDanList" @click="goFinaceDetails(childItem.FinaceId)">{{childItem.FinaceId}}</span>
</span> </span>
...@@ -1647,7 +1727,7 @@ ...@@ -1647,7 +1727,7 @@
<span>2</span> <span>2</span>
</el-tooltip> </el-tooltip>
</div> </div>
<div class="FinaDetailContent"> <div class="FinaDetailContentTM">
<span v-if="item.SecondAuditList!=null" v-for="(childItem,childIndex) in item.SecondAuditList" :key="childIndex"> <span v-if="item.SecondAuditList!=null" v-for="(childItem,childIndex) in item.SecondAuditList" :key="childIndex">
<span class="FinaceDanList" @click="goFinaceDetails(childItem.FinaceId)">{{childItem.FinaceId}}</span> <span class="FinaceDanList" @click="goFinaceDetails(childItem.FinaceId)">{{childItem.FinaceId}}</span>
</span> </span>
...@@ -1660,7 +1740,7 @@ ...@@ -1660,7 +1740,7 @@
<span>3</span> <span>3</span>
</el-tooltip> </el-tooltip>
</div> </div>
<div class="FinaDetailContent"> <div class="FinaDetailContentTM">
<span v-if="item.ThirdAuditList!=null" v-for="(childItem,childIndex) in item.ThirdAuditList" :key="childIndex"> <span v-if="item.ThirdAuditList!=null" v-for="(childItem,childIndex) in item.ThirdAuditList" :key="childIndex">
<span class="FinaceDanList" @click="goFinaceDetails(childItem.FinaceId)">{{childItem.FinaceId}}</span> <span class="FinaceDanList" @click="goFinaceDetails(childItem.FinaceId)">{{childItem.FinaceId}}</span>
</span> </span>
...@@ -1673,7 +1753,7 @@ ...@@ -1673,7 +1753,7 @@
<span>4</span> <span>4</span>
</el-tooltip> </el-tooltip>
</div> </div>
<div class="FinaDetailContent"> <div class="FinaDetailContentTM">
<span v-if="item.FourthAuditList!=null" v-for="(childItem,childIndex) in item.FourthAuditList" :key="childIndex"> <span v-if="item.FourthAuditList!=null" v-for="(childItem,childIndex) in item.FourthAuditList" :key="childIndex">
<span class="FinaceDanList" @click="goFinaceDetails(childItem.FinaceId)">{{childItem.FinaceId}}</span> <span class="FinaceDanList" @click="goFinaceDetails(childItem.FinaceId)">{{childItem.FinaceId}}</span>
</span> </span>
...@@ -1686,7 +1766,7 @@ ...@@ -1686,7 +1766,7 @@
<span>尾</span> <span>尾</span>
</el-tooltip> </el-tooltip>
</div> </div>
<div class="FinaDetailContent"> <div class="FinaDetailContentTM">
<span v-if="item.FinalAuditList!=null" v-for="(childItem,childIndex) in item.FinalAuditList" :key="childIndex"> <span v-if="item.FinalAuditList!=null" v-for="(childItem,childIndex) in item.FinalAuditList" :key="childIndex">
<span class="FinaceDanList" @click="goFinaceDetails(childItem.FinaceId)">{{childItem.FinaceId}}</span> <span class="FinaceDanList" @click="goFinaceDetails(childItem.FinaceId)">{{childItem.FinaceId}}</span>
</span> </span>
...@@ -1695,6 +1775,7 @@ ...@@ -1695,6 +1775,7 @@
</ul> </ul>
</div> </div>
</el-col> </el-col>
</template>
<el-col :span="1" class="vmiddle"> <el-col :span="1" class="vmiddle">
<div class="TMA_raduis"> <div class="TMA_raduis">
<ul style="padding:0;"> <ul style="padding:0;">
......
src/components/TravelManager/TravelList/TravelControlListSale.vue
View file @ d24e51ad
...@@ -42,7 +42,7 @@ ...@@ -42,7 +42,7 @@
<div class="query-box"> <div class="query-box">
<div class="TC_companyList" v-if="queryCommonData.IsParentCompany==1"> <div class="TC_companyList" v-if="queryCommonData.IsParentCompany==1">
<span :class="{'TC_checked':queryCommonData.checkCompanyAll}" @click="getCompanyCheckAll()">{{$t('advmanager.v_all')}}</span> <span :class="{'TC_checked':queryCommonData.checkCompanyAll}" @click="getCompanyCheckAll()">{{$t('advmanager.v_all')}}</span>
<span v-for="(item,bindex) in queryCommonData.BranchList" :class="{'TC_checked':item.isShow}" @click="getCompanyCheck(item)">{{item.BName}}</span> <span v-for="(item,bindex) in queryCommonData.BranchList" :class="{'TC_checked':item.isShow}" @click="getCompanyCheck(item)" :key="bindex">{{item.BName}}</span>
</div> </div>
<ul> <ul>
<li> <li>
...@@ -444,7 +444,7 @@ ...@@ -444,7 +444,7 @@
</p> </p>
<p> <p>
<span>{{$t('visa.v_currentseat')}}</span> <span>{{$t('visa.v_currentseat')}}</span>
<i>{{item.SurplusSeat=item.SurplusSeat < 0 ? 0:item.SurplusSeat}}</i> </p> <p> <i>{{item.SurplusSeat=(item.SurplusSeat<0) ? 0:item.SurplusSeat}}</i> </p> <p>
<span>{{$t('visa.v_yibaoru')}}</span> <span>{{$t('visa.v_yibaoru')}}</span>
<i> <i>
{{item.OrderGuestNum}} {{item.OrderGuestNum}}
...@@ -457,7 +457,7 @@ ...@@ -457,7 +457,7 @@
</p> </p>
<p class="travelnowrap"> <p class="travelnowrap">
<span>{{$t('visa.v_houbu')}}</span> <span>{{$t('visa.v_houbu')}}</span>
<span v-if="item.IsSubstitution==1" class="TCL-greenType">{{$t('Operation.v_yxhoubu')}}</span> <span v-if="item.IsSubstitution==1" class="TCL-greenType">{{$t('visa.v_yxhoubu')}}</span>
<span v-else class="TCL-redType">{{$t('Operation.v_byxhoubu')}}</span> <span v-else class="TCL-redType">{{$t('Operation.v_byxhoubu')}}</span>
</p> </p>
<p> <p>
...@@ -546,7 +546,7 @@ ...@@ -546,7 +546,7 @@
</el-dropdown-menu> </el-dropdown-menu>
</el-dropdown> </el-dropdown>
<el-button @click='goUrlMake("GroupAdvertising",item.LineID,item.TCID,"团期广告")' type="primary" style="background:#67c23a; border-color:#67c23a">广告&nbsp;{{item.AdvertCount}}</el-button> <el-button @click='goUrlMake("GroupAdvertising",item.LineID,item.TCID,"团期广告")' type="primary" style="background:#67c23a; border-color:#67c23a">广告&nbsp;{{item.AdvertCount}}</el-button>
<el-button @click="ckOPremark(item)" type="primary" style="background:#F16C3C; border-color:#F16C3C">{{$t('Operation.Op_childNobed')}}OP备注</el-button> <el-button @click="ckOPremark(item)" type="primary" style="background:#F16C3C; border-color:#F16C3C">{{$t('Operation.Op_remark')}}</el-button>
<el-dropdown trigger="click"> <el-dropdown trigger="click">
<span class="el-dropdown-link">{{$t('Operation.Op_moreOperation')}} <span class="el-dropdown-link">{{$t('Operation.Op_moreOperation')}}
<i class="el-icon-arrow-down el-icon--right"></i> <i class="el-icon-arrow-down el-icon--right"></i>
...@@ -580,7 +580,7 @@ ...@@ -580,7 +580,7 @@
<div class="clearfix TCL-redType" v-if="item.PriceTagList.length>0"> <div class="clearfix TCL-redType" v-if="item.PriceTagList.length>0">
<div class="TCL_remarkTitle">{{$t('sm.biaoqian')}}：</div> <div class="TCL_remarkTitle">{{$t('sm.biaoqian')}}：</div>
<div class="TCL_Content"> <div class="TCL_Content">
<span v-for="chidItem in item.PriceTagList">{{chidItem.Content}}</span> <span v-for="(chidItem,childIndex) in item.PriceTagList" :key="childIndex">{{chidItem.Content}}</span>
</div> </div>
</div> </div>
</div> </div>
...@@ -1377,9 +1377,9 @@ ...@@ -1377,9 +1377,9 @@
this.queryMsg.StartGroupDate = nowDate; this.queryMsg.StartGroupDate = nowDate;
if ( if (
this.queryCommonData.IsParentCompany != 1 && this.queryCommonData.IsParentCompany != 1 &&
this.CurrentUserInfo.RB_Branch_id != 49 userInfo.RB_Branch_id != 49
) { ) {
this.queryMsg.OutBranchIds.push(this.CurrentUserInfo.RB_Branch_id); this.queryMsg.OutBranchIds.push(userInfo.RB_Branch_id);
} }
//默认查询全部团队状态 //默认查询全部团队状态
this.$tripUtils.TeamStatesList.TeamStates.forEach(states=>{ this.$tripUtils.TeamStatesList.TeamStates.forEach(states=>{
......
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