Skip to content

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

Merge branch 'master' of http://gitlab.oytour.com/luochao/superman

parents f33a7e46 bf0022d6
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 271 additions and 238 deletions
src/components/SalesModule/productQuery.vue
View file @ cfea6c66
......@@ -594,6 +594,9 @@
</li>
</ul>
</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>
<div class="productQueryList" v-loading='loading'>
<ul v-if="list.length!=0">
<li v-for="(item,index) in list" :key="index">
......@@ -832,7 +835,7 @@
</div>
</div>
<el-pagination background @current-change="handleCurrentChange" :current-page.sync="currentPage" layout="total,prev, pager, next, jumper"
:page-size=msg.pageSize :total=total>
:page-size="msg.pageSize" :total="total">
</el-pagination>
<el-dialog custom-class='ComTeamPlan_info_box' :title="tripTitle" :visible.sync="outerVisible" center>
<commonTeamInfo ref="comTeam"></commonTeamInfo>
......
src/components/TravelManager/TravelList/RegistrationStatistics.vue
View file @ cfea6c66
......@@ -119,15 +119,10 @@
<span class="Order_RS" :class="{'RS_RedType':item.OrderTotalNum>0}" @click="goUrl('RegistrationList',item.TCID)">{{item.OrderTotalNum-item.OrderLeaderGuestNum}}<span v-if="item.OrderLeaderGuestNum>0">+{{item.OrderLeaderGuestNum}}</span></span>
</td>
<td><span class="Order_RS" @click="goUrl('RegistrationList',item.TCID)">{{item.OrderPaymentNum}}</span></td>
<td><span class="PingFangSC Order_RS" @click="goUrl('SetTheLeader')">{{item.LeaderName}}</span></td>
<td><span class="RS_RedType PingFangSC Order_RS" @click="goUrl('leaderTaskBoard')">{{item.GuideName}}</span></td>
<td><span :class="item.LeaderName!=''&&item.LeaderName!=null?'PingFangSC Order_RS':'Order_RS'" @click="goUrl('RegistrationList',item.TCID,'报名清单')">{{item.LeaderName!=""&&item.LeaderName!=null ?item.LeaderName:"设置领队"}}</span></td>
<td><span :class="item.GuideName!=''&&item.GuideName!=null?'RS_RedType PingFangSC Order_RS':'Order_RS'" @click="goUrl('leaderArrangement',item.TCID,'设置导游')">{{item.GuideName!=""&&item.GuideName!=null?item.GuideName:"设置导游"}}</span></td>
<td><span class="RS_Nameover">{{item.OPRemark}}</span></td>
</tr>
<!-- <tr>
<td colspan="12">
<span class="RS_Nameover" @click="goUrlTM('productQuery',item.TCNUM)">团名: {{item.Title}}</span>
</td>
</tr> -->
</tbody>
</table>
</div>
......
src/components/dmc/manager/dmcTotalTable.vue
View file @ cfea6c66
......@@ -3,7 +3,7 @@
<div class="query-box" style="border-bottom: none;">
<ul>
<li><span><em>系列</em>
<el-select v-model="msg.LineteamId" filterable :placeholder="$t('pub.pleaseSel')">
<el-select v-model="msg.LineteamId" filterable :placeholder="$t('pub.pleaseSel')" class="w150">
<el-option label="不限" value='-1'></el-option>
<el-option v-for="item in LineTeamList" :label='item.LtName' :value='item.LtID' :key='item.LtID'>
</el-option>
......@@ -13,7 +13,7 @@
<li>
<span>
<em>团号</em>
<el-input v-model='msg.TCNUM'></el-input>
<el-input v-model='msg.TCNUM' class="w150"></el-input>
</span>
</li>
<li><span><em>日期</em>
......@@ -23,12 +23,17 @@
</span>
</li>
<li><span><em>状态</em></span>
<el-select v-model='msg.PriceStatus'>
<el-select v-model='msg.PriceStatus' class="w150">
<el-option label='正常' value='0' key='0'></el-option>
<el-option label='取消' value='1' key='1'></el-option>
</el-select>
</li>
<li>
<span>
<em>地接团号</em>
<el-input v-model='msg.CombinationNum' class="w150"></el-input>
</span>
</li>
<li>
<input type="button" class="normalBtn" value="查询" @click="getList();resetPageIndex()" />
</li>
......@@ -49,32 +54,32 @@
<th width="75">出发地</th>
<th width="80">航班时间</th>
<th width="125">公司团号</th>
<th width="75">线路<br/>负责人</th>
<th width="75">线路<br />负责人</th>
<th width="75">进出点</th>
<th width="80">机位总数<br/>(Y/E/F)</th>
<th width="80">机位总数<br />(Y/E/F)</th>
<th width="60">领队</th>
<th width="60">导游</th>
<th width="60">已开票</th>
<th width="60">分房表</th>
<th width="60">出团<br/>通知书</th>
<th width="60">导游<br/>计划表</th>
<th width="60">领队<br/>交接表</th>
<th width="60">用款<br/>计划</th>
<th width="60">出团<br />通知书</th>
<th width="60">导游<br />计划表</th>
<th width="60">领队<br />交接表</th>
<th width="60">用款<br />计划</th>
<th width="60">酒店</th>
<th width="60">门票</th>
<th width="60">餐食</th>
<th width="60">车辆</th>
<th width="60">领队<br/>报账</th>
<th width="60">领队<br />报账</th>
<th width="120">操作</th>
</tr>
<tbody v-for="(outItem,outindex) in list" :class="{dmcTotalSplitTrCss:outindex%2!=0}">
<template v-for="(item,index) in outItem.StaticsReportList">
<tr>
<td :rowspan="2*outItem.StaticsReportList.length" v-if='index==0'>
{{outItem.NewCombinationNum}}
{{outItem.NewCombinationNum}}
</td>
<td>
{{item.StartCityNames}}
{{item.StartCityNames}}
</td>
<td>
<div class="w120">
......@@ -221,6 +226,15 @@
<el-button type="primary" slot="reference" @click='CkedItem(item)' style="background:#AD9AF6; border-color:#AD9AF6; border-radius: 0;">添加备注</el-button>
</el-popover>
<el-button @click='openChart(item)' type="primary" style="background:#6DD875; border-color:#6DD875">联系OP</el-button>
<el-popover placement="bottom" width="300" trigger="click">
<el-input class='mt10' v-model='NumObj.newCombinationNum' type='textarea'></el-input>
<p class="alcenter mt10">
<input type="button" value="保存" @click="UpdateCombinationNum()" class="normalBtn" />
</p>
<el-button type="primary" slot="reference" @click='ClickNumItem(outItem.NewCombinationNum,outItem.TCIDs)'
style="background:#3333FF; border-color:#AD9AF6; border-radius: 0;">地接团号</el-button>
</el-popover>
</el-button-group>
</div>
</td>
......@@ -242,7 +256,6 @@
:page-size="msg.pageSize" :total="total"></el-pagination>
</div>
</template>
<script>
export default {
data() {
......@@ -262,12 +275,19 @@
LineId: 14,
LineteamId: "-1",
PriceStatus: "0",
//地接团号
CombinationNum: ""
},
LineList: [],
LineTeamList: [],
thLengthTitle: [],
list: [],
colspanTotal: 0,
//地接团号对象
NumObj: {
newCombinationNum: "",
TCIDs: ""
}
}
},
methods: {
......@@ -279,9 +299,8 @@
})
},
CkedItem(obj) {
console.log(obj)
this.ckedTCID = obj.TCID
this.remarkString = obj.DMCRemark
this.ckedTCID = obj.TCID;
this.remarkString = obj.DMCRemark;
},
saveRemark() {
this.apipost('dmcstatistics_post_SetDMCRemark', {
......@@ -415,12 +434,33 @@
getList() {
this.loading = true
this.apipost('dmcstatistics_post_GetUniteCombinationNumService', this.msg, res => {
this.loading = false
if (res.data.resultCode == 1) {
this.total = res.data.data.count
this.list = res.data.data.pageData.data
this.loading = false
if (res.data.resultCode == 1) {
this.total = res.data.data.count;
this.list = res.data.data.pageData.data;
} else {
this.$message.error(res.data.message)
this.$message.error(res.data.message);
}
}, err => {})
},
ClickNumItem(newCombinationNum, tcids) {
this.NumObj.newCombinationNum = newCombinationNum;
this.NumObj.TCIDs = tcids;
},
//保存地接团号
UpdateCombinationNum() {
this.loading = true;
let msg = {
newCombinationNum: this.NumObj.newCombinationNum,
TCIDs: this.NumObj.TCIDs
};
this.apipost('dmcstatistics_post_UpdateCombinationNum', msg, res => {
this.loading = false
if (res.data.resultCode == 1) {
this.Success(res.data.message);
this.getList();
} else {
this.Error(res.data.message)
}
}, err => {})
},
......
src/components/dmc/manager/tripsManager.vue
View file @ cfea6c66
......@@ -365,11 +365,12 @@
<em>团队状态</em>
<el-select class="w150" v-model="queryMsg.QTCState" filterable :placeholder="$t('pub.pleaseSel')">
<el-option :label="$t('pub.unlimitedSel')" :value="queryCommonData.SelectDefaultValue"></el-option>
<el-option v-for="tcItem in $tripUtils.TeamStatesList.TeamStates" :label="tcItem.Name" :key="tcItem.Id" :value="tcItem.Id">{{tcItem.Name}}</el-option>
<el-option v-for="tcItem in $tripUtils.TeamStatesList.TeamStates" :label="tcItem.Name" :key="tcItem.Id"
:value="tcItem.Id">{{tcItem.Name}}</el-option>
</el-select>
</span>
</li>
<li>
<li>
<span>
<em>出团公司</em>
<el-select class="w150" v-model="queryMsg.OutBranchId" filterable :placeholder="$t('pub.pleaseSel')">
......@@ -377,6 +378,13 @@
<el-option v-for="item in queryCommonData.BranchList" :label="item.BName" :key="item.Id" :value="item.Id">{{item.BName}}</el-option>
</el-select>
</span>
</li>
<li>
<span>
<em>合团团号</em>
<el-input maxlength="50" v-model="queryMsg.CombinationNum" class="permiss-input w150" @keyup.native.enter="getControlList"
:placeholder="$t('pub.pleaseImport')"></el-input>
</span>
</li>
<li>
<button class="hollowFixedBtn" @click="getControlList(),resetPageIndex()">{{$t('pub.searchBtn')}}</button>
......@@ -491,21 +499,18 @@
</p>
</div>
</td>
<td width="240">
<td width="240">
<div class="d7">
<el-button-group v-if='outItem.TravelPriceList.length>1'>
<el-button
@click.native='chaiTuan(item)'
type="primary"
style="background:#00C6FF; border-color:#00C6FF">团队分拆</el-button>
<el-button @click.native='chaiTuan(item)' type="primary" style="background:#00C6FF; border-color:#00C6FF">团队分拆</el-button>
</el-button-group>
</div>
</td>
</tr>
<tr height="40">
<td colspan="5" style="padding-left: 30px;">
<div>备注：{{item.OPRemark}}</div>
<div v-if="item.DmcRemarkLast">地接备注：{{item.DmcRemarkLast.DMCRemark}}</div>
<div>备注：{{item.OPRemark}}</div>
<div v-if="item.DmcRemarkLast">地接备注：{{item.DmcRemarkLast.DMCRemark}}</div>
</td>
</tr>
</template>
......@@ -533,11 +538,11 @@
//下拉框默认值
SelectDefaultValue: 0,
//分公司默认值
BranchDefaultValue:-1,
BranchDefaultValue: -1,
//数据列表
dataList: [],
//分公司列表
BranchList:[],
BranchList: [],
},
//查询参数
queryMsg: {
......@@ -552,9 +557,11 @@
//是否有数据
noData: false,
currentPage: 1,
QTCState:0,
QTCState: 0,
//出团公司
OutBranchId:-1
OutBranchId: -1,
//合团团号
CombinationNum:""
},
pickerBeginDateBefore: {
disabledDate: time => {
......@@ -571,44 +578,41 @@
};
},
methods: {
chaiTuan(obj){
let subArr=[]
subArr.push(Number(obj.TCID))
this.$confirm('是否拆团?', '提示', {
confirmButtonText: '确定',
cancelButtonText: '取消',
type: 'warning'
}).then(() => {
this.apipost('travel_post_SetPartition',{Ids:subArr,CombinationNum:obj.CombinationNum},res=>{
if (res.data.resultCode == 1) {
this.$message.success(res.data.message);
this.ArrList=[];
this.getControlList()
}else{
this.$message.error(res.data.message)
}
},err=>{})
}).catch(() => {
this.$message({
type: 'info',
message: '已取消'
});
});
},
//拆团
chaiTuan(obj) {
let subArr = [];
subArr.push(Number(obj.TCID));
var that = this;
that.Confirm("是否拆团?", function () {
that.apipost('travel_post_SetPartition', {
Ids: subArr,
CombinationNum: obj.CombinationNum
}, res => {
if (res.data.resultCode == 1) {
that.$message.success(res.data.message);
that.ArrList = [];
that.getControlList()
} else {
that.Error(res.data.message)
}
}, err => {})
})
},
//合团
heTuan() {
let sumArr = []
let sumArr = [];
this.ArrList.forEach(item => {
sumArr = sumArr.concat(item.split(','))
})
});
this.apipost('travel_post_SetCombination', {
Ids: sumArr
}, res => {
if (res.data.resultCode == 1) {
this.$message.success(res.data.message)
this.getControlList()
this.ArrList=[];
this.ArrList = [];
} else {
this.$message.error(res.data.message)
this.Error(res.data.message)
}
}, err => {})
},
......@@ -684,30 +688,12 @@
res => {
if (res.data.resultCode == 1) {
this.queryCommonData.BranchList = res.data.data;
console.log("this.queryCommonData.BranchList",this.queryCommonData.BranchList);
}
},
err => {}
);
},
},
filters: {
priceFormat(value) {
if (value == null) {
return 0.0;
}
let nStr = value.toFixed(2);
nStr += "";
let x = nStr.split(".");
let x1 = x[0];
let x2 = x.length > 1 ? "." + x[1] : "";
var rgx = /(\d+)(\d{3})/;
while (rgx.test(x1)) {
x1 = x1.replace(rgx, "$1" + "," + "$2");
}
return x1 + x2;
}
},
mounted() {
this.getCompanyList();
this.getLineTeamList();
......@@ -721,9 +707,8 @@
"-" +
myDate.getDate();
this.queryMsg.StartGroupDate = nowDate;
this.queryMsg.TCNUM=this.$route.query.TCNUM
this.queryMsg.TCNUM = this.$route.query.TCNUM;
this.getControlList();
}
};
</script>
</script>
\ No newline at end of file
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