Commit 96300756 authored by 黄媛媛's avatar 黄媛媛

update

parent f002e188
...@@ -103,7 +103,7 @@ ...@@ -103,7 +103,7 @@
</div> </div>
<div class="clearfix"></div> <div class="clearfix"></div>
<table class="singeRowTable" border="0" cellspacing="0" cellpadding="0"> <table class="singeRowTable" border="0" cellspacing="0" cellpadding="0" v-loading="loading">
<tr> <tr>
<th width="250">标题</th> <th width="250">标题</th>
...@@ -114,7 +114,7 @@ ...@@ -114,7 +114,7 @@
<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" >
<td>{{ item.Name }}</td> <td>{{ item.Name }}</td>
<td> <td>
...@@ -207,13 +207,6 @@ export default { ...@@ -207,13 +207,6 @@ export default {
let userInfo = this.getLocalStorage(); let userInfo = this.getLocalStorage();
this.getCompanyMsg.RB_Group_Id = userInfo.RB_Group_id; //集团ID this.getCompanyMsg.RB_Group_Id = userInfo.RB_Group_id; //集团ID
if(this.$route.query.RB_Branch_Id){
this.msg.RB_Branch_Id=Number(this.$route.query.RB_Branch_Id)
}
if(this.$route.query.DepartmentId){
this.msg.DepartmentId=Number(this.$route.query.DepartmentId)
}
if(this.$route.query.CreateBy){ if(this.$route.query.CreateBy){
this.msg.CreateBy=Number(this.$route.query.CreateBy) this.msg.CreateBy=Number(this.$route.query.CreateBy)
} }
......
...@@ -21,7 +21,7 @@ ...@@ -21,7 +21,7 @@
<li> <li>
<span <span
><em>{{ $t("system.table_company") }}</em ><em>{{ $t("system.table_company") }}</em
><el-select class="w150" ><el-select class="w180"
filterable filterable
v-model="msg.RB_Branch_Id" v-model="msg.RB_Branch_Id"
@change="linkageDepartment()" @change="linkageDepartment()"
...@@ -40,7 +40,7 @@ ...@@ -40,7 +40,7 @@
<li> <li>
<span <span
><em>{{ $t("admin.admin_Department") }}</em ><em>{{ $t("admin.admin_Department") }}</em
><el-select class="w150" ><el-select class="w180"
filterable filterable
v-model="msg.DepartmentId" v-model="msg.DepartmentId"
@change="linkagePost()" @change="linkagePost()"
...@@ -59,7 +59,7 @@ ...@@ -59,7 +59,7 @@
<li> <li>
<span <span
><em>发布人</em ><em>发布人</em
><el-select class="w150" filterable v-model="msg.CreateBy"> ><el-select class="w180" filterable v-model="msg.CreateBy">
<el-option :label="$t('pub.unlimitedSel')" value="0"></el-option> <el-option :label="$t('pub.unlimitedSel')" value="0"></el-option>
<el-option v-for='item in employeeList' <el-option v-for='item in employeeList'
:label='item.name' :label='item.name'
...@@ -95,7 +95,7 @@ ...@@ -95,7 +95,7 @@
</div> </div>
<div class="clearfix"></div> <div class="clearfix"></div>
<table class="singeRowTable" border="0" cellspacing="0" cellpadding="0"> <table class="singeRowTable" border="0" cellspacing="0" cellpadding="0" v-loading="loading">
<tr> <tr>
<th>员工编号</th> <th>员工编号</th>
<th>公司</th> <th>公司</th>
...@@ -105,7 +105,7 @@ ...@@ -105,7 +105,7 @@
<!-- <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" >
<td>{{ item.EmployeeId }}</td> <td>{{ item.EmployeeId }}</td>
<td>{{ item.BranchName }}</td> <td>{{ item.BranchName }}</td>
<td>{{ item.DepartmentName }}</td> <td>{{ item.DepartmentName }}</td>
...@@ -224,8 +224,6 @@ export default { ...@@ -224,8 +224,6 @@ export default {
this.$router.push({ this.$router.push({
name: 'PublishvideoList', name: 'PublishvideoList',
query: { query: {
RB_Branch_Id: this.msg.RB_Branch_Id,
DepartmentId: this.msg.DepartmentId,
CreateBy: item.EmployeeId, CreateBy: item.EmployeeId,
StartTime:StartTime, StartTime:StartTime,
EndTime:EndTime, EndTime:EndTime,
...@@ -290,8 +288,9 @@ export default { ...@@ -290,8 +288,9 @@ export default {
"Video_get_GetVideoStatisticsPublishPageList", "Video_get_GetVideoStatisticsPublishPageList",
this.msg, this.msg,
res => { res => {
if (res.data.resultCode == 1) {
this.loading = false; this.loading = false;
if (res.data.resultCode == 1) {
this.DataList = res.data.data.pageData; this.DataList = res.data.data.pageData;
this.total = res.data.data.count; this.total = res.data.data.count;
} else { } else {
......
...@@ -104,7 +104,7 @@ ...@@ -104,7 +104,7 @@
</div> </div>
<div class="clearfix"></div> <div class="clearfix"></div>
<table class="singeRowTable" border="0" cellspacing="0" cellpadding="0"> <table class="singeRowTable" border="0" cellspacing="0" cellpadding="0" v-loading="loading">
<tr> <tr>
<th>公司</th> <th>公司</th>
<th>部门</th> <th>部门</th>
...@@ -114,7 +114,7 @@ ...@@ -114,7 +114,7 @@
<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">
<td>{{ item.BranchName }}</td> <td>{{ item.BranchName }}</td>
<td>{{ item.DepartmentName }}</td> <td>{{ item.DepartmentName }}</td>
<td>{{ item.EmName }}</td> <td>{{ item.EmName }}</td>
......
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