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
Expand all Hide 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 @@
GetHotelList() {
this.apipost(
"hotel_post_GetHasStockHotelList", {
Country: 651
Country: 651,
IsMoreThanZero:1
},
res => {
if (res.data.resultCode == 1) {
......
src/components/Hotel/roomReservations.vue
View file @ 12541d7b
......@@ -178,7 +178,6 @@
layout="total,prev, pager, next, jumper" :page-size=msg.pageSize :total=total></el-pagination>
</div>
</template>
<script>
export default {
data() {
......@@ -193,14 +192,17 @@
LineId: 14,
LineteamId: "-1",
StartDate: '',
EndDate: ''
EndDate: '',
//酒店编号
HotelId: 0,
//日期
DateStr: ""
},
LineList: [],
LineTeamList: [],
thLengthTitle: [],
list: [],
colspanTotal: 0,
}
},
methods: {
......@@ -276,7 +278,6 @@
this.apipost('dmcstatistics_post_GetUniteCombinationNumService', this.msg, res => {
if (res.data.resultCode == 1) {
this.loading = false
console.log(res.data.data.pageData.data)
this.total = res.data.data.count
this.list = res.data.data.pageData.data
this.thLengthArr = []
......@@ -297,34 +298,15 @@
})
}
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 {
this.loading = false
this.$message.error(res.data.message)
}
}, err => {})
},
},
beforeCreate() {
},
mounted() {
let myDate = new Date();
......@@ -334,13 +316,27 @@
parseInt(myDate.getMonth() + 1) +
"-" +
myDate.getDate();
this.msg.StartDate = nowDate;
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.getList()
// this.getLineList()
this.getLineTeamList()
},
}
</script>
<style>
......
src/components/TravelManager/TravelList/RegistrationList.vue
View file @ 12541d7b
......@@ -2337,7 +2337,9 @@
<el-dialog custom-class='passgenrDialog' title="航班列表" :visible.sync="outerVisible" center>
<table border="0" cellspacing="0" cellpadding="0" class="singeRowTable">
<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>
<th>航班号</th>
......@@ -2346,6 +2348,7 @@
<th>出发时间</th>
<th>起飞机场</th>
<th>到达机场</th>
<th>经停机场</th>
</tr>
<tr v-for="item in flightList">
<td>{{item.Flight_number}}</td>
......@@ -2354,6 +2357,7 @@
<td>{{item.FlightDate}}</td>
<td>{{item.dName}}</td>
<td>{{item.aName}}</td>
<td>{{item.sName}}</td>
</tr>
</table>
<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";
CreateBy:'',
OrderId:0
},
//航班是否确认
flightIsConfirmFlight:0,
flightList:[],
combineTeamList:[],
};
......@@ -4062,6 +4068,7 @@ submitYSZEForm(){
}
this.apipost("ticket_get_GetEntityExtend", msg, res => {
if (res.data.resultCode == 1) {
this.flightIsConfirmFlight=res.data.data.IsConfirmFlight;
this.flightList = res.data.data.flightList;
} else {
this.Error(res.data.message);
......
src/components/TravelManager/TravelList/priceIncomeConfirmInfo.vue
View file @ 12541d7b
......@@ -33,45 +33,71 @@
float:left;
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>
<template>
<div>
<table class="singeRowTable">
<div class="priceContent">
<p class="pri_title">团队收入确认单</p>
<table border="1" bordercolor="#c94052" style="border-collapse: collapse;width:100%;font-size:14px;text-align:center;">
<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>
<th>部门</th>
<th width="250">单号</th>
<th width="180">团号</th>
<th>团号</th>
<th>团队编号</th>
<th>人数</th>
<th width="100">领队</th>
<th>团费收入合计</th>
<th>直客收入</th>
<th>同行交客收入</th>
<th>平台收入</th>
</tr>
<th>领队</th>
</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.TCID}}</td>
<td>{{dataList.PeopleNum}}</td>
<td>{{dataList.LeaderName}}</td>
<td>{{dataList.TotalIncome}}</td>
<td>{{dataList.DirectGuestIncome}}</td>
<td>{{dataList.PlatformGuestIncome}}</td>
<td>{{dataList.PlatformIncome}}</td>
</tr>
<tr>
<td>团费收入合计</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>
</table>
<div class="PriceRemark clearfix">
<div class="leftRemarkTitle">备注：</div>
<div class="rightRemarkContent">{{dataList.Remark}} </div>
</div>
</div>
</template>
<script>
......
src/components/administrative/Approval.vue
View file @ 12541d7b
......@@ -34,8 +34,8 @@
<div class="approval_doDiv">
<p>
<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==2' @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">{{$t('fnc.qiyong')}}</button>
</p>
</div>
</div>
......
src/components/administrative/ApprovalStatistical.vue
View file @ 12541d7b
......@@ -59,8 +59,8 @@
<th width="300">待审核人</th>
<th width="300">已审核人</th>
<th>申请时间</th>
<th>状态</th>
<th width="80">操作</th>
<th>{{$t('admin.admin_status')}}</th>
<th width="150">{{$t('system.table_operation')}}</th>
</tr>
<tr v-for='item in list' v-loading='loading'>
......
src/components/administrative/AttendanceStatistics.vue
View file @ 12541d7b
......@@ -2,8 +2,8 @@
<div class="flexOne">
<div class="query-box">
<ul>
<li><span><em>公司</em><el-select filterable v-model='msg.BranchId' @change='linkageDepartment()'>
<el-option label='不限' value='-1'></el-option>
<li><span><em>{{$t('system.table_company')}}</em><el-select filterable v-model='msg.BranchId' @change='linkageDepartment()'>
<el-option :label="$t('pub.unlimitedSel')" value='-1'></el-option>
<el-option v-for='item in companyList'
:label='item.BName'
:value='item.Id'
......@@ -11,8 +11,8 @@
</el-option>
</el-select>
</span></li>
<li><span><em>部门</em><el-select filterable v-model='msg.DepartmentId' @change='linkageEmployeeMsg()'>
<el-option label='不限' value='-1'></el-option>
<li><span><em>{{$t('admin.admin_Department')}}</em><el-select filterable v-model='msg.DepartmentId' @change='linkageEmployeeMsg()'>
<el-option :label="$t('pub.unlimitedSel')" value='-1'></el-option>
<el-option v-for='item in departmentList'
:label='item.DepartmentName'
:value='item.DepartmentID'
......@@ -20,8 +20,8 @@
</el-option>
</el-select>
</span></li>
<li><span><em>员工</em><el-select filterable v-model='msg.EmployeeId'>
<el-option label='不限' value='-1'></el-option>
<li><span><em>{{$t('system.table_staffs')}}</em><el-select filterable v-model='msg.EmployeeId'>
<el-option :label="$t('pub.unlimitedSel')" value='-1'></el-option>
<el-option v-for='item in employeeList'
:label='item.name'
:value='item.empId'
......@@ -36,20 +36,20 @@
</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()" />
</li>
</ul>
</div>
<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 prop="EmployeeId" label="工号" width="50">
</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 prop="PostName" label="岗位" width="120">
<el-table-column prop="PostName" :label="$t('admin.admin_Post')" width="120">
</el-table-column>
<el-table-column prop="DateStr" label="考勤日期" width="120">
</el-table-column>
......
src/components/administrative/CommissionManagement.vue
View file @ 12541d7b
......@@ -18,9 +18,9 @@
<tr>
<th>期数</th>
<th>提成总金额</th>
<th>操作人</th>
<th>{{$t('admin.admin_czPerson')}}</th>
<th>日期</th>
<th>操作</th>
<th>{{$t('system.table_operation')}}</th>
</tr>
<tr v-for="item in dataList">
<td>{{item.periods}}</td>
......
src/components/administrative/ShareMeDocuments.vue
View file @ 12541d7b
......@@ -12,8 +12,8 @@
<el-button v-if='fileListInside.length>0||notFileListInside.length>0' type="danger" @click='moveFiles'>移动到里</el-button>
</el-button-group>
<div class="fr" v-if='!isChildFiles'>
<el-input class='w200' placeholder="请输入内容" v-model="msg.ShareName" prefix-icon="el-icon-search"></el-input>
<input type="button" class="hollowFixedBtn" @click='getList()' value="查询" />
<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="$t('pub.searchBtn')" />
</div>
</div>
<div class="myDocumentsLink">
......@@ -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>
<div slot="footer" class="dialog-footer">
<input type="button" class="hollowFixedBtn" value="取消" @click="moveCancel" />
<input type="button" v-if='!isChildFiles' class="normalBtn" value="确定" @click="saveMoveFiles" />
<input type="button" v-if='isChildFiles' class="normalBtn" value="确定" @click="saveMoveFilesInside" />
<input type="button" class="hollowFixedBtn" :value="$t('pub.cancelBtn')" @click="moveCancel" />
<input type="button" v-if='!isChildFiles' class="normalBtn" :value="$t('pub.sureBtn')" @click="saveMoveFiles" />
<input type="button" v-if='isChildFiles' class="normalBtn" :value="$t('pub.sureBtn')" @click="saveMoveFilesInside" />
</div>
</el-dialog>
<el-dialog custom-class='w800' :title="dialogTitle4" :visible.sync="outerVisible4" center>
......@@ -108,7 +108,7 @@
your browser does not support the video tag
</video>
<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>
</el-dialog >
<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 @@
<input type="button" @click="createCode" class="DocumentLoadVerification" v-model="checkCode"/>
</p>
<div slot="footer" class="dialog-footer">
<input type="button" class="hollowFixedBtn" value="取消" @click="yzmVisible=false" />
<input v-if='!isChildFiles' type="button" class="normalBtn" value="确定" @click="downloadTotal()" />
<input v-if='isChildFiles' type="button" class="normalBtn" value="确定" @click="downloadTotalInside()" />
<input type="button" class="hollowFixedBtn" :value="$t('pub.cancelBtn')" @click="yzmVisible=false" />
<input v-if='!isChildFiles' type="button" class="normalBtn" :value="$t('pub.sureBtn')" @click="downloadTotal()" />
<input v-if='isChildFiles' type="button" class="normalBtn" :value="$t('pub.sureBtn')" @click="downloadTotalInside()" />
</div>
</el-dialog >
......
src/components/administrative/myDocuments.vue
View file @ 12541d7b
......@@ -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='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 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" @click='moveFiles'>移动到</el-button>
</el-button-group>
<div class="fr">
<el-input class='w200' placeholder="请输入内容" prefix-icon="el-icon-search" v-model="srearchKey" ></el-input>
<input type="button" class="hollowFixedBtn" @click='doSearch()' value="查询" />
<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="$t('pub.searchBtn')" />
</div>
</div>
<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>
<table class="singeRowTable myDocumentsTable" border="0" cellspacing="0" cellpadding="0">
......@@ -66,8 +66,8 @@
</el-form-item>
</el-form>
<div slot="footer" class="dialog-footer">
<input type="button" class="hollowFixedBtn" value="取消" @click="outerVisible = false,addFileMsg.FolderName=''" />
<input type="button" class="normalBtn" value="确定" @click="submitForm('addFileMsg')" />
<input type="button" class="hollowFixedBtn" :value="$t('pub.cancelBtn')" @click="outerVisible = false,addFileMsg.FolderName=''" />
<input type="button" class="normalBtn" :value="$t('pub.sureBtn')" @click="submitForm('addFileMsg')" />
</div>
</el-dialog>
......@@ -78,8 +78,8 @@
</el-form-item>
</el-form>
<div slot="footer" class="dialog-footer">
<input type="button" class="hollowFixedBtn" value="取消" @click="outerVisible1 = false" />
<input type="button" class="normalBtn" value="确定" @click="saveUpdateFile" />
<input type="button" class="hollowFixedBtn" :value="$t('pub.cancelBtn')" @click="outerVisible1 = false" />
<input type="button" class="normalBtn" :value="$t('pub.sureBtn')" @click="saveUpdateFile" />
</div>
</el-dialog>
......@@ -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>
<div slot="footer" class="dialog-footer">
<input type="button" class="hollowFixedBtn" value="取消" @click="moveCancel" />
<input type="button" class="normalBtn" value="确定" @click="saveMoveFiles" />
<input type="button" class="hollowFixedBtn" :value="$t('pub.cancelBtn')" @click="moveCancel" />
<input type="button" class="normalBtn" :value="$t('pub.sureBtn')" @click="saveMoveFiles" />
</div>
</el-dialog>
<el-dialog custom-class='w800 shareDocumentDialog' :title="dialogTitle3" :visible.sync="outerVisible3" center>
<div class="documentDialogNav">
<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>
<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>
<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>
</div>
......@@ -175,8 +175,8 @@
</div>
</div>
<div slot="footer" class="dialog-footer">
<input type="button" class="hollowFixedBtn" value="取消" @click="outerVisible3=false" />
<input type="button" class="normalBtn" value="确定" @click="saveShareDocument" />
<input type="button" class="hollowFixedBtn" :value="$t('pub.cancelBtn')" @click="outerVisible3=false" />
<input type="button" class="normalBtn" :value="$t('pub.sureBtn')" @click="saveShareDocument" />
</div>
</el-dialog>
......@@ -186,7 +186,7 @@
your browser does not support the video tag
</video>
<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>
</el-dialog >
......@@ -214,8 +214,8 @@
<input type="button" @click="createCode" class="DocumentLoadVerification" v-model="checkCode"/>
</p>
<div slot="footer" class="dialog-footer">
<input type="button" class="hollowFixedBtn" value="取消" @click="yzmVisible=false" />
<input type="button" class="normalBtn" value="确定" @click="downloadTotal()" />
<input type="button" class="hollowFixedBtn" :value="$t('pub.cancelBtn')" @click="yzmVisible=false" />
<input type="button" class="normalBtn" :value="$t('pub.sureBtn')" @click="downloadTotal()" />
</div>
</el-dialog >
......
src/components/administrative/myShareDocuments.vue
View file @ 12541d7b
......@@ -2,8 +2,8 @@
<div class="flexOne">
<div class="myDocumentsNav">
<div class="fr" v-if='!isChildFiles'>
<el-input class='w200' placeholder="请输入内容" v-model="msg.ShareName" prefix-icon="el-icon-search"></el-input>
<input type="button" class="hollowFixedBtn" @click='getList()' value="查询" />
<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="$t('pub.searchBtn')" />
</div>
</div>
<div class="myDocumentsLink">
......@@ -43,7 +43,7 @@
<th width="100">分享状态</th>
<th width="200">分享类型</th>
<th width="200">分享日期</th>
<th width="200">操作</th>
<th width="200">{{$t('system.table_operation')}}</th>
</tr>
<tr v-for="(item,index) in list" @mouseover="enterTr(index)" @mouseleave="leaveTr">
<td v-if="item.shareFileType==1">
......@@ -122,20 +122,20 @@
</el-form-item>
</el-form>
<div slot="footer" class="dialog-footer">
<input type="button" class="hollowFixedBtn" value="取消" @click="outerVisible = false,addFileMsg.FolderName=''" />
<input type="button" class="normalBtn" value="确定" @click="submitForm('addFileMsg')" />
<input type="button" class="hollowFixedBtn" :value="$t('pub.cancelBtn')" @click="outerVisible = false,addFileMsg.FolderName=''" />
<input type="button" class="normalBtn" :value="$t('pub.sureBtn')" @click="submitForm('addFileMsg')" />
</div>
</el-dialog>
<el-dialog custom-class='w400' :title="dialogTitle1" :visible.sync="outerVisible1" center>
<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-form-item>
</el-form>
<div slot="footer" class="dialog-footer">
<input type="button" class="hollowFixedBtn" value="取消" @click="outerVisible1 = false" />
<input type="button" class="normalBtn" value="确定" @click="saveUpdateFile" />
<input type="button" class="hollowFixedBtn" :value="$t('pub.cancelBtn')" @click="outerVisible1 = false" />
<input type="button" class="normalBtn" :value="$t('pub.sureBtn')" @click="saveUpdateFile" />
</div>
</el-dialog>
......@@ -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>
<div slot="footer" class="dialog-footer">
<input type="button" class="hollowFixedBtn" value="取消" @click="outerVisible2=false" />
<input type="button" class="normalBtn" value="确定" @click="saveMoveFiles" />
<input type="button" class="hollowFixedBtn" :value="$t('pub.cancelBtn')" @click="outerVisible2=false" />
<input type="button" class="normalBtn" :value="$t('pub.sureBtn')" @click="saveMoveFiles" />
</div>
</el-dialog>
<el-dialog custom-class='w800 shareDocumentDialog' :title="dialogTitle3" :visible.sync="outerVisible3" center>
<div class="documentDialogNav">
<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>
<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>
<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>
</div>
......@@ -231,8 +231,8 @@
</div>
</div>
<div slot="footer" class="dialog-footer">
<input type="button" class="hollowFixedBtn" value="取消" @click="outerVisible3=false" />
<input type="button" class="normalBtn" value="确定" @click="saveShareDocument" />
<input type="button" class="hollowFixedBtn" :value="$t('pub.cancelBtn')" @click="outerVisible3=false" />
<input type="button" class="normalBtn" :value="$t('pub.sureBtn')" @click="saveShareDocument" />
</div>
</el-dialog>
......@@ -242,7 +242,7 @@
your browser does not support the video tag
</video>
<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>
</el-dialog >
<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 @@
<input type="button" @click="createCode" class="DocumentLoadVerification" v-model="checkCode"/>
</p>
<div slot="footer" class="dialog-footer">
<input type="button" class="hollowFixedBtn" value="取消" @click="yzmVisible=false" />
<input type="button" class="normalBtn" value="确定" @click="downloadTotal()" />
<input type="button" class="hollowFixedBtn" :value="$t('pub.cancelBtn')" @click="yzmVisible=false" />
<input type="button" class="normalBtn" :value="$t('pub.sureBtn')" @click="downloadTotal()" />
</div>
</el-dialog >
......
src/components/administrative/outWorkApproval.vue
View file @ 12541d7b
......@@ -22,7 +22,7 @@
</span>
</li>
<li>
<input type="button" class="hollowFixedBtn" value="查询" @click="resetPageIndex(),getList()" />
<input type="button" class="hollowFixedBtn" :value="$t('pub.searchBtn')" @click="resetPageIndex(),getList()" />
</li>
</ul>
</div>
......@@ -30,13 +30,13 @@
<table style="min-width: 1400px;" class="singeRowTable" border="0" cellspacing="0" cellpadding="0">
<tr>
<th>公司</th>
<th>姓名</th>
<th>{{$t('system.query_name')}}</th>
<th>签到日期</th>
<th>第一次签到时间</th>
<th width="400">第一次签到地点</th>
<th>最后一次签到时间</th>
<th width="400">最后一次签到地点</th>
<th width="80">操作</th>
<th width="300">最后一次签到地点</th>
<th width="150">{{$t('system.table_operation')}}</th>
</tr>
<tr v-for='item in list' v-loading='loading'>
......
src/components/administrative/statisticsCheckTime.vue
View file @ 12541d7b
......@@ -3,8 +3,8 @@
<div class="query-box">
<ul>
<li><span><em>公司</em><el-select filterable v-model='msg.BranchId' @change='linkageDepartment()'>
<el-option label='不限' value='-1'></el-option>
<li><span><em>{{$t('system.table_company')}}</em><el-select filterable v-model='msg.BranchId' @change='linkageDepartment()'>
<el-option :label="$t('pub.unlimitedSel')" value='-1'></el-option>
<el-option v-for='item in companyList'
:label='item.BName'
:value='item.Id'
......@@ -12,8 +12,8 @@
</el-option>
</el-select>
</span></li>
<li><span><em>部门</em><el-select filterable v-model='msg.DepartmentId' @change='linkageEmployeeMsg()'>
<el-option label='不限' value='-1'></el-option>
<li><span><em>{{$t('admin.admin_Department')}}</em><el-select filterable v-model='msg.DepartmentId' @change='linkageEmployeeMsg()'>
<el-option :label="$t('pub.unlimitedSel')" value='-1'></el-option>
<el-option v-for='item in departmentList'
:label='item.DepartmentName'
:value='item.DepartmentID'
......@@ -21,8 +21,8 @@
</el-option>
</el-select>
</span></li>
<li><span><em>员工</em><el-select filterable v-model='msg.EmployeeId'>
<el-option label='不限' value='-1'></el-option>
<li><span><em>{{$t('system.table_staffs')}}</em><el-select filterable v-model='msg.EmployeeId'>
<el-option :label="$t('pub.unlimitedSel')" value='-1'></el-option>
<el-option v-for='item in employeeList'
:label='item.name'
:value='item.empId'
......@@ -38,19 +38,19 @@
</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()" />
</li>
</ul>
</div>
<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 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 prop="EmployeeId" label="工号" min-width="80">
</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 v-for='(item,index) in newArr' :prop='item.value' :label="item.title" :key='index' min-width="120">
<template slot-scope="scope">
......
src/components/administrative/statisticsDetail.vue
View file @ 12541d7b
......@@ -2,8 +2,8 @@
<div class="flexOne">
<div class="query-box">
<ul>
<li><span><em>公司</em><el-select filterable v-model='msg.BranchId' @change='linkageDepartment()'>
<el-option label='不限' value='-1'></el-option>
<li><span><em>{{$t('system.table_company')}}</em><el-select filterable v-model='msg.BranchId' @change='linkageDepartment()'>
<el-option :label="$t('pub.unlimitedSel')" value='-1'></el-option>
<el-option v-for='item in companyList'
:label='item.BName'
:value='item.Id'
......@@ -11,8 +11,8 @@
</el-option>
</el-select>
</span></li>
<li><span><em>部门</em><el-select filterable v-model='msg.DepartmentId' @change='linkageEmployeeMsg()'>
<el-option label='不限' value='-1'></el-option>
<li><span><em>{{$t('admin.admin_Department')}}</em><el-select filterable v-model='msg.DepartmentId' @change='linkageEmployeeMsg()'>
<el-option :label="$t('pub.unlimitedSel')" value='-1'></el-option>
<el-option v-for='item in departmentList'
:label='item.DepartmentName'
:value='item.DepartmentID'
......@@ -20,8 +20,8 @@
</el-option>
</el-select>
</span></li>
<li><span><em>员工</em><el-select filterable v-model='msg.EmployeeId'>
<el-option label='不限' value='-1'></el-option>
<li><span><em>{{$t('system.table_staffs')}}</em><el-select filterable v-model='msg.EmployeeId'>
<el-option :label="$t('pub.unlimitedSel')" value='-1'></el-option>
<el-option v-for='item in employeeList'
:label='item.name'
:value='item.empId'
......@@ -36,20 +36,20 @@
</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()" />
</li>
</ul>
</div>
<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 fixed prop="EmployeeId" label="工号" min-width="80">
</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 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 prop="DateStr" label="日期" min-width="150">
</el-table-column>
......
src/components/administrative/statisticsTotal.vue
View file @ 12541d7b
<template>
<div class="flexOne">
<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='column2'>休息天数</el-checkbox>
<el-checkbox v-model='column4'>迟到次数</el-checkbox>
......@@ -13,8 +13,8 @@
</div>
<div class="query-box">
<ul>
<li><span><em>公司</em><el-select filterable v-model='msg.BranchId' @change='linkageDepartment()'>
<el-option label='不限' value='-1'></el-option>
<li><span><em>{{$t('system.table_company')}}</em><el-select filterable v-model='msg.BranchId' @change='linkageDepartment()'>
<el-option :label="$t('pub.unlimitedSel')" value='-1'></el-option>
<el-option v-for='item in companyList'
:label='item.BName'
:value='item.Id'
......@@ -23,8 +23,8 @@
</el-select>
</span>
</li>
<li><span><em>部门</em><el-select filterable v-model='msg.DepartmentId' @change='linkageEmployeeMsg()'>
<el-option label='不限' value='-1'></el-option>
<li><span><em>{{$t('admin.admin_Department')}}</em><el-select filterable v-model='msg.DepartmentId' @change='linkageEmployeeMsg()'>
<el-option :label="$t('pub.unlimitedSel')" value='-1'></el-option>
<el-option v-for='item in departmentList'
:label='item.DepartmentName'
:value='item.DepartmentID'
......@@ -33,8 +33,8 @@
</el-select>
</span>
</li>
<li><span><em>员工</em><el-select filterable v-model='msg.EmployeeId'>
<el-option label='不限' value='-1'></el-option>
<li><span><em>{{$t('system.table_staffs')}}</em><el-select filterable v-model='msg.EmployeeId'>
<el-option :label="$t('pub.unlimitedSel')" value='-1'></el-option>
<el-option v-for='item in employeeList'
:label='item.name'
:value='item.empId'
......@@ -54,13 +54,13 @@
</ul>
</div>
<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 prop="DepartmentName" label="部门" width="150">
<el-table-column prop="DepartmentName" :label="$t('admin.admin_Department')" width="150">
</el-table-column>
<el-table-column prop="EmployeeId" label="工号" width="80">
</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 v-if='column1' prop="CQDay" label="出勤天数" width="100">
</el-table-column>
......@@ -113,14 +113,14 @@
<el-table-column v-if='column9' label="年假时长" width="100">
<template slot-scope="scope">
<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>
</el-table-column>
<el-table-column v-if='column9' label="年假天数" width="100">
<template slot-scope="scope">
<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>
</el-table-column>
......
src/router/config.js
View file @ 12541d7b
......@@ -1430,7 +1430,7 @@ export default {
{
path: '/priceIncomeConfirmInfo',///priceIncomeConfirmInfo
name: 'priceIncomeConfirmInfo',
component: resolve => require(['@/components/TravelManager/TravelList//priceIncomeConfirmInfo'], resolve),
component: resolve => require(['@/components/TravelManager/TravelList/priceIncomeConfirmInfo'], resolve),
meta: {
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