Skip to content

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

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

parents 927ef691 d4994d92
Show whitespace changes
Inline Side-by-side
Showing with 430 additions and 327 deletions
src/components/Hotel/HotelSalesBoard.vue
View file @ 12541d7b
...@@ -412,7 +412,8 @@ ...@@ -412,7 +412,8 @@
GetHotelList() { GetHotelList() {
this.apipost( this.apipost(
"hotel_post_GetHasStockHotelList", { "hotel_post_GetHasStockHotelList", {
Country: 651 Country: 651,
IsMoreThanZero:1
}, },
res => { res => {
if (res.data.resultCode == 1) { if (res.data.resultCode == 1) {
......
src/components/Hotel/roomReservations.vue
View file @ 12541d7b
...@@ -178,7 +178,6 @@ ...@@ -178,7 +178,6 @@
layout="total,prev, pager, next, jumper" :page-size=msg.pageSize :total=total></el-pagination> layout="total,prev, pager, next, jumper" :page-size=msg.pageSize :total=total></el-pagination>
</div> </div>
</template> </template>
<script> <script>
export default { export default {
data() { data() {
...@@ -193,14 +192,17 @@ ...@@ -193,14 +192,17 @@
LineId: 14, LineId: 14,
LineteamId: "-1", LineteamId: "-1",
StartDate: '', StartDate: '',
EndDate: '' EndDate: '',
//酒店编号
HotelId: 0,
//日期
DateStr: ""
}, },
LineList: [], LineList: [],
LineTeamList: [], LineTeamList: [],
thLengthTitle: [], thLengthTitle: [],
list: [], list: [],
colspanTotal: 0, colspanTotal: 0,
} }
}, },
methods: { methods: {
...@@ -276,7 +278,6 @@ ...@@ -276,7 +278,6 @@
this.apipost('dmcstatistics_post_GetUniteCombinationNumService', this.msg, res => { this.apipost('dmcstatistics_post_GetUniteCombinationNumService', this.msg, res => {
if (res.data.resultCode == 1) { if (res.data.resultCode == 1) {
this.loading = false this.loading = false
console.log(res.data.data.pageData.data)
this.total = res.data.data.count this.total = res.data.data.count
this.list = res.data.data.pageData.data this.list = res.data.data.pageData.data
this.thLengthArr = [] this.thLengthArr = []
...@@ -297,34 +298,15 @@ ...@@ -297,34 +298,15 @@
}) })
} }
item.CommonReport.HotelList = item.CommonReport.HotelList.concat(_chaArr) item.CommonReport.HotelList = item.CommonReport.HotelList.concat(_chaArr)
} else {
} }
}) })
}) })
// this.list.forEach(item=>{
// item.CommonReport['valueLength']=item.CommonReport.HotelList.length
// if(item.CommonReport.HotelList.length<res.data.data.pageData.columnsCount){
// let _cha=res.data.data.pageData.columnsCount-item.CommonReport.HotelList.length
// let _chaArr=new Array()
// for (let i=0;i<_cha;i++) {
// _chaArr.push({'HotelName':''})
// }
// item.CommonReport.HotelList=item.CommonReport.HotelList.concat(_chaArr)
// console.log(item.CommonReport)
// }else{
//
// }
// })
} else { } else {
this.loading = false this.loading = false
this.$message.error(res.data.message) this.$message.error(res.data.message)
} }
}, err => {}) }, err => {})
}, },
},
beforeCreate() {
}, },
mounted() { mounted() {
let myDate = new Date(); let myDate = new Date();
...@@ -334,13 +316,27 @@ ...@@ -334,13 +316,27 @@
parseInt(myDate.getMonth() + 1) + parseInt(myDate.getMonth() + 1) +
"-" + "-" +
myDate.getDate(); myDate.getDate();
if(this.$route.query.hotelId)
{
this.msg.HotelId=this.$route.query.hotelId;
}
if(this.$route.query.dateStr)
{
this.msg.DateStr=this.$route.query.dateStr;
}
if(this.$route.query.hotelId||this.$route.query.dateStr)
{
this.msg.StartDate = "";
}
else
{
this.msg.StartDate = nowDate; this.msg.StartDate = nowDate;
}
this.getList() this.getList()
// this.getLineList()
this.getLineTeamList() this.getLineTeamList()
}, },
} }
</script> </script>
<style> <style>
......
src/components/TravelManager/TravelList/RegistrationList.vue
View file @ 12541d7b
...@@ -2337,7 +2337,9 @@ ...@@ -2337,7 +2337,9 @@
<el-dialog custom-class='passgenrDialog' title="航班列表" :visible.sync="outerVisible" center> <el-dialog custom-class='passgenrDialog' title="航班列表" :visible.sync="outerVisible" center>
<table border="0" cellspacing="0" cellpadding="0" class="singeRowTable"> <table border="0" cellspacing="0" cellpadding="0" class="singeRowTable">
<tr> <tr>
<td colspan="6" style="text-align:left;font-weight:bold;padding-left:5px">票务航班信息</td> <td colspan="7" style="text-align:left;font-weight:bold;padding-left:5px">票务航班信息
<span style="color:red">{{flightIsConfirmFlight==1?"已确认":"未确认"}}</span>
</td>
</tr> </tr>
<tr> <tr>
<th>航班号</th> <th>航班号</th>
...@@ -2346,6 +2348,7 @@ ...@@ -2346,6 +2348,7 @@
<th>出发时间</th> <th>出发时间</th>
<th>起飞机场</th> <th>起飞机场</th>
<th>到达机场</th> <th>到达机场</th>
<th>经停机场</th>
</tr> </tr>
<tr v-for="item in flightList"> <tr v-for="item in flightList">
<td>{{item.Flight_number}}</td> <td>{{item.Flight_number}}</td>
...@@ -2354,6 +2357,7 @@ ...@@ -2354,6 +2357,7 @@
<td>{{item.FlightDate}}</td> <td>{{item.FlightDate}}</td>
<td>{{item.dName}}</td> <td>{{item.dName}}</td>
<td>{{item.aName}}</td> <td>{{item.aName}}</td>
<td>{{item.sName}}</td>
</tr> </tr>
</table> </table>
<table border="0" cellspacing="0" cellpadding="0" class="singeRowTable" style="margin-top:20px;" v-if="combineTeamList.length>0"> <table border="0" cellspacing="0" cellpadding="0" class="singeRowTable" style="margin-top:20px;" v-if="combineTeamList.length>0">
...@@ -2778,6 +2782,8 @@ import updateSalesMan from "../../commonPage/updateSalesMan.vue"; ...@@ -2778,6 +2782,8 @@ import updateSalesMan from "../../commonPage/updateSalesMan.vue";
CreateBy:'', CreateBy:'',
OrderId:0 OrderId:0
}, },
//航班是否确认
flightIsConfirmFlight:0,
flightList:[], flightList:[],
combineTeamList:[], combineTeamList:[],
}; };
...@@ -4062,6 +4068,7 @@ submitYSZEForm(){ ...@@ -4062,6 +4068,7 @@ submitYSZEForm(){
} }
this.apipost("ticket_get_GetEntityExtend", msg, res => { this.apipost("ticket_get_GetEntityExtend", msg, res => {
if (res.data.resultCode == 1) { if (res.data.resultCode == 1) {
this.flightIsConfirmFlight=res.data.data.IsConfirmFlight;
this.flightList = res.data.data.flightList; this.flightList = res.data.data.flightList;
} else { } else {
this.Error(res.data.message); this.Error(res.data.message);
......
src/components/TravelManager/TravelList/TravelControlList.vue
View file @ 12541d7b
...@@ -55,29 +55,32 @@ ...@@ -55,29 +55,32 @@
font-weight: 700; font-weight: 700;
font-size: 14px; font-size: 14px;
} }
.TC_Content ._pic_upload .el-upload-dragger {
.TC_Content ._pic_upload .el-upload-dragger {
font-size: 28px; font-size: 28px;
color: #8c939d; color: #8c939d;
width: 126px; width: 126px;
height: 80px; height: 80px;
line-height: 41px; line-height: 41px;
text-align: center; text-align: center;
} }
.TC_Content ._pic_upload>div {
.TC_Content ._pic_upload > div {
float: left; float: left;
width: 138px; width: 138px;
height: 92px; height: 92px;
border: 1px dashed rgba(210,210,210,1); border: 1px dashed rgba(210, 210, 210, 1);
border-radius: 2px; border-radius: 2px;
cursor: pointer; cursor: pointer;
margin-bottom: 10px; margin-bottom: 10px;
padding: 5px; padding: 5px;
margin-right: 10px; margin-right: 10px;
position: relative; position: relative;
} }
.TC_Content .avatar-uploader-icon{
.TC_Content .avatar-uploader-icon {
height: auto; height: auto;
} }
</style> </style>
<template> <template>
<div class="TC_Content"> <div class="TC_Content">
...@@ -86,24 +89,29 @@ ...@@ -86,24 +89,29 @@
<!--v-if="queryCommonData.IsParentCompany==1"--> <!--v-if="queryCommonData.IsParentCompany==1"-->
<div class="TC_companyList"> <div class="TC_companyList">
<span :class="{'TC_checked':queryCommonData.checkCompanyAll}" @click="getCompanyCheckAll()">全部</span> <span :class="{'TC_checked':queryCommonData.checkCompanyAll}" @click="getCompanyCheckAll()">全部</span>
<span v-for="(item,bindex) in queryCommonData.BranchList" :class="{'TC_checked':item.isShow}" @click="getCompanyCheck(item)">{{item.BName}}</span> <span v-for="(item,bindex) in queryCommonData.BranchList" :class="{'TC_checked':item.isShow}"
@click="getCompanyCheck(item)">{{item.BName}}</span>
</div> </div>
<ul> <ul>
<li> <li>
<span> <span>
<em>所属线路</em> <em>所属线路</em>
<el-select class="w150" v-model="queryMsg.LineId" filterable :placeholder="$t('pub.pleaseSel')" @change="getLinePlaceList()"> <el-select class="w150" v-model="queryMsg.LineId" filterable :placeholder="$t('pub.pleaseSel')"
@change="getLinePlaceList()">
<el-option :label="$t('pub.unlimitedSel')" :value="queryCommonData.SelectDefaultValue"></el-option> <el-option :label="$t('pub.unlimitedSel')" :value="queryCommonData.SelectDefaultValue"></el-option>
<el-option v-for="item in queryCommonData.LineList" :label="item.LineName" :value="item.LineID" :key="item.LineID"></el-option> <el-option v-for="item in queryCommonData.LineList" :label="item.LineName" :value="item.LineID"
:key="item.LineID"></el-option>
</el-select> </el-select>
</span> </span>
</li> </li>
<li> <li>
<span> <span>
<em>国别/目的地</em> <em>国别/目的地</em>
<el-select class="w150" v-model="queryMsg.PlaceID" filterable :placeholder="$t('pub.pleaseSel')" @change="getLineTeamList()"> <el-select class="w150" v-model="queryMsg.PlaceID" filterable :placeholder="$t('pub.pleaseSel')"
@change="getLineTeamList()">
<el-option :label="$t('pub.unlimitedSel')" :value="queryCommonData.SelectDefaultValue"></el-option> <el-option :label="$t('pub.unlimitedSel')" :value="queryCommonData.SelectDefaultValue"></el-option>
<el-option v-for="item in queryCommonData.PlaceList" :label="item.PlaceName" :value="item.PlaceID" :key="item.LtID"></el-option> <el-option v-for="item in queryCommonData.PlaceList" :label="item.PlaceName" :value="item.PlaceID"
:key="item.LtID"></el-option>
</el-select> </el-select>
</span> </span>
</li> </li>
...@@ -112,30 +120,35 @@ ...@@ -112,30 +120,35 @@
<em>系列名称</em> <em>系列名称</em>
<el-select class="w150" v-model="queryMsg.LineteamId" filterable :placeholder="$t('pub.pleaseSel')"> <el-select class="w150" v-model="queryMsg.LineteamId" filterable :placeholder="$t('pub.pleaseSel')">
<el-option :label="$t('pub.unlimitedSel')" :value="queryCommonData.SelectDefaultValue"></el-option> <el-option :label="$t('pub.unlimitedSel')" :value="queryCommonData.SelectDefaultValue"></el-option>
<el-option v-for="item in queryCommonData.LineTeamList" :label="item.LtName" :value="item.LtID" :key="item.LtID"></el-option> <el-option v-for="item in queryCommonData.LineTeamList" :label="item.LtName" :value="item.LtID"
:key="item.LtID"></el-option>
</el-select> </el-select>
</span> </span>
</li> </li>
<li> <li>
<span> <span>
<em>团号</em> <em>团号</em>
<el-input maxlength="50" v-model="queryMsg.TCNUM" class="permiss-input w150" @keyup.native.enter="getControlList" <el-input maxlength="50" v-model="queryMsg.TCNUM" class="permiss-input w150"
@keyup.native.enter="getControlList"
:placeholder="$t('pub.pleaseImport')"></el-input> :placeholder="$t('pub.pleaseImport')"></el-input>
</span> </span>
</li> </li>
<li style="display:none;"> <li style="display:none;">
<span> <span>
<em>编号</em> <em>编号</em>
<el-input maxlength="50" v-model="queryMsg.TCID" class="permiss-input w150" @keyup.native.enter="getControlList" <el-input maxlength="50" v-model="queryMsg.TCID" class="permiss-input w150"
@keyup.native.enter="getControlList"
:placeholder="$t('pub.pleaseImport')"></el-input> :placeholder="$t('pub.pleaseImport')"></el-input>
</span> </span>
</li> </li>
<li> <li>
<span> <span>
<em>发团日期</em> <em>发团日期</em>
<el-date-picker class="w150" type="date" v-model="queryMsg.StartGroupDate" :picker-options="pickerBeginDateBefore" <el-date-picker class="w150" type="date" v-model="queryMsg.StartGroupDate"
:picker-options="pickerBeginDateBefore"
value-format="yyyy-MM-dd" placeholder></el-date-picker> value-format="yyyy-MM-dd" placeholder></el-date-picker>
<el-date-picker class="w150" type="date" v-model="queryMsg.EndGroupDate" :picker-options="pickerBeginDateAfter" <el-date-picker class="w150" type="date" v-model="queryMsg.EndGroupDate"
:picker-options="pickerBeginDateAfter"
value-format="yyyy-MM-dd" placeholder></el-date-picker> value-format="yyyy-MM-dd" placeholder></el-date-picker>
</span> </span>
</li> </li>
...@@ -147,17 +160,22 @@ ...@@ -147,17 +160,22 @@
<div class="TC_leftSearch"> <div class="TC_leftSearch">
<div> <div>
<span>航空公司</span> <span>航空公司</span>
<el-select v-model="queryMsg.AirTicketId" filterable :placeholder="$t('system.ph_buxian')" class="w150"> <el-select v-model="queryMsg.AirTicketId" filterable :placeholder="$t('system.ph_buxian')"
<el-option :label="$t('system.ph_buxian')" :value="queryCommonData.SelectDefaultValue"></el-option> class="w150">
<el-option v-for="item in queryCommonData.AirlineList" :key="item.AirLineId" :label="item.AlName" <el-option :label="$t('system.ph_buxian')"
:value="queryCommonData.SelectDefaultValue"></el-option>
<el-option v-for="item in queryCommonData.AirlineList" :key="item.AirLineId"
:label="item.AlName"
:value="item.AirLineId"></el-option> :value="item.AirLineId"></el-option>
</el-select> </el-select>
</div> </div>
<div> <div>
<span>操作人员</span> <span>操作人员</span>
<el-select class="w150" v-model="queryMsg.CreateBy" filterable :placeholder="$t('pub.pleaseSel')"> <el-select class="w150" v-model="queryMsg.CreateBy" filterable :placeholder="$t('pub.pleaseSel')">
<el-option :label="$t('pub.unlimitedSel')" :value="queryCommonData.SelectDefaultValue"></el-option> <el-option :label="$t('pub.unlimitedSel')"
<el-option v-for="item in queryCommonData.EmployeeList" :label="item.EmName" :value="item.EmployeeId" :value="queryCommonData.SelectDefaultValue"></el-option>
<el-option v-for="item in queryCommonData.EmployeeList" :label="item.EmName"
:value="item.EmployeeId"
:key="item.EmployeeId"></el-option> :key="item.EmployeeId"></el-option>
</el-select> </el-select>
</div> </div>
...@@ -169,32 +187,40 @@ ...@@ -169,32 +187,40 @@
<div> <div>
<span>联运城市</span> <span>联运城市</span>
<el-select class="w150" filterable v-model="queryMsg.UnionCityId" :placeholder="$t('pub.pleaseSel')"> <el-select class="w150" filterable v-model="queryMsg.UnionCityId"
<el-option :label="$t('pub.unlimitedSel')" :value="queryCommonData.SelectDefaultValue"></el-option> :placeholder="$t('pub.pleaseSel')">
<el-option v-for="item in queryCommonData.CityList" :label="item.Name" :value="item.ID" :key="item.ID"></el-option> <el-option :label="$t('pub.unlimitedSel')"
:value="queryCommonData.SelectDefaultValue"></el-option>
<el-option v-for="item in queryCommonData.CityList" :label="item.Name" :value="item.ID"
:key="item.ID"></el-option>
</el-select> </el-select>
</div> </div>
</div> </div>
<div class="TC_rightSearch"> <div class="TC_rightSearch">
<div> <div>
<span>团队人数</span> <span>团队人数</span>
<el-input maxlength="50" class="w80" v-model="queryMsg.TeamMinNum" @keyup.native="checkInteger(queryMsg,'TeamMinNum')" <el-input maxlength="50" class="w80" v-model="queryMsg.TeamMinNum"
@keyup.native="checkInteger(queryMsg,'TeamMinNum')"
:placeholder="$t('pub.pleaseImport')"></el-input> :placeholder="$t('pub.pleaseImport')"></el-input>
- -
<el-input maxlength="50" class="w80" v-model="queryMsg.TeamMaxNum" @keyup.native="checkInteger(queryMsg,'TeamMaxNum')" <el-input maxlength="50" class="w80" v-model="queryMsg.TeamMaxNum"
@keyup.native="checkInteger(queryMsg,'TeamMaxNum')"
@blur="checkTeamNum(queryMsg)" :placeholder="$t('pub.pleaseImport')"></el-input> @blur="checkTeamNum(queryMsg)" :placeholder="$t('pub.pleaseImport')"></el-input>
</div> </div>
<div> <div>
<span>报名人数</span> <span>报名人数</span>
<el-input maxlength="50" class="w80" v-model="queryMsg.ApplyMinNum" @keyup.native="checkInteger(queryMsg,'ApplyMinNum')" <el-input maxlength="50" class="w80" v-model="queryMsg.ApplyMinNum"
@keyup.native="checkInteger(queryMsg,'ApplyMinNum')"
:placeholder="$t('pub.pleaseImport')"></el-input> :placeholder="$t('pub.pleaseImport')"></el-input>
- -
<el-input maxlength="50" class="w80" v-model="queryMsg.ApplyMaxNum" @keyup.native="checkInteger(queryMsg,'ApplyMaxNum')" <el-input maxlength="50" class="w80" v-model="queryMsg.ApplyMaxNum"
@keyup.native="checkInteger(queryMsg,'ApplyMaxNum')"
@blur="checkTeamNum(queryMsg)" :placeholder="$t('pub.pleaseImport')"></el-input> @blur="checkTeamNum(queryMsg)" :placeholder="$t('pub.pleaseImport')"></el-input>
</div> </div>
<div class="OnlyShowOverTeam"> <div class="OnlyShowOverTeam">
<span>只看报超团</span> <span>只看报超团</span>
<el-switch v-model="queryMsg.OnlyShowOverTeam" active-value="true" inactive-value="false"></el-switch> <el-switch v-model="queryMsg.OnlyShowOverTeam" active-value="true"
inactive-value="false"></el-switch>
</div> </div>
<div> <div>
<span>销售公司</span> <span>销售公司</span>
...@@ -211,7 +237,8 @@ ...@@ -211,7 +237,8 @@
<span> <span>
<el-checkbox v-model="queryCommonData.checkTCStateAll" @change="checkAllTeam">全选</el-checkbox> <el-checkbox v-model="queryCommonData.checkTCStateAll" @change="checkAllTeam">全选</el-checkbox>
<el-checkbox-group v-model="queryMsg.TCState" @change="checkedTeamList"> <el-checkbox-group v-model="queryMsg.TCState" @change="checkedTeamList">
<el-checkbox v-for="team in $tripUtils.TeamStatesList.TeamStates" :label="team.Id" :key="team.Name">{{team.Name}}</el-checkbox> <el-checkbox v-for="team in $tripUtils.TeamStatesList.TeamStates" :label="team.Id"
:key="team.Name">{{team.Name}}</el-checkbox>
</el-checkbox-group> </el-checkbox-group>
</span> </span>
</div> </div>
...@@ -221,7 +248,8 @@ ...@@ -221,7 +248,8 @@
<span> <span>
<el-checkbox v-model="queryCommonData.checkPlatForm" @change="checkAllSales">全选</el-checkbox> <el-checkbox v-model="queryCommonData.checkPlatForm" @change="checkAllSales">全选</el-checkbox>
<el-checkbox-group v-model="queryMsg.SalePlat" @change="checkSales"> <el-checkbox-group v-model="queryMsg.SalePlat" @change="checkSales">
<el-checkbox v-for="sales in $tripUtils.TeamStatesList.salsPlat" :label="sales.Id" :key="sales.Name">{{sales.Name}}</el-checkbox> <el-checkbox v-for="sales in $tripUtils.TeamStatesList.salsPlat" :label="sales.Id"
:key="sales.Name">{{sales.Name}}</el-checkbox>
</el-checkbox-group> </el-checkbox-group>
</span> </span>
</div> </div>
...@@ -230,7 +258,8 @@ ...@@ -230,7 +258,8 @@
<span> <span>
<el-checkbox v-model="queryCommonData.checkGroupALL" @change="checkGroupAll">全选</el-checkbox> <el-checkbox v-model="queryCommonData.checkGroupALL" @change="checkGroupAll">全选</el-checkbox>
<el-checkbox-group v-model="queryMsg.GroupState" @change="checkGroup"> <el-checkbox-group v-model="queryMsg.GroupState" @change="checkGroup">
<el-checkbox v-for="state in $tripUtils.TeamStatesList.teamDateStates" :label="state.Id" :key="state.Name">{{state.Name}}</el-checkbox> <el-checkbox v-for="state in $tripUtils.TeamStatesList.teamDateStates" :label="state.Id"
:key="state.Name">{{state.Name}}</el-checkbox>
</el-checkbox-group> </el-checkbox-group>
<el-checkbox v-model="queryMsg.IsWarning">预警团</el-checkbox> <el-checkbox v-model="queryMsg.IsWarning">预警团</el-checkbox>
</span> </span>
...@@ -239,7 +268,8 @@ ...@@ -239,7 +268,8 @@
<span>航班状态</span> <span>航班状态</span>
<span> <span>
<el-checkbox-group v-model="queryCommonData.flightCKed" style="margin-left:0;"> <el-checkbox-group v-model="queryCommonData.flightCKed" style="margin-left:0;">
<el-checkbox v-for="state in flightStatus" :label="state.Id" :checked="state.Checked" @change="checkedFlight(state)" <el-checkbox v-for="state in flightStatus" :label="state.Id" :checked="state.Checked"
@change="checkedFlight(state)"
:key="state.Name">{{state.Name}}</el-checkbox> :key="state.Name">{{state.Name}}</el-checkbox>
</el-checkbox-group> </el-checkbox-group>
</span> </span>
...@@ -253,7 +283,8 @@ ...@@ -253,7 +283,8 @@
</el-select> </el-select>
</span> </span>
</div> </div>
<button class="normalBtn TC_SearchBtn" @click="resetPageIndex(),getControlList(),queryCommonData.showHigradeSearch=false">查询 <button class="normalBtn TC_SearchBtn"
@click="resetPageIndex(),getControlList(),queryCommonData.showHigradeSearch=false">查询
</button> </button>
</div> </div>
<span class="advancedQuery" slot="reference">高级查询 <span class="advancedQuery" slot="reference">高级查询
...@@ -269,7 +300,8 @@ ...@@ -269,7 +300,8 @@
<div class="TC_leftSearch"> <div class="TC_leftSearch">
<div> <div>
<span style="display:inline-block;margin: 0 5px 0 0;width:50px;text-align:right;">报名人数</span> <span style="display:inline-block;margin: 0 5px 0 0;width:50px;text-align:right;">报名人数</span>
<el-select v-model="queryMsg.WarningQuery" filterable :placeholder="$t('system.ph_buxian')" class="w150"> <el-select v-model="queryMsg.WarningQuery" filterable :placeholder="$t('system.ph_buxian')"
class="w150">
<el-option :label="$t('system.ph_buxian')" value="-1"></el-option> <el-option :label="$t('system.ph_buxian')" value="-1"></el-option>
<el-option label="尚未有人报名" value="1"></el-option> <el-option label="尚未有人报名" value="1"></el-option>
<el-option label="10人以下" value="2"></el-option> <el-option label="10人以下" value="2"></el-option>
...@@ -280,7 +312,8 @@ ...@@ -280,7 +312,8 @@
</div> </div>
<div> <div>
<span style="display:inline-block;margin: 0 5px 0 0;width:50px;text-align:right;">天数选择</span> <span style="display:inline-block;margin: 0 5px 0 0;width:50px;text-align:right;">天数选择</span>
<el-select v-model="queryMsg.RateOnDay" filterable :placeholder="$t('system.ph_buxian')" class="w150"> <el-select v-model="queryMsg.RateOnDay" filterable :placeholder="$t('system.ph_buxian')"
class="w150">
<el-option :label="$t('system.ph_buxian')" value="-1"></el-option> <el-option :label="$t('system.ph_buxian')" value="-1"></el-option>
<el-option label="10天以内" value="1"></el-option> <el-option label="10天以内" value="1"></el-option>
<el-option label="15天以内" value="2"></el-option> <el-option label="15天以内" value="2"></el-option>
...@@ -290,7 +323,8 @@ ...@@ -290,7 +323,8 @@
</div> </div>
<div> <div>
<span style="display:inline-block;margin: 0 5px 0 0;width:50px;text-align:right;">上座率</span> <span style="display:inline-block;margin: 0 5px 0 0;width:50px;text-align:right;">上座率</span>
<el-select v-model="queryMsg.RateOn" filterable :placeholder="$t('system.ph_buxian')" class="w150"> <el-select v-model="queryMsg.RateOn" filterable :placeholder="$t('system.ph_buxian')"
class="w150">
<el-option :label="$t('system.ph_buxian')" value="-1"></el-option> <el-option :label="$t('system.ph_buxian')" value="-1"></el-option>
<el-option label="100%" value="1"></el-option> <el-option label="100%" value="1"></el-option>
<el-option label="不足80%" value="2"></el-option> <el-option label="不足80%" value="2"></el-option>
...@@ -300,7 +334,8 @@ ...@@ -300,7 +334,8 @@
</div> </div>
</div> </div>
</div> </div>
<button class="normalBtn TC_SearchBtn" @click="resetPageIndex(),getControlList(),queryCommonData.showWarningSearch=false">查询 <button class="normalBtn TC_SearchBtn"
@click="resetPageIndex(),getControlList(),queryCommonData.showWarningSearch=false">查询
</button> </button>
</div> </div>
<span class="advancedQuery" slot="reference">预警查询 <span class="advancedQuery" slot="reference">预警查询
...@@ -317,8 +352,10 @@ ...@@ -317,8 +352,10 @@
<div class="TravelTclList" v-loading="queryCommonData.loading"> <div class="TravelTclList" v-loading="queryCommonData.loading">
<ul> <ul>
<el-pagination background @current-change="handleCurrentChange" :current-page.sync="queryMsg.currentPage" <el-pagination background @current-change="handleCurrentChange" :current-page.sync="queryMsg.currentPage"
layout="total,prev, pager, next, jumper" :page-size="queryMsg.pageSize" :total="queryMsg.total"></el-pagination> layout="total,prev, pager, next, jumper" :page-size="queryMsg.pageSize"
<li v-for="(item,index) in queryCommonData.dataList" :key="index" :class="{'TC_hasContent':item.OPInnerRemark==''&&item.OPRemark==''}"> :total="queryMsg.total"></el-pagination>
<li v-for="(item,index) in queryCommonData.dataList" :key="index"
:class="{'TC_hasContent':item.OPInnerRemark==''&&item.OPRemark==''}">
<div class="TC_remarkContent TC_teamName"> <div class="TC_remarkContent TC_teamName">
<div class="clearfix"> <div class="clearfix">
<div class="TCL_remarkTitle">团名：</div> <div class="TCL_remarkTitle">团名：</div>
...@@ -346,7 +383,8 @@ ...@@ -346,7 +383,8 @@
<p class="d12p">{{item.LtName}}</p> <p class="d12p">{{item.LtName}}</p>
</div> </div>
<div class="TC_TravelSalePlat clearfix"> <div class="TC_TravelSalePlat clearfix">
<span class="TC_neibu" v-if="item.TCState==3" :class="{'TCneibu':plat==3,'TCb2b':plat==1,'TCb2c':plat==2,'AppPlat':plat==4,'otherPlat':plat==5}" <span class="TC_neibu" v-if="item.TCState==3"
:class="{'TCneibu':plat==3,'TCb2b':plat==1,'TCb2c':plat==2,'AppPlat':plat==4,'otherPlat':plat==5}"
v-for="plat in item.SalePlatList" :key="plat.subCode">{{$tripUtils.getPlatName(plat)}}</span> v-for="plat in item.SalePlatList" :key="plat.subCode">{{$tripUtils.getPlatName(plat)}}</span>
<span class="TC_xiajia daiwanshan" v-if="item.TCState==1">待完善</span> <span class="TC_xiajia daiwanshan" v-if="item.TCState==1">待完善</span>
<span class="TC_xiajia" v-if="item.TCState==2">已下架</span> <span class="TC_xiajia" v-if="item.TCState==2">已下架</span>
...@@ -372,7 +410,8 @@ ...@@ -372,7 +410,8 @@
<td class="_d_name _color_666"> <td class="_d_name _color_666">
<span v-if="fIndex==0">{{$t('Airticket.Air_go')}}</span> <span v-if="fIndex==0">{{$t('Airticket.Air_go')}}</span>
<span v-else-if="fIndex==item.flightList.length-1">{{$t('Airticket.Air_returnTrip')}}</span> <span v-else-if="fIndex==item.flightList.length-1">{{$t('Airticket.Air_returnTrip')}}</span>
<span v-else-if="fIndex>0 && fIndex!=item.flightList.length-1">{{$t('Airticket.Air_transit')}}</span> <span
v-else-if="fIndex>0 && fIndex!=item.flightList.length-1">{{$t('Airticket.Air_transit')}}</span>
</td> </td>
<td> <td>
<div>{{fItem.Flight_number}}</div> <div>{{fItem.Flight_number}}</div>
...@@ -390,7 +429,8 @@ ...@@ -390,7 +429,8 @@
</tr> </tr>
</table> </table>
<div class="FlightDiv-TCL" slot="reference"> <div class="FlightDiv-TCL" slot="reference">
<div v-for="subItem in item.flightList" slot="reference" :key="subItem.subCode" class="TCL-flighInfoList"> <div v-for="subItem in item.flightList" slot="reference" :key="subItem.subCode"
class="TCL-flighInfoList">
<span class="travelnowrap"> <span class="travelnowrap">
<span class="TCL-FlightNumber">{{subItem.Flight_number}}</span> <span class="TCL-FlightNumber">{{subItem.Flight_number}}</span>
({{subItem.DIATA}}){{subItem.DepartureName}} ({{subItem.DIATA}}){{subItem.DepartureName}}
...@@ -503,7 +543,8 @@ ...@@ -503,7 +543,8 @@
</p> </p>
<p> <p>
<span>当前余位</span> <span>当前余位</span>
<i>{{item.SurplusSeat=item.SurplusSeat < 0 ? 0:item.SurplusSeat}}</i> </p> <p> <i>{{item.SurplusSeat=item.SurplusSeat < 0 ? 0:item.SurplusSeat}}</i></p>
<p>
<span>已报入</span> <span>已报入</span>
<i> <i>
...@@ -583,7 +624,8 @@ ...@@ -583,7 +624,8 @@
<span>签证资料</span> <span>签证资料</span>
</p> </p>
<p v-if="item.VisaFileList.length!==0" v-for="(item2, index2) in item.VisaFileList" :key="index2"> <p v-if="item.VisaFileList.length!==0" v-for="(item2, index2) in item.VisaFileList" :key="index2">
<span style="cursor:pointer;text-decoration: underline;" @click="downloadFile(item2)">{{item2.Name}}</span> <span style="cursor:pointer;text-decoration: underline;"
@click="downloadFile(item2)">{{item2.Name}}</span>
</p> </p>
<p> <p>
<span>个签</span> <span>个签</span>
...@@ -595,7 +637,8 @@ ...@@ -595,7 +637,8 @@
</div> </div>
<div class="el-col"> <div class="el-col">
<div class="d7"> <div class="d7">
<el-button @click.native='goUrl("RegistrationList", item.TCID,"报名清单")' type="primary" style="background:#00C6FF; border-color:#00C6FF">报名清单 <el-button @click.native='goUrl("RegistrationList", item.TCID,"报名清单")' type="primary"
style="background:#00C6FF; border-color:#00C6FF">报名清单
</el-button> </el-button>
<el-dropdown trigger="click" style="margin-bottom:5px;"> <el-dropdown trigger="click" style="margin-bottom:5px;">
<span class="el-dropdown-link">修改 <span class="el-dropdown-link">修改
...@@ -609,7 +652,8 @@ ...@@ -609,7 +652,8 @@
</el-dropdown-item> </el-dropdown-item>
</el-dropdown-menu> </el-dropdown-menu>
</el-dropdown> </el-dropdown>
<el-button @click='goUrlMake("GroupAdvertising",item.LineID,item.TCID,"团期广告")' type="primary" style="background:#67c23a; border-color:#67c23a">广告&nbsp;{{item.AdvertCount}} <el-button @click='goUrlMake("GroupAdvertising",item.LineID,item.TCID,"团期广告")' type="primary"
style="background:#67c23a; border-color:#67c23a">广告&nbsp;{{item.AdvertCount}}
</el-button> </el-button>
<el-button @click="ckOPremark(item)" type="primary" style="background:#F16C3C; border-color:#F16C3C"> <el-button @click="ckOPremark(item)" type="primary" style="background:#F16C3C; border-color:#F16C3C">
OP备注 OP备注
...@@ -623,7 +667,8 @@ ...@@ -623,7 +667,8 @@
</el-dropdown-item> </el-dropdown-item>
<el-dropdown-item @click.native="goUrlR('confirmationOrderDownLoad',item)">行程下载</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 @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 v-if="item.TCState==2||item.TCState==0||item.TCState==1"
@click.native="setUpPlat(item)">上架
</el-dropdown-item> </el-dropdown-item>
<el-dropdown-item v-if="item.TCState==3" @click.native="Setshelves(item.TCID)">下架 <el-dropdown-item v-if="item.TCState==3" @click.native="Setshelves(item.TCID)">下架
</el-dropdown-item> </el-dropdown-item>
...@@ -631,15 +676,17 @@ ...@@ -631,15 +676,17 @@
</el-dropdown-item> </el-dropdown-item>
<el-dropdown-item v-if="item.Status==2" @click.native="OutGroup(item.TCID,1)">销售 <el-dropdown-item v-if="item.Status==2" @click.native="OutGroup(item.TCID,1)">销售
</el-dropdown-item> </el-dropdown-item>
<el-dropdown-item @click.native="goSureOrder('priceIncomeConfirmInfo',item.TCID)" style="display:none;">收入确认单 <el-dropdown-item v-if="item.Status==1&&showSureOrder('P_Query_Income_ConfirmInfo',item.CreateBy)"
@click.native="goSureOrder('priceIncomeConfirmInfo',item.TCID)">收入确认单
</el-dropdown-item> </el-dropdown-item>
<el-dropdown-item v-if="CurrentUserInfo.B2BDomain!=''" @click.native="goB2B(item.ConfigId, item.TCID)"> <el-dropdown-item v-if="CurrentUserInfo.B2BDomain!=''"
@click.native="goB2B(item.ConfigId, item.TCID)">
B2B预览 B2B预览
</el-dropdown-item> </el-dropdown-item>
<el-dropdown-item @click.native='goUrl("DistributionTransport",item.ID,"分销联运")'>分销联运 <el-dropdown-item @click.native='goUrl("DistributionTransport",item.ID,"分销联运")'>分销联运
</el-dropdown-item> </el-dropdown-item>
<el-dropdown-item @click.native='ckSellPoint(item)'>本团卖点</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-item @click.native='ShowUploadWord(item)'>WORD行程</el-dropdown-item>
</el-dropdown-menu> </el-dropdown-menu>
</el-dropdown> </el-dropdown>
</div> </div>
...@@ -654,12 +701,14 @@ ...@@ -654,12 +701,14 @@
<div class="TCL_remarkTitle">OP对内备注：</div> <div class="TCL_remarkTitle">OP对内备注：</div>
<div class="TCL_Content">{{item.OPInnerRemark}}</div> <div class="TCL_Content">{{item.OPInnerRemark}}</div>
</div> </div>
<div class="clearfix TCL-redType" v-if="item.DmcRemarkLast || item.HotelDiningBus.HotelChangeState>0 || item.HotelDiningBus.DiningChangeState>0 || item.HotelDiningBus.ResultBusTypeStr!='' "> <div class="clearfix TCL-redType"
v-if="item.DmcRemarkLast || item.HotelDiningBus.HotelChangeState>0 || item.HotelDiningBus.DiningChangeState>0 || item.HotelDiningBus.ResultBusTypeStr!='' ">
<div class="TCL_remarkTitle">地接备注：</div> <div class="TCL_remarkTitle">地接备注：</div>
<div class="TCL_Content">{{item.DmcRemarkLast!=null? item.DmcRemarkLast.DMCRemark:''}} <div class="TCL_Content">{{item.DmcRemarkLast!=null? item.DmcRemarkLast.DMCRemark:''}}
<a v-if="item.HotelDiningBus.HotelChangeState>0" @click="goHotelDiningBus(item,item.HotelDiningBus,1)" <a v-if="item.HotelDiningBus.HotelChangeState>0" @click="goHotelDiningBus(item,item.HotelDiningBus,1)"
style="color:blue;cursor:pointer">酒店变更</a> style="color:blue;cursor:pointer">酒店变更</a>
<a v-if="item.HotelDiningBus.DiningChangeState>0" @click="goHotelDiningBus(item,item.HotelDiningBus,2)" <a v-if="item.HotelDiningBus.DiningChangeState>0"
@click="goHotelDiningBus(item,item.HotelDiningBus,2)"
style="color:blue;cursor:pointer">餐厅变更</a> style="color:blue;cursor:pointer">餐厅变更</a>
<a v-if="item.HotelDiningBus.ResultBusTypeStr!=''">车型:{{item.HotelDiningBus.ResultBusTypeStr}}</a> <a v-if="item.HotelDiningBus.ResultBusTypeStr!=''">车型:{{item.HotelDiningBus.ResultBusTypeStr}}</a>
</div> </div>
...@@ -669,7 +718,8 @@ ...@@ -669,7 +718,8 @@
</ul> </ul>
<div class="noData" v-show="queryMsg.noData">{{$t('system.content_noData')}}</div> <div class="noData" v-show="queryMsg.noData">{{$t('system.content_noData')}}</div>
<el-pagination background @current-change="handleCurrentChange" :current-page.sync="queryMsg.currentPage" <el-pagination background @current-change="handleCurrentChange" :current-page.sync="queryMsg.currentPage"
layout="total,prev, pager, next, jumper" :page-size="queryMsg.pageSize" :total="queryMsg.total"></el-pagination> layout="total,prev, pager, next, jumper" :page-size="queryMsg.pageSize"
:total="queryMsg.total"></el-pagination>
</div> </div>
</div> </div>
...@@ -677,7 +727,8 @@ ...@@ -677,7 +727,8 @@
<div class="combottomTitle">请选择上架平台</div> <div class="combottomTitle">请选择上架平台</div>
<span class="setPlatLeft">销售平台</span> <span class="setPlatLeft">销售平台</span>
<span> <span>
<el-checkbox v-model="queryCommonData.checkDialogAll" @change="checkAllDialog" style="margin-right:20px;">全选</el-checkbox> <el-checkbox v-model="queryCommonData.checkDialogAll" @change="checkAllDialog"
style="margin-right:20px;">全选</el-checkbox>
<el-checkbox-group v-model="queryCommonData.ckedplat" @change="checkDialog"> <el-checkbox-group v-model="queryCommonData.ckedplat" @change="checkDialog">
<el-checkbox v-for="sales in $tripUtils.TeamStatesList.salsPlat" :label="sales.Id" :key="sales.Name">{{sales.Name}}</el-checkbox> <el-checkbox v-for="sales in $tripUtils.TeamStatesList.salsPlat" :label="sales.Id" :key="sales.Name">{{sales.Name}}</el-checkbox>
</el-checkbox-group> </el-checkbox-group>
...@@ -720,11 +771,17 @@ ...@@ -720,11 +771,17 @@
<button class="normalBtn" type="primary" @click="SetSellingPoints">{{$t('pub.sureBtn')}}</button> <button class="normalBtn" type="primary" @click="SetSellingPoints">{{$t('pub.sureBtn')}}</button>
</div> </div>
</div> </div>
<div class="combottomDiv OPremarkDiv" v-if="queryCommonData.UploadWORDTip" v-loading="queryCommonData.uploadLoading"> <div class="combottomDiv OPremarkDiv" v-if="queryCommonData.UploadWORDTip"
<div class="combottomTitle">上传WORD行程 <button style="float:right;margin-right:100px;" class="hollowFixedBtn" type="primary" @click="queryCommonData.UploadWORDTip = false">{{$t('pub.cancelBtn')}}</button></div> v-loading="queryCommonData.uploadLoading">
<div class="combottomTitle">上传WORD行程
<button style="float:right;margin-right:100px;" class="hollowFixedBtn" type="primary"
@click="queryCommonData.UploadWORDTip = false">{{$t('pub.cancelBtn')}}
</button>
</div>
<el-form label-width="100px"> <el-form label-width="100px">
<el-col :span="8" class="_pic_upload"> <el-col :span="8" class="_pic_upload">
<el-upload :http-request="uploadFileBtn" drag :multiple="true" :show-file-list="false" action="" accept="*.doc,*.docx"> <el-upload :http-request="uploadFileBtn" drag :multiple="true" :show-file-list="false" action=""
accept="*.doc,*.docx">
<i class="el-icon-plus avatar-uploader-icon"></i> <i class="el-icon-plus avatar-uploader-icon"></i>
<div class="el-upload__text">点击/拖拽上传</div> <div class="el-upload__text">点击/拖拽上传</div>
</el-upload> </el-upload>
...@@ -735,7 +792,7 @@ ...@@ -735,7 +792,7 @@
</template> </template>
<script> <script>
export default { export default {
data() { data () {
return { return {
//查询数据列表 //查询数据列表
queryCommonData: { queryCommonData: {
...@@ -803,7 +860,7 @@ ...@@ -803,7 +860,7 @@
//选择上传项 //选择上传项
UploadItem: {}, UploadItem: {},
//word上传提示层 //word上传提示层
uploadLoading:false, uploadLoading: false,
}, },
//查询参数 //查询参数
queryMsg: { queryMsg: {
...@@ -894,17 +951,17 @@ ...@@ -894,17 +951,17 @@
this.downloadFileRename(item.FullUrl.replace(reg, ''), item.Name) this.downloadFileRename(item.FullUrl.replace(reg, ''), item.Name)
}, },
//翻页 //翻页
handleCurrentChange(val) { handleCurrentChange (val) {
this.queryMsg.pageIndex = val this.queryMsg.pageIndex = val
this.getControlList() this.getControlList()
}, },
//重新查询 //重新查询
resetPageIndex() { resetPageIndex () {
this.queryMsg.pageIndex = 1 this.queryMsg.pageIndex = 1
this.queryMsg.currentPage = 1 this.queryMsg.currentPage = 1
}, },
//获取线路列表 //获取线路列表
getLineList() { getLineList () {
this.apipost('line_post_GetList', {}, res => { this.apipost('line_post_GetList', {}, res => {
if (res.data.resultCode == 1) { if (res.data.resultCode == 1) {
this.queryCommonData.LineList = res.data.data this.queryCommonData.LineList = res.data.data
...@@ -914,7 +971,7 @@ ...@@ -914,7 +971,7 @@
}) })
}, },
//获取目的地列表 //获取目的地列表
getLinePlaceList() { getLinePlaceList () {
this.queryMsg.PlaceID = 0 this.queryMsg.PlaceID = 0
let msg = { let msg = {
lineID: this.queryMsg.LineId, lineID: this.queryMsg.LineId,
...@@ -927,7 +984,7 @@ ...@@ -927,7 +984,7 @@
}) })
}, },
//获取系列列表 //获取系列列表
getLineTeamList() { getLineTeamList () {
this.queryMsg.LineteamId = 0 this.queryMsg.LineteamId = 0
let msg = { let msg = {
lineID: this.queryMsg.LineId, lineID: this.queryMsg.LineId,
...@@ -941,13 +998,13 @@ ...@@ -941,13 +998,13 @@
}) })
}, },
//切换公司 //切换公司
getCompanyTab(Id) { getCompanyTab (Id) {
this.queryMsg.OutBranchId = Id this.queryMsg.OutBranchId = Id
this.queryMsg.currentPage = 1 this.queryMsg.currentPage = 1
this.getControlList() this.getControlList()
}, },
//获取航空公司 //获取航空公司
getAirlineList() { getAirlineList () {
this.apipost( this.apipost(
'airline_post_GetList', {}, 'airline_post_GetList', {},
res => { res => {
...@@ -955,11 +1012,12 @@ ...@@ -955,11 +1012,12 @@
this.queryCommonData.AirlineList = res.data.data this.queryCommonData.AirlineList = res.data.data
} }
}, },
err => {} err => {
}
) )
}, },
//根据当前员工所在部门获取该部门及子部门员工信息 //根据当前员工所在部门获取该部门及子部门员工信息
getEmployeeList() { getEmployeeList () {
let userInfo = this.getLocalStorage() let userInfo = this.getLocalStorage()
let msg = { let msg = {
GroupId: userInfo.RB_Group_id, GroupId: userInfo.RB_Group_id,
...@@ -975,12 +1033,13 @@ ...@@ -975,12 +1033,13 @@
this.queryCommonData.EmployeeList = res.data.data this.queryCommonData.EmployeeList = res.data.data
} }
}, },
err => {} err => {
}
) )
}, },
//新获取列表数据 //新获取列表数据
getControlList() { getControlList () {
if (this.flagWangYue) { if (this.flagWangYue) {
this.queryCommonData.flightCKed = [] this.queryCommonData.flightCKed = []
this.queryCommonData.flightCKed.push(0) this.queryCommonData.flightCKed.push(0)
...@@ -1023,12 +1082,13 @@ ...@@ -1023,12 +1082,13 @@
}) })
} }
}, },
err => {} err => {
}
) )
}, },
//验证大小 //验证大小
checkTeamNum(queryMsg) { checkTeamNum (queryMsg) {
var TeamMinNum = parseInt(queryMsg.TeamMinNum) var TeamMinNum = parseInt(queryMsg.TeamMinNum)
var TeamMaxNum = parseInt(queryMsg.TeamMaxNum) var TeamMaxNum = parseInt(queryMsg.TeamMaxNum)
var ApplyMinNum = parseInt(queryMsg.ApplyMinNum) var ApplyMinNum = parseInt(queryMsg.ApplyMinNum)
...@@ -1041,7 +1101,7 @@ ...@@ -1041,7 +1101,7 @@
} }
}, },
//初始化公司 //初始化公司
getCompanyList() { getCompanyList () {
let userInfo = this.getLocalStorage() let userInfo = this.getLocalStorage()
var RB_Group_id = userInfo.RB_Group_id var RB_Group_id = userInfo.RB_Group_id
let msg = { let msg = {
...@@ -1060,11 +1120,12 @@ ...@@ -1060,11 +1120,12 @@
}) })
} }
}, },
err => {} err => {
}
) )
}, },
//团期状态全选 //团期状态全选
checkGroupAll(val) { checkGroupAll (val) {
this.queryMsg.GroupState = [] this.queryMsg.GroupState = []
if (val) { if (val) {
this.$tripUtils.TeamStatesList.teamDateStates.forEach(x => { this.$tripUtils.TeamStatesList.teamDateStates.forEach(x => {
...@@ -1072,13 +1133,13 @@ ...@@ -1072,13 +1133,13 @@
}) })
} }
}, },
checkGroup(value) { checkGroup (value) {
let checkedCount = value.length let checkedCount = value.length
this.queryCommonData.checkGroupALL = this.queryCommonData.checkGroupALL =
checkedCount === this.$tripUtils.TeamStatesList.teamDateStates.length checkedCount === this.$tripUtils.TeamStatesList.teamDateStates.length
}, },
//销售平台全选 //销售平台全选
checkAllSales(val) { checkAllSales (val) {
this.queryMsg.SalePlat = [] this.queryMsg.SalePlat = []
if (val) { if (val) {
this.$tripUtils.TeamStatesList.salsPlat.forEach(x => { this.$tripUtils.TeamStatesList.salsPlat.forEach(x => {
...@@ -1086,13 +1147,13 @@ ...@@ -1086,13 +1147,13 @@
}) })
} }
}, },
checkSales(value) { checkSales (value) {
let checkedCount = value.length let checkedCount = value.length
this.queryCommonData.checkPlatForm = this.queryCommonData.checkPlatForm =
checkedCount === this.$tripUtils.TeamStatesList.salsPlat.length checkedCount === this.$tripUtils.TeamStatesList.salsPlat.length
}, },
//团队状态全选 //团队状态全选
checkAllTeam(val) { checkAllTeam (val) {
this.queryMsg.TCState = [] this.queryMsg.TCState = []
if (val) { if (val) {
this.$tripUtils.TeamStatesList.TeamStates.forEach(x => { this.$tripUtils.TeamStatesList.TeamStates.forEach(x => {
...@@ -1109,7 +1170,7 @@ ...@@ -1109,7 +1170,7 @@
this.queryCommonData.showPlatForm = false this.queryCommonData.showPlatForm = false
} }
}, },
checkedTeamList(value) { checkedTeamList (value) {
if (value.indexOf(this.$tripUtils.TeamStatesList.TeamStates[2].Id) > -1) { if (value.indexOf(this.$tripUtils.TeamStatesList.TeamStates[2].Id) > -1) {
this.queryCommonData.showPlatForm = true this.queryCommonData.showPlatForm = true
} else { } else {
...@@ -1120,7 +1181,7 @@ ...@@ -1120,7 +1181,7 @@
checkedCount === this.$tripUtils.TeamStatesList.TeamStates.length checkedCount === this.$tripUtils.TeamStatesList.TeamStates.length
}, },
//全选弹出框 //全选弹出框
checkAllDialog(val) { checkAllDialog (val) {
this.queryCommonData.ckedplat = [] this.queryCommonData.ckedplat = []
if (val) { if (val) {
this.$tripUtils.TeamStatesList.salsPlat.forEach(x => { this.$tripUtils.TeamStatesList.salsPlat.forEach(x => {
...@@ -1128,13 +1189,13 @@ ...@@ -1128,13 +1189,13 @@
}) })
} }
}, },
checkDialog(value) { checkDialog (value) {
let checkedCount = value.length let checkedCount = value.length
this.queryCommonData.checkDialogAll = this.queryCommonData.checkDialogAll =
checkedCount === this.$tripUtils.TeamStatesList.salsPlat.length checkedCount === this.$tripUtils.TeamStatesList.salsPlat.length
}, },
//点击上架 //点击上架
setUpPlat(item) { setUpPlat (item) {
this.queryCommonData.outerVisible = false this.queryCommonData.outerVisible = false
this.queryCommonData.setPlatDialog = true this.queryCommonData.setPlatDialog = true
this.queryCommonData.singleTCID = item.TCID this.queryCommonData.singleTCID = item.TCID
...@@ -1154,7 +1215,7 @@ ...@@ -1154,7 +1215,7 @@
} }
}, },
//单团设置下架 //单团设置下架
Setshelves(TCID) { Setshelves (TCID) {
let msg = { let msg = {
TCID: TCID, TCID: TCID,
TCState: 2, TCState: 2,
...@@ -1172,7 +1233,7 @@ ...@@ -1172,7 +1233,7 @@
}) })
}, },
//单团设置上架 //单团设置上架
SetshelvesUp() { SetshelvesUp () {
let msg = { let msg = {
TCID: this.queryCommonData.singleTCID, TCID: this.queryCommonData.singleTCID,
TCState: 3, TCState: 3,
...@@ -1193,7 +1254,7 @@ ...@@ -1193,7 +1254,7 @@
}) })
}, },
goUrl(path, id, name) { goUrl (path, id, name) {
this.$store.commit('pageConditionUpdate', this.queryMsg) this.$store.commit('pageConditionUpdate', this.queryMsg)
this.$router.push({ this.$router.push({
name: path, name: path,
...@@ -1204,7 +1265,7 @@ ...@@ -1204,7 +1265,7 @@
} }
}) })
}, },
goUrlR(path, item) { goUrlR (path, item) {
var cityId = item.StartCityID var cityId = item.StartCityID
if (item.IsUnion == 1 && item.UnionTypeStr == 2) { if (item.IsUnion == 1 && item.UnionTypeStr == 2) {
cityId = item.UnionCityId cityId = item.UnionCityId
...@@ -1223,7 +1284,16 @@ ...@@ -1223,7 +1284,16 @@
}) })
window.open(routeData.href, '_blank') window.open(routeData.href, '_blank')
}, },
goSureOrder(path,TCID){ //控制是否显示确认单按钮
showSureOrder (code,createBy) {
let UserInfo = this.getLocalStorage();
if(createBy == UserInfo.EmployeeId||UserInfo.ActionMenuCode.indexOf(code)!=-1){
return true;
}else{
return false;
}
},
goSureOrder (path, TCID) {
this.$router.push({ this.$router.push({
name: path, name: path,
query: { query: {
...@@ -1233,7 +1303,7 @@ ...@@ -1233,7 +1303,7 @@
} }
}) })
}, },
goUrlMake(path, LineID, TCID, name) { goUrlMake (path, LineID, TCID, name) {
this.$router.push({ this.$router.push({
name: path, name: path,
query: { query: {
...@@ -1244,7 +1314,7 @@ ...@@ -1244,7 +1314,7 @@
} }
}) })
}, },
goB2B(ConfigId,tcid) { goB2B (ConfigId, tcid) {
var B2BDomain = this.CurrentUserInfo.B2BDomain var B2BDomain = this.CurrentUserInfo.B2BDomain
window.open( window.open(
'http://www.oytour.com/#/detailTwo/' + 'http://www.oytour.com/#/detailTwo/' +
...@@ -1253,7 +1323,7 @@ ...@@ -1253,7 +1323,7 @@
'_blank' '_blank'
) )
}, },
goTeamBalance(id, OutBranchId) { goTeamBalance (id, OutBranchId) {
this.$router.push({ this.$router.push({
name: 'TeamBalancePayment', name: 'TeamBalancePayment',
query: { query: {
...@@ -1265,7 +1335,7 @@ ...@@ -1265,7 +1335,7 @@
}) })
}, },
//开团或修改 //开团或修改
goToOpenTravel(path, configId, tcid) { goToOpenTravel (path, configId, tcid) {
if (configId > 0) { if (configId > 0) {
this.$store.commit('pageConditionUpdate', this.queryMsg) this.$store.commit('pageConditionUpdate', this.queryMsg)
this.$router.push({ this.$router.push({
...@@ -1287,7 +1357,7 @@ ...@@ -1287,7 +1357,7 @@
}, },
//当团修改 //当团修改
goTonowTeam(path, configId, tcid, TCNUM) { goTonowTeam (path, configId, tcid, TCNUM) {
if (configId > 0) { if (configId > 0) {
this.$store.commit('pageConditionUpdate', this.queryMsg) this.$store.commit('pageConditionUpdate', this.queryMsg)
this.$router.push({ this.$router.push({
...@@ -1311,7 +1381,7 @@ ...@@ -1311,7 +1381,7 @@
}, },
//删除团期 //删除团期
removeTeamInfo(TCID) { removeTeamInfo (TCID) {
var that = this var that = this
that.Confirm('是否删除?', function () { that.Confirm('是否删除?', function () {
var msg = { var msg = {
...@@ -1333,14 +1403,14 @@ ...@@ -1333,14 +1403,14 @@
}) })
}, },
//获取城市 //获取城市
getCountryCity() { getCountryCity () {
this.apipost('sellorder_get_GetAllStartCity', {}, res => { this.apipost('sellorder_get_GetAllStartCity', {}, res => {
if (res.data.resultCode == 1) { if (res.data.resultCode == 1) {
this.queryCommonData.CityList = res.data.data this.queryCommonData.CityList = res.data.data
} }
}) })
}, },
getSellorCompany() { getSellorCompany () {
//出团公司 //出团公司
this.apipost( this.apipost(
'sellorder_post_GetBranchList', {}, 'sellorder_post_GetBranchList', {},
...@@ -1349,11 +1419,12 @@ ...@@ -1349,11 +1419,12 @@
this.queryCommonData.companyList = res.data.data this.queryCommonData.companyList = res.data.data
} }
}, },
err => {} err => {
}
) )
}, },
//点击op备注 //点击op备注
ckOPremark(item) { ckOPremark (item) {
this.remarkMsg.TCID = item.TCID this.remarkMsg.TCID = item.TCID
this.remarkMsg.OPRemark = item.OPRemark this.remarkMsg.OPRemark = item.OPRemark
this.remarkMsg.OPInnerRemark = item.OPInnerRemark this.remarkMsg.OPInnerRemark = item.OPInnerRemark
...@@ -1361,7 +1432,7 @@ ...@@ -1361,7 +1432,7 @@
this.queryCommonData.outerVisible = true this.queryCommonData.outerVisible = true
}, },
//设置OP备注 //设置OP备注
setOPremark() { setOPremark () {
this.apipost( this.apipost(
'travel_post_SetTravelPrcieOpRemark', 'travel_post_SetTravelPrcieOpRemark',
this.remarkMsg, this.remarkMsg,
...@@ -1374,18 +1445,19 @@ ...@@ -1374,18 +1445,19 @@
this.Error(res.data.message) this.Error(res.data.message)
} }
}, },
err => {} err => {
}
) )
}, },
//点击本团卖点 //点击本团卖点
ckSellPoint(item) { ckSellPoint (item) {
this.queryCommonData.SellingPoints = true this.queryCommonData.SellingPoints = true
this.remarkMsg.ConfigId = item.ID this.remarkMsg.ConfigId = item.ID
this.remarkMsg.ProductRecommend = item.ProductRecommend this.remarkMsg.ProductRecommend = item.ProductRecommend
this.remarkMsg.TCID = item.TCID this.remarkMsg.TCID = item.TCID
}, },
//本团卖点 //本团卖点
SetSellingPoints() { SetSellingPoints () {
this.apipost( this.apipost(
'travel_post_SetSellingPoints', 'travel_post_SetSellingPoints',
this.remarkMsg, this.remarkMsg,
...@@ -1398,16 +1470,17 @@ ...@@ -1398,16 +1470,17 @@
this.Error(res.data.message) this.Error(res.data.message)
} }
}, },
err => {} err => {
}
) )
}, },
checkedFlight(item) { checkedFlight (item) {
this.queryMsg.FlightState = item.Id this.queryMsg.FlightState = item.Id
this.queryCommonData.flightCKed = [] this.queryCommonData.flightCKed = []
this.queryCommonData.flightCKed.push(item.Id) this.queryCommonData.flightCKed.push(item.Id)
}, },
//点击选取出团公司 //点击选取出团公司
getCompanyCheck(item) { getCompanyCheck (item) {
item.isShow = !item.isShow item.isShow = !item.isShow
this.queryCommonData.checkCompanyAll = false this.queryCommonData.checkCompanyAll = false
this.$forceUpdate() this.$forceUpdate()
...@@ -1429,7 +1502,7 @@ ...@@ -1429,7 +1502,7 @@
this.getControlList() this.getControlList()
}, },
//查询全部 //查询全部
getCompanyCheckAll() { getCompanyCheckAll () {
this.queryCommonData.checkCompanyAll = true this.queryCommonData.checkCompanyAll = true
this.queryMsg.OutBranchIds = [] this.queryMsg.OutBranchIds = []
this.queryCommonData.BranchList.forEach(x => { this.queryCommonData.BranchList.forEach(x => {
...@@ -1438,7 +1511,7 @@ ...@@ -1438,7 +1511,7 @@
this.getControlList() this.getControlList()
}, },
SetPrice(value) { SetPrice (value) {
if (value == null) { if (value == null) {
return 0.0 return 0.0
} }
...@@ -1455,7 +1528,7 @@ ...@@ -1455,7 +1528,7 @@
}, },
//隐藏显示 //隐藏显示
ShowUnionList(item) { ShowUnionList (item) {
// this.queryCommonData.showUnion = !this.queryCommonData.showUnion; // this.queryCommonData.showUnion = !this.queryCommonData.showUnion;
item.isshowUnion = !item.isshowUnion item.isshowUnion = !item.isshowUnion
if (item.isshowUnion) { if (item.isshowUnion) {
...@@ -1466,7 +1539,7 @@ ...@@ -1466,7 +1539,7 @@
this.$forceUpdate() this.$forceUpdate()
}, },
//酒店餐厅处理跳转 //酒店餐厅处理跳转
goHotelDiningBus(item, HotelDiningBus, type) { goHotelDiningBus (item, HotelDiningBus, type) {
if (type == 1) { if (type == 1) {
this.$router.push({ this.$router.push({
name: 'ChangeHotel', name: 'ChangeHotel',
...@@ -1490,20 +1563,20 @@ ...@@ -1490,20 +1563,20 @@
} }
}, },
//显示弹窗层 //显示弹窗层
ShowUploadWord(item) { ShowUploadWord (item) {
this.queryCommonData.UploadWORDTip = true; this.queryCommonData.UploadWORDTip = true
this.queryCommonData.UploadItem = item; this.queryCommonData.UploadItem = item
}, },
//保存WORD路劲 //保存WORD路劲
uploadFileBtn(file) { uploadFileBtn (file) {
var that = this; var that = this
let newArr = []; let newArr = []
newArr.push(file.file); newArr.push(file.file)
let fileName = file.file.name; let fileName = file.file.name
var path = "/Upload/WordTrip/"; var path = '/Upload/WordTrip/'
this.UploadSelfFileT(path, newArr, res => { this.UploadSelfFileT(path, newArr, res => {
if (res.data.StatusCode == 1) { if (res.data.StatusCode == 1) {
that.queryCommonData.uploadLoading=true; that.queryCommonData.uploadLoading = true
let uploadMsg = { let uploadMsg = {
TCID: that.queryCommonData.UploadItem.TCID, TCID: that.queryCommonData.UploadItem.TCID,
wordPath: res.data.FilePath wordPath: res.data.FilePath
...@@ -1511,7 +1584,7 @@ ...@@ -1511,7 +1584,7 @@
that.apipost( that.apipost(
'travel_post_UploadWord', uploadMsg, 'travel_post_UploadWord', uploadMsg,
res => { res => {
that.queryCommonData.uploadLoading=false; that.queryCommonData.uploadLoading = false
if (res.data.resultCode == 1) { if (res.data.resultCode == 1) {
that.Success(res.data.message) that.Success(res.data.message)
that.queryCommonData.UploadWORDTip = false that.queryCommonData.UploadWORDTip = false
...@@ -1520,16 +1593,16 @@ ...@@ -1520,16 +1593,16 @@
that.Error(res.data.message) that.Error(res.data.message)
} }
}, },
err => {} err => {
); }
)
} else { } else {
that.Error("上传文件失败!") that.Error('上传文件失败!')
} }
}) })
}, },
//结团/正常 //结团/正常
OutGroup(TCID,Status) OutGroup (TCID, Status) {
{
let msg = { let msg = {
TCID: TCID, TCID: TCID,
Status: Status, Status: Status,
...@@ -1547,11 +1620,11 @@ ...@@ -1547,11 +1620,11 @@
}, },
}, },
filters: { filters: {
formatStartDate(value) { formatStartDate (value) {
let dataArr = value.split('-') let dataArr = value.split('-')
return dataArr[1] + '-' + dataArr[2] return dataArr[1] + '-' + dataArr[2]
}, },
priceFormat(value) { priceFormat (value) {
if (value == null) { if (value == null) {
return 0.0 return 0.0
} }
...@@ -1567,7 +1640,7 @@ ...@@ -1567,7 +1640,7 @@
return x1 + x2 return x1 + x2
} }
}, },
mounted() { mounted () {
//销售公司 //销售公司
this.getSellorCompany() this.getSellorCompany()
this.getCompanyList() this.getCompanyList()
...@@ -1576,7 +1649,7 @@ ...@@ -1576,7 +1649,7 @@
this.getEmployeeList() this.getEmployeeList()
this.getCountryCity() this.getCountryCity()
}, },
created() { created () {
//默认显示联运 //默认显示联运
this.queryMsg.IsShowUnion = 1 this.queryMsg.IsShowUnion = 1
let userInfo = this.getLocalStorage() let userInfo = this.getLocalStorage()
......
src/components/TravelManager/TravelList/priceIncomeConfirmInfo.vue
View file @ 12541d7b
...@@ -33,45 +33,71 @@ ...@@ -33,45 +33,71 @@
float:left; float:left;
width:95%; width:95%;
} }
.priceContent{
width:830px;
padding:15px;
background-color: #fff;
min-height:500px;
color:#c94052;
}
.pri_title{
font-size: 18px;
text-align: center;
margin-bottom:20px;
}
.priceContent table td,.priceContent table th{
height:34px;
padding:10px;
}
</style> </style>
<template> <template>
<div> <div class="priceContent">
<table class="singeRowTable"> <p class="pri_title">团队收入确认单</p>
<table border="1" bordercolor="#c94052" style="border-collapse: collapse;width:100%;font-size:14px;text-align:center;">
<tr> <tr>
<th colspan="10">团队收入确认单</th> <th>部门</th>
<th>{{dataList.DepartmentName}}</th>
<th>单号</th>
<th width="200" style="text-align:left;">
<span class="princeOrderSpan" v-for="item in dataList.OrderIds">{{item}}</span>
</th>
</tr> </tr>
<tr> <tr>
<th>部门</th> <th>团号</th>
<th width="250">单号</th>
<th width="180">团号</th>
<th>团队编号</th> <th>团队编号</th>
<th>人数</th> <th>人数</th>
<th width="100">领队</th> <th>领队</th>
<th>团费收入合计</th>
<th>直客收入</th>
<th>同行交客收入</th>
<th>平台收入</th>
</tr> </tr>
<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.TCNUM}}</td>
<td>{{dataList.TCID}}</td> <td>{{dataList.TCID}}</td>
<td>{{dataList.PeopleNum}}</td> <td>{{dataList.PeopleNum}}</td>
<td>{{dataList.LeaderName}}</td> <td>{{dataList.LeaderName}}</td>
<td>{{dataList.TotalIncome}}</td> </tr>
<td>{{dataList.DirectGuestIncome}}</td> <tr>
<td>{{dataList.PlatformGuestIncome}}</td> <td>团费收入合计</td>
<td>{{dataList.PlatformIncome}}</td> <td colspan="3">{{dataList.TotalIncome}}</td>
</tr>
<tr>
<td rowspan="3">其中</td>
<td>直客收入</td>
<td colspan="2">{{dataList.DirectGuestIncome}}</td>
</tr>
<tr>
<td>同行交客收入</td>
<td colspan="2">{{dataList.PlatformGuestIncome}}</td>
</tr>
<tr>
<td>平台收入</td>
<td colspan="2">{{dataList.PlatformIncome}}</td>
</tr>
<tr>
<td colspan="4" style="text-align:left;">
备注：{{dataList.Remark}}
</td>
</tr> </tr>
</table> </table>
<div class="PriceRemark clearfix">
<div class="leftRemarkTitle">备注：</div>
<div class="rightRemarkContent">{{dataList.Remark}} </div>
</div>
</div> </div>
</template> </template>
<script> <script>
......
src/components/administrative/Approval.vue
View file @ 12541d7b
...@@ -34,8 +34,8 @@ ...@@ -34,8 +34,8 @@
<div class="approval_doDiv"> <div class="approval_doDiv">
<p> <p>
<button v-if='item.Status==1' class="normalBtn" @click="goUrl('ApprovalProcess',item.Id)">审批流程</button> &nbsp;&nbsp; <button v-if='item.Status==1' class="normalBtn" @click="goUrl('ApprovalProcess',item.Id)">审批流程</button> &nbsp;&nbsp;
<button v-if='item.Status==1' @click="updateTempStatus(item.Id,item.TemplateType,item.Status)" class="hollowFixedBtn">停用</button> <button v-if='item.Status==1' @click="updateTempStatus(item.Id,item.TemplateType,item.Status)" class="hollowFixedBtn">{{$t('fnc.tingyong')}}</button>
<button v-if='item.Status==2' @click="updateTempStatus(item.Id,item.TemplateType,item.Status)" class="hollowFixedBtn">启用</button> <button v-if='item.Status==2' @click="updateTempStatus(item.Id,item.TemplateType,item.Status)" class="hollowFixedBtn">{{$t('fnc.qiyong')}}</button>
</p> </p>
</div> </div>
</div> </div>
......
src/components/administrative/ApprovalStatistical.vue
View file @ 12541d7b
...@@ -59,8 +59,8 @@ ...@@ -59,8 +59,8 @@
<th width="300">待审核人</th> <th width="300">待审核人</th>
<th width="300">已审核人</th> <th width="300">已审核人</th>
<th>申请时间</th> <th>申请时间</th>
<th>状态</th> <th>{{$t('admin.admin_status')}}</th>
<th width="80">操作</th> <th width="150">{{$t('system.table_operation')}}</th>
</tr> </tr>
<tr v-for='item in list' v-loading='loading'> <tr v-for='item in list' v-loading='loading'>
......
src/components/administrative/AttendanceStatistics.vue
View file @ 12541d7b
...@@ -2,8 +2,8 @@ ...@@ -2,8 +2,8 @@
<div class="flexOne"> <div class="flexOne">
<div class="query-box"> <div class="query-box">
<ul> <ul>
<li><span><em>公司</em><el-select filterable v-model='msg.BranchId' @change='linkageDepartment()'> <li><span><em>{{$t('system.table_company')}}</em><el-select filterable v-model='msg.BranchId' @change='linkageDepartment()'>
<el-option label='不限' value='-1'></el-option> <el-option :label="$t('pub.unlimitedSel')" value='-1'></el-option>
<el-option v-for='item in companyList' <el-option v-for='item in companyList'
:label='item.BName' :label='item.BName'
:value='item.Id' :value='item.Id'
...@@ -11,8 +11,8 @@ ...@@ -11,8 +11,8 @@
</el-option> </el-option>
</el-select> </el-select>
</span></li> </span></li>
<li><span><em>部门</em><el-select filterable v-model='msg.DepartmentId' @change='linkageEmployeeMsg()'> <li><span><em>{{$t('admin.admin_Department')}}</em><el-select filterable v-model='msg.DepartmentId' @change='linkageEmployeeMsg()'>
<el-option label='不限' value='-1'></el-option> <el-option :label="$t('pub.unlimitedSel')" 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'
...@@ -20,8 +20,8 @@ ...@@ -20,8 +20,8 @@
</el-option> </el-option>
</el-select> </el-select>
</span></li> </span></li>
<li><span><em>员工</em><el-select filterable v-model='msg.EmployeeId'> <li><span><em>{{$t('system.table_staffs')}}</em><el-select filterable v-model='msg.EmployeeId'>
<el-option label='不限' value='-1'></el-option> <el-option :label="$t('pub.unlimitedSel')" value='-1'></el-option>
<el-option v-for='item in employeeList' <el-option v-for='item in employeeList'
:label='item.name' :label='item.name'
:value='item.empId' :value='item.empId'
...@@ -36,20 +36,20 @@ ...@@ -36,20 +36,20 @@
</li> </li>
<li> <li>
<input type="button" class="hollowFixedBtn" value="查询" @click="resetPageIndex(),getList()" /> <input type="button" class="hollowFixedBtn" :value="$t('pub.searchBtn')" @click="resetPageIndex(),getList()" />
<input type="button" class="normalBtn" value="导出报表" @click="exportExcel()" /> <input type="button" class="normalBtn" value="导出报表" @click="exportExcel()" />
</li> </li>
</ul> </ul>
</div> </div>
<el-table :data="dataList" stripe style="width: 100%" max-height="700" v-loading='loading'> <el-table :data="dataList" stripe style="width: 100%" max-height="700" v-loading='loading'>
<el-table-column fixed prop="EmName" label="姓名" width="80"> <el-table-column fixed prop="EmName" :label="$t('system.query_name')" width="80">
</el-table-column> </el-table-column>
<el-table-column prop="EmployeeId" label="工号" width="50"> <el-table-column prop="EmployeeId" label="工号" width="50">
</el-table-column> </el-table-column>
<el-table-column prop="DepartmentName" label="部门" width="150"> <el-table-column prop="DepartmentName" :label="$t('admin.admin_Department')" width="150">
</el-table-column> </el-table-column>
<el-table-column prop="PostName" label="岗位" width="120"> <el-table-column prop="PostName" :label="$t('admin.admin_Post')" width="120">
</el-table-column> </el-table-column>
<el-table-column prop="DateStr" label="考勤日期" width="120"> <el-table-column prop="DateStr" label="考勤日期" width="120">
</el-table-column> </el-table-column>
......
src/components/administrative/CommissionManagement.vue
View file @ 12541d7b
...@@ -18,9 +18,9 @@ ...@@ -18,9 +18,9 @@
<tr> <tr>
<th>期数</th> <th>期数</th>
<th>提成总金额</th> <th>提成总金额</th>
<th>操作人</th> <th>{{$t('admin.admin_czPerson')}}</th>
<th>日期</th> <th>日期</th>
<th>操作</th> <th>{{$t('system.table_operation')}}</th>
</tr> </tr>
<tr v-for="item in dataList"> <tr v-for="item in dataList">
<td>{{item.periods}}</td> <td>{{item.periods}}</td>
......
src/components/administrative/ShareMeDocuments.vue
View file @ 12541d7b
...@@ -12,8 +12,8 @@ ...@@ -12,8 +12,8 @@
<el-button v-if='fileListInside.length>0||notFileListInside.length>0' type="danger" @click='moveFiles'>移动到里</el-button> <el-button v-if='fileListInside.length>0||notFileListInside.length>0' type="danger" @click='moveFiles'>移动到里</el-button>
</el-button-group> </el-button-group>
<div class="fr" v-if='!isChildFiles'> <div class="fr" v-if='!isChildFiles'>
<el-input class='w200' placeholder="请输入内容" v-model="msg.ShareName" prefix-icon="el-icon-search"></el-input> <el-input class='w200' :placeholder="$t('pub.pleaseImport')" v-model="msg.ShareName" prefix-icon="el-icon-search"></el-input>
<input type="button" class="hollowFixedBtn" @click='getList()' value="查询" /> <input type="button" class="hollowFixedBtn" @click='getList()' :value="$t('pub.searchBtn')" />
</div> </div>
</div> </div>
<div class="myDocumentsLink"> <div class="myDocumentsLink">
...@@ -98,9 +98,9 @@ ...@@ -98,9 +98,9 @@
<el-tree :data="fileTreeList" :props="defaultProps" :check-strictly='true' @check-change="handleNodeChange" node-key="Id" show-checkbox accordion ref="tree"> <el-tree :data="fileTreeList" :props="defaultProps" :check-strictly='true' @check-change="handleNodeChange" node-key="Id" show-checkbox accordion ref="tree">
</el-tree> </el-tree>
<div slot="footer" class="dialog-footer"> <div slot="footer" class="dialog-footer">
<input type="button" class="hollowFixedBtn" value="取消" @click="moveCancel" /> <input type="button" class="hollowFixedBtn" :value="$t('pub.cancelBtn')" @click="moveCancel" />
<input type="button" v-if='!isChildFiles' class="normalBtn" value="确定" @click="saveMoveFiles" /> <input type="button" v-if='!isChildFiles' class="normalBtn" :value="$t('pub.sureBtn')" @click="saveMoveFiles" />
<input type="button" v-if='isChildFiles' class="normalBtn" value="确定" @click="saveMoveFilesInside" /> <input type="button" v-if='isChildFiles' class="normalBtn" :value="$t('pub.sureBtn')" @click="saveMoveFilesInside" />
</div> </div>
</el-dialog> </el-dialog>
<el-dialog custom-class='w800' :title="dialogTitle4" :visible.sync="outerVisible4" center> <el-dialog custom-class='w800' :title="dialogTitle4" :visible.sync="outerVisible4" center>
...@@ -108,7 +108,7 @@ ...@@ -108,7 +108,7 @@
your browser does not support the video tag your browser does not support the video tag
</video> </video>
<div slot="footer" class="dialog-footer"> <div slot="footer" class="dialog-footer">
<input type="button" class="normalBtn" value="关闭" @click="outerVisible4=false" /> <input type="button" class="normalBtn" :value="$t('pub.closeSel')" @click="outerVisible4=false" />
</div> </div>
</el-dialog > </el-dialog >
<div v-if='audioIsShow' style="position: fixed; bottom: 100px; right: 20px; z-index: 999; border:1px solid #ccc; padding: 10px; background: #eee;"> <div v-if='audioIsShow' style="position: fixed; bottom: 100px; right: 20px; z-index: 999; border:1px solid #ccc; padding: 10px; background: #eee;">
...@@ -135,9 +135,9 @@ ...@@ -135,9 +135,9 @@
<input type="button" @click="createCode" class="DocumentLoadVerification" v-model="checkCode"/> <input type="button" @click="createCode" class="DocumentLoadVerification" v-model="checkCode"/>
</p> </p>
<div slot="footer" class="dialog-footer"> <div slot="footer" class="dialog-footer">
<input type="button" class="hollowFixedBtn" value="取消" @click="yzmVisible=false" /> <input type="button" class="hollowFixedBtn" :value="$t('pub.cancelBtn')" @click="yzmVisible=false" />
<input v-if='!isChildFiles' type="button" class="normalBtn" value="确定" @click="downloadTotal()" /> <input v-if='!isChildFiles' type="button" class="normalBtn" :value="$t('pub.sureBtn')" @click="downloadTotal()" />
<input v-if='isChildFiles' type="button" class="normalBtn" value="确定" @click="downloadTotalInside()" /> <input v-if='isChildFiles' type="button" class="normalBtn" :value="$t('pub.sureBtn')" @click="downloadTotalInside()" />
</div> </div>
</el-dialog > </el-dialog >
......
src/components/administrative/myDocuments.vue
View file @ 12541d7b
...@@ -9,18 +9,18 @@ ...@@ -9,18 +9,18 @@
<el-button v-if='notFileList.length==1&&fileList.length<1' type="danger" icon="el-icon-download" @click='dowloadSingle()'>下载</el-button> <el-button v-if='notFileList.length==1&&fileList.length<1' type="danger" icon="el-icon-download" @click='dowloadSingle()'>下载</el-button>
<el-button v-if='fileList.length>0||notFileList.length>0' type="danger" icon="el-icon-download" @click='yzmVisible=true,createCode()'>压缩下载</el-button> <el-button v-if='fileList.length>0||notFileList.length>0' type="danger" icon="el-icon-download" @click='yzmVisible=true,createCode()'>压缩下载</el-button>
<el-button type="danger" @click='openAddFilesDialog'>新键文件夹</el-button> <el-button type="danger" @click='openAddFilesDialog'>新键文件夹</el-button>
<el-button v-if='fileList.length>0||notFileList.length>0' type="danger" icon="el-icon-delete" @click='deleteFiles'>删除</el-button> <el-button v-if='fileList.length>0||notFileList.length>0' type="danger" icon="el-icon-delete" @click='deleteFiles'>{{$t('system.table_delete')}}</el-button>
<el-button v-if='fileList.length>0||notFileList.length>0' type="danger" icon="el-icon-share" @click='openShareDialog'>分享</el-button> <el-button v-if='fileList.length>0||notFileList.length>0' type="danger" icon="el-icon-share" @click='openShareDialog'>分享</el-button>
<el-button v-if='fileList.length>0||notFileList.length>0' type="danger" @click='moveFiles'>移动到</el-button> <el-button v-if='fileList.length>0||notFileList.length>0' type="danger" @click='moveFiles'>移动到</el-button>
</el-button-group> </el-button-group>
<div class="fr"> <div class="fr">
<el-input class='w200' placeholder="请输入内容" prefix-icon="el-icon-search" v-model="srearchKey" ></el-input> <el-input class='w200' :placeholder="$t('pub.pleaseImport')" prefix-icon="el-icon-search" v-model="srearchKey" ></el-input>
<input type="button" class="hollowFixedBtn" @click='doSearch()' value="查询" /> <input type="button" class="hollowFixedBtn" @click='doSearch()' :value="$t('pub.searchBtn')" />
</div> </div>
</div> </div>
<div class="myDocumentsLink" v-if='this.NavigationList.length>0'> <div class="myDocumentsLink" v-if='this.NavigationList.length>0'>
<span @click="getNextLevel(0)">全部</span><span v-for="item in NavigationList" @click="getNextLevel(item.Id)">{{item.FolderName}}</span> <span @click="getNextLevel(0)">{{$t('advmanager.v_all')}}</span><span v-for="item in NavigationList" @click="getNextLevel(item.Id)">{{item.FolderName}}</span>
</div> </div>
<table class="singeRowTable myDocumentsTable" border="0" cellspacing="0" cellpadding="0"> <table class="singeRowTable myDocumentsTable" border="0" cellspacing="0" cellpadding="0">
...@@ -66,8 +66,8 @@ ...@@ -66,8 +66,8 @@
</el-form-item> </el-form-item>
</el-form> </el-form>
<div slot="footer" class="dialog-footer"> <div slot="footer" class="dialog-footer">
<input type="button" class="hollowFixedBtn" value="取消" @click="outerVisible = false,addFileMsg.FolderName=''" /> <input type="button" class="hollowFixedBtn" :value="$t('pub.cancelBtn')" @click="outerVisible = false,addFileMsg.FolderName=''" />
<input type="button" class="normalBtn" value="确定" @click="submitForm('addFileMsg')" /> <input type="button" class="normalBtn" :value="$t('pub.sureBtn')" @click="submitForm('addFileMsg')" />
</div> </div>
</el-dialog> </el-dialog>
...@@ -78,8 +78,8 @@ ...@@ -78,8 +78,8 @@
</el-form-item> </el-form-item>
</el-form> </el-form>
<div slot="footer" class="dialog-footer"> <div slot="footer" class="dialog-footer">
<input type="button" class="hollowFixedBtn" value="取消" @click="outerVisible1 = false" /> <input type="button" class="hollowFixedBtn" :value="$t('pub.cancelBtn')" @click="outerVisible1 = false" />
<input type="button" class="normalBtn" value="确定" @click="saveUpdateFile" /> <input type="button" class="normalBtn" :value="$t('pub.sureBtn')" @click="saveUpdateFile" />
</div> </div>
</el-dialog> </el-dialog>
...@@ -87,24 +87,24 @@ ...@@ -87,24 +87,24 @@
<el-tree :data="fileTreeList" :props="defaultProps" :check-strictly='true' @check-change="handleNodeChange" node-key="Id" show-checkbox accordion ref="tree"> <el-tree :data="fileTreeList" :props="defaultProps" :check-strictly='true' @check-change="handleNodeChange" node-key="Id" show-checkbox accordion ref="tree">
</el-tree> </el-tree>
<div slot="footer" class="dialog-footer"> <div slot="footer" class="dialog-footer">
<input type="button" class="hollowFixedBtn" value="取消" @click="moveCancel" /> <input type="button" class="hollowFixedBtn" :value="$t('pub.cancelBtn')" @click="moveCancel" />
<input type="button" class="normalBtn" value="确定" @click="saveMoveFiles" /> <input type="button" class="normalBtn" :value="$t('pub.sureBtn')" @click="saveMoveFiles" />
</div> </div>
</el-dialog> </el-dialog>
<el-dialog custom-class='w800 shareDocumentDialog' :title="dialogTitle3" :visible.sync="outerVisible3" center> <el-dialog custom-class='w800 shareDocumentDialog' :title="dialogTitle3" :visible.sync="outerVisible3" center>
<div class="documentDialogNav"> <div class="documentDialogNav">
<div @click="shareDeparment"> <div @click="shareDeparment">
<i class="iconfont icon-user11"></i>部门 <i class="iconfont icon-user11"></i>{{$t('admin.admin_Department')}}
<div v-if='shareMsg.shareType==1' class="checkIcon"></div> <div v-if='shareMsg.shareType==1' class="checkIcon"></div>
</div> </div>
<div @click="shareRole"> <div @click="shareRole">
<i class="iconfont icon-user11"></i>岗位 <i class="iconfont icon-user11"></i>{{$t('admin.admin_Post')}}
<div v-if='shareMsg.shareType==2' class="checkIcon"></div> <div v-if='shareMsg.shareType==2' class="checkIcon"></div>
</div> </div>
<div @click="shareMenber"> <div @click="shareMenber">
<i class="iconfont icon-user11"></i>员工 <i class="iconfont icon-user11"></i>{{$t('system.table_staffs')}}
<div v-if='shareMsg.shareType==3' class="checkIcon"></div> <div v-if='shareMsg.shareType==3' class="checkIcon"></div>
</div> </div>
</div> </div>
...@@ -175,8 +175,8 @@ ...@@ -175,8 +175,8 @@
</div> </div>
</div> </div>
<div slot="footer" class="dialog-footer"> <div slot="footer" class="dialog-footer">
<input type="button" class="hollowFixedBtn" value="取消" @click="outerVisible3=false" /> <input type="button" class="hollowFixedBtn" :value="$t('pub.cancelBtn')" @click="outerVisible3=false" />
<input type="button" class="normalBtn" value="确定" @click="saveShareDocument" /> <input type="button" class="normalBtn" :value="$t('pub.sureBtn')" @click="saveShareDocument" />
</div> </div>
</el-dialog> </el-dialog>
...@@ -186,7 +186,7 @@ ...@@ -186,7 +186,7 @@
your browser does not support the video tag your browser does not support the video tag
</video> </video>
<div slot="footer" class="dialog-footer"> <div slot="footer" class="dialog-footer">
<input type="button" class="normalBtn" value="关闭" @click="outerVisible4=false" /> <input type="button" class="normalBtn" :value="$t('pub.closeSel')" @click="outerVisible4=false" />
</div> </div>
</el-dialog > </el-dialog >
...@@ -214,8 +214,8 @@ ...@@ -214,8 +214,8 @@
<input type="button" @click="createCode" class="DocumentLoadVerification" v-model="checkCode"/> <input type="button" @click="createCode" class="DocumentLoadVerification" v-model="checkCode"/>
</p> </p>
<div slot="footer" class="dialog-footer"> <div slot="footer" class="dialog-footer">
<input type="button" class="hollowFixedBtn" value="取消" @click="yzmVisible=false" /> <input type="button" class="hollowFixedBtn" :value="$t('pub.cancelBtn')" @click="yzmVisible=false" />
<input type="button" class="normalBtn" value="确定" @click="downloadTotal()" /> <input type="button" class="normalBtn" :value="$t('pub.sureBtn')" @click="downloadTotal()" />
</div> </div>
</el-dialog > </el-dialog >
......
src/components/administrative/myShareDocuments.vue
View file @ 12541d7b
...@@ -2,8 +2,8 @@ ...@@ -2,8 +2,8 @@
<div class="flexOne"> <div class="flexOne">
<div class="myDocumentsNav"> <div class="myDocumentsNav">
<div class="fr" v-if='!isChildFiles'> <div class="fr" v-if='!isChildFiles'>
<el-input class='w200' placeholder="请输入内容" v-model="msg.ShareName" prefix-icon="el-icon-search"></el-input> <el-input class='w200' :placeholder="$t('pub.pleaseImport')" v-model="msg.ShareName" prefix-icon="el-icon-search"></el-input>
<input type="button" class="hollowFixedBtn" @click='getList()' value="查询" /> <input type="button" class="hollowFixedBtn" @click='getList()' :value="$t('pub.searchBtn')" />
</div> </div>
</div> </div>
<div class="myDocumentsLink"> <div class="myDocumentsLink">
...@@ -43,7 +43,7 @@ ...@@ -43,7 +43,7 @@
<th width="100">分享状态</th> <th width="100">分享状态</th>
<th width="200">分享类型</th> <th width="200">分享类型</th>
<th width="200">分享日期</th> <th width="200">分享日期</th>
<th width="200">操作</th> <th width="200">{{$t('system.table_operation')}}</th>
</tr> </tr>
<tr v-for="(item,index) in list" @mouseover="enterTr(index)" @mouseleave="leaveTr"> <tr v-for="(item,index) in list" @mouseover="enterTr(index)" @mouseleave="leaveTr">
<td v-if="item.shareFileType==1"> <td v-if="item.shareFileType==1">
...@@ -122,20 +122,20 @@ ...@@ -122,20 +122,20 @@
</el-form-item> </el-form-item>
</el-form> </el-form>
<div slot="footer" class="dialog-footer"> <div slot="footer" class="dialog-footer">
<input type="button" class="hollowFixedBtn" value="取消" @click="outerVisible = false,addFileMsg.FolderName=''" /> <input type="button" class="hollowFixedBtn" :value="$t('pub.cancelBtn')" @click="outerVisible = false,addFileMsg.FolderName=''" />
<input type="button" class="normalBtn" value="确定" @click="submitForm('addFileMsg')" /> <input type="button" class="normalBtn" :value="$t('pub.sureBtn')" @click="submitForm('addFileMsg')" />
</div> </div>
</el-dialog> </el-dialog>
<el-dialog custom-class='w400' :title="dialogTitle1" :visible.sync="outerVisible1" center> <el-dialog custom-class='w400' :title="dialogTitle1" :visible.sync="outerVisible1" center>
<el-form :model="updateFileMsg" :rules="rules1" ref="updateFileMsg" label-width="80px"> <el-form :model="updateFileMsg" :rules="rules1" ref="updateFileMsg" label-width="80px">
<el-form-item label='名称' prop="FileName"> <el-form-item :label="$t('admin.mane')" prop="FileName">
<el-input type="text" maxLength='50' v-model='updateFileMsg.FileName'></el-input> <el-input type="text" maxLength='50' v-model='updateFileMsg.FileName'></el-input>
</el-form-item> </el-form-item>
</el-form> </el-form>
<div slot="footer" class="dialog-footer"> <div slot="footer" class="dialog-footer">
<input type="button" class="hollowFixedBtn" value="取消" @click="outerVisible1 = false" /> <input type="button" class="hollowFixedBtn" :value="$t('pub.cancelBtn')" @click="outerVisible1 = false" />
<input type="button" class="normalBtn" value="确定" @click="saveUpdateFile" /> <input type="button" class="normalBtn" :value="$t('pub.sureBtn')" @click="saveUpdateFile" />
</div> </div>
</el-dialog> </el-dialog>
...@@ -143,24 +143,24 @@ ...@@ -143,24 +143,24 @@
<el-tree :data="fileTreeList" :props="defaultProps" :check-strictly='true' @check-change="handleNodeChange" node-key="Id" show-checkbox accordion ref="tree"> <el-tree :data="fileTreeList" :props="defaultProps" :check-strictly='true' @check-change="handleNodeChange" node-key="Id" show-checkbox accordion ref="tree">
</el-tree> </el-tree>
<div slot="footer" class="dialog-footer"> <div slot="footer" class="dialog-footer">
<input type="button" class="hollowFixedBtn" value="取消" @click="outerVisible2=false" /> <input type="button" class="hollowFixedBtn" :value="$t('pub.cancelBtn')" @click="outerVisible2=false" />
<input type="button" class="normalBtn" value="确定" @click="saveMoveFiles" /> <input type="button" class="normalBtn" :value="$t('pub.sureBtn')" @click="saveMoveFiles" />
</div> </div>
</el-dialog> </el-dialog>
<el-dialog custom-class='w800 shareDocumentDialog' :title="dialogTitle3" :visible.sync="outerVisible3" center> <el-dialog custom-class='w800 shareDocumentDialog' :title="dialogTitle3" :visible.sync="outerVisible3" center>
<div class="documentDialogNav"> <div class="documentDialogNav">
<div @click="shareDeparment"> <div @click="shareDeparment">
<i class="iconfont icon-user11"></i>部门 <i class="iconfont icon-user11"></i>{{$t('admin.admin_Department')}}
<div v-if='shareMsg.shareType==1' class="checkIcon"></div> <div v-if='shareMsg.shareType==1' class="checkIcon"></div>
</div> </div>
<div @click="shareRole"> <div @click="shareRole">
<i class="iconfont icon-user11"></i>岗位 <i class="iconfont icon-user11"></i>{{$t('admin.admin_Post')}}
<div v-if='shareMsg.shareType==2' class="checkIcon"></div> <div v-if='shareMsg.shareType==2' class="checkIcon"></div>
</div> </div>
<div @click="shareMenber"> <div @click="shareMenber">
<i class="iconfont icon-user11"></i>员工 <i class="iconfont icon-user11"></i>{{$t('system.table_staffs')}}
<div v-if='shareMsg.shareType==3' class="checkIcon"></div> <div v-if='shareMsg.shareType==3' class="checkIcon"></div>
</div> </div>
</div> </div>
...@@ -231,8 +231,8 @@ ...@@ -231,8 +231,8 @@
</div> </div>
</div> </div>
<div slot="footer" class="dialog-footer"> <div slot="footer" class="dialog-footer">
<input type="button" class="hollowFixedBtn" value="取消" @click="outerVisible3=false" /> <input type="button" class="hollowFixedBtn" :value="$t('pub.cancelBtn')" @click="outerVisible3=false" />
<input type="button" class="normalBtn" value="确定" @click="saveShareDocument" /> <input type="button" class="normalBtn" :value="$t('pub.sureBtn')" @click="saveShareDocument" />
</div> </div>
</el-dialog> </el-dialog>
...@@ -242,7 +242,7 @@ ...@@ -242,7 +242,7 @@
your browser does not support the video tag your browser does not support the video tag
</video> </video>
<div slot="footer" class="dialog-footer"> <div slot="footer" class="dialog-footer">
<input type="button" class="normalBtn" value="关闭" @click="outerVisible4=false" /> <input type="button" class="normalBtn" :value="$t('pub.closeSel')" @click="outerVisible4=false" />
</div> </div>
</el-dialog > </el-dialog >
<div v-if='audioIsShow' style="position: fixed; bottom: 100px; right: 20px; z-index: 999; border:1px solid #ccc; padding: 10px; background: #eee;"> <div v-if='audioIsShow' style="position: fixed; bottom: 100px; right: 20px; z-index: 999; border:1px solid #ccc; padding: 10px; background: #eee;">
...@@ -269,8 +269,8 @@ ...@@ -269,8 +269,8 @@
<input type="button" @click="createCode" class="DocumentLoadVerification" v-model="checkCode"/> <input type="button" @click="createCode" class="DocumentLoadVerification" v-model="checkCode"/>
</p> </p>
<div slot="footer" class="dialog-footer"> <div slot="footer" class="dialog-footer">
<input type="button" class="hollowFixedBtn" value="取消" @click="yzmVisible=false" /> <input type="button" class="hollowFixedBtn" :value="$t('pub.cancelBtn')" @click="yzmVisible=false" />
<input type="button" class="normalBtn" value="确定" @click="downloadTotal()" /> <input type="button" class="normalBtn" :value="$t('pub.sureBtn')" @click="downloadTotal()" />
</div> </div>
</el-dialog > </el-dialog >
......
src/components/administrative/outWorkApproval.vue
View file @ 12541d7b
...@@ -22,7 +22,7 @@ ...@@ -22,7 +22,7 @@
</span> </span>
</li> </li>
<li> <li>
<input type="button" class="hollowFixedBtn" value="查询" @click="resetPageIndex(),getList()" /> <input type="button" class="hollowFixedBtn" :value="$t('pub.searchBtn')" @click="resetPageIndex(),getList()" />
</li> </li>
</ul> </ul>
</div> </div>
...@@ -30,13 +30,13 @@ ...@@ -30,13 +30,13 @@
<table style="min-width: 1400px;" class="singeRowTable" border="0" cellspacing="0" cellpadding="0"> <table style="min-width: 1400px;" class="singeRowTable" border="0" cellspacing="0" cellpadding="0">
<tr> <tr>
<th>公司</th> <th>公司</th>
<th>姓名</th> <th>{{$t('system.query_name')}}</th>
<th>签到日期</th> <th>签到日期</th>
<th>第一次签到时间</th> <th>第一次签到时间</th>
<th width="400">第一次签到地点</th> <th width="400">第一次签到地点</th>
<th>最后一次签到时间</th> <th>最后一次签到时间</th>
<th width="400">最后一次签到地点</th> <th width="300">最后一次签到地点</th>
<th width="80">操作</th> <th width="150">{{$t('system.table_operation')}}</th>
</tr> </tr>
<tr v-for='item in list' v-loading='loading'> <tr v-for='item in list' v-loading='loading'>
......
src/components/administrative/statisticsCheckTime.vue
View file @ 12541d7b
...@@ -3,8 +3,8 @@ ...@@ -3,8 +3,8 @@
<div class="query-box"> <div class="query-box">
<ul> <ul>
<li><span><em>公司</em><el-select filterable v-model='msg.BranchId' @change='linkageDepartment()'> <li><span><em>{{$t('system.table_company')}}</em><el-select filterable v-model='msg.BranchId' @change='linkageDepartment()'>
<el-option label='不限' value='-1'></el-option> <el-option :label="$t('pub.unlimitedSel')" value='-1'></el-option>
<el-option v-for='item in companyList' <el-option v-for='item in companyList'
:label='item.BName' :label='item.BName'
:value='item.Id' :value='item.Id'
...@@ -12,8 +12,8 @@ ...@@ -12,8 +12,8 @@
</el-option> </el-option>
</el-select> </el-select>
</span></li> </span></li>
<li><span><em>部门</em><el-select filterable v-model='msg.DepartmentId' @change='linkageEmployeeMsg()'> <li><span><em>{{$t('admin.admin_Department')}}</em><el-select filterable v-model='msg.DepartmentId' @change='linkageEmployeeMsg()'>
<el-option label='不限' value='-1'></el-option> <el-option :label="$t('pub.unlimitedSel')" 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'
...@@ -21,8 +21,8 @@ ...@@ -21,8 +21,8 @@
</el-option> </el-option>
</el-select> </el-select>
</span></li> </span></li>
<li><span><em>员工</em><el-select filterable v-model='msg.EmployeeId'> <li><span><em>{{$t('system.table_staffs')}}</em><el-select filterable v-model='msg.EmployeeId'>
<el-option label='不限' value='-1'></el-option> <el-option :label="$t('pub.unlimitedSel')" value='-1'></el-option>
<el-option v-for='item in employeeList' <el-option v-for='item in employeeList'
:label='item.name' :label='item.name'
:value='item.empId' :value='item.empId'
...@@ -38,19 +38,19 @@ ...@@ -38,19 +38,19 @@
</li> </li>
<li> <li>
<input type="button" class="hollowFixedBtn" value="查询" @click="resetPageIndex(),getList()" /> <input type="button" class="hollowFixedBtn" :value="$t('pub.searchBtn')" @click="resetPageIndex(),getList()" />
<input type="button" class="normalBtn" value="导出报表" @click="exportExcel()" /> <input type="button" class="normalBtn" value="导出报表" @click="exportExcel()" />
</li> </li>
</ul> </ul>
</div> </div>
<el-table :data="dataList" stripe v-loading='loading'> <el-table :data="dataList" stripe v-loading='loading'>
<el-table-column fixed prop="EmName" label="姓名" min-width="100"> <el-table-column fixed prop="EmName" :label="$t('system.query_name')" min-width="100">
</el-table-column> </el-table-column>
<el-table-column prop="DepartmentName" label="部门" min-width="120"> <el-table-column prop="DepartmentName" :label="$t('admin.admin_Department')" min-width="120">
</el-table-column> </el-table-column>
<el-table-column prop="EmployeeId" label="工号" min-width="80"> <el-table-column prop="EmployeeId" label="工号" min-width="80">
</el-table-column> </el-table-column>
<el-table-column prop="PostName" label="岗位" min-width="120"> <el-table-column prop="PostName" :label="$t('admin.admin_Post')" min-width="120">
</el-table-column> </el-table-column>
<el-table-column v-for='(item,index) in newArr' :prop='item.value' :label="item.title" :key='index' min-width="120"> <el-table-column v-for='(item,index) in newArr' :prop='item.value' :label="item.title" :key='index' min-width="120">
<template slot-scope="scope"> <template slot-scope="scope">
......
src/components/administrative/statisticsDetail.vue
View file @ 12541d7b
...@@ -2,8 +2,8 @@ ...@@ -2,8 +2,8 @@
<div class="flexOne"> <div class="flexOne">
<div class="query-box"> <div class="query-box">
<ul> <ul>
<li><span><em>公司</em><el-select filterable v-model='msg.BranchId' @change='linkageDepartment()'> <li><span><em>{{$t('system.table_company')}}</em><el-select filterable v-model='msg.BranchId' @change='linkageDepartment()'>
<el-option label='不限' value='-1'></el-option> <el-option :label="$t('pub.unlimitedSel')" value='-1'></el-option>
<el-option v-for='item in companyList' <el-option v-for='item in companyList'
:label='item.BName' :label='item.BName'
:value='item.Id' :value='item.Id'
...@@ -11,8 +11,8 @@ ...@@ -11,8 +11,8 @@
</el-option> </el-option>
</el-select> </el-select>
</span></li> </span></li>
<li><span><em>部门</em><el-select filterable v-model='msg.DepartmentId' @change='linkageEmployeeMsg()'> <li><span><em>{{$t('admin.admin_Department')}}</em><el-select filterable v-model='msg.DepartmentId' @change='linkageEmployeeMsg()'>
<el-option label='不限' value='-1'></el-option> <el-option :label="$t('pub.unlimitedSel')" 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'
...@@ -20,8 +20,8 @@ ...@@ -20,8 +20,8 @@
</el-option> </el-option>
</el-select> </el-select>
</span></li> </span></li>
<li><span><em>员工</em><el-select filterable v-model='msg.EmployeeId'> <li><span><em>{{$t('system.table_staffs')}}</em><el-select filterable v-model='msg.EmployeeId'>
<el-option label='不限' value='-1'></el-option> <el-option :label="$t('pub.unlimitedSel')" value='-1'></el-option>
<el-option v-for='item in employeeList' <el-option v-for='item in employeeList'
:label='item.name' :label='item.name'
:value='item.empId' :value='item.empId'
...@@ -36,20 +36,20 @@ ...@@ -36,20 +36,20 @@
</li> </li>
<li> <li>
<input type="button" class="hollowFixedBtn" value="查询" @click="resetPageIndex(),getList()" /> <input type="button" class="hollowFixedBtn" :value="$t('pub.searchBtn')" @click="resetPageIndex(),getList()" />
<input type="button" class="normalBtn" value="导出报表" @click="exportExcel()" /> <input type="button" class="normalBtn" value="导出报表" @click="exportExcel()" />
</li> </li>
</ul> </ul>
</div> </div>
<el-table :data="dataList" stripe style="width: 100%" v-loading='loading'> <el-table :data="dataList" stripe style="width: 100%" v-loading='loading'>
<el-table-column fixed prop="EmName" label="姓名" min-width="100"> <el-table-column fixed prop="EmName" :label="$t('system.query_name')" min-width="100">
</el-table-column> </el-table-column>
<el-table-column fixed prop="EmployeeId" label="工号" min-width="80"> <el-table-column fixed prop="EmployeeId" label="工号" min-width="80">
</el-table-column> </el-table-column>
<el-table-column prop="DepartmentName" label="部门" min-width="120"> <el-table-column prop="DepartmentName" :label="$t('admin.admin_Department')" min-width="120">
</el-table-column> </el-table-column>
<el-table-column prop="PostName" label="岗位" min-width="100"> <el-table-column prop="PostName" :label="$t('admin.admin_Post')" min-width="100">
</el-table-column> </el-table-column>
<el-table-column prop="DateStr" label="日期" min-width="150"> <el-table-column prop="DateStr" label="日期" min-width="150">
</el-table-column> </el-table-column>
......
src/components/administrative/statisticsTotal.vue
View file @ 12541d7b
<template> <template>
<div class="flexOne"> <div class="flexOne">
<div class="rowDiv">展示列： <div class="rowDiv">展示列：
<el-checkbox v-model='column'>岗位</el-checkbox> <el-checkbox v-model='column'>{{$t('admin.admin_Post')}}</el-checkbox>
<el-checkbox v-model='column1'>出勤天数</el-checkbox> <el-checkbox v-model='column1'>出勤天数</el-checkbox>
<el-checkbox v-model='column2'>休息天数</el-checkbox> <el-checkbox v-model='column2'>休息天数</el-checkbox>
<el-checkbox v-model='column4'>迟到次数</el-checkbox> <el-checkbox v-model='column4'>迟到次数</el-checkbox>
...@@ -13,8 +13,8 @@ ...@@ -13,8 +13,8 @@
</div> </div>
<div class="query-box"> <div class="query-box">
<ul> <ul>
<li><span><em>公司</em><el-select filterable v-model='msg.BranchId' @change='linkageDepartment()'> <li><span><em>{{$t('system.table_company')}}</em><el-select filterable v-model='msg.BranchId' @change='linkageDepartment()'>
<el-option label='不限' value='-1'></el-option> <el-option :label="$t('pub.unlimitedSel')" value='-1'></el-option>
<el-option v-for='item in companyList' <el-option v-for='item in companyList'
:label='item.BName' :label='item.BName'
:value='item.Id' :value='item.Id'
...@@ -23,8 +23,8 @@ ...@@ -23,8 +23,8 @@
</el-select> </el-select>
</span> </span>
</li> </li>
<li><span><em>部门</em><el-select filterable v-model='msg.DepartmentId' @change='linkageEmployeeMsg()'> <li><span><em>{{$t('admin.admin_Department')}}</em><el-select filterable v-model='msg.DepartmentId' @change='linkageEmployeeMsg()'>
<el-option label='不限' value='-1'></el-option> <el-option :label="$t('pub.unlimitedSel')" 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'
...@@ -33,8 +33,8 @@ ...@@ -33,8 +33,8 @@
</el-select> </el-select>
</span> </span>
</li> </li>
<li><span><em>员工</em><el-select filterable v-model='msg.EmployeeId'> <li><span><em>{{$t('system.table_staffs')}}</em><el-select filterable v-model='msg.EmployeeId'>
<el-option label='不限' value='-1'></el-option> <el-option :label="$t('pub.unlimitedSel')" value='-1'></el-option>
<el-option v-for='item in employeeList' <el-option v-for='item in employeeList'
:label='item.name' :label='item.name'
:value='item.empId' :value='item.empId'
...@@ -54,13 +54,13 @@ ...@@ -54,13 +54,13 @@
</ul> </ul>
</div> </div>
<el-table :data="dataList" stripe style="width: 100%" max-height='600' v-loading='loading'> <el-table :data="dataList" stripe style="width: 100%" max-height='600' v-loading='loading'>
<el-table-column fixed prop="EmName" label="姓名" width="100"> <el-table-column fixed prop="EmName" :label="$t('system.query_name')" width="100">
</el-table-column> </el-table-column>
<el-table-column prop="DepartmentName" label="部门" width="150"> <el-table-column prop="DepartmentName" :label="$t('admin.admin_Department')" width="150">
</el-table-column> </el-table-column>
<el-table-column prop="EmployeeId" label="工号" width="80"> <el-table-column prop="EmployeeId" label="工号" width="80">
</el-table-column> </el-table-column>
<el-table-column v-if='column' prop="PostName" label="岗位" width="100"> <el-table-column v-if='column' prop="PostName" :label="$t('admin.admin_Post')" width="100">
</el-table-column> </el-table-column>
<el-table-column v-if='column1' prop="CQDay" label="出勤天数" width="100"> <el-table-column v-if='column1' prop="CQDay" label="出勤天数" width="100">
</el-table-column> </el-table-column>
...@@ -113,14 +113,14 @@ ...@@ -113,14 +113,14 @@
<el-table-column v-if='column9' label="年假时长" width="100"> <el-table-column v-if='column9' label="年假时长" width="100">
<template slot-scope="scope"> <template slot-scope="scope">
<p v-if='scope.row.AnnualLeave==0'>{{scope.row.AnnualLeave}}</p> <p v-if='scope.row.AnnualLeave==0'>{{scope.row.AnnualLeave}}</p>
<p v-if='scope.row.AnnualLeave>0'class="pclick" @click="getLeave(msg.MonthTime,scope.row.EmployeeId,type=1,scope.row.EmName,title='月年假汇总')">{{scope.row.AnnualLeave}}</p> <p v-if='scope.row.AnnualLeave>0' class="pclick" @click="getLeave(msg.MonthTime,scope.row.EmployeeId,type=1,scope.row.EmName,title='月年假汇总')">{{scope.row.AnnualLeave}}</p>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column v-if='column9' label="年假天数" width="100"> <el-table-column v-if='column9' label="年假天数" width="100">
<template slot-scope="scope"> <template slot-scope="scope">
<p v-if='scope.row.AnnualLeave==0'>{{scope.row.AnnualLeaveForDay}}</p> <p v-if='scope.row.AnnualLeave==0'>{{scope.row.AnnualLeaveForDay}}</p>
<p v-if='scope.row.AnnualLeave>0'class="pclick" @click="getLeave(msg.MonthTime,scope.row.EmployeeId,type=1,scope.row.EmName,title='月年假汇总')">{{scope.row.AnnualLeaveForDay}}</p> <p v-if='scope.row.AnnualLeave>0' class="pclick" @click="getLeave(msg.MonthTime,scope.row.EmployeeId,type=1,scope.row.EmName,title='月年假汇总')">{{scope.row.AnnualLeaveForDay}}</p>
</template> </template>
</el-table-column> </el-table-column>
......
src/router/config.js
View file @ 12541d7b
...@@ -1430,7 +1430,7 @@ export default { ...@@ -1430,7 +1430,7 @@ export default {
{ {
path: '/priceIncomeConfirmInfo',///priceIncomeConfirmInfo path: '/priceIncomeConfirmInfo',///priceIncomeConfirmInfo
name: 'priceIncomeConfirmInfo', name: 'priceIncomeConfirmInfo',
component: resolve => require(['@/components/TravelManager/TravelList//priceIncomeConfirmInfo'], resolve), component: resolve => require(['@/components/TravelManager/TravelList/priceIncomeConfirmInfo'], resolve),
meta: { meta: {
title: '收入确认单' title: '收入确认单'
}, },
......
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