Skip to content

S
SuperMan
Commit 87218662 authored by 沈良进's avatar 沈良进
Browse files
Options

save

parents 130c193b 4af9e597
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 4091 additions and 4126 deletions
src/components/Details.vue
View file @ 87218662
...@@ -229,19 +229,34 @@ ...@@ -229,19 +229,34 @@
showRightMenu(e) { showRightMenu(e) {
if (e.button == 2) { if (e.button == 2) {
let id = '' let id = ''
e.path.forEach(x => { if (e.path) {
if (x.className && x.className.indexOf('el-tabs__item') != -1) { e.path.forEach(x => {
id = x.id.split('-')[1] if (x.className && x.className.indexOf('el-tabs__item') != -1) {
return false id = x.id.split('-')[1]
} return false
}) }
this.tabs.forEach((x, i) => { })
if ((x.name + "_" + i) == id) { this.tabs.forEach((x, i) => {
this.mouseX = e.clientX if ((x.name + "_" + i) == id) {
this.mouserY = e.offsetY this.mouseX = e.clientX
this.currentRightIndex = i this.mouserY = e.offsetY
this.currentRightIndex = i
}
})
} else if (id == '' && e.target && e.target.id) {
var tempArray = e.target.id.split('-');
if (tempArray && tempArray.length > 1) {
id = tempArray[1];
} }
}) this.tabs.forEach((x, i) => {
var newName = x.name + "_" + i;
if (newName == id) {
this.mouseX = e.clientX
this.mouserY = e.offsetY
this.currentRightIndex = i
}
})
}
} }
}, },
goback(t) { goback(t) {
......
src/components/FinancialModule/TradeCommission/TicketDetails.vue
View file @ 87218662
...@@ -4,20 +4,20 @@ ...@@ -4,20 +4,20 @@
position: relative; position: relative;
top: 1px; top: 1px;
} }
.opUl li { .opUl li {
display: inline-block; display: inline-block;
margin: 10px 15px 10px 0; margin: 10px 15px 10px 0;
} }
.domesticCommissiondetails .opUl li input { .domesticCommissiondetails .opUl li input {
height: 34px !important; height: 34px !important;
} }
.domesticCommissiondetails .singeRowTable tr td { .domesticCommissiondetails .singeRowTable tr td {
padding: 8px 5px; padding: 8px 5px;
} }
.domesticCommissiondetails .hoverSpan span:hover { .domesticCommissiondetails .hoverSpan span:hover {
cursor: pointer; cursor: pointer;
text-decoration: underline; text-decoration: underline;
...@@ -36,13 +36,13 @@ ...@@ -36,13 +36,13 @@
<ul class="opUl"> <ul class="opUl">
<li> <li>
<em>出团公司</em> <em>出团公司</em>
<el-select filterable v-model='msg.OutBranchId' <el-select filterable v-model='msg.OutBranchId'
@change='handleCurrentChange(1)'> @change='handleCurrentChange(1)'>
<el-option label="不限" :value="-1" :key="-1"></el-option> <el-option label="不限" :value="-1" :key="-1"></el-option>
<el-option <el-option
v-for="item in companyList" v-for="item in companyList"
:label='item.BName' :label='item.BName'
:value='item.Id' :value='item.Id'
:key='item.Id' :key='item.Id'
></el-option> ></el-option>
</el-select> </el-select>
...@@ -57,24 +57,24 @@ ...@@ -57,24 +57,24 @@
</li> </li>
<li> <li>
<em>所属公司</em> <em>所属公司</em>
<el-select filterable v-model='msg.RB_Branch_Id' <el-select filterable v-model='msg.RB_Branch_Id'
@change='getDepartment();handleCurrentChange(1)' :disabled="disabled"> @change='getDepartment();handleCurrentChange(1)' :disabled="disabled">
<el-option label="不限" :value="-1" :key="-1"></el-option> <el-option label="不限" :value="-1" :key="-1"></el-option>
<el-option <el-option
v-for="item in companyList" v-for="item in companyList"
:label='item.BName' :label='item.BName'
:value='item.Id' :value='item.Id'
:key='item.Id' :key='item.Id'
></el-option> ></el-option>
</el-select> </el-select>
</li> </li>
<li> <li>
<em>部门</em> <em>部门</em>
<el-select filterable v-model='msg.RB_Department_Id' <el-select filterable v-model='msg.RB_Department_Id'
@change='getEmployee();handleCurrentChange(1)'> @change='getEmployee();handleCurrentChange(1)'>
<el-option label="不限" :value="-1"></el-option> <el-option label="不限" :value="-1"></el-option>
<el-option v-for='item in departmentList' <el-option v-for='item in departmentList'
:label='item.DepartmentName' :label='item.DepartmentName'
:value='item.DepartmentID' :value='item.DepartmentID'
:key='item.DepartmentID'> :key='item.DepartmentID'>
...@@ -83,7 +83,7 @@ ...@@ -83,7 +83,7 @@
</li> </li>
<li> <li>
<em>人员</em> <em>人员</em>
<el-select v-model="msg.UserId" size="mini" <el-select v-model="msg.UserId" size="mini"
@change="handleCurrentChange(1)" :disabled="disabled" filterable> @change="handleCurrentChange(1)" :disabled="disabled" filterable>
<el-option label="不限" :value="-1"></el-option> <el-option label="不限" :value="-1"></el-option>
<el-option label="微途" :value="-2"></el-option> <el-option label="微途" :value="-2"></el-option>
...@@ -109,9 +109,9 @@ ...@@ -109,9 +109,9 @@
<el-option v-for="item in OrderTypeList" :key="item.Id" :label="item.Name" :value="item.Id"></el-option> <el-option v-for="item in OrderTypeList" :key="item.Id" :label="item.Name" :value="item.Id"></el-option>
</el-select> </el-select>
</li> </li>
<li style="position: fixed;right: 3px;top: 51px;"><input type="button" class="normalBtn" value="导出" @click="exportExcel"></li> <li style="position: fixed;right: 3px;top: 51px;"><input type="button" class="normalBtn" value="导出" @click="exportExcel"></li>
</ul> </ul>
</div> </div>
...@@ -134,7 +134,7 @@ ...@@ -134,7 +134,7 @@
</p> </p>
</div> </div>
</el-col> </el-col>
</el-row> </el-row>
</div> </div>
<table v-loading="loading" class="singeRowTable" border="0" cellspacing="0" cellpadding="0" <table v-loading="loading" class="singeRowTable" border="0" cellspacing="0" cellpadding="0"
...@@ -145,12 +145,12 @@ ...@@ -145,12 +145,12 @@
<th style="width: 80px;">订单号</th> <th style="width: 80px;">订单号</th>
<th style="width: 150px;">团号</th> <th style="width: 150px;">团号</th>
<th style="width: 100px;">所属公司</th> <th style="width: 100px;">所属公司</th>
<th style="width: 100px;">部门</th> <th style="width: 100px;">部门</th>
<th style="width: 100px;">姓名</th> <th style="width: 100px;">姓名</th>
<th style="width: 100px;">线路</th> <th style="width: 100px;">线路</th>
<th style="width: 100px;">是否欧洲</th> <th style="width: 100px;">是否欧洲</th>
<th style="width: 100px;">订单利润</th> <th style="width: 100px;">订单利润</th>
<th style="width: 100px;">团队总人数</th> <th style="width: 100px;">团队总人数</th>
<th style="width: 100px;">团队利润</th> <th style="width: 100px;">团队利润</th>
...@@ -160,7 +160,7 @@ ...@@ -160,7 +160,7 @@
<th style="width: 100px;">提成金额</th> <th style="width: 100px;">提成金额</th>
<th style="width: 100px;">期数</th> <th style="width: 100px;">期数</th>
<th width='200'>备注</th> <th width='200'>备注</th>
</tr> </tr>
<tr v-for="item in dataList"> <tr v-for="item in dataList">
<td>{{item.OutBranchName?item.OutBranchName:'-'}}</td> <td>{{item.OutBranchName?item.OutBranchName:'-'}}</td>
...@@ -174,7 +174,7 @@ ...@@ -174,7 +174,7 @@
<td>{{item.IsEurope==1?'是':''}}</td> <td>{{item.IsEurope==1?'是':''}}</td>
<td>{{item.TCProfit?item.TCProfit:'-'}}</td> <td>{{item.TCProfit?item.TCProfit:'-'}}</td>
<td>{{item.PeopleNum?item.PeopleNum:'-'}}</td> <td>{{item.PeopleNum?item.PeopleNum:'-'}}</td>
<td>{{item.TCGuestNum?item.TCGuestNum:'-'}}</td> <td>{{item.TCProfit?item.TCProfit:'-'}}</td><!-- TCGuestNum -->
<td>{{item.Way==1?'销售额':'利润比'}}</td> <td>{{item.Way==1?'销售额':'利润比'}}</td>
<td>{{item.Rate?item.Rate+'%':'-'}}</td> <td>{{item.Rate?item.Rate+'%':'-'}}</td>
<td>{{item.OrderProfit}}</td> <td>{{item.OrderProfit}}</td>
...@@ -192,12 +192,12 @@ ...@@ -192,12 +192,12 @@
</el-pagination> </el-pagination>
</div> </div>
</template> </template>
<script> <script>
import moment from "moment" import moment from "moment"
export default { export default {
components:{ components:{
}, },
data() { data() {
return { return {
...@@ -273,7 +273,7 @@ ...@@ -273,7 +273,7 @@
} }
if (this.$route.query) { //不大于0的话用默认值 if (this.$route.query) { //不大于0的话用默认值
if (this.$route.query.PeriodId && this.$route.query.PeriodId > 0) { if (this.$route.query.PeriodId && this.$route.query.PeriodId > 0) {
} }
} }
this.msg.TCNUM = this.$route.query.TCNUM?this.$route.query.TCNUM:'' this.msg.TCNUM = this.$route.query.TCNUM?this.$route.query.TCNUM:''
...@@ -281,7 +281,7 @@ ...@@ -281,7 +281,7 @@
this.msg.OrderId = this.$route.query.OrderId?this.$route.query.OrderId:'' this.msg.OrderId = this.$route.query.OrderId?this.$route.query.OrderId:''
this.msg.OutBranchId = this.$route.query.OutBranchId?Number(this.$route.query.OutBranchId):-1 this.msg.OutBranchId = this.$route.query.OutBranchId?Number(this.$route.query.OutBranchId):-1
this.msg.RB_Branch_Id = this.$route.query.RB_Branch_Id?Number(this.$route.query.RB_Branch_Id):Number(userInfo.RB_Branch_id) this.msg.RB_Branch_Id = this.$route.query.RB_Branch_Id?Number(this.$route.query.RB_Branch_Id):Number(userInfo.RB_Branch_id)
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)
if (ActionMenuCode.indexOf('S_CheckBranchOrder') != -1 if (ActionMenuCode.indexOf('S_CheckBranchOrder') != -1
||ActionMenuCode.indexOf('S_CheckAllOrder')!=-1 ||ActionMenuCode.indexOf('S_CheckAllOrder')!=-1
||ActionMenuCode.indexOf('F_Query_AllIncomPay')!=-1) {//是否有看所有人的权限 ||ActionMenuCode.indexOf('F_Query_AllIncomPay')!=-1) {//是否有看所有人的权限
...@@ -293,7 +293,7 @@ ...@@ -293,7 +293,7 @@
}else{ }else{
this.disabled = true; this.disabled = true;
} }
}, },
methods: { methods: {
GetOrderTypeEnumList() { GetOrderTypeEnumList() {
...@@ -311,7 +311,7 @@ ...@@ -311,7 +311,7 @@
this.departmentList = res.data.data; this.departmentList = res.data.data;
} }
}, err => {}) }, err => {})
}, },
getCompany(){ getCompany(){
this.apipost('admin_get_BranchGetList',this.getCompanyMsg,res=>{ this.apipost('admin_get_BranchGetList',this.getCompanyMsg,res=>{
...@@ -319,7 +319,7 @@ ...@@ -319,7 +319,7 @@
this.companyList=res.data.data; this.companyList=res.data.data;
}else{} }else{}
},err=>{}) },err=>{})
}, },
goTuanDetails(row) { goTuanDetails(row) {
let name = '' let name = ''
if (row.IsOneDayOrder == 1) { if (row.IsOneDayOrder == 1) {
...@@ -513,8 +513,8 @@ ...@@ -513,8 +513,8 @@
err => {} err => {}
); );
}, },
handleCurrentChange(val) { handleCurrentChange(val) {
this.msg.pageIndex = val; this.msg.pageIndex = val;
this.getList(); this.getList();
...@@ -558,9 +558,8 @@ ...@@ -558,9 +558,8 @@
var fileName = "同业提成人员表.xls"; var fileName = "同业提成人员表.xls";
this.GetLocalFile("sellcommission_GetTYSaleCommissionSingleDetailsListToExcel", msg, fileName); this.GetLocalFile("sellcommission_GetTYSaleCommissionSingleDetailsListToExcel", msg, fileName);
} }
} }
} }
</script> </script>
\ No newline at end of file
src/components/FinancialModule/addFinancialDocuments.vue
View file @ 87218662
This source diff could not be displayed because it is too large. You can view the blob instead.
src/components/FinancialModule/invoicesManager.vue
View file @ 87218662
...@@ -286,7 +286,10 @@ export default { ...@@ -286,7 +286,10 @@ export default {
cancelButtonText: '取消', cancelButtonText: '取消',
type: 'warning' type: 'warning'
}).then(() => { }).then(() => {
this.apipost('InvoiceApply_get_BatchUpdateInvoiceApply', {OrderId: OrderId}, res=>{ this.apipost('InvoiceApply_get_BatchUpdateInvoiceApply', {
OrderId: OrderId,
InvoiceApplyType: this.msg.InvoiceApplyType
}, res=>{
if (res.data.resultCode == 1) { if (res.data.resultCode == 1) {
this.getPageList() this.getPageList()
} }
......
src/components/SalesModule/productOrderList.vue
View file @ 87218662
...@@ -524,7 +524,6 @@ ...@@ -524,7 +524,6 @@
}, },
}, },
mounted() { mounted() {
console.log('this.router', this.$route, this.$router)
if(this.$route.path === '/productOrderList') { if(this.$route.path === '/productOrderList') {
this.isVisa = false this.isVisa = false
} else { } else {
......
src/components/SingleContract.vue
View file @ 87218662
...@@ -414,7 +414,7 @@ ...@@ -414,7 +414,7 @@
<tr> <tr>
<td> <td>
<el-form-item label="名称"> <el-form-item label="名称">
<el-input type="text" v-model="CtObj.TravelAgency_Name" :disabled="true" class="w300" <el-input type="text" v-model="CtObj.TravelAgency_Name" class="w300"
maxlength="70"></el-input> maxlength="70"></el-input>
</el-form-item> </el-form-item>
</td> </td>
...@@ -1258,11 +1258,11 @@ ...@@ -1258,11 +1258,11 @@
Tourists_Fax: "", Tourists_Fax: "",
Tourists_EmergencyLinkMan: "", Tourists_EmergencyLinkMan: "",
Tourists_EmergencyLinkTel: "", Tourists_EmergencyLinkTel: "",
TravelAgency_Name: "四川和平国际旅行社有限公司", //旅行社名称 TravelAgency_Name: "（株）ピースインターナショナル", //旅行社名称
TravelAgency_LicenseNum: "L-SC-CJ00015", TravelAgency_LicenseNum: "L-SC-CJ00015",
TravelAgency_DealMan: "", TravelAgency_DealMan: "",
TravelAgency_IDNum: "", TravelAgency_IDNum: "",
TravelAgency_Address: "成都市锦江区一环路东五段87号2幢23层2310.2311.2312号", TravelAgency_Address: "東京都北区滝野川5－41－3　TKビル9階",
TravelAgency_Tel: "", TravelAgency_Tel: "",
TravelAgency_Fax: "", TravelAgency_Fax: "",
TravelAgency_PostNum: "", TravelAgency_PostNum: "",
......
src/components/TravelManager/TravelGroupControl/AuditDan.vue
View file @ 87218662
...@@ -79,23 +79,25 @@ ...@@ -79,23 +79,25 @@
</el-tabs> </el-tabs>
<div class="commonContent" v-loading="loading"> <div class="commonContent" v-loading="loading">
<ul class="_content"> <ul class="_content">
<li v-for="item in dataList" :key="item.subCode" :data-id='item.ID' style="padding:0 15px;"> <li v-for="item in dataList" :key="item.ID" style="padding:0 15px;">
<div class="Audit_left" style="width:80px"> <div class="Audit_left" style="width:140px">
<div> <div>
<el-tooltip popper-class="max-w250" effect="dark" :content="item.ID" placement="top-start"> <span>编号：{{item.ID}}</span>
<span>编号：{{item.ID}}</span>
</el-tooltip>
</div> </div>
<el-tooltip popper-class="max-w250" effect="dark" :content="item.TeamTypeName" placement="top-start"> <div style="margin-top:1px">类型：
<div style="margin-top: 10px">类型：{{item.TeamTypeName}}</div> <template v-if="item.TeamType==1">
</el-tooltip> <i style="color:red;font-weight:bold;">{{item.TeamTypeName}}</i>
</template>
<template v-else>
{{item.TeamTypeName}}
</template>
</div>
<div style="margin-top:3px">出发日期：{{item.OutDateTime}}</div>
</div> </div>
<div class="Audit_left" style="width:20%;"> <div class="Audit_left" style="width:20%;">
<div> <div>
<p class="quoListName" style="padding-right:20px;width:100%;"> <p class="quoListName" style="padding-right:20px;width:100%;">
<el-tooltip popper-class="max-w250" effect="dark" :content="item.LineName" placement="top-start"> <span>{{item.LineName}}</span>
<span>{{item.LineName}}</span>
</el-tooltip>
</p> </p>
<p class="Quo_Content" style="padding-right:20px;width:100%;"><i v-if="item.LtName" <p class="Quo_Content" style="padding-right:20px;width:100%;"><i v-if="item.LtName"
class="iconfont icon-richeng"></i> class="iconfont icon-richeng"></i>
...@@ -251,32 +253,11 @@ ...@@ -251,32 +253,11 @@
<el-pagination background @current-change="handleCurrentChange" :current-page.sync="currentPage" <el-pagination background @current-change="handleCurrentChange" :current-page.sync="currentPage"
layout="total,prev, pager, next, jumper" :page-size="queryData.pageSize" :total="total"> layout="total,prev, pager, next, jumper" :page-size="queryData.pageSize" :total="total">
</el-pagination> </el-pagination>
<el-dialog custom-class='ComTeamPlan_info_box' :title="tripTitle" :visible.sync="outerVisible" center>
<commonTeamInfo ref="comDialog"></commonTeamInfo>
</el-dialog>
<div class="shenheBtm" v-if="isShowDan">
<el-form label-width="100px" :model="AuditInfo" :rules="rules" ref="AuditInfo">
<el-col :span="3">
<div style="margin:58px 0 0 50px;">
<el-radio v-model="AuditInfo.TravelState" label="3">通过</el-radio>
<el-radio v-model="AuditInfo.TravelState" label="4">驳回</el-radio>
</div>
</el-col>
<el-col :span="10" style="margin-top:30px;">
<el-form-item label="审批说明">
<el-input type="textarea" class="w600" v-model="AuditInfo.AuditContent"></el-input>
</el-form-item>
</el-col>
<el-col :span="3" style="margin-top:60px;">
<button class="hollowFixedBtn" @click="isShowDan=false">取消</button>
<button class="normalBtn" @click="submitForm('AuditInfo')">保存</button>
</el-col>
</el-form>
</div>
</div> </div>
</template> </template>
<script> <script>
import commonTeamInfo from "../../commonPage/commonTeamInfo.vue";
export default { export default {
data() { data() {
return { return {
...@@ -287,18 +268,6 @@ ...@@ -287,18 +268,6 @@
PageSize: "5", PageSize: "5",
TravelState: 2 TravelState: 2
}, },
AuditInfo: {
ID: "",
TravelState: "",
AuditContent: ""
},
rules: {
AuditContent: [{
required: true,
message: "请填写审核说明",
trigger: "blur"
}]
},
loading: true, loading: true,
//默认选中 //默认选中
activeName: "2", activeName: "2",
...@@ -306,8 +275,7 @@ ...@@ -306,8 +275,7 @@
EmployeeList: [], EmployeeList: [],
//日志 //日志
AuditLogList: "", AuditLogList: "",
//显示隐藏审核
isShowDan: false,
//线路列表 //线路列表
LineList: "", LineList: "",
noLimit: 0, noLimit: 0,
...@@ -318,14 +286,10 @@ ...@@ -318,14 +286,10 @@
dataList: "", dataList: "",
total: 0, total: 0,
currentPage: 1, currentPage: 1,
SalesPriceList: [],
CostList: [],
outerVisible: false,
tripTitle: ""
}; };
}, },
components: { components: {
commonTeamInfo: commonTeamInfo
}, },
methods: { methods: {
handleCurrentChange(val) { handleCurrentChange(val) {
...@@ -415,57 +379,6 @@ ...@@ -415,57 +379,6 @@
} }
); );
}, },
//点击销售定价获取数据
getSalsPrice(ID) {
let msg = {
ID: ID
};
this.SalesPriceList = [];
this.apipost("travel_get_GetTravelQuotationPrice", msg, res => {
if (res.data.resultCode == 1) {
this.SalesPriceList.push(res.data.data[0]);
}
});
},
//点击地接成本获取数据
getCostPrice(ID) {
let msg = {
ID: ID
};
this.CostList = [];
this.apipost("travel_get_GetTravelOfferPrice", msg, res => {
if (res.data.resultCode == 1) {
if (res.data.data[0] != undefined || res.data.data[0] != null) {
let cost = res.data.data[0];
let dayNum = 0;
cost.LocalOfferPriceList.forEach(x => {
if (x.DayNum > dayNum) {
dayNum = x.DayNum;
}
});
let offerPriceList = [];
for (let i = 1; i <= dayNum; i++) {
let dayOfferPriceList = [];
let totalPrice = 0;
cost.LocalOfferPriceList.forEach(x => {
if (x.DayNum == i) {
dayOfferPriceList.push(x);
totalPrice += x.OfferPrice;
}
});
let offerPrice = {
day: i,
dayOfferPriceList,
totalPrice
};
offerPriceList.push(offerPrice);
}
cost["offerPriceList"] = offerPriceList;
this.CostList.push(cost);
}
}
});
},
//根据当前员工所在部门获取该部门及子部门员工信息 //根据当前员工所在部门获取该部门及子部门员工信息
getEmployeeList() { getEmployeeList() {
this.apipost( this.apipost(
...@@ -474,26 +387,15 @@ ...@@ -474,26 +387,15 @@
if (res.data.resultCode == 1) { if (res.data.resultCode == 1) {
this.EmployeeList = res.data.data; this.EmployeeList = res.data.data;
} }
}, }
err => {}
); );
}, },
getJourney(id, title) {
//根据ID 获取行程内容
var that = this;
this.tripTitle = title;
this.$nextTick(() => {
that.$refs.comDialog.GetTrip(id);
});
that.outerVisible = true;
},
goUrl(path, configId, qType) { goUrl(path, configId, qType) {
if (configId > 0) { if (configId > 0) {
this.$router.push({ this.$router.push({
name: path, name: path,
query: { query: {
configId: configId, configId: configId,
Qtype: qType, Qtype: qType,
blank: 'y', blank: 'y',
tab: '报价单审核' tab: '报价单审核'
...@@ -505,44 +407,6 @@ ...@@ -505,44 +407,6 @@
}); });
} }
}, },
submitForm() {
//提交创建、修改表单
this.$refs["AuditInfo"].validate(valid => {
if (valid) {
this.saveAudit();
} else {
return false;
}
});
},
auditDanList(ID) {
this.isShowDan = true;
this.AuditInfo.ID = ID;
},
//提交审核
saveAudit() {
this.apipost(
"travel_get_AuditTravelConfig",
this.AuditInfo,
res => {
if (res.data.resultCode == 1) {
this.Success("审核成功");
this.isShowDan = false;
this.getList();
}
},
err => {}
);
},
//格式化日期去掉年
formatStartDate(value) {
if (value == null || value == undefined) {
return "";
} else {
let dataArr = value.split("-");
return dataArr[1] + "-" + dataArr[2];
}
}
}, },
mounted() { mounted() {
this.getLineList(); this.getLineList();
......
src/components/TravelManager/TravelNewQuotation/CostNewPriceAudit.vue
View file @ 87218662
...@@ -95,7 +95,12 @@ ...@@ -95,7 +95,12 @@
</td> </td>
<td width="80" class="txtRightCost">团队类型</td> <td width="80" class="txtRightCost">团队类型</td>
<td width="300"> <td width="300">
{{postConfig.TeamTypeName}} <template v-if="postConfig.TeamType==1">
<span style="color:red;font-weight:bold;">{{postConfig.TeamTypeName}}</span>
</template>
<template v-else>
{{postConfig.TeamTypeName}}
</template>
</td> </td>
<td width="80" class="txtRightCost">行程天数</td> <td width="80" class="txtRightCost">行程天数</td>
<td> <td>
...@@ -175,7 +180,7 @@ ...@@ -175,7 +180,7 @@
<td width="100" class="CP_ComTitle2 CostcomCenter">中</td> <td width="100" class="CP_ComTitle2 CostcomCenter">中</td>
<td width="100" class="CP_ComTitle2 CostcomCenter">晚</td> <td width="100" class="CP_ComTitle2 CostcomCenter">晚</td>
</tr> </tr>
<template v-if="CostNumberList&&CostNumberList.length>1" > <template v-if="CostNumberList&&CostNumberList.length>1">
<template v-for="(subItem,subIndex) in dayCostPrice"> <template v-for="(subItem,subIndex) in dayCostPrice">
<template v-for="(childItem,childIndex) in CostNumberList"> <template v-for="(childItem,childIndex) in CostNumberList">
<tr> <tr>
...@@ -222,7 +227,6 @@ ...@@ -222,7 +227,6 @@
</tr> </tr>
</template> </template>
</template> </template>
<template v-for="(childItem,childIndex) in CostNumberList"> <template v-for="(childItem,childIndex) in CostNumberList">
<tr> <tr>
<td colspan="3" class="CP_ComTitle2 CostcomCenter" v-if="childIndex==0" <td colspan="3" class="CP_ComTitle2 CostcomCenter" v-if="childIndex==0"
...@@ -259,7 +263,7 @@ ...@@ -259,7 +263,7 @@
</tr> </tr>
</template> </template>
<template v-for="(childItem,childIndex) in CostNumberList"> <template v-for="(childItem,childIndex) in CostNumberList">
<tr> <tr :key="childIndex+1000">
<td colspan="3" class="CP_ComTitle2 CostcomCenter" v-if="childIndex==0" <td colspan="3" class="CP_ComTitle2 CostcomCenter" v-if="childIndex==0"
:rowspan="CostNumberList.length"> :rowspan="CostNumberList.length">
人民币小计 人民币小计
...@@ -775,12 +779,6 @@ ...@@ -775,12 +779,6 @@
{{teamPrice.SingleRoomPrice}} {{teamPrice.SingleRoomPrice}}
</td> </td>
</tr> </tr>
<!-- <tr>
<td class="CP_ComTitle2">备注</td>
<td colspan="13">
{{OtherPrice.OtherRemark}}
</td>
</tr> -->
<tr> <tr>
<td class="CP_ComTitle2">附件</td> <td class="CP_ComTitle2">附件</td>
<td colspan="13"> <td colspan="13">
...@@ -794,9 +792,25 @@ ...@@ -794,9 +792,25 @@
</tr> </tr>
<tr> <tr>
<td class="CP_ComTitle2">审核备注</td> <td class="CP_ComTitle2">审核备注</td>
<td colspan="13"> <td colspan="7">
<el-input type="textarea" v-model="postConfig.AuditContent"></el-input> <el-input type="textarea" v-model="postConfig.AuditContent"></el-input>
</td> </td>
<td colspan="2">
当前团队类型: <template v-if="postConfig.TeamTypeName=='小包团'">
<span style="color:red;font-weight:bold;">{{postConfig.TeamTypeName}}</span>
</template>
<template v-else>
{{postConfig.TeamTypeName}}
</template>
</td>
<td colspan="4">
<el-form-item label="更改团队类型">
<el-select class="multiple_input" v-model="postConfig.TeamType">
<el-option v-for='item in teamList' :key="item.ID" :label="item.Name" :value="item.ID">
</el-option>
</el-select>
</el-form-item>
</td>
</tr> </tr>
<tr v-if="IsEdit==2"> <tr v-if="IsEdit==2">
<td colspan="14" style="text-align:center;"> <td colspan="14" style="text-align:center;">
...@@ -825,10 +839,23 @@ ...@@ -825,10 +839,23 @@
dayCostPrice: [], dayCostPrice: [],
CostCurrencyList: [], CostCurrencyList: [],
CostNumberList: [], CostNumberList: [],
teamPrice: {} teamPrice: {},
teamList: [], //团队类型
} }
}, },
methods: { methods: {
getTeamList() {
//出团公司
this.apipost(
"travel_GetTeamTypeEnumList", {},
res => {
if (res.data.resultCode == 1) {
this.teamList = res.data.data;
}
},
err => {}
);
},
selectTag(index) { selectTag(index) {
this.tabsActive = index this.tabsActive = index
this.changeTabs() this.changeTabs()
...@@ -1091,14 +1118,15 @@ ...@@ -1091,14 +1118,15 @@
}, },
getchange() { getchange() {
this.getLeaderShare(); this.getLeaderShare();
} }
}, },
mounted() { mounted() {
this.orderList = this.OfferArray this.orderList = this.OfferArray
this.changeTabs() this.changeTabs()
}, },
created() {}, created() {
this.getTeamList();
},
watch: { watch: {
}, },
......
src/components/TravelManager/TravelNewQuotation/CostNewPriceMun.vue
View file @ 87218662
...@@ -78,6 +78,17 @@ ...@@ -78,6 +78,17 @@
<el-form> <el-form>
<div class="QuotationFirstDiv1"> <div class="QuotationFirstDiv1">
<table> <table>
<tr>
<th>
开团提示
</th>
<th colspan="5" style="text-align:left;line-height:40px;">
<p style="color:red;font-weight:bold;"> 1.“常规团”对应 “散拼”;&nbsp;&nbsp; 2.“小包团”(10人以下 或者
超过10人纯玩不进店);&nbsp;&nbsp;
3.“当地游”(不需要机票);
</p>
</th>
</tr>
<tr> <tr>
<td width="80" class="txtRightCost">出团类型</td> <td width="80" class="txtRightCost">出团类型</td>
<td> <td>
......
src/components/TravelManager/TravelNewQuotation/QuotationAduit.vue
View file @ 87218662
...@@ -12,15 +12,15 @@ ...@@ -12,15 +12,15 @@
<template> <template>
<div class="DirectQuotation clearfix" v-loading="loading"> <div class="DirectQuotation clearfix" v-loading="loading">
<div class="singlePrice clearfix"> <div class="singlePrice clearfix">
<CostNewPriceAudit v-if="haveData" ref="CostNewPrice" :postConfig="postData" :OtherPrice="otherPrice" :OfferArray="OfferArray" <CostNewPriceAudit v-if="haveData" ref="CostNewPrice" :postConfig="postData" :OtherPrice="otherPrice"
:dayCostPrice="dayCostPriceList" :CostCurrencyList="CostCurrencyList" :CostNumberList="CostNumberList" :OfferArray="OfferArray" :dayCostPrice="dayCostPriceList" :CostCurrencyList="CostCurrencyList"
:CurrencyNumberListExt="CurrencyNumberListExt" :teamPrice="teamPrice" :IsEdit="IsEdit"></CostNewPriceAudit> :CostNumberList="CostNumberList" :CurrencyNumberListExt="CurrencyNumberListExt" :teamPrice="teamPrice"
:IsEdit="IsEdit"></CostNewPriceAudit>
</div> </div>
</div> </div>
</template> </template>
<script> <script>
import CostNewPriceAudit from "../TravelNewQuotation/CostNewPriceAudit"; import CostNewPriceAudit from "../TravelNewQuotation/CostNewPriceAudit";
export default { export default {
data() { data() {
return { return {
...@@ -64,7 +64,7 @@ ...@@ -64,7 +64,7 @@
OutBranchName: "", //出团公司名称 OutBranchName: "", //出团公司名称
OutDateTime: "", //出发时间 OutDateTime: "", //出发时间
OfferPayType: 0, //报价单付款方式() OfferPayType: 0, //报价单付款方式()
SaleOfferPayType:0,//售价付款方式 SaleOfferPayType: 0, //售价付款方式
}, },
dayCostPriceList: [], //报价列表 dayCostPriceList: [], //报价列表
isSubmit: true, isSubmit: true,
...@@ -145,7 +145,6 @@ ...@@ -145,7 +145,6 @@
}; };
}, },
methods: { methods: {
//保存数据 //保存数据
SaveData(Type) { SaveData(Type) {
var nObj = { var nObj = {
...@@ -153,6 +152,7 @@ ...@@ -153,6 +152,7 @@
AuditContent: this.postData.AuditContent, AuditContent: this.postData.AuditContent,
TravelState: Type, TravelState: Type,
OfferPayType: this.postData.OfferPayType, OfferPayType: this.postData.OfferPayType,
TeamType:this.postData.TeamType,
}; };
this.loading = true; this.loading = true;
this.apipost( this.apipost(
...@@ -186,8 +186,9 @@ ...@@ -186,8 +186,9 @@
let msg = { let msg = {
ID: configId, ID: configId,
offerId: offerId offerId: offerId
};this.apipost( };
"travel_get_GetMyTravelInfo_V3", // travel_get_GetMyTravelInfo_V2 this.apipost(
"travel_get_GetMyTravelInfo_V3",
msg, msg,
res => { res => {
if (res.data.resultCode == 1) { if (res.data.resultCode == 1) {
...@@ -226,54 +227,20 @@ ...@@ -226,54 +227,20 @@
this.postData.OutBranchId = tempData.OutBranchId; this.postData.OutBranchId = tempData.OutBranchId;
this.postData.OutDateTime = tempData.OutDateTime; this.postData.OutDateTime = tempData.OutDateTime;
this.postData.OfferPayType = tempData.OfferPayType; this.postData.OfferPayType = tempData.OfferPayType;
this.postData.SaleOfferPayType=tempData.SaleOfferPayType; this.postData.SaleOfferPayType = tempData.SaleOfferPayType;
this.LineList = tempData.LineList; this.LineList = tempData.LineList;
this.postData.LineName = tempData.LineName this.postData.LineName = tempData.LineName;
this.postData.LtName = tempData.LtName this.postData.LtName = tempData.LtName;
this.postData.LtName = tempData.LtName this.postData.LtName = tempData.LtName;
this.postData.OutBranchName = tempData.OutBranchName this.postData.OutBranchName = tempData.OutBranchName;
this.postData.TeamTypeName = tempData.TeamTypeName this.postData.TeamTypeName = tempData.TeamTypeName;
if(tempData.OfferArray) { this.postData.TeamType = tempData.TeamType;
if (tempData.OfferArray) {
tempData.OfferArray.forEach(item => { tempData.OfferArray.forEach(item => {
this.OfferArray.push(item) this.OfferArray.push(item)
}) })
// this.OfferArray = tempData.OfferArray
} }
// if (tempData.dayCostPriceList && tempData.dayCostPriceList != null && tempData.dayCostPriceList.length > this.haveData = true;
// 0) {
// this.dayCostPriceList = tempData.dayCostPriceList;
// }
// if (tempData.otherPrice) {
// this.otherPrice = tempData.otherPrice;
// }
// if (tempData.teamPrice) {
// this.teamPrice = tempData.teamPrice;
// }
// if (tempData.CostNumberList && tempData.CostNumberList != null && tempData.CostNumberList.length > 0) {
// this.CostNumberList = tempData.CostNumberList;
// }
// if (tempData.CostCurrencyList && tempData.CostCurrencyList != null && tempData.CostCurrencyList.length >
// 0) {
// this.CostCurrencyList = tempData.CostCurrencyList;
// }
// if (tempData.CurrencyNumberListExt && tempData.CurrencyNumberListExt != null && tempData
// .CurrencyNumberListExt.length > 0) {
// this.CurrencyNumberListExt = tempData.CurrencyNumberListExt;
// }
// if (this.CostCurrencyList && this.CostCurrencyList.length > 0 &&
// this.CurrencyNumberListExt) {
// this.CostCurrencyList.forEach(item => {
// let currencyNumberItem = {
// Key: item.CurrencyId,
// currencyNumberList: []
// };
// if (this.CurrencyNumberListExt.length == 0) {
// this.CurrencyNumberListExt.push(currencyNumberItem);
// }
// });
// }
this.haveData = true;
} else { } else {
this.Error(res.data.message); this.Error(res.data.message);
} }
......
src/components/TravelManager/TravelNewQuotation/QuotationNewPrice.vue
View file @ 87218662
...@@ -159,7 +159,6 @@ ...@@ -159,7 +159,6 @@
return currencyNumList return currencyNumList
} }
this.postData.TravelState = type; this.postData.TravelState = type;
// console.log('this.postData', this.postData, this.postData.LineId)
// 线路必填 // 线路必填
if(!this.postData.LineId) { if(!this.postData.LineId) {
this.$message.error('请选择线路') this.$message.error('请选择线路')
......
src/components/myOrdersAllType/components/allList.vue
View file @ 87218662
...@@ -37,34 +37,34 @@ ...@@ -37,34 +37,34 @@
.el-table th.is-leaf { .el-table th.is-leaf {
background-color: #EAEAEA !important; background-color: #EAEAEA !important;
} }
.HotelWorkList .HW_hotelDialog { .HotelWorkList .HW_hotelDialog {
width: 900px; width: 900px;
} }
.HotelWorkList .Hw_tableOne { .HotelWorkList .Hw_tableOne {
width: 100%; width: 100%;
height: 40px; height: 40px;
background-color: #EAEAEA; background-color: #EAEAEA;
} }
.HotelWorkList .Hw_tableOne th { .HotelWorkList .Hw_tableOne th {
text-align: center; text-align: center;
} }
.HotelWorkList .HotelWorkInput .el-input { .HotelWorkList .HotelWorkInput .el-input {
width: 223px; width: 223px;
} }
.HotelWorkList .HworkInput .el-input { .HotelWorkList .HworkInput .el-input {
width: 210px; width: 210px;
} }
/deep/.query-box li span>em{ /deep/.query-box li span>em{
min-width: 60px; min-width: 60px;
} }
</style> </style>
<template> <template>
<div class="HotelWorkList"> <div class="HotelWorkList">
<div class="query-box HotelWorkInput" style="border-bottom: none;"> <div class="query-box HotelWorkInput" style="border-bottom: none;">
...@@ -128,8 +128,8 @@ ...@@ -128,8 +128,8 @@
</el-select> </el-select>
</span> </span>
</li> </li>
<li> <li>
<span> <span>
<em>订单状态</em> <em>订单状态</em>
...@@ -155,8 +155,8 @@ ...@@ -155,8 +155,8 @@
</el-select> </el-select>
</span> </span>
</li> </li>
<li> <li>
<span> <span>
<em>报名时间</em> <em>报名时间</em>
...@@ -189,7 +189,7 @@ ...@@ -189,7 +189,7 @@
</el-option> </el-option>
</el-select> </el-select>
</td> </td>
</tr> </tr>
<tr> <tr>
<td style="padding: 5px 0"> <td style="padding: 5px 0">
...@@ -204,7 +204,7 @@ ...@@ -204,7 +204,7 @@
:end-placeholder="$t('OrderList.end')" @change="getDatesUse"> :end-placeholder="$t('OrderList.end')" @change="getDatesUse">
</el-date-picker> </el-date-picker>
</td> </td>
</tr> </tr>
<tr> <tr>
<td style="padding: 5px 0"> <td style="padding: 5px 0">
...@@ -223,7 +223,7 @@ ...@@ -223,7 +223,7 @@
<tr> <tr>
<td colspan="4"> <td colspan="4">
<input type="button" class="normalBtn" :value="$t('pub.searchBtn')" <input type="button" class="normalBtn" :value="$t('pub.searchBtn')"
@click="GetList();showWarningSearch=false" style="width: 310px!important;" /> @click="msg.pageIndex=1,currentPage=1,GetList();showWarningSearch=false" style="width: 310px!important;" />
</td> </td>
</tr> </tr>
</table> </table>
...@@ -285,15 +285,15 @@ ...@@ -285,15 +285,15 @@
</div> </div>
</el-col> </el-col>
</template> </template>
</el-row> </el-row>
</div> </div>
<OrderList :pagesTitle="Title" :OrderList="OrderList" v-loading="loading" @success="msg.pageIndex=1,GetList()"> </OrderList> <OrderList :pagesTitle="Title" :OrderList="OrderList" v-loading="loading" @success="msg.pageIndex=1,GetList()"> </OrderList>
<div v-if="OrderList&&OrderList.length==0" style="text-align: center;padding: 100px;">暂无数据</div> <div v-if="OrderList&&OrderList.length==0" style="text-align: center;padding: 100px;">暂无数据</div>
<el-pagination v-if="OrderList&&OrderList.length>0" background @current-change="handleCurrentChange" :current-page.sync="currentPage" layout="total,prev, pager, next, jumper" :page-size=msg.pageSize :total=total> <el-pagination v-if="OrderList&&OrderList.length>0" background @current-change="handleCurrentChange" :current-page.sync="currentPage" layout="total,prev, pager, next, jumper" :page-size=msg.pageSize :total=total>
</el-pagination> </el-pagination>
</div> </div>
</template> </template>
<script> <script>
...@@ -342,7 +342,7 @@ ...@@ -342,7 +342,7 @@
Q_IsCollect: "0", //收款状态 Q_IsCollect: "0", //收款状态
StartTime: "",//报名开始日期 StartTime: "",//报名开始日期
EndTime: "",//报名结束日期 EndTime: "",//报名结束日期
FinishSTime: "",//完结开始时间 FinishSTime: "",//完结开始时间
FinishETime: "",//完结结束时间 FinishETime: "",//完结结束时间
DepartSTime: "",//出发开始 DepartSTime: "",//出发开始
DepartETime: "",//出发结束 DepartETime: "",//出发结束
...@@ -606,8 +606,8 @@ ...@@ -606,8 +606,8 @@
if(this.Title!='销售'){ if(this.Title!='销售'){
this.getEmployee() this.getEmployee()
} }
this.msg.StartTime = this.getBeforeDate(0, new Date()) this.msg.StartTime = this.getBeforeDate(0, new Date())
this.msg.EndTime = this.getBeforeDate(0, new Date()) this.msg.EndTime = this.getBeforeDate(0, new Date())
this.DatelistBM = [new Date(this.msg.StartTime),new Date()] this.DatelistBM = [new Date(this.msg.StartTime),new Date()]
// this.GetOrderStatusEnumList()//订单状态 // this.GetOrderStatusEnumList()//订单状态
// this.GetTicketStatusEnumList()//出票状态 // this.GetTicketStatusEnumList()//出票状态
...@@ -616,7 +616,7 @@ ...@@ -616,7 +616,7 @@
this.Datelist = this.getyMDOne() this.Datelist = this.getyMDOne()
this.userInfo = this.getLocalStorage(); this.userInfo = this.getLocalStorage();
this.GetList(); this.GetList();
//自适应高度调节 //自适应高度调节
this.com_onresize(); this.com_onresize();
window.onresize = () => { window.onresize = () => {
...@@ -624,6 +624,5 @@ ...@@ -624,6 +624,5 @@
} }
}, },
}; };
</script> </script>
\ No newline at end of file
src/components/rank/entryForm.vue
View file @ 87218662
This diff is collapsed.
src/components/rank/salesVolumeRank.vue
View file @ 87218662
...@@ -531,8 +531,7 @@ export default { ...@@ -531,8 +531,7 @@ export default {
settStartDates() { settStartDates() {
let date = moment().format('yyyy-MM-DD') let date = moment().format('yyyy-MM-DD')
let start = moment().subtract(1, 'months').format('yyyy-MM-DD') let start = moment().subtract(1, 'months').format('yyyy-MM-DD')
this.msg.tStartDates = [start, date] this.msg.tStartDates = [start, date]
console.log('settStartDates',date,start)
}, },
handleClick(tab, event) { handleClick(tab, event) {
this.msg.EnterID = 0; this.msg.EnterID = 0;
......
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