Skip to content

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

页面修改

parent 0e4e5e4c
Hide whitespace changes
Inline Side-by-side
Showing with 51 additions and 29 deletions
src/components/TravelManager/TravelList/TravelControlList.vue
View file @ c416ff47
...@@ -1197,12 +1197,18 @@ ...@@ -1197,12 +1197,18 @@
<div class="TC_remarkContent" v-if="item.BranchAuditState>0"> <div class="TC_remarkContent" v-if="item.BranchAuditState>0">
<div class="clearfix TCL-redType"> <div class="clearfix TCL-redType">
<div class="TCL_remarkTitle" style="width: auto;"> <div class="TCL_remarkTitle" style="width: auto;">
<span style="color: black;">修改出团公司</span> <span style="color: black;">出团公司调整： {{item.BranchApplyResion}}</span>
{{item.BranchAuditStateStr}} <template v-if="item.BranchAuditState==1">
<span style="color:blue;font-weight:bold;">【{{item.BranchAuditStateStr}}】</span>
</template>
<template v-if="item.BranchAuditState==2">
<span style="color:green;font-weight:bold;">【{{item.BranchAuditStateStr}}】</span>
</template>
<template v-if="item.BranchAuditState==3">
<span style="color:red;font-weight:bold;">【{{item.BranchAuditStateStr}}】</span>
<span style="color:red;">原因: {{item.BranchAuditRemark}}</span>
</template>
</div> </div>
<div class="TCL_Content" v-if="item.BranchAuditStateStr=='驳回'">
<span style="color: red;">缘由:</span>
{{item.BranchAuditRemark}}</div>
</div> </div>
</div> </div>
</li> </li>
...@@ -1290,7 +1296,7 @@ ...@@ -1290,7 +1296,7 @@
</div> </div>
<!-- 修改出团公司 --> <!-- 修改出团公司 -->
<EditLeaveGroup v-if="GroupTypeVisible" :item="GroupTypeObj" @Cancel='CancelGroupType' <EditLeaveGroup v-if="GroupTypeVisible" :item="GroupTypeObj" @Cancel='CancelGroupType'
@Success="queryMsg.pageIndex=1,getControlList()"/> @Success="queryMsg.pageIndex=1,getControlList()" />
</div> </div>
</template> </template>
<script> <script>
...@@ -1311,7 +1317,7 @@ ...@@ -1311,7 +1317,7 @@
data() { data() {
return { return {
GroupTypeVisible: false, GroupTypeVisible: false,
GroupTypeObj:{}, GroupTypeObj: {},
dialog: { dialog: {
show: false, show: false,
ConfigId: '', ConfigId: '',
...@@ -2858,7 +2864,7 @@ ...@@ -2858,7 +2864,7 @@
} }
if ( if (
this.queryCommonData.IsParentCompany != 1 && this.queryCommonData.IsParentCompany != 1 &&
this.CurrentUserInfo.RB_Branch_id != 49 && this.CurrentUserInfo.RB_Branch_id != 1249 this.CurrentUserInfo.RB_Branch_id != 49 && this.CurrentUserInfo.RB_Branch_id != 1249
) { ) {
this.queryMsg.OutBranchIds.push(this.CurrentUserInfo.RB_Branch_id); this.queryMsg.OutBranchIds.push(this.CurrentUserInfo.RB_Branch_id);
} }
......
src/components/TravelManager/TravelList/TravelControlListSale.vue
View file @ c416ff47
...@@ -883,12 +883,18 @@ ...@@ -883,12 +883,18 @@
<div class="TC_remarkContent" v-if="item.BranchAuditState>0"> <div class="TC_remarkContent" v-if="item.BranchAuditState>0">
<div class="clearfix TCL-redType"> <div class="clearfix TCL-redType">
<div class="TCL_remarkTitle" style="width: auto;"> <div class="TCL_remarkTitle" style="width: auto;">
<span style="color: black;">修改出团公司</span> <span style="color: black;">出团公司调整： {{item.BranchApplyResion}}</span>
{{item.BranchAuditStateStr}} <template v-if="item.BranchAuditState==1">
<span style="color:blue;font-weight:bold;">【{{item.BranchAuditStateStr}}】</span>
</template>
<template v-if="item.BranchAuditState==2">
<span style="color:green;font-weight:bold;">【{{item.BranchAuditStateStr}}】</span>
</template>
<template v-if="item.BranchAuditState==3">
<span style="color:red;font-weight:bold;">【{{item.BranchAuditStateStr}}】</span>
<span style="color:red;">原因: {{item.BranchAuditRemark}}</span>
</template>
</div> </div>
<div class="TCL_Content" v-if="item.BranchAuditStateStr=='驳回'">
<span style="color: red;">缘由:</span>
{{item.BranchAuditRemark}}</div>
</div> </div>
</div> </div>
</li> </li>
...@@ -958,7 +964,7 @@ ...@@ -958,7 +964,7 @@
</el-dialog> </el-dialog>
<!-- 修改出团公司 --> <!-- 修改出团公司 -->
<EditLeaveGroup v-if="GroupTypeVisible" :item="GroupTypeObj" @Cancel='CancelGroupType' <EditLeaveGroup v-if="GroupTypeVisible" :item="GroupTypeObj" @Cancel='CancelGroupType'
@Success="queryMsg.pageIndex=1,getControlList()"/> @Success="queryMsg.pageIndex=1,getControlList()" />
</div> </div>
</template> </template>
<script> <script>
...@@ -974,7 +980,7 @@ ...@@ -974,7 +980,7 @@
data() { data() {
return { return {
GroupTypeVisible: false, GroupTypeVisible: false,
GroupTypeObj:{}, GroupTypeObj: {},
isCommissionDetails: false, //团控提成详情权限 isCommissionDetails: false, //团控提成详情权限
dialog: { dialog: {
show: false, show: false,
...@@ -1936,7 +1942,8 @@ ...@@ -1936,7 +1942,8 @@
this.queryMsg.StartGroupDate = nowDate; this.queryMsg.StartGroupDate = nowDate;
} }
if (this.queryCommonData.IsParentCompany != 1 && userInfo.RB_Branch_id != 49 && userInfo.RB_Branch_id != 1224&& userInfo.RB_Branch_id != 1249) { if (this.queryCommonData.IsParentCompany != 1 && userInfo.RB_Branch_id != 49 && userInfo.RB_Branch_id != 1224 &&
userInfo.RB_Branch_id != 1249) {
this.queryMsg.OutBranchIds.push(userInfo.RB_Branch_id); this.queryMsg.OutBranchIds.push(userInfo.RB_Branch_id);
} }
//默认查询全部团队状态 //默认查询全部团队状态
......
src/components/TravelManager/TravelList/oneDayTrip.vue
View file @ c416ff47
...@@ -244,8 +244,10 @@ ...@@ -244,8 +244,10 @@
<el-checkbox v-model="queryCommonData.checkPlatForm" @change="checkAllSales"> <el-checkbox v-model="queryCommonData.checkPlatForm" @change="checkAllSales">
{{$t('system.table_chekAll')}}</el-checkbox> {{$t('system.table_chekAll')}}</el-checkbox>
<el-checkbox-group v-model="queryMsg.SalePlat" @change="checkSales"> <el-checkbox-group v-model="queryMsg.SalePlat" @change="checkSales">
<el-checkbox v-for="sales in $tripUtils.TeamStatesList.salsPlat" :label="sales.Id" :key="sales.Name" :disabled="((sales.Id=='2'||sales.Id=='5')&&SaleB2COrWeChatStatus)?true:false"> <el-checkbox v-for="sales in $tripUtils.TeamStatesList.salsPlat" :label="sales.Id"
{{sales.Name}}</el-checkbox> :key="sales.Name"
:disabled="((sales.Id=='2'||sales.Id=='5')&&SaleB2COrWeChatStatus)?true:false">
{{sales.Name}}</el-checkbox>
</el-checkbox-group> </el-checkbox-group>
</span> </span>
</div> </div>
...@@ -768,12 +770,18 @@ ...@@ -768,12 +770,18 @@
<div class="TC_remarkContent" v-if="item.BranchAuditState>0"> <div class="TC_remarkContent" v-if="item.BranchAuditState>0">
<div class="clearfix TCL-redType"> <div class="clearfix TCL-redType">
<div class="TCL_remarkTitle" style="width: auto;"> <div class="TCL_remarkTitle" style="width: auto;">
<span style="color: black;">修改出团公司</span> <span style="color: black;">出团公司调整： {{item.BranchApplyResion}}</span>
{{item.BranchAuditStateStr}} <template v-if="item.BranchAuditState==1">
<span style="color:blue;font-weight:bold;">【{{item.BranchAuditStateStr}}】</span>
</template>
<template v-if="item.BranchAuditState==2">
<span style="color:green;font-weight:bold;">【{{item.BranchAuditStateStr}}】</span>
</template>
<template v-if="item.BranchAuditState==3">
<span style="color:red;font-weight:bold;">【{{item.BranchAuditStateStr}}】</span>
<span style="color:red;">原因: {{item.BranchAuditRemark}}</span>
</template>
</div> </div>
<div class="TCL_Content" v-if="item.BranchAuditStateStr=='驳回'">
<span style="color: red;">缘由:</span>
{{item.BranchAuditRemark}}</div>
</div> </div>
</div> </div>
</li> </li>
...@@ -856,7 +864,7 @@ ...@@ -856,7 +864,7 @@
</el-dialog> </el-dialog>
<!-- 修改出团公司 --> <!-- 修改出团公司 -->
<EditLeaveGroup v-if="GroupTypeVisible" :item="GroupTypeObj" @Cancel='CancelGroupType' <EditLeaveGroup v-if="GroupTypeVisible" :item="GroupTypeObj" @Cancel='CancelGroupType'
@Success="queryMsg.pageIndex=1,getControlList()"/> @Success="queryMsg.pageIndex=1,getControlList()" />
</div> </div>
</template> </template>
<script> <script>
...@@ -872,14 +880,14 @@ ...@@ -872,14 +880,14 @@
data() { data() {
return { return {
GroupTypeVisible: false, GroupTypeVisible: false,
GroupTypeObj:{}, GroupTypeObj: {},
dialog: { dialog: {
show: false, show: false,
ConfigId: '', ConfigId: '',
OfferId: '' OfferId: ''
}, },
isCommissionDetails: false, //团控提成详情权限 isCommissionDetails: false, //团控提成详情权限
SaleB2COrWeChatStatus:true,//上架B2C或者微信小程序 SaleB2COrWeChatStatus: true, //上架B2C或者微信小程序
QSendCommissionStateList: [{ QSendCommissionStateList: [{
Name: '不限', Name: '不限',
ID: 0 ID: 0
...@@ -1926,8 +1934,8 @@ ...@@ -1926,8 +1934,8 @@
this.isCommissionDetails = true; this.isCommissionDetails = true;
} }
if (ActionMenuCode.indexOf("SaleB2COrWeChat") != -1) { if (ActionMenuCode.indexOf("SaleB2COrWeChat") != -1) {
this.SaleB2COrWeChatStatus = false; this.SaleB2COrWeChatStatus = false;
} }
this.CurrentUserInfo = userInfo this.CurrentUserInfo = userInfo
if (this.$route.query.tcmun) { if (this.$route.query.tcmun) {
...@@ -1958,7 +1966,8 @@ ...@@ -1958,7 +1966,8 @@
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.RB_Branch_id != 1249) { if (this.CurrentUserInfo.RB_Branch_id != 49 && this.CurrentUserInfo.RB_Branch_id != 1245 && this.CurrentUserInfo
.RB_Branch_id != 1249) {
this.queryMsg.OutBranchIds.push(this.CurrentUserInfo.RB_Branch_id) this.queryMsg.OutBranchIds.push(this.CurrentUserInfo.RB_Branch_id)
} }
......
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