Skip to content

S
SuperMan
Commit e2f33ed6 authored by 华国豪's avatar 华国豪 🙄
Browse files
Options

合并

parents 4e45a440 69af77b4
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 2642 additions and 703 deletions
src/components/FinancialModule/ReportForm/EasyReport.vue
View file @ e2f33ed6
......@@ -85,6 +85,7 @@
@on-custom-comp="customCompFunc"
@sort-change="sortChange"
:row-click="rowClick"
:row-dblclick="rowDbClick"
>
</v-table>
</div>
......@@ -279,7 +280,6 @@ Vue.component("LiuYueJump", {
},
methods: {
goUrl(path,month,year,BranchId, ids) {
console.log(123)
this.$router.push({
path: "/" + path,
query: {
......@@ -552,7 +552,7 @@ export default {
result: [],
type: "select",
isFrozen: false,
// componentName: "YiYueJump"
componentName: "YiYueJump"
},
{
field: "ErYue",
......@@ -853,8 +853,15 @@ export default {
}
});
},
rowDbClick(rowIndex,rowData,column){
// console.log("rowIndex",rowIndex)
// console.log("rowData",rowData)
// console.log("column",column)
},
rowClick(rowIndex,rowData,column){
console.log("column",column)
var that = this;
return;
let startDate=that.year+"-"+column.start;
let endDate="";
let BranchId=that.msg.BranchId;
......@@ -885,9 +892,10 @@ export default {
if(rowData.ZhaiYao=="员工提成"){
if(Number(this.year)==2019){
if(column.title=="八月" || column.title=="九月" || column.title=="十月" || column.title=="十一月" || column.title=="十二月"){
if(column.title=="十月" || column.title=="十一月" || column.title=="十二月"){
let CostIds="";
CostIds=rowData.CostIds.replace('112,', '');
CostIds=CostIds.replace('16,', '');
that.GoUrlFan('JumpReport',month,rowData.Year,rowData.BranchId,CostIds)
}
else{
......@@ -899,6 +907,7 @@ export default {
else if(Number(this.year)>2019){
let CostIds="";
CostIds=rowData.CostIds.replace('112,', '');
CostIds=CostIds.replace('16,', '');
that.GoUrlFan('JumpReport',month,rowData.Year,rowData.BranchId,CostIds)
}
......@@ -952,7 +961,6 @@ export default {
},
customCompFunc: function(param) {
console.log(param);
},
columnCellClass: function(rowIndex, columnName, rowData) {
if(rowData.YiYue < 0 && columnName=="YiYue"){
......@@ -1151,7 +1159,19 @@ export default {
data.sharelist.forEach((x, i) => {
this.monthList[i].value = x.Money
})
this.DataList = data.list
// this.DataList = data.list;
let tichengList=[];
this.DataList=[];
data.list.forEach(item=>{
if(item.ZhaiYao!="销售提成" && item.ZhaiYao!="原始提成"){
this.DataList.push(item)
}else{
tichengList.push(item);
}
})
console.log("DataList",this.DataList)
console.log("tichengList",tichengList)
this.UpdateStaus=data.Status;
this.UpdateStartTime=data.UpdateStartTime;
this.UpdateEndTime=data.UpdateEndTime;
......
src/components/LeaderManagement/leaderReimbursement.vue
View file @ e2f33ed6
......@@ -2,6 +2,7 @@
<div class="mb30" v-loading='loading'>
<table class="leaderReimbursementTableNav" border="0" cellspacing="1" cellpadding="0">
<tr>
<th width="8%">出团公司</th>
<th width="8%">出发地</th>
<th width="30%">行程名称</th>
<th width="150">团号</th>
......@@ -14,6 +15,9 @@
<th>酒店</th>
</tr>
<tr v-for='item in nav'>
<td>
{{item.OutBranchName}}
</td>
<td>{{item.StartCityNames}}
</td>
<td>
......
src/components/SalesModule/VisitRecord.vue
View file @ e2f33ed6
......@@ -3,7 +3,7 @@
.page_VisitRecord ._scrollbar::-webkit-scrollbar-thumb{border-radius: 4px;-webkit-box-shadow: inset 0 0 2px rgba(0, 0, 0, 0.2);background: #c9c9c9;}
.page_VisitRecord ._scrollbar::-webkit-scrollbar-track{-webkit-box-shadow: inset 0 0 2px rgba(0, 0, 0, 0.2);border-radius: 4px;background: #EDEDED;}
.page_VisitRecord>div>ul{height: 650px;margin: 20px 20px;background-color: #FFFFFF;border: 1px solid #F1F2F5;padding: 20px;border-radius: 4px;padding-right: 16px;margin-bottom: 5px}
.page_VisitRecord ._vr_left{width: 510px;}
.page_VisitRecord ._vr_left{width: 630px;}
.page_VisitRecord ._vr_right{width: 1110px;}
.page_VisitRecord ._tit{padding-left: 10px;border-left: 3px solid #E95252; font-size: 14px;color: #000000;margin: 20px 0 0 20px;}
.page_VisitRecord .icon-ditu{color: #E95252;cursor: pointer;}
......@@ -59,6 +59,7 @@
<div class="_info">
<div><i class="iconfont icon-xinzengkehu-copy"></i>&nbsp;新增客户&nbsp;&nbsp;&nbsp;{{item.addNewCustomerCount}}</div>
<div><i class="iconfont el-icon-view"></i>&nbsp;拜访客户&nbsp;&nbsp;&nbsp;{{item.visitOldCustomerCount}}</div>
<div style="margin-left:10px;"><i class="iconfont icon-qianming"></i>&nbsp;签到&nbsp;&nbsp;&nbsp;{{item.signInCount}}</div>
</div>
</div>
</li>
......@@ -163,7 +164,6 @@ export default {
// console.log(end_time)
let url='?ak=ZzGBZF6L0sgFDLlDohyvYhCnWy4dwksX&service_id=203768&entity_name='+this.account+'&start_time='+start_time+'&end_time='+end_time+'&is_processed=1&process_option=need_denoise=1,need_vacuate=1,need_mapmatch=1';
this.$http.get('https://bird.ioliu.cn/v1?url=http://yingyan.baidu.com/api/v3/track/gettrack'+url).then(res=>{
console.log(res.data.points)
let xy=res.data.points
this.Point=[]
xy.forEach(x=>{
......@@ -179,10 +179,12 @@ export default {
this.apipost('app_get_visit_line_list',{},res=>{
if(res.data.resultCode==1){
this.VisitLineList = res.data.data.pageData
this.getTodayVisitList(this.VisitLineList[0].date)
this.thisDay = this.VisitLineList[0].dateStr
if(this.VisitLineList.length>0){
this.getTodayVisitList(this.VisitLineList[0].date)
this.thisDay = this.VisitLineList[0].dateStr
}
}else{
this.$message.error(res.data.message)
this.Error(res.data.message)
}
},err=>{})
},
......@@ -192,7 +194,7 @@ export default {
if(res.data.resultCode==1){
this.TodayVisitList = res.data.data;
}else{
this.$message.error(res.data.message)
this.Error(res.data.message)
}
},err=>{})
},
......@@ -208,7 +210,6 @@ export default {
this.Point.forEach(x=>{
x.xy = x.point.split(',')
})
console.log(this.Point)
this.creatMap()
}else{
let div = document.createElement("div")
......
src/components/activity/PerCompetition.vue 0 → 100644
View file @ e2f33ed6
This diff is collapsed.
src/components/administrative/CommissionDetail.vue
View file @ e2f33ed6
......@@ -43,7 +43,8 @@ export default {
pageSize: 20,
ParentId: 0,
OrderStr: "RB_Branch_Id asc",
BName:-1
BName:-1,
RB_Branch_Id:-1
},
total: 0,
currentPage: 1,
......@@ -56,7 +57,8 @@ export default {
loading: true,
CompanyList:[],
dataListTwo: [],
stringPerons:''
stringPerons:'',
userInfo: {}
};
},
methods: {
......@@ -133,7 +135,17 @@ export default {
data.forEach(x => {
x.disabled = false;
});
this.CompanyList = data;
if(this.userInfo.RB_Branch_id!=0){
this.CompanyList = data.filter(x=>{
if(x.BName==this.userInfo.BranchName){
return x
}else
return false
})
}else{
this.CompanyList = data;
}
this.initColums();
} else {
}
......@@ -347,6 +359,10 @@ export default {
},
getList() {
this.loading = true;
if(this.userInfo.RB_Branch_id!=0){
this.msg.RB_Branch_Id=this.userInfo.RB_Branch_id
}
this.apipost(
"sellcommission_GetDetailsList",
this.msg,
......@@ -406,7 +422,7 @@ export default {
this.msg.ParentId = this.$route.query.ParentId;
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());
console.log(this.stringPerons)
this.userInfo = this.getLocalStorage();
this.getList();
this.getCompanyList();
},
......
src/components/administrative/CommissionManagement.vue
View file @ e2f33ed6
<style>
.CM_look{
padding:4px!important;
position: relative;
top:1px;
}
.CM_look {
padding: 4px !important;
position: relative;
top: 1px;
}
.TCommission-finance {
font-size: 12px;
text-decoration: underline;
cursor: pointer;
margin-right: 5px;
}
</style>
<template>
<div class="flexOne">
......@@ -13,106 +19,175 @@
<input type="button" class="normalBtn" @click="generateTable" value="生成提成报表"/>
</li>
</ul>
</div> -->
</div>-->
<table class="singeRowTable" border="0" cellspacing="0" cellpadding="0">
<tr>
<th>期数</th>
<th>提成总金额</th>
<th v-if="userInfo.RB_Branch_id==0 || userInfo.RB_Branch_id==49">提成总金额</th>
<th>{{$t('admin.admin_czPerson')}}</th>
<th>所属公司提成</th>
<th>财务单据</th>
<th>日期</th>
<th>{{$t('system.table_operation')}}</th>
</tr>
<tr v-for="(item,index) in dataList" :key="index">
<td>{{item.periods}}</td>
<td>{{item.sumPrice}}</td>
<td
v-if="userInfo.RB_Branch_id==0 || userInfo.RB_Branch_id==49"
>{{item.sumPrice.toFixed(2)}}</td>
<td>{{item.createByStr}}</td>
<td>{{item.branchMoney.toFixed(2)}}</td>
<td>
<span
class="TCommission-finance"
v-for="(fno, i) in item.financialsArray"
:key="i"
@click="goUrl2(fno)"
>{{fno}}</span>
</td>
<td>{{item.createStr}}</td>
<td>
<!-- <el-tooltip class="item" effect="dark" content="取消" placement="top">
<el-button type="danger" icon="el-icon-delete" circle></el-button>
</el-tooltip> -->
<el-tooltip class="item" effect="dark" content="查看" placement="top">
<el-button type="primary" class="CM_look" @click="goUrl('CommissionDetail',item.id)" icon="iconfont icon-chakan" circle></el-button>
<el-button
type="primary"
class="CM_look"
@click="goUrl('CommissionDetail',item.id)"
icon="iconfont icon-chakan"
title="查看"
circle
></el-button>
</el-tooltip>
<el-tooltip class="item" effect="dark" content="制单" placement="top">
<el-button
type="primary"
class="CM_look"
@click="generalFinancacls"
icon="el-icon-plus"
title="制单"
circle
></el-button>
</el-tooltip>
</td>
</tr>
</table>
<!-- 分页 -->
<el-pagination background @current-change="handleCurrentChange" :current-page.sync="currentPage"
layout="total,prev, pager, next, jumper" :page-size='msg.PageSize' :total='total'>
</el-pagination>
<el-pagination
background
@current-change="handleCurrentChange"
:current-page.sync="currentPage"
layout="total,prev, pager, next, jumper"
:page-size="msg.PageSize"
:total="total"
></el-pagination>
</div>
</template>
<script>
export default {
data() {
return {
msg: {
PageIndex: 1,
PageSize: 20
},
loading:false,
//数据源
dataList:[],
total:0,
currentPage: 1,
}
},
mounted() {
export default {
data() {
return {
msg: {
PageIndex: 1,
PageSize: 20
},
loading: false,
//数据源
dataList: [],
total: 0,
currentPage: 1,
userInfo: {}
};
},
mounted() {
this.getList();
this.userInfo = this.getLocalStorage();
},
methods: {
handleCurrentChange(val) {
this.msg.PageIndex = val;
this.getList();
},
methods: {
handleCurrentChange(val) {
this.msg.PageIndex = val;
this.getList();
},
goUrl(path,id) {
this.$router.push({
path: path,
query: {
ParentId:id,
blank: 'y',
tab: '报价详情'
}
});
},
//获取数据
getList() {
this.loading = true;
this.apipost(
"sellcommission_GetPageList",
this.msg,
res => {
this.loading = false;
if(res.data.resultCode==1){
this.dataList = res.data.data.pageData;
this.total = res.data.data.count;
}else{
this.Error(res.data.message);
}
},
null
);
},
//生成提成报表
generateTable(){
let msg = {
UserId: 0
goUrl(path, id) {
this.$router.push({
path: path,
query: {
ParentId: id,
blank: "y",
tab: "报价详情"
}
this.apipost(
"sellcommission_SetGenerateCommission",msg,
res => {
if(res.data.resultCode==1){
this.getList();
this.Success('报表生成成功')
}else{
this.Error(res.data.message);
});
},
//获取数据
getList() {
this.loading = true;
this.apipost(
"sellcommission_GetPageList",
this.msg,
res => {
this.loading = false;
if (res.data.resultCode == 1) {
this.dataList = res.data.data.pageData;
this.total = res.data.data.count;
this.dataList.forEach(x => {
if (x.financials && x.financials.length > 0) {
x.financialsArray = x.financials.split(",");
}
},
null
);
});
} else {
this.Error(res.data.message);
}
},
null
);
},
goUrl2(id) {
this.$router.push({
path: "/FinancialDocumentsDetail",
query: {
id,
blank: "y",
tab: id + "单据详情"
}
});
},
//生成提成报表
generateTable() {
let msg = {
UserId: 0
};
this.apipost(
"sellcommission_SetGenerateCommission",
msg,
res => {
if (res.data.resultCode == 1) {
this.getList();
this.Success("报表生成成功");
} else {
this.Error(res.data.message);
}
},
null
);
},
generalFinancacls(){
let query = {
blank: "y",
tab: "新增付款单据",
Type:2,
IsUploadPic:1
}
if(this.userInfo.RB_Branch_id==0) {
query.id=28
query.Name="总部销售提成单"
}else{
query.id=30
query.Name="分公司销售提成单"
}
this.$router.push({
path: "/addFinancialDocuments",
query
});
}
}
};
</script>
src/components/administrative/myDocuments.vue
View file @ e2f33ed6
......@@ -94,6 +94,10 @@
<el-dialog custom-class='w800 shareDocumentDialog' :title="dialogTitle3" :visible.sync="outerVisible3" center>
<div class="documentDialogNav">
<div @click="shareGroup">
<i class="iconfont icon-user11"></i>集团
<div v-if='shareMsg.shareType==4' class="checkIcon"></div>
</div>
<div @click="shareDeparment">
<i class="iconfont icon-user11"></i>{{$t('admin.admin_Department')}}
<div v-if='shareMsg.shareType==1' class="checkIcon"></div>
......@@ -108,6 +112,11 @@
<div v-if='shareMsg.shareType==3' class="checkIcon"></div>
</div>
</div>
<div v-if="shareMsg.shareType==4" class="myDocumentShareDiv">
<div style="height:400px;padding:20px;font-size:15px;">
分享到整个集团
</div>
</div>
<div v-if='shareMsg.shareType==1' class="myDocumentShareDiv">
<div class="myDocumentShareTree">
<el-tree
......@@ -754,6 +763,7 @@
}
this.outerVisible3 = true
this.dialogTitle3 = '分享文件/文件夹'
this.shareMsg.shareType=1;
this.getDepartment()
this.getRole()
this.getMenber()
......@@ -761,10 +771,15 @@
openShareDialog() {
this.outerVisible3 = true
this.dialogTitle3 = '分享文件/文件夹'
this.shareMsg.shareType=1;
this.getDepartment()
this.getRole()
this.getMenber()
},
//按照集团分享
shareGroup(){
this.shareMsg.shareType=4;
},
shareDeparment(){
this.shareMsg.shareType=1
this.ckdRoleList=[]
......@@ -876,6 +891,10 @@
}else{
this.shareMsg.targetIds=this.ckdMenberListId.join(',')
}
if(this.shareMsg.shareType==4){
let userInfo = this.getLocalStorage();
this.shareMsg.targetIds = userInfo.RB_Group_id;
}
this.shareMsg.fileIds=this.notFileList
this.shareMsg.folderIds=this.fileList
this.apipost('user_cloud_file_share',this.shareMsg,res=>{
......
src/components/administrative/myShareDocuments.vue
View file @ e2f33ed6
......@@ -150,6 +150,10 @@
<el-dialog custom-class='w800 shareDocumentDialog' :title="dialogTitle3" :visible.sync="outerVisible3" center>
<div class="documentDialogNav">
<div @click="shareGroup">
<i class="iconfont icon-user11"></i>集团
<div v-if='shareMsg.shareType==4' class="checkIcon"></div>
</div>
<div @click="shareDeparment">
<i class="iconfont icon-user11"></i>{{$t('admin.admin_Department')}}
<div v-if='shareMsg.shareType==1' class="checkIcon"></div>
......@@ -230,6 +234,11 @@
</ul>
</div>
</div>
<div v-if="shareMsg.shareType==4" class="myDocumentShareDiv">
<div style="height:400px;padding:20px;font-size:15px;">
分享到整个集团
</div>
</div>
<div slot="footer" class="dialog-footer">
<input type="button" class="hollowFixedBtn" :value="$t('pub.cancelBtn')" @click="outerVisible3=false" />
<input type="button" class="normalBtn" :value="$t('pub.sureBtn')" @click="saveShareDocument" />
......@@ -858,6 +867,10 @@
this.getRole()
this.getMenber()
},
//按照集团分享
shareGroup(){
this.shareMsg.shareType=4;
},
shareDeparment(){
this.shareMsg.shareType=1
this.ckdRoleList=[]
......@@ -987,6 +1000,11 @@
targetIds=this.ckdMenberListId
}
this.shareMsg.targetIds = targetIds.join(",")
if(this.shareMsg.shareType==4){
let userInfo = this.getLocalStorage();
this.shareMsg.targetIds = userInfo.RB_Group_id;
}
//this.shareMsg.fileIds=this.notFileList
//this.shareMsg.folderIds=this.fileList
this.apipost('user_cloud_update_file_share_target',this.shareMsg,res=>{
......
src/components/busManagement/busUsePrice2.vue 0 → 100644
View file @ e2f33ed6
This diff is collapsed.
src/components/busManagement/busUsePriceDetails.vue 0 → 100644
View file @ e2f33ed6
This diff is collapsed.
src/components/index.vue
View file @ e2f33ed6
......@@ -44,6 +44,14 @@
.myIndexStyle .addTichengDialog .el-dialog__body{
padding:0;
}
.TiChengScore{
position: absolute;
left:2rem;
top:1.5rem;
}
.TiChengScore img {
width:30px;
}
</style>
......@@ -516,6 +524,14 @@
{{getResetTime(item.createTime)}}
</p>
<div class="tichengContent" @click="getTichengInfo(item)">
<div class="TiChengScore">
<img v-if="item.SellGeneralContent.totalCommission>=2000&&item.SellGeneralContent.totalCommission<4000" src="../assets/img/imbg/A.png" alt=""/>
<img v-if="item.SellGeneralContent.totalCommission>=1000&&item.SellGeneralContent.totalCommission<2000" src="../assets/img/imbg/B.png" alt=""/>
<img v-if="item.SellGeneralContent.totalCommission<1000" src="../assets/img/imbg/C.png" alt=""/>
<img v-if="item.SellGeneralContent.totalCommission>=4000&&item.SellGeneralContent.totalCommission<8000" src="../assets/img/imbg/S.png" alt=""/>
<img style="width:40px;" v-if="item.SellGeneralContent.totalCommission>=8000&&item.SellGeneralContent.totalCommission<15000" src="../assets/img/imbg/SS.png" alt=""/>
<img style="width:65px;" v-if="item.SellGeneralContent.totalCommission>=15000" src="../assets/img/imbg/SSR.png" alt=""/>
</div>
<div class="Ticheng_Date">
<span>{{item.SellGeneralContent.Month}}月</span><span class="Ticheng_Money"><span>¥</span>{{item.SellGeneralContent.totalCommission}}</span>
</div>
......@@ -641,6 +657,14 @@
{{getResetTime(item.createTime)}}
</p>
<div class="tichengContent" @click="getTichengInfo(item)">
<div class="TiChengScore">
<img v-if="item.SellGeneralContent.totalCommission>=2000&&item.SellGeneralContent.totalCommission<4000" src="../assets/img/imbg/A.png" alt=""/>
<img v-if="item.SellGeneralContent.totalCommission>=1000&&item.SellGeneralContent.totalCommission<2000" src="../assets/img/imbg/B.png" alt=""/>
<img v-if="item.SellGeneralContent.totalCommission<1000" src="../assets/img/imbg/C.png" alt=""/>
<img v-if="item.SellGeneralContent.totalCommission>=4000&&item.SellGeneralContent.totalCommission<8000" src="../assets/img/imbg/S.png" alt=""/>
<img style="width:40px;" v-if="item.SellGeneralContent.totalCommission>=8000&&item.SellGeneralContent.totalCommission<15000" src="../assets/img/imbg/SS.png" alt=""/>
<img style="width:65px;" v-if="item.SellGeneralContent.totalCommission>=15000" src="../assets/img/imbg/SSR.png" alt=""/>
</div>
<div class="Ticheng_Date">
<span>{{item.SellGeneralContent.Month}}月</span><span class="Ticheng_Money"><span>¥</span>{{item.SellGeneralContent.totalCommission}}</span>
</div>
......
src/components/newTravelmanager/TravelGroupControl/TravelFeature.vue
View file @ e2f33ed6
......@@ -287,6 +287,16 @@
});
},
getHtml: function (postData, SaveType, TeamType) {
//HK 2019-10-14 新增开始
if (this.$refs.newFeature2 != undefined) {
//检查是否有更新
var IsRefresh = this.$refs.newFeature2.getIsRefresh();
if (IsRefresh) {
//有更新重新初始化行程特色内容
this.$refs.newFeature2.UpDateInfo();
}
}
//HK 2019-10-14 新增结束
var FeatureData = {
B2BRemark: postData.B2BRemark,
ConfigId: postData.ConfigId,
......
src/components/newTravelmanager/TravelGroupControl/TravelTemp/travelFeature3.vue
View file @ e2f33ed6
......@@ -1636,6 +1636,11 @@
blockList.splice(index1, 1);
this.pageCount(name)
},
//判断是否切换
getIsRefresh()
{
return this.Refresh;
},
// 返回数据对象
getFeatureData: function () {
this.canEditChange(false);
......
src/components/newTravelmanager/TravelGroupControl/travelFeature/featureBody.vue
View file @ e2f33ed6
......@@ -35,35 +35,6 @@
</div>
</div>
</div>
<!-- <div class="meal-first-box" v-if='i==0 && x.type==1'>
<div class="img-box" :id='"box_"+index+"_"+i'>
<div class="img-parent">
<VueDraggableResizable :ref='"vds_"+index+"_"+i' tabindex="0" :resizable='false' :active="false" :parent="false" axis='y' @activated="onActivated(i)" :w="860" :h="1960" :x="x.x" :y="x.y" :z="2" @dragstop="onDragstop">
<img :src='x.img' :id='"body_"+index+"_"+i' />
</VueDraggableResizable>
</div>
<div class="type">
<span>酒店</span>
</div>
</div>
<div class="remark">优选酒店</div>
<div class="hotelInfo">
<div class="name-box">
<div class="name">
<div class="right-bg"></div>
<input v-if='!r' v-model='x.name' :style='{width:x.name.length*28+"px"}' type="text" maxlength="10" />
</div>
<div class="cityName">
<div class="left-bg"></div>
<input v-if='!r' v-model='x.cityName' type="text" maxlength="5" />
</div>
</div>
<div class="star-box"></div>
<div class="txt-content">
<textarea v-if='!r' v-model="x.description" spellcheck="false"></textarea>
</div>
</div>
</div> -->
<div class="hotel-second-box" v-if='i==1 && x.type==1'>
<div class="hotelInfo">
<div class="txt-content">
......
src/components/newTravelmanager/TravelGroupControl/travelFeature/index.vue
View file @ e2f33ed6
......@@ -347,7 +347,6 @@
this.h.subTitle = this.data.Subtitle ? this.data.Subtitle : "";
this.h.title = this.data.Title ? (this.data.Title.length > 20 ? this.data.Title.substring(0, 20) : this.data.Title) :
"";
console.log("this.h",this.data,this.h);
//初始化A4腰
if (this.data.LineName) {
this.f.line = this.data.LineName.replace(/出境/ig, "");
......@@ -432,13 +431,6 @@
this.t.push(i)
}
} else if (active == 'change') {
// if (chooseType == 1 || chooseType == 2) {
// } else {
// let tempObj = this.d[i]
// tempObj.img = path
// this.$set(this.d, i, tempObj)
// }
let tempObj = this.d[i];
tempObj.img.list[tempObj.img.index] = path
this.$set(this.d, i, tempObj)
......@@ -457,5 +449,4 @@
}
}
}
</script>
</script>
\ No newline at end of file
src/router/config.js
View file @ e2f33ed6
......@@ -1732,7 +1732,24 @@ export default {
meta: {
title: '车辆报价'
},
}, {
},
{
path: '/busUsePrice2', //车辆报价2
name: 'busUsePrice2',
component: resolve => require(['@/components/busManagement/busUsePrice2'], resolve),
meta: {
title: '车辆报价'
},
},
{
path: '/busUsePriceDetails', //车辆报价详情
name: 'busUsePriceDetails',
component: resolve => require(['@/components/busManagement/busUsePriceDetails'], resolve),
meta: {
title: '车辆报价'
},
},
{
path: '/BusApportionManagement',
name: 'BusApportionManagement',
component: resolve => require(['@/components/busManagement/BusApportionManagement'], resolve),
......@@ -3819,6 +3836,15 @@ export default {
title: '人员管理'
}
},
{
path: '/PerCompetition',
name: 'PerCompetition',
component: resolve => require(['@/components/activity/PerCompetition'], resolve),
meta: {
title: '业绩竞赛'
}
},
{
path: '/BmenuManagement',
name: 'BmenuManagement',
......
yarn.lock
View file @ e2f33ed6
This diff is collapsed.
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