Skip to content

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

11

parent 799cafcd
Hide whitespace changes
Inline Side-by-side
Showing with 27 additions and 28 deletions
src/components/TravelManager/TravelList/TravelControlList.vue
View file @ d573e325
...@@ -119,14 +119,14 @@ ...@@ -119,14 +119,14 @@
<div class="TC-MyList"> <div class="TC-MyList">
<div class="query-box"> <div class="query-box">
<!--v-if="queryCommonData.IsParentCompany==1"--> <!--v-if="queryCommonData.IsParentCompany==1"-->
<div class="TC_companyList" v-show="IsShowAllBranch() &&CurrentUserInfo.EmployeeId!=3384"> <div class="TC_companyList" v-show="IsShowAllBranch() &&CurrentUserInfo.RB_Branch_id!=1257">
<span :class="{ TC_checked: queryCommonData.checkCompanyAll }" <span :class="{ TC_checked: queryCommonData.checkCompanyAll }"
@click="getCompanyCheckAll()">{{ $t("advmanager.v_all") }}</span> @click="getCompanyCheckAll()">{{ $t("advmanager.v_all") }}</span>
<span v-for="(item, bindex) in queryCommonData.BranchList" :class="{ TC_checked: item.isShow }" <span v-for="(item, bindex) in queryCommonData.BranchList" :class="{ TC_checked: item.isShow }"
@click="getCompanyCheck(item)" :key="bindex">{{ item.BName }}</span> @click="getCompanyCheck(item)" :key="bindex">{{ item.BName }}</span>
</div> </div>
<ul> <ul>
<li v-if="CurrentUserInfo.EmployeeId != 3384"> <li v-if="CurrentUserInfo.RB_Branch_id!=1257">
<span> <span>
<em>{{ $t("system.table_ssLine") }}</em> <em>{{ $t("system.table_ssLine") }}</em>
<el-select class="w150" v-model="queryMsg.LineId" filterable :placeholder="$t('pub.pleaseSel')" <el-select class="w150" v-model="queryMsg.LineId" filterable :placeholder="$t('pub.pleaseSel')"
...@@ -137,7 +137,7 @@ ...@@ -137,7 +137,7 @@
</el-select> </el-select>
</span> </span>
</li> </li>
<li v-if="CurrentUserInfo.EmployeeId != 3384"> <li v-if="CurrentUserInfo.RB_Branch_id!=1257">
<span> <span>
<em>{{ $t("Operation.Op_Country") }}/{{ $t("system.query_dest") }}</em> <em>{{ $t("Operation.Op_Country") }}/{{ $t("system.query_dest") }}</em>
<el-select class="w150" v-model="queryMsg.PlaceID" filterable :placeholder="$t('pub.pleaseSel')" <el-select class="w150" v-model="queryMsg.PlaceID" filterable :placeholder="$t('pub.pleaseSel')"
...@@ -148,7 +148,7 @@ ...@@ -148,7 +148,7 @@
</el-select> </el-select>
</span> </span>
</li> </li>
<li v-if="CurrentUserInfo.EmployeeId != 3384"> <li v-if="CurrentUserInfo.RB_Branch_id!=1257">
<span> <span>
<em>{{ $t("active.ad_xlmc") }}</em> <em>{{ $t("active.ad_xlmc") }}</em>
<el-select class="w150" v-model="queryMsg.LineteamId" filterable :placeholder="$t('pub.pleaseSel')"> <el-select class="w150" v-model="queryMsg.LineteamId" filterable :placeholder="$t('pub.pleaseSel')">
...@@ -3950,7 +3950,10 @@ ...@@ -3950,7 +3950,10 @@
this.queryMsg.StartGroupDate = nowDate; this.queryMsg.StartGroupDate = nowDate;
} }
if (this.CurrentUserInfo.RB_Group_id == 2) { if (this.CurrentUserInfo.RB_Group_id == 2) {
if ( if (this.CurrentUserInfo.RB_Branch_id == 1257) {
this.queryMsg.LineId = 1;
this.queryMsg.PlaceID = 12;
} else if (
this.queryCommonData.IsParentCompany != 1 && this.queryCommonData.IsParentCompany != 1 &&
this.CurrentUserInfo.RB_Branch_id != 49 && this.CurrentUserInfo.RB_Branch_id != 49 &&
this.CurrentUserInfo.RB_Branch_id != 1249 && this.CurrentUserInfo.RB_Branch_id != 1249 &&
...@@ -3960,10 +3963,6 @@ ...@@ -3960,10 +3963,6 @@
this.CurrentUserInfo.RB_Branch_id != 1257 this.CurrentUserInfo.RB_Branch_id != 1257
) { ) {
this.queryMsg.OutBranchIds.push(this.CurrentUserInfo.RB_Branch_id); this.queryMsg.OutBranchIds.push(this.CurrentUserInfo.RB_Branch_id);
} else if (this.CurrentUserInfo.EmployeeId == 3384) {
//this.queryMsg.OutBranchIds.push(this.CurrentUserInfo.RB_Branch_id);
this.queryMsg.LineId = 1;
this.queryMsg.PlaceID = 12;
} }
} }
var routeName = this.$route.name; var routeName = this.$route.name;
......
src/components/TravelManager/TravelList/TravelControlListSale.vue
View file @ d573e325
...@@ -78,14 +78,14 @@ ...@@ -78,14 +78,14 @@
<div class="TC_Content TC-MyList"> <div class="TC_Content TC-MyList">
<div class="query-box"> <div class="query-box">
<!--v-if="queryCommonData.IsParentCompany==1"--> <!--v-if="queryCommonData.IsParentCompany==1"-->
<div class="TC_companyList" v-if="CurrentUserInfo.EmployeeId!=3384"> <div class="TC_companyList" v-if="CurrentUserInfo.RB_Branch_id!=1257">
<span :class="{'TC_checked':queryCommonData.checkCompanyAll}" <span :class="{'TC_checked':queryCommonData.checkCompanyAll}"
@click="getCompanyCheckAll()">{{$t('advmanager.v_all')}}</span> @click="getCompanyCheckAll()">{{$t('advmanager.v_all')}}</span>
<span v-for="(item,bindex) in queryCommonData.BranchList" :class="{'TC_checked':item.isShow}" <span v-for="(item,bindex) in queryCommonData.BranchList" :class="{'TC_checked':item.isShow}"
@click="getCompanyCheck(item)" :key="bindex">{{item.BName}}</span> @click="getCompanyCheck(item)" :key="bindex">{{item.BName}}</span>
</div> </div>
<ul> <ul>
<li v-if="CurrentUserInfo.EmployeeId!=3384"> <li v-if="CurrentUserInfo.RB_Branch_id!=1257">
<span> <span>
<em>{{$t('system.table_ssLine')}}</em> <em>{{$t('system.table_ssLine')}}</em>
<el-select class="w150" v-model="queryMsg.LineId" filterable :placeholder="$t('pub.pleaseSel')" <el-select class="w150" v-model="queryMsg.LineId" filterable :placeholder="$t('pub.pleaseSel')"
...@@ -96,7 +96,7 @@ ...@@ -96,7 +96,7 @@
</el-select> </el-select>
</span> </span>
</li> </li>
<li v-if="CurrentUserInfo.EmployeeId!=3384"> <li v-if="CurrentUserInfo.RB_Branch_id!=1257">
<span> <span>
<em>{{$t('Operation.Op_Country')}}/{{$t('system.query_dest')}}</em> <em>{{$t('Operation.Op_Country')}}/{{$t('system.query_dest')}}</em>
<el-select class="w150" v-model="queryMsg.PlaceID" filterable :placeholder="$t('pub.pleaseSel')" <el-select class="w150" v-model="queryMsg.PlaceID" filterable :placeholder="$t('pub.pleaseSel')"
...@@ -107,7 +107,7 @@ ...@@ -107,7 +107,7 @@
</el-select> </el-select>
</span> </span>
</li> </li>
<li v-if="CurrentUserInfo.EmployeeId!=3384"> <li v-if="CurrentUserInfo.RB_Branch_id!=1257">
<span> <span>
<em>{{$t('active.ad_xlmc')}}</em> <em>{{$t('active.ad_xlmc')}}</em>
<el-select class="w150" v-model="queryMsg.LineteamId" filterable :placeholder="$t('pub.pleaseSel')"> <el-select class="w150" v-model="queryMsg.LineteamId" filterable :placeholder="$t('pub.pleaseSel')">
...@@ -2788,14 +2788,14 @@ ...@@ -2788,14 +2788,14 @@
myDate.getDate(); myDate.getDate();
this.queryMsg.StartGroupDate = nowDate; this.queryMsg.StartGroupDate = nowDate;
} }
if (this.queryCommonData.IsParentCompany != 1 && userInfo.RB_Branch_id != 49 && userInfo.RB_Branch_id != 1224 && if (userInfo.RB_Branch_id == 1257) {
userInfo.RB_Branch_id != 1249 && userInfo.RB_Branch_id != 1252 && userInfo.RB_Branch_id != 1253 && userInfo
.RB_Branch_id != 1216&& userInfo.RB_Branch_id != 1257) {
this.queryMsg.OutBranchIds.push(userInfo.RB_Branch_id);
} else if (this.CurrentUserInfo.EmployeeId == 3384) {
//this.queryMsg.OutBranchIds.push(this.CurrentUserInfo.RB_Branch_id);
this.queryMsg.LineId = 1; this.queryMsg.LineId = 1;
this.queryMsg.PlaceID = 12; this.queryMsg.PlaceID = 12;
} else if (this.queryCommonData.IsParentCompany != 1 && userInfo.RB_Branch_id != 49 && userInfo.RB_Branch_id !=
1224 &&
userInfo.RB_Branch_id != 1249 && userInfo.RB_Branch_id != 1252 && userInfo.RB_Branch_id != 1253 && userInfo
.RB_Branch_id != 1216 && userInfo.RB_Branch_id != 1257) {
this.queryMsg.OutBranchIds.push(userInfo.RB_Branch_id);
} }
//默认查询全部团队状态 //默认查询全部团队状态
this.$tripUtils.TeamStatesList.TeamStates.forEach(states => { this.$tripUtils.TeamStatesList.TeamStates.forEach(states => {
......
src/components/TravelManager/TravelList/oneDayTrip.vue
View file @ d573e325
...@@ -87,14 +87,14 @@ ...@@ -87,14 +87,14 @@
<div class="TC_Content"> <div class="TC_Content">
<div class=" TC-MyList"> <div class=" TC-MyList">
<div class="query-box"> <div class="query-box">
<div class="TC_companyList" v-show="IsShowAllBranch()&&CurrentUserInfo.EmployeeId!=3384"> <div class="TC_companyList" v-show="IsShowAllBranch()&&CurrentUserInfo.RB_Branch_id!=1257">
<span :class="{'TC_checked':queryCommonData.checkCompanyAll}" <span :class="{'TC_checked':queryCommonData.checkCompanyAll}"
@click="getCompanyCheckAll()">{{$t('advmanager.v_all')}}</span> @click="getCompanyCheckAll()">{{$t('advmanager.v_all')}}</span>
<span v-for="(item,bindex) in queryCommonData.BranchList" :class="{'TC_checked':item.isShow}" <span v-for="(item,bindex) in queryCommonData.BranchList" :class="{'TC_checked':item.isShow}"
@click="getCompanyCheck(item)">{{item.BName}}</span> @click="getCompanyCheck(item)">{{item.BName}}</span>
</div> </div>
<ul> <ul>
<li v-if="CurrentUserInfo.EmployeeId!=3384"> <li v-if="CurrentUserInfo.RB_Branch_id!=1257">
<span> <span>
<em>{{$t('system.table_ssLine')}}</em> <em>{{$t('system.table_ssLine')}}</em>
<el-select class="w150" v-model="queryMsg.LineId" filterable :placeholder="$t('pub.pleaseSel')" <el-select class="w150" v-model="queryMsg.LineId" filterable :placeholder="$t('pub.pleaseSel')"
...@@ -105,7 +105,7 @@ ...@@ -105,7 +105,7 @@
</el-select> </el-select>
</span> </span>
</li> </li>
<li v-if="CurrentUserInfo.EmployeeId!=3384"> <li v-if="CurrentUserInfo.RB_Branch_id!=1257">
<span> <span>
<em>{{$t('Operation.Op_Country')}}/{{$t('system.query_dest')}}</em> <em>{{$t('Operation.Op_Country')}}/{{$t('system.query_dest')}}</em>
<el-select class="w150" v-model="queryMsg.PlaceID" filterable :placeholder="$t('pub.pleaseSel')" <el-select class="w150" v-model="queryMsg.PlaceID" filterable :placeholder="$t('pub.pleaseSel')"
...@@ -116,7 +116,7 @@ ...@@ -116,7 +116,7 @@
</el-select> </el-select>
</span> </span>
</li> </li>
<li> <li v-if="CurrentUserInfo.RB_Branch_id!=1257">
<span> <span>
<em>{{$t('active.ad_xlmc')}}</em> <em>{{$t('active.ad_xlmc')}}</em>
<el-select class="w150" v-model="queryMsg.LineteamId" filterable :placeholder="$t('pub.pleaseSel')"> <el-select class="w150" v-model="queryMsg.LineteamId" filterable :placeholder="$t('pub.pleaseSel')">
...@@ -2475,14 +2475,14 @@ ...@@ -2475,14 +2475,14 @@
this.queryMsg.StartGroupDate = nowDate this.queryMsg.StartGroupDate = nowDate
} }
if (this.queryCommonData.IsParentCompany != 1) { if (this.queryCommonData.IsParentCompany != 1) {
if (this.CurrentUserInfo.RB_Branch_id != 49 && this.CurrentUserInfo.RB_Branch_id != 1245 && this.CurrentUserInfo if (this.CurrentUserInfo.RB_Branch_id == 1257) {
this.queryMsg.LineId = 177;
this.queryMsg.PlaceID = 525;
} else if (this.CurrentUserInfo.RB_Branch_id != 49 && this.CurrentUserInfo.RB_Branch_id != 1245 && this
.CurrentUserInfo
.RB_Branch_id != 1249 && this.CurrentUserInfo.RB_Branch_id != 1252 && this.CurrentUserInfo.RB_Branch_id != .RB_Branch_id != 1249 && this.CurrentUserInfo.RB_Branch_id != 1252 && this.CurrentUserInfo.RB_Branch_id !=
1253 && this.CurrentUserInfo.RB_Branch_id != 1257) { 1253 && this.CurrentUserInfo.RB_Branch_id != 1257) {
this.queryMsg.OutBranchIds.push(this.CurrentUserInfo.RB_Branch_id) this.queryMsg.OutBranchIds.push(this.CurrentUserInfo.RB_Branch_id)
} else if (this.CurrentUserInfo.EmployeeId == 3384) {
//this.queryMsg.OutBranchIds.push(this.CurrentUserInfo.RB_Branch_id);
this.queryMsg.LineId = 177;
this.queryMsg.PlaceID = 525;
} }
} }
this.getControlList() this.getControlList()
......
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