Skip to content

S
SuperMan
Commit 5de15bdb authored by 黄媛媛's avatar 黄媛媛
Browse files
Options

update

parent 764192dc
Hide whitespace changes
Inline Side-by-side
Showing with 406 additions and 11 deletions
src/components/Hotel/HotelManagement.vue
View file @ 5de15bdb
...@@ -608,6 +608,20 @@ ...@@ -608,6 +608,20 @@
this.msg = this.$store.state.pageCondition; this.msg = this.$store.state.pageCondition;
} }
} }
if(this.$route.query.StatisticsSTime){
this.msg.StatisticsSTime=this.$route.query.StatisticsSTime
}
if(this.$route.query.StatisticsETime){
this.msg.StatisticsETime=this.$route.query.StatisticsETime
}
if(this.$route.query.type){
if(this.$route.query.type==1){
this.msg.CreateBy =1;
}
if(this.$route.query.type==2){
this.msg.CreateBy =2;
}
}
var id = this.$route.query.ID; var id = this.$route.query.ID;
if (id) { if (id) {
this.msg.ID = id; this.msg.ID = id;
......
src/components/Restaurant/restaurantList.vue
View file @ 5de15bdb
...@@ -608,6 +608,20 @@ ...@@ -608,6 +608,20 @@
this.msg = this.$store.state.pageCondition; this.msg = this.$store.state.pageCondition;
} }
} }
if(this.$route.query.StatisticsSTime){
this.msg.StatisticsSTime=this.$route.query.StatisticsSTime
}
if(this.$route.query.StatisticsETime){
this.msg.StatisticsETime=this.$route.query.StatisticsETime
}
if(this.$route.query.type){
if(this.$route.query.type==1){
this.msg.CreateBy =1;
}
if(this.$route.query.type==2){
this.msg.CreateBy =2;
}
}
var id = this.$route.query.ID; var id = this.$route.query.ID;
if (id) { if (id) {
this.msg.ID = id; this.msg.ID = id;
......
src/components/SalesModule/PublishvideoList.vue
View file @ 5de15bdb
...@@ -105,33 +105,35 @@ ...@@ -105,33 +105,35 @@
<table class="singeRowTable" border="0" cellspacing="0" cellpadding="0"> <table class="singeRowTable" border="0" cellspacing="0" cellpadding="0">
<tr> <tr>
<th width="250">标题</th> <th width="250">标题</th>
<th>类型</th>
<th>观看次数</th> <th>观看次数</th>
<th>视频状态</th>
<th>姓名</th>
<th>线路</th> <th>线路</th>
<th>类型</th> <th>视频状态</th>
<th>公司</th>
<th>时间</th> <th>时间</th>
</tr> </tr>
<tr v-for="(item, index) in DataList" :key="index" v-loading="loading"> <tr v-for="(item, index) in DataList" :key="index" v-loading="loading">
<td>{{ item.Name }}</td> <td>{{ item.Name }}</td>
<td>
<span v-if="item.Type==1">内部视频</span>
<span v-if="item.Type==2">外部视频</span>
</td>
<td>{{ item.WatchNum }}</td> <td>{{ item.WatchNum }}</td>
<td>{{ item.LineName }}</td>
<td> <td>
<span v-if="item.VideoStatus==1">发布</span> <span v-if="item.VideoStatus==1">发布</span>
<span v-if="item.VideoStatus==2">草稿</span> <span v-if="item.VideoStatus==2">草稿</span>
<span v-if="item.VideoStatus==3">撤回</span> <span v-if="item.VideoStatus==3">撤回</span>
</td> </td>
<td>{{ item.EmName }}</td> <td>{{ item.EmName }}</td>
<td>{{ item.LineName }}</td>
<td>
<span v-if="item.Type==1">内部视频</span>
<span v-if="item.Type==2">外部视频</span>
</td>
<td>{{ item.UpdateDate }}</td> <td>{{ item.UpdateDate }}</td>
</tr> </tr>
<tr v-show="DataList.length==0"> <tr v-show="DataList.length==0">
<td colspan="10" align="center">暂无数据</td> <td colspan="15" align="center">暂无数据</td>
</tr> </tr>
</table> </table>
......
src/components/SalesModule/Videostatistics.vue
View file @ 5de15bdb
...@@ -98,6 +98,8 @@ ...@@ -98,6 +98,8 @@
<table class="singeRowTable" border="0" cellspacing="0" cellpadding="0"> <table class="singeRowTable" border="0" cellspacing="0" cellpadding="0">
<tr> <tr>
<th>员工编号</th> <th>员工编号</th>
<th>公司</th>
<th>部门</th>
<th>姓名</th> <th>姓名</th>
<th>发布数量</th> <th>发布数量</th>
<!-- <th>开始时间</th> <!-- <th>开始时间</th>
...@@ -105,6 +107,8 @@ ...@@ -105,6 +107,8 @@
</tr> </tr>
<tr v-for="(item, index) in DataList" :key="index" v-loading="loading"> <tr v-for="(item, index) in DataList" :key="index" v-loading="loading">
<td>{{ item.EmployeeId }}</td> <td>{{ item.EmployeeId }}</td>
<td>{{ item.BranchName }}</td>
<td>{{ item.DepartmentName }}</td>
<td>{{ item.EmName }}</td> <td>{{ item.EmName }}</td>
<td> <td>
<span style="text-decoration: underline;" @click="goUrl(item)">{{ item.Number }}</span> <span style="text-decoration: underline;" @click="goUrl(item)">{{ item.Number }}</span>
...@@ -114,7 +118,7 @@ ...@@ -114,7 +118,7 @@
</tr> </tr>
<tr v-show="DataList.length==0"> <tr v-show="DataList.length==0">
<td colspan="4" align="center">暂无数据</td> <td colspan="10" align="center">暂无数据</td>
</tr> </tr>
</table> </table>
...@@ -221,7 +225,7 @@ export default { ...@@ -221,7 +225,7 @@ export default {
query: { query: {
RB_Branch_Id: this.msg.RB_Branch_Id, RB_Branch_Id: this.msg.RB_Branch_Id,
DepartmentId: this.msg.DepartmentId, DepartmentId: this.msg.DepartmentId,
CreateBy: this.msg.CreateBy, CreateBy: item.EmployeeId,
StartTime:StartTime, StartTime:StartTime,
EndTime:EndTime, EndTime:EndTime,
blank: "y", blank: "y",
...@@ -230,6 +234,7 @@ export default { ...@@ -230,6 +234,7 @@ export default {
}); });
}, },
linkagePost() { linkagePost() {
console.log("this.msg.RB_Branch_Id",this.msg.RB_Branch_Id)
//联动岗位 //联动岗位
this.employeeMsg.RB_Branch_id = this.msg.RB_Branch_Id; this.employeeMsg.RB_Branch_id = this.msg.RB_Branch_Id;
this.employeeMsg.departmentId = this.msg.DepartmentId; this.employeeMsg.departmentId = this.msg.DepartmentId;
...@@ -299,6 +304,7 @@ export default { ...@@ -299,6 +304,7 @@ export default {
//联动部门 //联动部门
this.msg.RB_Department_Id = "0"; this.msg.RB_Department_Id = "0";
this.msg.RB_Post_Id = "0"; this.msg.RB_Post_Id = "0";
console.log("sfasf",this.msg.RB_Branch_Id)
this.getDepartmentMsg.RB_Branch_Id = this.msg.RB_Branch_Id; this.getDepartmentMsg.RB_Branch_Id = this.msg.RB_Branch_Id;
this.getDerpartMent(); this.getDerpartMent();
}, },
......
src/components/dmc/manager/GroundingStatistics.vue 0 → 100644
View file @ 5de15bdb
<style>
.user_time_picker .el-date-editor--date > .el-input__inner {
padding: 0 10px;
font-size: 13px;
}
.user_time_picker .el-date-editor--date > span.el-input__prefix {
display: none;
}
.user_time_picker .el-date-editor--date > span.el-input__suffix {
top: -4px;
right: 2px;
}
.zidingyiFz i {
font-size: 14px !important;
}
</style>
<template>
<div class="flexOne">
<div class="query-box">
<ul class="user_time_picker">
<li>
<span
><em>类型</em
><el-select class="w150" v-model="msg.Type">
<el-option label="新增" :value="1" ></el-option>
<el-option label="修改" :value="2" ></el-option>
</el-select>
</span>
</li>
<li>
<span
><em>{{ $t("system.table_company") }}</em
><el-select class="w150"
filterable
v-model="msg.RB_Branch_Id"
@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"
:key="item.Id"
>
</el-option>
</el-select>
</span>
</li>
<li>
<span
><em>{{ $t("admin.admin_Department") }}</em
><el-select class="w150"
filterable
v-model="msg.DepartmentId"
@change="linkagePost()"
>
<el-option :label="$t('pub.unlimitedSel')" value="0"></el-option>
<el-option
v-for="item in departMentList"
:label="item.DepartmentName"
:value="item.DepartmentID"
:key="item.DepartmentID"
>
</el-option>
</el-select>
</span>
</li>
<li>
<span
><em>发布人</em
><el-select class="w150" filterable v-model="msg.EmployeeId">
<el-option :label="$t('pub.unlimitedSel')" value="0"></el-option>
<el-option v-for='item in employeeList'
:label='item.name'
:value='item.empId'
:key='item.empId'>
</el-option>
</el-select>
</span>
</li>
<li>
<span
><em>时间</em>
<el-date-picker
v-model="dateList"
type="daterange"
range-separator="至"
start-placeholder="开始日期"
end-placeholder="结束日期">
</el-date-picker>
</span>
</li>
<li>
<input
type="button"
class="hollowFixedBtn"
:value="$t('pub.searchBtn')"
@click="resetPageIndex(), getList()"
/>
</li>
</ul>
</div>
<div class="clearfix"></div>
<table class="singeRowTable" border="0" cellspacing="0" cellpadding="0">
<tr>
<th>公司</th>
<th>部门</th>
<th>姓名</th>
<th>酒店数量</th>
<th>景点数量</th>
<th>门票数量</th>
<th>类型</th>
</tr>
<tr v-for="(item, index) in DataList" :key="index" v-loading="loading">
<td>{{ item.BranchName }}</td>
<td>{{ item.DepartmentName }}</td>
<td>{{ item.EmName }}</td>
<td>
<span style="text-decoration: underline;" @click="goUrl('HotelManagement',item)">{{ item.HotelNum }}</span>
</td>
<td>
<span style="text-decoration: underline;" @click="goUrl('restaurantList',item)">{{ item.DiningNum }}</span>
</td>
<td>
<span style="text-decoration: underline;" @click="goUrl('scenicSpotList',item)">{{ item.TicketNum }}</span>
</td>
<td>
<span v-if="item.Type==1">新增</span>
<span v-if="item.Type==2">修改</span>
</td>
</tr>
<tr v-show="DataList.length==0">
<td colspan="10" align="center">暂无数据</td>
</tr>
</table>
<el-pagination
background
@current-change="handleCurrentChange"
:current-page.sync="currentPage"
layout="total,prev, pager, next, jumper"
:page-size="msg.pageSize"
:total="total"
>
</el-pagination>
</div>
</template>
<script>
import moment from 'moment'
export default {
data() {
return {
loading: false,
isleaveBtn: false,
total: 0,
pageSize: "",
currentPage: 1,
dateList:[],
//请求
msg: {
pageIndex: 1,
pageSize: 15,
EmployeeId:'',
StartTime:'',
EndTime:'',
RB_Branch_Id:-1,
DepartmentId:'',
Type:1,
},
getGroupMsg: {
Status: "0",
GroupName: "",
Domain: "",
Versions_Id: ""
},
getCompanyMsg: {
RB_Group_Id: "0",
Status: "0"
},
getDepartmentMsg: {
RB_Group_Id: "0",
RB_Branch_Id: "-1",
Status: "0"
},
companyList:[],
departMentList:[],
employeeMsg: {
RB_Group_id:'0',
RB_Branch_id:'-1',
departmentId:'0',
IsLeave:'-1',
},
DataList:[],
employeeList:[],
};
},
mounted() {
let userInfo = this.getLocalStorage();
this.getCompanyMsg.RB_Group_Id = userInfo.RB_Group_id; //集团ID
// this.dateList[0]=moment().format("YYYY-MM-DD");
// this.dateList[1]=moment().format("YYYY-MM-DD");
let date=moment().format("YYYY-MM-DD");
this.dateList=[];
this.dateList.push(date)
this.dateList.push(date)
this.getList();
this.getCompany();
this.getDerpartMent();
},
filters:{
YMD(date){
if(date!=''){
return moment(date).format("YYYY-MM-DD");
}else{
return date;
}
}
},
methods: {
goUrl(path,item) {
let StartTime='';
let EndTime='';
if(item.StartTime!=''){
StartTime= moment(item.StartTime).format("YYYY-MM-DD");
}
if(item.EndTime!=''){
EndTime= moment(item.EndTime).format("YYYY-MM-DD");
}
this.$router.push({
name: path,
query: {
StatisticsSTime:StartTime,
StatisticsETime:EndTime,
type:this.msg.Type,
blank: "y",
tab: ""
}
});
},
linkagePost() {
//联动岗位
this.employeeMsg.RB_Branch_id = this.msg.RB_Branch_Id;
this.employeeMsg.departmentId = this.msg.DepartmentId;
this.getEmployee();
},
getEmployee() {
this.apipost('app_get_company_employee', this.employeeMsg, res => {
if(res.data.resultCode == 1) {
this.employeeList = res.data.data;
}
}, err => {})
},
getCompany() {
this.apipost(
"admin_get_BranchGetList",
this.getCompanyMsg,
res => {
if (res.data.resultCode == 1) {
this.companyList = res.data.data;
} else {
}
},
err => {}
);
},
getDerpartMent() {
//获取部门
this.apipost(
"admin_get_DepartmentGetList",
this.getDepartmentMsg,
res => {
if (res.data.resultCode == 1) {
this.departMentList = res.data.data;
} else {
}
},
err => {}
);
},
getList() {
//获取数据
this.loading = true;
if(this.dateList && this.dateList.length>0){
this.msg.StartTime=this.dateList[0];
this.msg.EndTime=this.dateList[1];
}else{
this.msg.StartTime='';
this.msg.EndTime='';
}
this.apipost(
"buspricedetails_get_GetHotelDiningTicketStatistics",
this.msg,
res => {
if (res.data.resultCode == 1) {
this.loading = false;
this.DataList = res.data.data.pageData;
this.total = res.data.data.count;
} else {
}
},
err => {}
);
},
linkageDepartment() {
//联动部门
this.msg.RB_Department_Id = "0";
this.msg.RB_Post_Id = "0";
this.getDepartmentMsg.RB_Branch_Id = this.msg.RB_Branch_Id;
this.getDerpartMent();
},
handleCurrentChange(val) {
this.msg.pageIndex = val;
this.getList();
},
resetPageIndex() {
this.msg.pageIndex = 1;
this.currentPage = 1;
},
}
};
</script>
\ No newline at end of file
src/components/scenicSpot/scenicSpotList.vue
View file @ 5de15bdb
...@@ -589,6 +589,20 @@ ...@@ -589,6 +589,20 @@
this.msg = this.$store.state.pageCondition; this.msg = this.$store.state.pageCondition;
} }
} }
if(this.$route.query.StatisticsSTime){
this.msg.StatisticsSTime=this.$route.query.StatisticsSTime
}
if(this.$route.query.StatisticsETime){
this.msg.StatisticsETime=this.$route.query.StatisticsETime
}
if(this.$route.query.type){
if(this.$route.query.type==1){
this.msg.CreateBy =1;
}
if(this.$route.query.type==2){
this.msg.CreateBy =2;
}
}
var id = this.$route.query.ID; var id = this.$route.query.ID;
if (id) { if (id) {
this.msg.ID = id; this.msg.ID = id;
......
src/router/config.js
View file @ 5de15bdb
...@@ -3901,6 +3901,14 @@ export default { ...@@ -3901,6 +3901,14 @@ export default {
title: '收损订单' title: '收损订单'
} }
}, },
{
path: '/GroundingStatistics', //地接->收损订单
name: 'GroundingStatistics',
component: resolve => require(['@/components/dmc/manager/GroundingStatistics'], resolve),
meta: {
title: '收损订单'
}
},
{ {
path: '/teamRevenueExpenditure', //地接总表 path: '/teamRevenueExpenditure', //地接总表
name: 'teamRevenueExpenditure', name: 'teamRevenueExpenditure',
......
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