Skip to content

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

页面修改

parent 25420239
Show whitespace changes
Inline Side-by-side
Showing with 4310 additions and 3748 deletions
src/components/FinancialModule/BasicDocuments.vue
View file @ 2f307dee
This source diff could not be displayed because it is too large. You can view the blob instead.
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{
.sanjiao-box {
position: relative;
}
.sanjiao-box .Receipt_table td{
.sanjiao-box .Receipt_table td {
padding: 0 10px;
}
.hover_text span{
.hover_text span {
cursor: pointer;
text-decoration: underline;
}
.czBillModule td{
text-align: center!important;
padding:6px 0!important;
.czBillModule td {
text-align: center !important;
padding: 6px 0 !important;
}
._tit2{
._tit2 {
border: none !important;
}
</style>
<template>
</style>
<template>
<div class="m_TicketingModule" v-if="DataList&&DataList.length>0">
<div>
<div class="_tit">
......@@ -56,19 +62,19 @@
</div>
</div>
</div>
</template>
</template>
<script>
<script>
export default {
props:["GetDetail"],
data(){
return{
props: ["GetDetail"],
data() {
return {
loading: true,
cdtotal: 0,
ybtotal: 0,
tableShow: true,
DataList: [],
msg:{
msg: {
pageIndex: 1,
pageSize: 10,
RemitterName: '',
......@@ -78,12 +84,12 @@
}
}
},
watch:{
GetDetail:{
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:{
methods: {
goPrestorageManagement() {
this.$router.push({
name: 'prestoreList',
query: {
// ClientIdStr:this.msg.ClientIdStr,
blank:'y',tab:'客户预存管理'
}
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.msg, res => {
this.loading = false
if(res.data.resultCode == 1) {
console.log(res.data.data.pageData)
if (res.data.resultCode == 1) {
this.DataList = res.data.data.pageData;
}
})
},
}
}
</script>
</script>
src/components/FinancialModule/domestic/OPsalesCommissionUser.vue
View file @ 2f307dee
......@@ -9,9 +9,11 @@
display: inline-block;
margin: 10px 15px 10px 0;
}
.domesticCommissionUser .opUl li input{
.domesticCommissionUser .opUl li input {
height: 34px !important;
}
.domesticCommissionUser .singeRowTable tr td {
padding: 8px 5px;
}
......@@ -21,6 +23,7 @@
text-decoration: underline;
color: red;
}
</style>
<template>
<div class="flexOne domesticCommissionUser">
......@@ -38,24 +41,24 @@
<em>人员</em>
<el-select v-model="msg.UserId" size="mini" @change="handleCurrentChange(1)" filterable :disabled='disabled'>
<el-option label="不限" :value="-1"></el-option>
<el-option v-for="(item,index) in searchList" :key="item.index" :label="item.name"
:value="item.empId"></el-option>
<el-option v-for="(item,index) in searchList" :key="item.index" :label="item.name" :value="item.empId">
</el-option>
</el-select>
</li>
<li>
<em>出团公司</em>
<el-select v-model="msg.OutBranchId" size="mini" @change="handleCurrentChange(1)" :disabled='disabled'>
<el-option label="不限" :value="-1"></el-option>
<el-option v-for="(item,index) in BranchList" :key="item.index" :label="item.BName"
:value="item.Id"></el-option>
<el-option v-for="(item,index) in BranchList" :key="item.index" :label="item.BName" :value="item.Id">
</el-option>
</el-select>
</li>
<li>
<em>公司</em>
<el-select v-model="msg.RB_Branch_Id" size="mini" @change="handleCurrentChange(1)" :disabled='disabled'>
<el-option label="不限" :value="-1"></el-option>
<el-option v-for="(item,index) in BranchList" :key="item.index" :label="item.BName"
:value="item.Id"></el-option>
<el-option v-for="(item,index) in BranchList" :key="item.index" :label="item.BName" :value="item.Id">
</el-option>
</el-select>
</li>
<li>
......@@ -125,7 +128,7 @@
UserId: -1,
RB_Branch_Id: -1,
RB_Department_Id: -1,
OutBranchId:-1,
OutBranchId: -1,
},
loading: false,
//数据源
......@@ -135,26 +138,25 @@
PeriodsList: [],
BranchList: [],
searchList: [],
departMentList:[],
departMentList: [],
}
},
mounted() {
let userInfo = this.getLocalStorage();
let ActionMenuCode = userInfo.ActionMenuCode;
if (ActionMenuCode.indexOf('home_CommissionSeeAll') != -1) {//是否有看所有人的权限
if (ActionMenuCode.indexOf('home_CommissionSeeAll') != -1) { //是否有看所有人的权限
this.disabled = false;
this.msg.UserId = this.$route.query.UserId?Number(this.$route.query.UserId):-1
}else{
this.msg.UserId = this.$route.query.UserId ? Number(this.$route.query.UserId) : -1
} else {
this.disabled = true;
this.msg.UserId = this.$route.query.UserId?Number(this.$route.query.UserId):Number(userInfo.EmployeeId)
this.msg.UserId = this.$route.query.UserId ? Number(this.$route.query.UserId) : Number(userInfo.EmployeeId)
}
this.msg.PeriodId = this.$route.query.PeriodId?Number(this.$route.query.PeriodId):0
console.log(this.msg.PeriodId,'====')
this.msg.PeriodId = this.$route.query.PeriodId ? Number(this.$route.query.PeriodId) : 0
this.getList();
this.getqishilist()
this.getCompanyList()//获取公司
this.getEmployee()//人员
this.getDerpartMent()//部门
this.getCompanyList() //获取公司
this.getEmployee() //人员
this.getDerpartMent() //部门
},
methods: {
getDerpartMent() {
......@@ -165,12 +167,12 @@
res => {
if (res.data.resultCode == 1) {
this.departMentList = res.data.data;
} else { }
} else {}
},
err => { }
err => {}
);
},
getEmployee() {//所有人员下拉
getEmployee() { //所有人员下拉
let employeeMsg = {
RB_Group_id: "0",
RB_Branch_id: "-1",
......@@ -185,7 +187,7 @@
this.searchList = res.data.data;
}
},
err => { }
err => {}
);
},
//初始化公司
......@@ -206,17 +208,16 @@
}
},
err => { }
err => {}
);
},
getqishilist() {
this.apipost(
"opcommission_GetGNOPCommissionPeriodsList",
{},
"opcommission_GetGNOPCommissionPeriodsList", {},
res => {
if (res.data.resultCode == 1) {
this.PeriodsList = res.data.data;
if (!this.$route.query.PeriodId&&this.PeriodsList && this.PeriodsList.length > 0) {
if (!this.$route.query.PeriodId && this.PeriodsList && this.PeriodsList.length > 0) {
this.msg.PeriodId = Number(this.PeriodsList[0].Id)
}
......@@ -238,9 +239,9 @@
path: path,
query: {
PeriodId: this.msg.PeriodId,
UserId:item.UserId,
RB_Branch_Id:item.RB_Branch_Id,
RB_Department_Id:item.RB_Department_Id,
UserId: item.UserId,
RB_Branch_Id: item.RB_Branch_Id,
RB_Department_Id: item.RB_Department_Id,
blank: 'y',
tab: '国内提现详情'
}
......@@ -267,4 +268,5 @@
}
}
</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"
<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/administrative/CommissionDetail.vue
View file @ 2f307dee
......@@ -8,76 +8,67 @@
</ul>
</div>
<div v-if="isReady" v-loading='loading'>
<el-table
ref="multipleTable"
:data="dataList"
tooltip-effect="dark"
style="width: 100%"
>
<el-table ref="multipleTable" :data="dataList" tooltip-effect="dark" style="width: 100%">
<el-table-column prop="bName" label="公司"></el-table-column>
<el-table-column prop="departmentName" label="部门"></el-table-column>
<el-table-column
label="姓名">
<el-table-column label="姓名">
<template slot-scope="scope">
<div v-if="scope.row.leaveStr && scope.row.leaveStr != ''">{{scope.row.createByStr}}<span style="color:red;display:inline-block">({{scope.row.leaveStr}})</span></div>
<div v-if="scope.row.leaveStr && scope.row.leaveStr != ''">{{scope.row.createByStr}}<span
style="color:red;display:inline-block">({{scope.row.leaveStr}})</span></div>
<div v-else>{{scope.row.createByStr}}</div>
</template>
</el-table-column>
<el-table-column
label="提成金额">
<el-table-column label="提成金额">
<template slot-scope="scope">
<span>{{scope.row.commissionMoney.toFixed(2)}}</span>
</template>
</el-table-column>
<el-table-column
label="额外奖励">
<el-table-column label="额外奖励">
<template slot-scope="scope">
<span>{{scope.row.otherMoney.toFixed(2)}}</span>
</template>
</el-table-column>
<el-table-column
label="额外扣除">
<el-table-column label="额外扣除">
<template slot-scope="scope">
<span>{{scope.row.backMoney.toFixed(2)}}</span>
</template>
</el-table-column>
<el-table-column
label="应发提成">
<el-table-column label="应发提成">
<template slot-scope="scope">
<span style='color:red'>{{(scope.row.otherMoney+scope.row.commissionMoney-scope.row.backMoney).toFixed(2)}}</span>
<span
style='color:red'>{{(scope.row.otherMoney+scope.row.commissionMoney-scope.row.backMoney).toFixed(2)}}</span>
</template>
</el-table-column>
<el-table-column
label="收客人数">
<el-table-column label="收客人数">
<template slot-scope="scope">
<span style='color:blue'>{{scope.row.peopleCount}}人</span>
</template>
</el-table-column>
<el-table-column
label="单签证人数">
<el-table-column label="单签证人数">
<template slot-scope="scope">
<span style='color:orange'>{{scope.row.visaPeopleCount}}人</span>
</template>
</el-table-column>
<el-table-column
label="期数">
<el-table-column label="期数">
<template slot-scope="scope">
<div v-if="scope.row.periods != stringPerons" style='height:40px;line-height:40px;color:#f1f1f1;background: red;margin: 0 -5px;;padding-left: 10px;'>{{scope.row.periods}}</div>
<div v-if="scope.row.periods != stringPerons"
style='height:40px;line-height:40px;color:#f1f1f1;background: red;margin: 0 -5px;;padding-left: 10px;'>
{{scope.row.periods}}</div>
<template v-else>{{scope.row.periods}}</template>
</template>
</el-table-column>
<el-table-column
label="销售留言">
<el-table-column label="销售留言">
<template slot-scope="scope">
<div v-if="scope.row.remark" class="outDiv">
<div class="toolDiv">
<div class="triangle_border_up">
</div>{{scope.row.remark}}</div>{{scope.row.remark}}</div>
</div>{{scope.row.remark}}
</div>{{scope.row.remark}}
</div>
<template v-else>''</template>
</template>
</el-table-column>
<el-table-column
label="操作">
<el-table-column label="操作">
<template slot-scope="scope">
<el-button type="primary" size='mini' icon="el-icon-view" circle @click="getInfo(scope.row)"></el-button>
</template>
......@@ -99,9 +90,9 @@
</div>
<div style="height:20px;"> </div>
</div>
</template>
</template>
<script>
<script>
import Vue from 'vue'
import XLSX from 'xlsx'
var FileSaver = require('file-saver')
......@@ -212,7 +203,8 @@
if (filters.createByStr != '') {
data = data.filter(item => item.createByStr.indexOf(filters.createByStr) != -1);
}
if ((filters.bName === '' || filters.bName === '__all__') && filters.departmentName === '' && filters.createByStr === '') {
if ((filters.bName === '' || filters.bName === '__all__') && filters.departmentName === '' && filters
.createByStr === '') {
data = dataListTwo
}
this.dataList = data
......@@ -259,7 +251,6 @@
item.value = x.BName;
companyList.push(item);
});
console.log(companyList,'-------')
let company = {}
if (this.disabledCPSelect) {
company = {
......@@ -383,7 +374,8 @@
this.disabledCPSelect = true
}
let dt = new Date()
this.stringPerons = (dt.getMonth() == 0 ? (dt.getFullYear() - 1) : dt.getFullYear()) + '' + (dt.getMonth().toString().length < 2 ? '0' : '') + (dt.getMonth() == 0 ? 12 : dt.getMonth());
this.stringPerons = (dt.getMonth() == 0 ? (dt.getFullYear() - 1) : dt.getFullYear()) + '' + (dt.getMonth()
.toString().length < 2 ? '0' : '') + (dt.getMonth() == 0 ? 12 : dt.getMonth());
this.userInfo = this.getLocalStorage();
this.getList();
this.getCompanyList();
......@@ -415,9 +407,10 @@
}
};
</script>
<style>
</script>
<style>
.commissionDetails .triangle_border_up {
width: 0;
height: 0;
......@@ -466,4 +459,5 @@
display: block;
width: 100%;
}
</style>
</style>
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 = []
......
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