Skip to content

S
SuperMan
Commit 533dc8ca authored by youjie's avatar youjie
Browse files
Options

no message

parent ff6b5fbf
Hide whitespace changes
Inline Side-by-side
Showing with 70 additions and 76 deletions
src/components/TravelManager/TravelList/TravelControlList.vue
View file @ 533dc8ca
...@@ -122,25 +122,6 @@ ...@@ -122,25 +122,6 @@
@click="getCompanyCheck(item)" :key="bindex">{{item.BName}}</span> @click="getCompanyCheck(item)" :key="bindex">{{item.BName}}</span>
</div> </div>
<ul> <ul>
<li>
<span>
<em>提成状态</em>
<el-select class="w150" v-model="queryMsg.QSendCommissionState" filterable
@change="getControlList()">
<el-option v-for="item in QSendCommissionStateList" :label="item.Name" :value="item.ID"
:key="item.LineID"></el-option>
</el-select>
<a style="margin-left: 5px;margin-right: 5px;">只看审核驳回</a>
<el-switch
v-model="queryMsg.QOutGroupAuditReject"
active-text=""
inactive-text=""
active-color="#409eff"
inactive-color="#dcdfe6"
active-value="1"
inactive-value="0" @change="resetPageIndex(),getControlList()"/>
</span>
</li>
<li> <li>
<span> <span>
<em>{{$t('system.table_ssLine')}}</em> <em>{{$t('system.table_ssLine')}}</em>
...@@ -338,6 +319,29 @@ ...@@ -338,6 +319,29 @@
</el-checkbox-group> </el-checkbox-group>
</span> </span>
</div> </div>
<div class="comSearchDiv" style="display: flex;align-items: center;">
<span style="flex-shrink: 0;">提成状态</span>
<span style="display: flex;align-items: center;flex-wrap: wrap;">
<el-select class="w180 multiple_input" v-model="queryMsg.QSendCommissionState">
<el-option v-for="item in QSendCommissionStateList" :label="item.Name" :value="item.ID"
:key="item.LineID"></el-option>
</el-select>
<a style="margin-left: 5px;margin-right: 5px;">只看审核驳回</a>
<el-switch
v-model="queryMsg.QOutGroupAuditReject"
active-text=""
inactive-text=""
active-color="#409eff"
inactive-color="#dcdfe6"
active-value="1"
inactive-value="0"/>
<div class="hotelProductManage2_tableBox" style="margin-left: 10px;font-size: 11px;" v-if="isCommissionDetails">
<span style="color:#000000;background-color: #ff99cc;padding:0px 2px;border-radius:5px">单项</span>
<span style="color:#000000;background-color: #bcd6ee;padding:0px 4px;border-radius:5px">国内</span>
<span style="color:#000000;background-color: #DDDDDD;padding:0px 4px;border-radius:5px">出境</span>
</div>
</span>
</div>
<button class="normalBtn TC_SearchBtn" <button class="normalBtn TC_SearchBtn"
@click="resetPageIndex(),getControlList(),queryCommonData.showHigradeSearch=false">{{$t('pub.searchBtn')}} @click="resetPageIndex(),getControlList(),queryCommonData.showHigradeSearch=false">{{$t('pub.searchBtn')}}
</button> </button>
...@@ -406,11 +410,6 @@ ...@@ -406,11 +410,6 @@
</li> </li>
</ul> </ul>
</div> </div>
<div class="hotelProductManage2_tableBox" style="margin-bottom:20px;" v-if="isCommissionDetails">
<span style="color:#000000;background-color: #ff99cc;padding:2px 4px;border-radius:5px">单项</span>
<span style="color:#000000;background-color: #bcd6ee;padding:2px 4px;border-radius:5px">国内</span>
<span style="color:#000000;background-color: #DDDDDD;padding:2px 4px;border-radius:5px">出境</span>
</div>
<div class="TravelTclList" v-loading="queryCommonData.loading"> <div class="TravelTclList" v-loading="queryCommonData.loading">
<ul> <ul>
<el-pagination background @current-change="handleCurrentChange" :current-page.sync="queryMsg.currentPage" <el-pagination background @current-change="handleCurrentChange" :current-page.sync="queryMsg.currentPage"
...@@ -469,12 +468,12 @@ ...@@ -469,12 +468,12 @@
<span class="TC_xiajia quxiao" v-if="item.TCState==4">{{$t('hotel.hotel_HasBeenCancelled')}}</span> <span class="TC_xiajia quxiao" v-if="item.TCState==4">{{$t('hotel.hotel_HasBeenCancelled')}}</span>
</div> </div>
<div class="TC_TravelSalePlat clearfix" <div class="TC_TravelSalePlat clearfix"
v-if="item.Royalty"> v-if="item.Royalty" style="display: flex;flex-wrap: wrap;align-items: baseline;">
<span class="TC_neibu" style="color: red;font-size: 11px;line-height: 25px;">{{item.Royalty?item.Royalty.Periods:''}} 期</span> <span class="TC_neibu" style="color: red;font-size: 11px;line-height: 25px;">{{item.Royalty?item.Royalty.Periods:''}} 期</span>
<span style="cursor: pointer;" v-for="x in item.Royalty.List" <span style="cursor: pointer;" v-for="x in item.Royalty.List"
@click="goRoyaltyUrl(item,item.Royalty,x)" @click="goRoyaltyUrl(item,item.Royalty,x)"
class="TC_neibu" class="TC_neibu"
:style="{'background-color':x.Type==1?'#ff99cc':x.Type==2?'#bcd6ee':'#DDDDDD','color':'#000000','margin-top':'3px'}"> :style="{'background-color':item.Royalty.Type==1?'#ff99cc':item.Royalty.Type==2?'#bcd6ee':'#DDDDDD','color':'#000000','margin-top':'3px'}">
{{x.UserName}}<span>¥{{x.CommissionMoney}}</span> {{x.UserName}}<span>¥{{x.CommissionMoney}}</span>
</span> </span>
</div> </div>
......
src/components/TravelManager/TravelList/oneDayTrip.vue
View file @ 533dc8ca
...@@ -94,25 +94,6 @@ ...@@ -94,25 +94,6 @@
@click="getCompanyCheck(item)">{{item.BName}}</span> @click="getCompanyCheck(item)">{{item.BName}}</span>
</div> </div>
<ul> <ul>
<li>
<span>
<em>提成状态</em>
<el-select class="w150" v-model="queryMsg.QSendCommissionState" filterable
@change="getControlList()">
<el-option v-for="item in QSendCommissionStateList" :label="item.Name" :value="item.ID"
:key="item.LineID"></el-option>
</el-select>
<a style="margin-left: 5px;margin-right: 5px;">只看审核驳回</a>
<el-switch
v-model="queryMsg.QOutGroupAuditReject"
active-text=""
inactive-text=""
active-color="#409eff"
inactive-color="#dcdfe6"
active-value="1"
inactive-value="0" @change="resetPageIndex(),getControlList()"/>
</span>
</li>
<li> <li>
<span> <span>
<em>{{$t('system.table_ssLine')}}</em> <em>{{$t('system.table_ssLine')}}</em>
...@@ -299,6 +280,29 @@ ...@@ -299,6 +280,29 @@
</el-select> </el-select>
</span> </span>
</div> </div>
<div class="comSearchDiv" style="display: flex;align-items: center;">
<span style="flex-shrink: 0;">提成状态</span>
<span style="display: flex;align-items: center;flex-wrap: wrap;">
<el-select class="w180 multiple_input" v-model="queryMsg.QSendCommissionState">
<el-option v-for="item in QSendCommissionStateList" :label="item.Name" :value="item.ID"
:key="item.LineID"></el-option>
</el-select>
<a style="margin-left: 5px;margin-right: 5px;">只看审核驳回</a>
<el-switch
v-model="queryMsg.QOutGroupAuditReject"
active-text=""
inactive-text=""
active-color="#409eff"
inactive-color="#dcdfe6"
active-value="1"
inactive-value="0"/>
<div style="margin-top: 10px;margin-left: 10px;font-size: 11px;" v-if="isCommissionDetails">
<span style="color:#000000;background-color: #ff99cc;padding:0px 2px;border-radius:5px">单项</span>
<span style="color:#000000;background-color: #bcd6ee;padding:0px 4px;border-radius:5px">国内</span>
<span style="color:#000000;background-color: #DDDDDD;padding:0px 4px;border-radius:5px">出境</span>
</div>
</span>
</div>
<button class="normalBtn TC_SearchBtn" <button class="normalBtn TC_SearchBtn"
@click="resetPageIndex(),getControlList(),queryCommonData.showHigradeSearch=false">{{$t('pub.searchBtn')}} @click="resetPageIndex(),getControlList(),queryCommonData.showHigradeSearch=false">{{$t('pub.searchBtn')}}
</button> </button>
...@@ -368,11 +372,7 @@ ...@@ -368,11 +372,7 @@
</li> </li>
</ul> </ul>
</div> </div>
<div class="hotelProductManage2_tableBox" style="margin-bottom:20px;" v-if="isCommissionDetails">
<span style="color:#000000;background-color: #ff99cc;padding:2px 4px;border-radius:5px">单项</span>
<span style="color:#000000;background-color: #bcd6ee;padding:2px 4px;border-radius:5px">国内</span>
<span style="color:#000000;background-color: #DDDDDD;padding:2px 4px;border-radius:5px">出境</span>
</div>
<div class="TravelTclList" v-loading="queryCommonData.loading"> <div class="TravelTclList" v-loading="queryCommonData.loading">
<ul> <ul>
<el-pagination background @current-change="handleCurrentChange" :current-page.sync="queryMsg.currentPage" <el-pagination background @current-change="handleCurrentChange" :current-page.sync="queryMsg.currentPage"
...@@ -420,12 +420,12 @@ ...@@ -420,12 +420,12 @@
<span class="TC_xiajia quxiao" v-if="item.TCState==4">{{$t('hotel.hotel_HasBeenCancelled')}}</span> <span class="TC_xiajia quxiao" v-if="item.TCState==4">{{$t('hotel.hotel_HasBeenCancelled')}}</span>
</div> </div>
<div class="TC_TravelSalePlat clearfix" <div class="TC_TravelSalePlat clearfix"
v-if="item.Royalty"> v-if="item.Royalty" style="display: flex;flex-wrap: wrap;align-items: baseline;">
<span class="TC_neibu" style="color: red;font-size: 11px;line-height: 25px;">{{item.Royalty?item.Royalty.Periods:''}} 期</span> <span class="TC_neibu" style="color: red;font-size: 11px;line-height: 25px;">{{item.Royalty?item.Royalty.Periods:''}} 期</span>
<span style="cursor: pointer;" v-for="x in item.Royalty.List" <span style="cursor: pointer;" v-for="x in item.Royalty.List"
@click="goRoyaltyUrl(item,item.Royalty,x)" @click="goRoyaltyUrl(item,item.Royalty,x)"
class="TC_neibu" class="TC_neibu"
:style="{'background-color':x.Type==1?'#ff99cc':x.Type==2?'#bcd6ee':'#DDDDDD','color':'#000000','margin-top':'3px'}"> :style="{'background-color':item.Royalty.Type==1?'#ff99cc':item.Royalty.Type==2?'#bcd6ee':'#DDDDDD','color':'#000000','margin-top':'3px'}">
{{x.UserName}}<span>¥{{x.CommissionMoney}}</span> {{x.UserName}}<span>¥{{x.CommissionMoney}}</span>
</span> </span>
</div> </div>
......
src/components/busManagement/BookAcar/addEditVehicle.vue
View file @ 533dc8ca
...@@ -514,78 +514,67 @@ ...@@ -514,78 +514,67 @@
rules:{ rules:{
UseCompName: [{ UseCompName: [{
required: true, required: true,
// message: '请输入订车单位', message: '请输入订车单位',
trigger: 'blur' trigger: 'blur'
}], }],
UseName: [{ UseName: [{
required: true, required: true,
// message: '请输入订车人名称', message: '请输入订车人名称',
trigger: 'blur' trigger: 'blur'
}], }],
PickUpInfo: [{ PickUpInfo: [{
required: true, required: true,
// message: '请输入接机信息', message: '请输入接机信息',
message: '',
trigger: 'blur' trigger: 'blur'
}], }],
GoFlightInfo: [{ GoFlightInfo: [{
required: true, required: true,
// message: '请输入去程航班', message: '请输入去程航班',
message: '',
trigger: 'change' trigger: 'change'
}], }],
BackFlightInfo: [{ BackFlightInfo: [{
required: true, required: true,
// message: '请输入回程航班', message: '请输入回程航班',
message: '',
trigger: 'blur' trigger: 'blur'
}], }],
PeopleNum: [{ PeopleNum: [{
required: true, required: true,
// message: '请输入用车人数', message: '请输入用车人数',
message: '',
trigger: 'blur' trigger: 'blur'
}], }],
UseDayNum: [{ UseDayNum: [{
required: true, required: true,
// message: '请输入行程天数', message: '请输入行程天数',
message: '',
trigger: 'blur' trigger: 'blur'
}], }],
StartDate:[{ StartDate:[{
required: true, required: true,
// message: '请选择开始日期', message: '请选择开始日期',
message: '',
trigger: 'change' trigger: 'change'
}], }],
BusType: [{ BusType: [{
required: true, required: true,
// message: '请选择用车类型', message: '请选择用车类型',
message: '',
trigger: 'change' trigger: 'change'
}], }],
GuideInfo: [{ GuideInfo: [{
required: true, required: true,
// message: '请输入导游信息', message: '请输入导游信息',
message: '',
trigger: 'blur' trigger: 'blur'
}], }],
TeamName: [{ TeamName: [{
required: true, required: true,
// message: '请输入团队信息', message: '请输入团队信息',
message: '',
trigger: 'blur' trigger: 'blur'
}], }],
UseType: [{ UseType: [{
required: true, required: true,
// message: '请选择用车类型', message: '请选择用车类型',
message: '',
trigger: 'change' trigger: 'change'
}], }],
TripInfo: [{ TripInfo: [{
required: true, required: true,
// message: '请输入行程信息', message: '请输入行程信息',
message: '',
trigger: 'blur' trigger: 'blur'
}], }],
}, },
...@@ -745,6 +734,12 @@ ...@@ -745,6 +734,12 @@
}); });
}, },
submit(){ submit(){
for(let i=0;i<this.msg.details.length;i++){
if(!this.msg.details&&!this.msg.details[i].TripInfo){
this.Error('请输入行程信息')
return
}
}
this.$refs['msg'].validate((valid) => { this.$refs['msg'].validate((valid) => {
if (valid) { if (valid) {
this.setFormMsg() this.setFormMsg()
......
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