Skip to content

S
SuperMan
Commit e5916c22 authored by zhengke's avatar zhengke
Browse files
Options

暂存到本地

parent 5b662960
Hide whitespace changes
Inline Side-by-side
Showing with 307 additions and 110 deletions
src/assets/common/lang/zh.js
View file @ e5916c22
......@@ -35,7 +35,8 @@ export const pub={
closeWindow:'关闭窗口',
noMsg:'咱无',
returnBack:'返回',
allday:'全天'
allday:'全天',
clickToView:'点击查看',
}
export const login = {
......@@ -709,4 +710,24 @@ export const rule = {
startDate: '请选择开始日期',
endDate: '请选择结束日期',
}
\ No newline at end of file
}
export const Operation = {
Op_ShortName:'线路简称',
Op_sname:'简称',
Op_depositAmount:'最低定金金额',
Op_EarlybirdDay:'早鸟优惠天数',
Op_LossAllocation:'损失分摊比列',
Op_partInCompany:'参与公司',
Op_belongDepartment:'所属部门',
Op_CombinedContry:'关联国家',
Op_lowDeposit:'最低定金',
Op_preferentialDays:'优惠天数',
Op_isDirect:'是否直采',
Op_isShared:'是否共享',
Op_AllowSmallGroup:'允许小包团',
Op_Project:'项目',
Op_notInvoled:'未参与',
Op_ManageDepartment:'管理部门',
}
src/components/ShoppingStore/ShoppingDetails.vue
View file @ e5916c22
......@@ -13,6 +13,7 @@
height: 30px;
text-align: center;
line-height: 30px;
margin-right:30px;
}
.ShoppingDetails .backBtn {
float: right;
......@@ -51,14 +52,13 @@
height: 38px;
background-color: #ededed;
line-height: 38px;
min-width: 1400px;
}
.infoTitle span {
display: inline-block;
color: #000000;
font-family: PingFangSC-Semibold, sans-serif;
font-size: 12px;
width: 10%;
width: 12%;
text-align: center;
}
.listInfo {
......@@ -66,7 +66,6 @@
height: 50px;
background-color: #fff;
margin-bottom: 10px;
min-width: 1400px;
line-height: 50px;
font-size: 12px;
}
......@@ -76,7 +75,7 @@
}
.listInfo span {
display: inline-block;
width: 10%;
width: 12%;
text-align: center;
}
.travelProfit {
......@@ -153,21 +152,31 @@
background-color: #fff;
padding-top: 50px;
}
.Shop_span{
font-size:14px;
}
</style>
<template>
<div class='flexOne ShoppingDetails'>
<div class="dataIn clearfix">
<div class="storeName">{{Name}}</div>
<input type="button" class="hollowFixedBtn backBtn" @click="goUrl('ShoppingStore')" value="返回"/>
<input type="button" class="normalBtn backBtn" @click="showStatis(1)" v-if="isShow==false" value="数据看板"/>
<span class="Shop_span">日期</span>
<el-date-picker class="w150" type="date" v-model="msg.StartDate" :picker-options="pickerBeginDateBefore"
value-format="yyyy-MM-dd" placeholder></el-date-picker>
<el-date-picker class="w150" type="date" v-model="msg.EndDate" :picker-options="pickerBeginDateAfter"
value-format="yyyy-MM-dd" placeholder></el-date-picker>
<input type="button" class="normalBtn backBtn" @click="showStatis(1)" v-if="isShow==false" value="数据看板" style="display:none;"/>
<input type="button" class="normalBtn backBtn" @click="showStatis(2)" v-else value="列表"/>
<input type="button" class="hollowFixedBtn backBtn" @click="goUrl('ShoppingStore')" value="返回"/>
<input type="button" class="hollowFixedBtn backBtn" @click="getList()" value="查询"/>
</div>
<div class="listSpan">
<!-- <div class="listSpan">
<span>总交易额：<label class="ShopDetail_c1 fbold">{{TotalPrice}}</label></span>
<span>旅行社盈利：<label class="ShopDetail_c2 fbold">{{GroupExtract}}</label></span>
<span>导游盈利：<label class="ShopDetail_c3 fbold">{{GuideExtract}}</label></span>
<span>领队盈利：<label class="ShopDetail_c4 fbold">{{LeaderExtract}}</label></span>
</div>
</div> -->
<div class="mainInfo" :class="{'hidDiv':isShow}">
<div class="infoTitle">
<span>进店日期</span>
......@@ -176,32 +185,30 @@
<span>旅行社提成</span>
<span>导游提成</span>
<span>领队提成</span>
<span>操作人</span>
<span>币种</span>
<span>日期</span>
<span>返佣余额</span>
<span>返佣总计</span>
</div>
<div class="listInfo" v-for="item in DataList" :key="item.subCode">
<span>{{item.StoreTime}}</span>
<span>{{item.TCID}}</span>
<span class="totalPrice">
<label class="total ShopDetail_c1">￥{{item.NowTotalPrice}}</label>
<label class="littleTotal">（{{item.TotalPrice}}*{{item.Rate}}）</label>
<label class="total ShopDetail_c1">￥{{getPrice(item.TotalMoney,item.DMCRate)}}</label>
<label class="littleTotal">（{{item.TotalMoney}}*{{item.DMCRate}}）</label>
</span>
<span class="totalPrice">
<label class="total ShopDetail_c2">￥{{item.NowGroupExtract}}</label>
<label class="littleTotal">（{{item.GroupExtract}}*{{item.Rate}}）</label>
<label class="total ShopDetail_c2">￥{{getPrice(item.CompanyCommission,item.DMCRate)}}</label>
<label class="littleTotal">（{{item.CompanyCommission}}*{{item.DMCRate}}）</label>
</span>
<span class="totalPrice">
<label class="total ShopDetail_c3">￥{{item.NowGuideExtract}}</label>
<label class="littleTotal">（{{item.GuideExtract}}*{{item.Rate}}）</label>
<label class="total ShopDetail_c3">￥{{getPrice(item.GuideCommission,item.DMCRate)}}</label>
<label class="littleTotal">（{{item.GuideCommission}}*{{item.DMCRate}}）</label>
</span>
<span class="totalPrice">
<label class="total ShopDetail_c4">￥{{item.NowLeaderExtract}}</label>
<label class="littleTotal">（{{item.LeaderExtract}}*{{item.Rate}}）</label>
<label class="total ShopDetail_c4">￥{{getPrice(item.LeaderCommission,item.DMCRate)}}</label>
<label class="littleTotal">（{{item.LeaderCommission}}*{{item.DMCRate}}）</label>
</span>
<span>{{item.emName}}</span>
<span>{{item.currencyName}}</span>
<span>{{item.UpdateDate}}</span>
<span>{{item.OtherDeduct}}</span>
<span>{{item.BackTotalMoney}}</span>
</div>
<el-pagination background @current-change="handleCurrentChange" :current-page.sync="currentPage" layout="total,prev, pager, next, jumper" :page-size=msg.pageSize :total=total>
</el-pagination>
......@@ -241,7 +248,9 @@ export default {
msg: {
pageIndex: 1,
pageSize: 10,
ShoppingID: ""
ShopId: "",
StartDate:'',
EndDate:''
},
noData: false,
loading: true,
......@@ -269,27 +278,40 @@ export default {
DayGroupExtract: [],
DayGuideExtract: [],
DayLeaderExtract: [],
DaydataZoom: []
DaydataZoom: [],
pickerBeginDateBefore: {
disabledDate: time => {
let endTime = new Date(this.msg.EndDate)
return endTime.getTime() < time.getTime()
}
},
pickerBeginDateAfter: {
disabledDate: time => {
let startTime = new Date(this.msg.StartDate)
return startTime.getTime() >= time.getTime()
}
}
};
},
methods: {
getList() {
this.loading = true;
this.apipost(
"ShoppingInfo_Post_GetPageList",
"ShoppingInfo_Post_GetPriceShopDetailsPageList",
this.msg,
res => {
this.loading = false;
if (res.data.resultCode == 1) {
this.loading = false;
if (res.data.data.count > 0) {
this.total = res.data.data.count;
this.noData = false;
this.DataList = res.data.data.pageData;
} else {
this.noData = true;
}
} else {
this.loading = false;
this.total = res.data.data.count;
this.DataList = res.data.data.pageData;
}else{
this.Error(res.data.message);
}
},
err => {}
......@@ -490,10 +512,14 @@ export default {
};
myChart.clear();
myChart.setOption(option2);
}
},
//乘以获得2位小数
getPrice(x,y){
return (x*y).toFixed(2);
}
},
mounted() {
this.msg.ShoppingID = this.$route.query.id;
this.msg.ShopId = this.$route.query.id;
this.Name = this.$route.query.Name;
this.TotalPrice = this.$route.query.TotalPrice;
this.GroupExtract = this.$route.query.GroupExtract;
......
src/components/TravelManager/TravelList/TravelControlList.vue
View file @ e5916c22
......@@ -631,6 +631,8 @@
</el-dropdown-item>
<el-dropdown-item v-if="item.Status==2" @click.native="OutGroup(item.TCID,1)">销售
</el-dropdown-item>
<el-dropdown-item @click.native="goSureOrder('priceIncomeConfirmInfo',item.TCID)" style="display:none;">收入确认单
</el-dropdown-item>
<el-dropdown-item v-if="CurrentUserInfo.B2BDomain!=''" @click.native="goB2B(item.ConfigId, item.TCID)">
B2B预览
</el-dropdown-item>
......@@ -1221,6 +1223,16 @@
})
window.open(routeData.href, '_blank')
},
goSureOrder(path,TCID){
this.$router.push({
name: path,
query: {
TCID: TCID,
blank: 'y',
tab: '收入确认单'
}
})
},
goUrlMake(path, LineID, TCID, name) {
this.$router.push({
name: path,
......
src/components/TravelManager/TravelList/priceIncomeConfirmInfo.vue 0 → 100644
View file @ e5916c22
<style>
.priceIncomeTable{
width:1200px;
border-collapse:collapse;
font-size:14px;
}
.priceIncomeTable td{
border: 1px solid #dcdfe6;
height:34px;
background-color: #fff;
text-align: center;
}
.priceComtd{
background: #e6e6e6!important;
}
.princeOrderSpan{
margin-right:10px;
display: inline-block;
}
.PriceRemark{
width:100%;
min-height: 100px;
padding:10px;
font-size: 14px;
background-color: #fff;
}
.leftRemarkTitle{
float:left;
width:5%;
text-align: right;
}
.rightRemarkContent{
float:left;
width:95%;
}
</style>
<template>
<div>
<table class="singeRowTable">
<tr>
<th colspan="10">团队收入确认单</th>
</tr>
<tr>
<th>部门</th>
<th width="250">单号</th>
<th width="180">团号</th>
<th>团队编号</th>
<th>人数</th>
<th width="100">领队</th>
<th>团费收入合计</th>
<th>直客收入</th>
<th>同行交客收入</th>
<th>平台收入</th>
</tr>
<tr>
<td>{{dataList.DepartmentName}}</td>
<td>
<span class="princeOrderSpan" v-for="item in dataList.OrderIds">{{item}}</span>
</td>
<td>{{dataList.TCNUM}}</td>
<td>{{dataList.TCID}}</td>
<td>{{dataList.PeopleNum}}</td>
<td>{{dataList.LeaderName}}</td>
<td>{{dataList.TotalIncome}}</td>
<td>{{dataList.DirectGuestIncome}}</td>
<td>{{dataList.PlatformGuestIncome}}</td>
<td>{{dataList.PlatformIncome}}</td>
</tr>
</table>
<div class="PriceRemark clearfix">
<div class="leftRemarkTitle">备注：</div>
<div class="rightRemarkContent">{{dataList.Remark}} </div>
</div>
</div>
</template>
<script>
export default {
data() {
return {
loading:false,
msg: {
tcid:''
},
dataList:[],
};
},
methods: {
getList() {
//获取数据
this.loading=true;
this.apipost(
"travel_post_GetPriceIncomeConfirmInfo",
this.msg,
res => {
this.loading=false;
if (res.data.resultCode == 1) {
console.log(res,'data');
this.dataList = res.data.data;
} else {
this.Error(res.data.message);
}
},
err => {}
);
},
},
mounted() {
this.msg.tcid = this.$route.query.TCID;
this.getList();
}
};
</script>
src/components/systemManagement/lineManagement.vue
View file @ e5916c22
<style>
.lineMG .query_box {
.lineManagement .query_box {
font-size: 12px;
padding: 29px 0;
padding-right: 30px;
......@@ -7,22 +7,22 @@
justify-content: space-between;
}
.lineMG .el-switch.is-checked .el-switch__core {
.lineManagement .el-switch.is-checked .el-switch__core {
border-color: #4bca81;
background-color: #4bca81;
}
.lineMG .addCompany {
.lineManagement .addCompany {
width: 440px;
max-height: 600px;
}
.lineMG .addCompany .el-dialog__body {
.lineManagement .addCompany .el-dialog__body {
height: 486px;
overflow: auto;
}
.lineMG .query_box div label {
.lineManagement .query_box div label {
display: inline-block;
min-width: 80px;
text-align: right;
......@@ -39,7 +39,7 @@ input[type="number"] {
-moz-appearance: textfield;
}
.lineType {
.lineManagement .lineType {
width: 51px;
height: 24px;
display: inline-block;
......@@ -49,7 +49,7 @@ input[type="number"] {
background-color: #ff9c00;
color: #ffffff;
}
.lineMG .LMTable tr {
.lineManagement .LMTable tr {
height: 70px;
text-align: center !important;
background-color: #fff;
......@@ -68,9 +68,7 @@ input[type="number"] {
.comPanyNum:hover {
color: #e95252;
}
.zhicai:first-child {
}
.zhicai {
.Linezhicai {
color: #47bf8c;
}
......@@ -115,21 +113,21 @@ input[type="number"] {
padding: 9px 15px;
}
.LineName {
.lineManagement .LineName {
display: inline-block;
width: 120px;
margin: 0 0 0 20px;
text-align: left;
}
.lineMG .LM_Back {
.lineManagement .LM_Back {
background-color: #f2f2f2;
}
.redType {
color: #e95252;
}
.lineMG .tbDiv {
.lineManagement .tbDiv {
overflow-y: auto;
}
......@@ -139,18 +137,18 @@ input[type="number"] {
overflow-y: auto;
}
.lineMG .tbDiv::-webkit-scrollbar {
.lineManagement .tbDiv::-webkit-scrollbar {
width: 4px;
height: 8px;
}
.lineMG .tbDiv::-webkit-scrollbar-track {
.lineManagement .tbDiv::-webkit-scrollbar-track {
-webkit-box-shadow: inset 0 0 2px rgba(0, 0, 0, 0.2);
border-radius: 4px;
background: #ededed;
}
.lineMG .tbDiv::-webkit-scrollbar-thumb {
.lineManagement .tbDiv::-webkit-scrollbar-thumb {
border-radius: 4px;
-webkit-box-shadow: inset 0 0 2px rgba(0, 0, 0, 0.2);
background: #c9c9c9;
......@@ -176,11 +174,11 @@ input[type="number"] {
width: 100%;
font-size: 12px;
}
.lineMG .LMTable tr th {
.lineManagement .LMTable tr th {
border-bottom: 1px solid #d1d1d1;
}
.lineMG .tbDiv .LMTable td {
.lineManagement .tbDiv .LMTable td {
border-bottom: 1px solid #d1d1d1;
border-right: 1px solid #d1d1d1;
position: relative;
......@@ -189,7 +187,7 @@ input[type="number"] {
min-width: 250px;
}
.lineMG .tbDiv table {
.lineManagement .tbDiv table {
padding-right: 80px;
margin-top: 10px;
border-top: 1px solid #d1d1d1;
......@@ -215,7 +213,7 @@ input[type="number"] {
position: relative;
top: 3px;
}
.lineMG ._addLineTB tr {
.lineManagement ._addLineTB tr {
height: 40px !important;
}
.saveCompanyBtn {
......@@ -229,12 +227,12 @@ input[type="number"] {
right: 13px;
top: 32%;
}
._LMComdiv {
.lineManagement ._LMComdiv {
float: left;
width: 32%;
text-align: left;
}
.LineRank {
.lineManagement .LineRank {
width: 24px;
height: 24px;
background-color: #2aaef2;
......@@ -244,30 +242,30 @@ input[type="number"] {
color: #fff;
margin: 0 auto 5px;
}
.lineMG .joinDepart {
.lineManagement .joinDepart {
display: inline-block;
margin-right: 50px;
text-align: left;
float: left;
width: 180px;
}
.lineMG .LM_Rank {
.lineManagement .LM_Rank {
text-align: center;
}
._LowDisMoney {
.lineManagement ._LowDisMoney {
width: 200px;
float: left;
text-align: left;
margin: 0 0 0 20px;
}
.LM_Btcontent {
.lineManagement .LM_Btcontent {
position: absolute;
right:100px;
top:10px;
text-align: right;
margin-left: 20px;
}
.LM_ul li {
.lineManagement .LM_ul li {
/*height: 78px;*/
margin: 20px 0 0px 0px;
transition: linear all 0.5s;
......@@ -278,18 +276,16 @@ input[type="number"] {
position: relative;
padding: 10px 0;
}
.LM_BTNList {
}
.lineMG .el-button-group .el-button {
.lineManagement .el-button-group .el-button {
padding: 5px;
}
.lineMG .LM_ul > li:hover {
.lineManagement .LM_ul > li:hover {
box-shadow: 0px 0px 20px rgba(191, 191, 191, 1);
transition: all linear 0.5s;
}
</style>
<template>
<div class="flexOne lineMG">
<div class="flexOne lineManagement">
<div class="query-box">
<ul>
<li>
......@@ -300,13 +296,13 @@ input[type="number"] {
</li>
<li>
<span>
<em>线路简称</em>
<em>{{$t('Operation.Op_ShortName')}}</em>
<el-input v-model="msg.lineShortName" :placeholder="$t('system.ph_in')" @keyup.native.enter="getList" class="w210"></el-input>
</span>
</li>
<li>
<span>
<em>线路代码</em>
<em>{{$t('system.ph_xianluCode')}}</em>
<el-input v-model="msg.lineCode" :placeholder="$t('system.ph_in')" @keyup.native.enter="getList" class="w210"></el-input>
</span>
</li>
......@@ -329,23 +325,29 @@ input[type="number"] {
</el-col>
<el-col :span="2">
<div class="_LowDisMoney">
<div>简称</div>
<div>{{$t('Operation.Op_sname')}}</div>
{{item.lineShortName}}
</div>
</el-col>
<el-col :span="2">
<div class="_LowDisMoney">
<div>{{item.lowDeposit}}</div>
<div>最低定金金额</div>
<div>{{$t('Operation.Op_depositAmount')}}</div>
</div>
</el-col>
<el-col :span="2">
<div class="_LowDisMoney">
<div>{{item.lineDirection==1?'入境':'出境'}}</div>
<div>线路方向</div>
</div>
</el-col>
<el-col :span="3">
<div class="LineRank">{{item.discountDayNum}}</div>
<div class="LM_Rank">早鸟优惠天数</div>
<div class="LM_Rank">{{$t('Operation.Op_EarlybirdDay')}}</div>
</el-col>
<el-col :span="3">
<div class="LineRank">{{item.rank}}</div>
<div class="LM_Rank">排序</div>
<div class="LM_Rank">{{$t('system.table_rank')}}</div>
</el-col>
<el-col :span="5">
<div class="_LMComdiv">
......@@ -356,8 +358,8 @@ input[type="number"] {
<div class="departListDiv">
<table width="100%" border="0" cellspacing="0" cellpadding="0">
<tr class="_color_666">
<th>公司</th>
<th>损失分摊比列</th>
<th>{{$t('system.table_company')}}</th>
<th>{{$t('Operation.Op_LossAllocation')}}</th>
</tr>
<tr v-for="childItem in departCompany" :key="childItem.subCode">
<td width="60%">{{childItem.companyName}}</td>
......@@ -367,7 +369,7 @@ input[type="number"] {
</div>
<span slot="reference" class="comPanyNum" @click="getLossCompany(item.lineID,1)">{{item.branchCount}}</span>
</el-popover>
<div class="particCompany">参与公司</div>
<div class="particCompany">{{$t('Operation.Op_partInCompany')}}</div>
</div>
<div class="_LMComdiv">
<el-popover
......@@ -377,8 +379,8 @@ input[type="number"] {
<div class="departListDiv">
<table width="100%" border="0" cellspacing="0" cellpadding="0">
<tr class="_color_666">
<th width="40%">公司</th>
<th width="60%">部门</th>
<th width="40%">{{$t('system.table_company')}}</th>
<th width="60%">{{$t('admin.admin_Department')}}</th>
</tr>
<tr v-for="childItem in departDepartment" :key="childItem.subCode">
<td>{{childItem.companyName}}</td>
......@@ -386,18 +388,18 @@ input[type="number"] {
</tr>
</table>
</div>
<span slot="reference" class="comPanyNum" @click="getLossCompany(item.lineID,2)">点击查看</span>
<span slot="reference" class="comPanyNum" @click="getLossCompany(item.lineID,2)">{{$t('pub.clickToView')}}</span>
</el-popover>
<div class="particCompany">所属部门</div>
<div class="particCompany">{{$t('Operation.Op_belongDepartment')}}</div>
</div>
</el-col>
<el-col :span="2">
<div class="zhicai" :class="{'redType':item.isDirect=='0'}">{{item.isDirect=="0"?'非直采':'直采'}}</div>
<div class="zhicai" :class="{'redType':item.isShow=='0'}">{{item.isShow=="0"?'不显示':'显示'}}</div>
<div class="zhicai" :class="{'redType':item.is_PacketGroup=='0'}">{{item.is_PacketGroup =="0"?'不允许小包团':'允许小包团'}}</div>
<div class="Linezhicai" :class="{'redType':item.isDirect=='0'}">{{item.isDirect=="0"?'非直采':'直采'}}</div>
<div class="Linezhicai" :class="{'redType':item.isShow=='0'}">{{item.isShow=="0"?'不显示':'显示'}}</div>
<div class="Linezhicai" :class="{'redType':item.is_PacketGroup=='0'}">{{item.is_PacketGroup =="0"?'不允许小包团':'允许小包团'}}</div>
</el-col>
<el-col :span="2">
<div class="LM_BTNList">
<div>
<el-button-group size='mini'>
<el-tooltip class="item" effect="dark" :content="$t('system.table_edit')" placement="top-start">
<el-button type="primary" icon="el-icon-edit" @click="isShowDIv = true,divTitle='修改线路',updateData(index)"></el-button>
......@@ -423,22 +425,22 @@ input[type="number"] {
<div class="">
<el-form :model="addMsg" :rules="rules" ref="addMsg" label-width="100px">
<el-col :span="5">
<el-form-item label="线路名称" prop="lineName">
<el-input v-model="addMsg.lineName" maxlength="20"></el-input>
<el-form-item :label="$t('system.query_lineName')" prop="lineName">
<el-input v-model="addMsg.lineName"></el-input>
</el-form-item>
</el-col>
<el-col :span="5">
<el-form-item label="线路简称" prop="lineShortName">
<el-input v-model="addMsg.lineShortName" maxlength="5"></el-input>
<el-form-item :label="$t('Operation.Op_ShortName')" prop="lineShortName">
<el-input v-model="addMsg.lineShortName"></el-input>
</el-form-item>
</el-col>
<el-col :span="5">
<el-form-item label="线路编码" prop="lineCode">
<el-input v-model="addMsg.lineCode" maxlength="3"></el-input>
<el-form-item :label="$t('system.table_lineCode')" prop="lineCode">
<el-input v-model="addMsg.lineCode"></el-input>
</el-form-item>
</el-col>
<el-col :span="5">
<el-form-item label="关联国家" style="display:none;">
<el-form-item :label="$t('Operation.Op_CombinedContry')" style="display:none;">
<el-select v-model="lineCountryArr" class='multiple_input' multiple :placeholder="$t('pub.pleaseSel')">
<el-option
v-for="item in countryList"
......@@ -450,47 +452,55 @@ input[type="number"] {
</el-form-item>
</el-col>
<el-col :span="5">
<el-form-item label="最低定金" prop="lowDeposit">
<el-form-item :label="$t('Operation.Op_lowDeposit')" prop="lowDeposit">
<el-input v-model="addMsg.lowDeposit" maxlength="10" @keyup.native="checkPrice(addMsg,'lowDeposit')"></el-input>
</el-form-item>
</el-col>
<el-col :span="5">
<el-form-item label="优惠天数">
<el-form-item :label="$t('Operation.Op_preferentialDays')">
<el-input v-model="addMsg.discountDayNum" maxlength="3" @keyup.native="checkInteger(addMsg,'discountDayNum')"></el-input>
</el-form-item>
</el-col>
<el-col :span="5">
<el-form-item label="排序">
<el-form-item :label="$t('system.table_rank')">
<el-input v-model="addMsg.Rank" @keyup.native="checkInteger(addMsg,'Rank')"></el-input>
</el-form-item>
</el-col>
<el-col :span="2">
<el-form-item label="是否直采">
<el-form-item :label="$t('Operation.Op_isDirect')">
<el-switch v-model="addMsg.isDirect" :active-value="isDefaultChecked"
:inactive-value="isDefaultUnchecked"></el-switch>
</el-form-item>
</el-col>
<el-col :span="3">
<el-form-item label="是否显示">
<el-form-item :label="$t('system.table_isShow')">
<el-switch v-model="addMsg.isShow" :active-value="isDefaultChecked"
:inactive-value="isDefaultUnchecked"></el-switch>
</el-form-item>
</el-col>
<el-col :span="3">
<el-form-item label="是否共享">
<el-form-item :label="$t('Operation.Op_isShared')">
<el-switch v-model="addMsg.IsShare" :active-value="isDefaultChecked"
:inactive-value="isDefaultUnchecked"></el-switch>
</el-form-item>
</el-col>
<el-col :span="2">
<el-form-item label="允许小包团">
<el-form-item :label="$t('Operation.Op_AllowSmallGroup')">
<el-switch v-model="addMsg.Is_PacketGroup" :active-value="isDefaultChecked"
:inactive-value="isDefaultUnchecked"></el-switch>
</el-form-item>
</el-col>
<el-col :span="5">
<el-form-item label="线路方向" prop="LineDirection">
<el-select v-model="addMsg.LineDirection" :placeholder="$t('pub.pleaseSel')" class="w290">
<el-option label='入境' :value='1'></el-option>
<el-option label='出境' :value='2'></el-option>
</el-select>
</el-form-item>
</el-col>
<div class="LM_Btcontent">
<input type="button" class="normalBtn" @click="submitForm('addMsg')" value="保存"/>
<input type="button" class="hollowFixedBtn" @click="isShowDIv=false" value="取消"/>
<input type="button" class="normalBtn" @click="submitForm('addMsg')" :value="$t('pub.saveBtn')"/>
<input type="button" class="hollowFixedBtn" @click="isShowDIv=false" :value="$t('pub.cancelBtn')"/>
</div>
</el-form>
</div>
......@@ -498,26 +508,26 @@ input[type="number"] {
<div class="managebtmDiv tbDiv" v-if="isShowTwo">
<table class="LMTable _addLineTB" border="0" cellspacing="0" cellpadding="0">
<tr>
<th>项目/公司</th>
<th>{{$t('Operation.Op_Project')}}/{{$t('system.table_company')}}</th>
<th v-for="item in getCompanyList" :key="item.subCode">{{item.companyName}}</th>
</tr>
<tr>
<td class="LM_Back">损失分摊比例</td>
<td class="LM_Back">{{$t('Operation.Op_LossAllocation')}}</td>
<td v-for="item in getCompanyList" :key="item.subCode">
<span v-if="!item.inputShow">{{item.lossAllocation}}</span>
<input type="text" v-model="item.lossAllocation" @blur="setInput(item)"
onkeyup="value=value.replace(/[^\d]/g,'')" class="w80" v-if="item.inputShow"/>
<span v-if="item.lossAllocation!=null">%</span>
<span class="upFentan" v-if="item.lossAllocation>=0&&!item.showSet&&item.selectDepIdArr.length>0"
@click="displayInput(item)">修改</span>
@click="displayInput(item)">{{$t('pub.updateMsg')}}</span>
<div v-if="item.showSet&&item.selectDepIdArr.length>0">
<span>未参与</span>
<span @click="clickedSet(item)" class="setItem">设置</span>
<span>{{$t('Operation.Op_notInvoled')}}</span>
<span @click="clickedSet(item)" class="setItem">{{$t('leader.leader_Set')}}</span>
</div>
</td>
</tr>
<tr>
<td v-on:click='closeDepOption()' class="LM_Back">管理部门</td>
<td v-on:click='closeDepOption()' class="LM_Back">{{$t('Operation.Op_ManageDepartment')}}</td>
<td v-on:click='closeDepOption(item)' v-for="item in getCompanyList" :key="item.subCode">
<span class="joinDepart" v-if="!item.seletShow">{{item.joinDepartment | getJoinDepName}}</span>
<el-select v-model="item.selectDepIdArr" multiple class='w160 multiple_input' filterable
......@@ -531,16 +541,16 @@ input[type="number"] {
</el-option>
</el-select>
<span class="upFentan" v-if="item.selectDepIdArr.length>0"
@click.stop="getSelectList(item,item.rB_Branch_id)">修改</span>
@click.stop="getSelectList(item,item.rB_Branch_id)">{{$t('pub.updateMsg')}}</span>
<div v-if="item.showSelectSet">
<span class="joinDepart">未参与</span>
<span @click.stop="clickedSelectSet(item)" class="setItem">设置</span>
<span class="joinDepart">{{$t('Operation.Op_notInvoled')}}</span>
<span @click.stop="clickedSelectSet(item)" class="setItem">{{$t('leader.leader_Set')}}</span>
</div>
</td>
</tr>
</table>
<input type="button" class="normalBtn saveCompanyBtn" @click="saveCompany()" value="保存"/>
<input type="button" class="normalBtn" @click="isShowTwo=false" value="取消"/>
<input type="button" class="normalBtn saveCompanyBtn" @click="saveCompany()" :value="$t('pub.saveBtn')"/>
<input type="button" class="normalBtn" @click="isShowTwo=false" :value="$t('pub.cancelBtn')"/>
</div>
<el-pagination background @current-change="handleCurrentChange" :current-page.sync="currentPage"
layout="total,prev, pager, next, jumper" :page-size=msg.pageSize :total=total>
......@@ -572,6 +582,7 @@ export default {
lineShortName: "",
IsShare: 0,
Is_PacketGroup: 0,
LineDirection:'',
},
departCompany: "",
departDepartment: "",
......@@ -604,6 +615,9 @@ export default {
],
lineShortName: [
{ required: true, message: "请填线路简称", trigger: "change" }
],
LineDirection:[
{ required: true, message: "请选择线路方向", trigger: "change" }
]
}
};
......@@ -622,6 +636,7 @@ export default {
this.total = res.data.data.count;
this.noData = !this.total > 0;
this.DataList = data;
console.log(this.DataList,'datalist');
} else {
this.Error(res.data.message);
}
......@@ -693,7 +708,7 @@ export default {
this.lineCountryArr = [];
var getInfo = this.DataList[index];
// console.log(getInfo)
console.log(getInfo)
this.addMsg.lineName = getInfo.lineName;
this.addMsg.lineCode = getInfo.lineCode;
this.addMsg.lineShortName = getInfo.lineShortName;
......@@ -708,6 +723,7 @@ export default {
this.addMsg.discountDayNum = getInfo.discountDayNum;
this.addMsg.IsShare = getInfo.isShare;
this.addMsg.Is_PacketGroup = getInfo.is_PacketGroup;
this.addMsg.LineDirection = getInfo.lineDirection;
},
deletelist(lineID) {
var that = this;
......
src/router/config.js
View file @ e5916c22
......@@ -1427,6 +1427,14 @@ export default {
title: '团控列表'
},
},
{
path: '/priceIncomeConfirmInfo',///priceIncomeConfirmInfo
name: 'priceIncomeConfirmInfo',
component: resolve => require(['@/components/TravelManager/TravelList//priceIncomeConfirmInfo'], resolve),
meta: {
title: '收入确认单'
},
},
{
//团控列表 自主开团
path: '/TravelControlListSale',
......
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