Commit 74406993 authored by 黄奎's avatar 黄奎

页面修改

parent 070d32e5
...@@ -25,7 +25,7 @@ ...@@ -25,7 +25,7 @@
return _load return _load
}, },
set: function set(v) { set: function set(v) {
console.log(v.toString()), //console.log(v.toString()),
eval("_load = " + v.toString().replace("maps.google.cn", "www.google.cn")) eval("_load = " + v.toString().replace("maps.google.cn", "www.google.cn"))
} }
}); });
......
...@@ -198,6 +198,7 @@ ...@@ -198,6 +198,7 @@
handleCurrentChange(val) { handleCurrentChange(val) {
this.queryMsg.pageIndex = val; this.queryMsg.pageIndex = val;
this.getControlList(); this.getControlList();
console.log("asdf")
}, },
//重新查询 //重新查询
resetPageIndex() { resetPageIndex() {
......
...@@ -931,6 +931,7 @@ ...@@ -931,6 +931,7 @@
"travel_get_GetTravelPrciePageList", "travel_get_GetTravelPrciePageList",
msg, msg,
res => { res => {
console.log("123")
this.queryCommonData.loading = false; this.queryCommonData.loading = false;
if (res.data.resultCode == 1) { if (res.data.resultCode == 1) {
this.queryCommonData.dataList = res.data.data.pageData; this.queryCommonData.dataList = res.data.data.pageData;
......
...@@ -343,7 +343,7 @@ ...@@ -343,7 +343,7 @@
</li> </li>
<li> <li>
<button class="hollowFixedBtn" @click="resetPageIndex(),getControlList()">{{$t('pub.searchBtn')}}</button> <button class="hollowFixedBtn" @click="resetPageIndex(),getControlList()">{{$t('pub.searchBtn')}}</button>
<button class="hollowFixedBtn" @click='goToOpenTravel("TravelManager4")'>{{$t('sm.kaituan')}}</button> <button class="hollowFixedBtn" @click='goToOpenTravel("TravelManager5")'>{{$t('sm.kaituan')}}</button>
</li> </li>
</ul> </ul>
</div> </div>
...@@ -477,9 +477,9 @@ ...@@ -477,9 +477,9 @@
<i class="el-icon-arrow-down el-icon--right"></i> <i class="el-icon-arrow-down el-icon--right"></i>
</span> </span>
<el-dropdown-menu slot="dropdown" class="TC-dropdown"> <el-dropdown-menu slot="dropdown" class="TC-dropdown">
<el-dropdown-item @click.native="goToOpenTravel('TravelManager4',item.ID,0)">{{$t('Operation.Op_xilieModyfi')}} <el-dropdown-item @click.native="goToOpenTravel('TravelManager5',item.ID,0)">{{$t('Operation.Op_xilieModyfi')}}
</el-dropdown-item> </el-dropdown-item>
<el-dropdown-item @click.native="goTonowTeam('TravelManager4',item.ID,item.TCID,item.TCNUM)"> <el-dropdown-item @click.native="goTonowTeam('TravelManager5',item.ID,item.TCID,item.TCNUM)">
{{$t('Operation.Op_dangtuanModify')}} {{$t('Operation.Op_dangtuanModify')}}
</el-dropdown-item> </el-dropdown-item>
</el-dropdown-menu> </el-dropdown-menu>
...@@ -497,7 +497,7 @@ ...@@ -497,7 +497,7 @@
<el-dropdown-menu slot="dropdown" class="TC-dropdown"> <el-dropdown-menu slot="dropdown" class="TC-dropdown">
<el-dropdown-item @click.native="goTeamBalance(item.TCID,item.OutBranchId)">{{$t('Operation.Op_shouzhiDetail')}} <el-dropdown-item @click.native="goTeamBalance(item.TCID,item.OutBranchId)">{{$t('Operation.Op_shouzhiDetail')}}
</el-dropdown-item> </el-dropdown-item>
<el-dropdown-item @click.native="goUrlR('confirmationOrderDownLoad',item)">{{$t('Operation.Op_tripDownLoad')}}</el-dropdown-item> <el-dropdown-item @click.native="goUrlR('SalesconfirmationOrder',item)">{{$t('Operation.Op_tripDownLoad')}}</el-dropdown-item>
<el-dropdown-item @click.native="removeTeamInfo(item.TCID)">{{$t('system.table_delete')}}</el-dropdown-item> <el-dropdown-item @click.native="removeTeamInfo(item.TCID)">{{$t('system.table_delete')}}</el-dropdown-item>
<el-dropdown-item v-if="item.TCState==2||item.TCState==0||item.TCState==1" <el-dropdown-item v-if="item.TCState==2||item.TCState==0||item.TCState==1"
@click.native="setUpPlat(item)">{{$t('Operation.Op_shangjia')}} @click.native="setUpPlat(item)">{{$t('Operation.Op_shangjia')}}
......
...@@ -101,7 +101,7 @@ ...@@ -101,7 +101,7 @@
</div> </div>
<div class="el-col"> <div class="el-col">
<div class="d7"> <div class="d7">
<el-button @click="goToOpenTravel('TravelManager4',item.ID)" type="primary">{{$t('Operation.Op_tripUpdate')}}</el-button> <el-button @click="goToOpenTravel('TravelManager5',item.ID)" type="primary">{{$t('Operation.Op_tripUpdate')}}</el-button>
<el-button @click="copyTravelInfo(item.ID)" type="primary">{{$t('Operation.Op_tripCopy')}}</el-button> <el-button @click="copyTravelInfo(item.ID)" type="primary">{{$t('Operation.Op_tripCopy')}}</el-button>
<el-button v-if="item.TCNUMS==''" @click="delConfig(item.ID)" type="primary">{{$t('system.ph_shanchu')}}</el-button> <el-button v-if="item.TCNUMS==''" @click="delConfig(item.ID)" type="primary">{{$t('system.ph_shanchu')}}</el-button>
</div> </div>
......
...@@ -357,7 +357,7 @@ ...@@ -357,7 +357,7 @@
</li> </li>
<li> <li>
<button class="hollowFixedBtn" @click="resetPageIndex(),getControlList()">{{$t('pub.searchBtn')}}</button> <button class="hollowFixedBtn" @click="resetPageIndex(),getControlList()">{{$t('pub.searchBtn')}}</button>
<button class="hollowFixedBtn" @click='goToOpenTravel("TravelManager4")'>开团</button> <button class="hollowFixedBtn" @click='goToOpenTravel("TravelManager5")'>开团</button>
</li> </li>
</ul> </ul>
</div> </div>
...@@ -512,59 +512,6 @@ ...@@ -512,59 +512,6 @@
<el-button @click.native="SetupState(item,0)" type="primary" <el-button @click.native="SetupState(item,0)" type="primary"
style="background:#67c23a; border-color:#67c23a">取消设置 style="background:#67c23a; border-color:#67c23a">取消设置
</el-button> </el-button>
<!-- <el-dropdown trigger="click" style="margin-bottom:5px;">
<span class="el-dropdown-link">修改
<i class="el-icon-arrow-down el-icon--right"></i>
</span>
<el-dropdown-menu slot="dropdown" class="TC-dropdown">
<el-dropdown-item @click.native="goToOpenTravel('TravelManager4',item.ID,0)">系列团修改
</el-dropdown-item>
<el-dropdown-item @click.native="goTonowTeam('TravelManager4',item.ID,item.TCID,item.TCNUM)">
当团修改
</el-dropdown-item>
</el-dropdown-menu>
</el-dropdown>
<el-button @click='goUrlMake("GroupAdvertising",item.LineID,item.TCID,"团期广告")' type="primary"
style="background:#67c23a; border-color:#67c23a">广告&nbsp;{{item.AdvertCount}}
</el-button>
<el-button @click="ckOPremark(item)" type="primary" style="background:#F16C3C; border-color:#F16C3C">
OP备注
</el-button>
<el-dropdown trigger="click">
<span class="el-dropdown-link">更多操作
<i class="el-icon-arrow-down el-icon--right"></i>
</span>
<el-dropdown-menu slot="dropdown" class="TC-dropdown">
<el-dropdown-item @click.native="SetupState(item,1)">设为推荐</el-dropdown-item>
<el-dropdown-item @click.native="SetupState(item,2)">设为热门</el-dropdown-item>
<el-dropdown-item @click.native="goTeamBalance(item.TCID,item.OutBranchId)">团队收支明细
</el-dropdown-item>
<el-dropdown-item @click.native="goUrlR('confirmationOrderDownLoad',item)">行程下载</el-dropdown-item>
<el-dropdown-item @click.native="removeTeamInfo(item.TCID)">删除</el-dropdown-item>
<el-dropdown-item v-if="item.TCState==2||item.TCState==0||item.TCState==1"
@click.native="setUpPlat(item)">上架
</el-dropdown-item>
<el-dropdown-item v-if="item.TCState==3" @click.native="Setshelves(item.TCID)">下架
</el-dropdown-item>
<el-dropdown-item v-if="item.Status==1" @click.native="OutGroup(item.TCID,2)">结团
</el-dropdown-item>
<el-dropdown-item v-if="item.Status==2" @click.native="OutGroup(item.TCID,1)">销售
</el-dropdown-item>
<el-dropdown-item v-if="item.Status==2&&showSureOrder('P_Query_Income_ConfirmInfo',item.CreateBy)"
@click.native="goSureOrder('priceIncomeConfirmInfo',item.TCID)">收入确认单
</el-dropdown-item>
<el-dropdown-item v-if="CurrentUserInfo.B2BDomain!=''"
@click.native="goB2B(item.ConfigId, item.TCID)">
B2B预览
</el-dropdown-item>
<el-dropdown-item @click.native='goUrl("DistributionTransport",item.ID,"分销联运")'>分销联运
</el-dropdown-item>
<el-dropdown-item @click.native='ckSellPoint(item)'>本团卖点</el-dropdown-item>
<el-dropdown-item @click.native='ShowUploadWord(item)'>WORD行程</el-dropdown-item>
</el-dropdown-menu>
</el-dropdown> -->
</div> </div>
</div> </div>
</div> </div>
......
...@@ -352,7 +352,7 @@ ...@@ -352,7 +352,7 @@
} else if (TeamType == 1) { } else if (TeamType == 1) {
path = "TravelManager3"; path = "TravelManager3";
} else if (TeamType == 2) { } else if (TeamType == 2) {
path = "TravelManager4"; path = "TravelManager5";
} else if (TeamType == 3) { } else if (TeamType == 3) {
path = "TravelManager6"; path = "TravelManager6";
} }
......
...@@ -624,7 +624,7 @@ ...@@ -624,7 +624,7 @@
if (routeName == 'TravelManager3') { if (routeName == 'TravelManager3') {
this.TeamType = 1; this.TeamType = 1;
} }
if (routeName == 'TravelManager4') { if (routeName == 'TravelManager5') {
this.TeamType = 2; this.TeamType = 2;
} }
if (routeName == 'TravelManager6') { if (routeName == 'TravelManager6') {
......
...@@ -343,6 +343,7 @@ export default { ...@@ -343,6 +343,7 @@ export default {
//点击往后追加 //点击往后追加
addChildItem(index, type) { addChildItem(index, type) {
switch (type.toString()) { switch (type.toString()) {
//交通 //交通
case this.$tripUtils.TypeKey.traffic: case this.$tripUtils.TypeKey.traffic:
...@@ -485,6 +486,7 @@ export default { ...@@ -485,6 +486,7 @@ export default {
this.subConfig.DayList[index].dayArray.push(daysArrayItem); this.subConfig.DayList[index].dayArray.push(daysArrayItem);
break; break;
} }
console.log(" this.subConfig.DayList", this.subConfig.DayList);
}, },
//获取相似线路行程 //获取相似线路行程
......
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