Skip to content

E
ElectricitySheep
Commit fbcdf3a1 authored by 黄奎's avatar 黄奎
Browse files
Options

Merge branch 'master' of http://gitlab.oytour.com/huangyuanyuan/electricitysheep

parents b8583e58 c1bf1803
Show whitespace changes
Inline Side-by-side
Showing with 156 additions and 104 deletions
src/components/tradePavilion/billboardList.vue
View file @ fbcdf3a1
...@@ -243,7 +243,7 @@ ...@@ -243,7 +243,7 @@
this.$router.push({ this.$router.push({
name: "listRegistration", name: "listRegistration",
query: { query: {
UserId: 0, Id: row.Id,
blank: "y", blank: "y",
}, },
}); });
...@@ -253,11 +253,11 @@ ...@@ -253,11 +253,11 @@
name: "addbillboard", name: "addbillboard",
}); });
}, },
fangbang() {//放榜功能 fangbang(row) {//放榜功能
this.$router.push({ this.$router.push({
name: "publishAlist", name: "publishAlist",
query: { query: {
UserId: 0, Id: row.Id,
}, },
}); });
}, },
......
src/components/tradePavilion/listRegistration.vue
View file @ fbcdf3a1
...@@ -4,73 +4,78 @@ ...@@ -4,73 +4,78 @@
<span @click="CommonJump('billboardList')" class="blue point">榜单管理</span> <span @click="CommonJump('billboardList')" class="blue point">榜单管理</span>
/ 报名列表 / 报名列表
<div style="float:right;"> <div style="float:right;">
<el-button style="float:right;margin-top: -5px;" size="small" type="primary" @click="CommonJump('addbillboard')">导出 <el-button style="float:right;margin-top: -5px;" size="small" type="primary"
@click="CommonJump('addbillboard')">导出
</el-button> </el-button>
</div> </div>
</div> </div>
<div class="content"> <div class="content">
<div> <div>
<!-- <span style="margin-left: 10px">品牌信息</span> <span style="margin-left: 10px">用户</span>
<div class="searchInput" style="width:250px"> <el-select size="small" v-model="msg.UserId" :filter-method="ChangeListName" filterable
<el-input @keyup.enter.native="msg.pageIndex=1,getList()" @clear="msg.pageIndex=1,getList()" @change="(msg.pageIndex = 1), getList()" placeholder="请选择">
style="display:inline-block;width:225px;height:30px" placeholder="品牌信息" v-model="msg.BranchName" size="small" <el-option label="不限" :value="0"></el-option>
clearable> <el-option v-for="item in userList" :key="item.Id" :label="item.Name" :value="item.Id">
</el-input> </el-option>
<span @click="msg.pageIndex=1,getList()" class="el-icon-search" </el-select>
style="color:#979dad;font-size:14px;position:relative;top:1px"></span> <span style="margin-left: 10px">面向群体</span>
</div> <el-select size="small" v-model="msg.ObjectType" filterable @change="(msg.pageIndex = 1), getList()"
<span style="margin-left: 10px">对标载体</span> placeholder="请选择">
<div class="searchInput" style="width:250px"> <el-option label="不限" :value="0"></el-option>
<el-input @keyup.enter.native="msg.pageIndex=1,getList()" @clear="msg.pageIndex=1,getList()" <el-option v-for="item in ListObjectType" :key="item.Id" :label="item.Name" :value="item.Id">
style="display:inline-block;width:225px;height:30px" placeholder="对标载体" v-model="msg.CarrierName" size="small" </el-option>
clearable> </el-select>
</el-input> <span style="margin-left: 10px">状态</span>
<span @click="msg.pageIndex=1,getList()" class="el-icon-search" <el-select size="small" v-model="msg.CandidateState" filterable @change="(msg.pageIndex = 1), getList()"
style="color:#979dad;font-size:14px;position:relative;top:1px"></span> placeholder="请选择">
</div> <el-option label="不限" :value="0"></el-option>
--> <el-option label="报名中" :value="1"></el-option>
<el-option label="候选" :value="2"></el-option>
<el-option label="淘汰" :value="3"></el-option>
</el-option>
</el-select>
</div> </div>
<el-table :data="tableData" v-loading="loading" border style="width: 100%;margin:20px 0"> <el-table :data="tableData" v-loading="loading" border style="width: 100%;margin:20px 0">
<el-table-column prop="EnterpriseName" label="报名企业"> <el-table-column prop="CompanyName" label="报名企业">
</el-table-column> </el-table-column>
<el-table-column prop="UserName" label="参与对象"> <el-table-column prop="UserName" label="参与对象">
<template slot-scope="scope"> <template slot-scope="scope">
<div class="app-image" <div class="app-image"
:style="{backgroundImage:'url(' + scope.row.Logo + ')',backgroundSize:'cover'}"> :style="{backgroundImage:'url(' + scope.row.ObjectIcon + ')',backgroundSize:'cover'}">
</div> </div>
<div flex="dir:left cross:center"> <div flex="dir:left cross:center">
{{scope.row.Name}} {{scope.row.ObjectName}}
</div> </div>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column prop="UserName" label="关联图片/视频"> <!-- <el-table-column prop="UserName" label="关联图片/视频">
<template slot-scope="scope"> <template slot-scope="scope">
<div class="app-image" <div class="app-image"
:style="{backgroundImage:'url(' + scope.row.images[0] + ')',backgroundSize:'cover'}"> :style="{backgroundImage:'url(' + scope.row.images[0] + ')',backgroundSize:'cover'}">
</div> </div>
<div flex="dir:left cross:center" @click="joinData = scope.row,dialogTableVisible=true" style="margin-top:14px;cursor: pointer;color: blue;"> <div flex="dir:left cross:center" @click="joinData = scope.row,dialogTableVisible=true"
style="margin-top:14px;cursor: pointer;color: blue;">
查看更多 查看更多
</div> </div>
</template> </template>
</el-table-column> </el-table-column> -->
<el-table-column prop="description" width='400' label="参与说明">
</el-table-column>
<el-table-column prop="Telephone" width='100' label="联系电话">
</el-table-column>
<el-table-column prop="Status" label="状态" width='140'>
<!-- <el-table-column prop="Status" label="状态" width='140'>
<template slot-scope="scope"> <template slot-scope="scope">
<span v-if="scope.row.Status==1">入榜（第x名）</span> <span v-if="scope.row.Status==1">入榜（第x名）</span>
<span v-if="scope.row.Status==2">淘汰</span> <span v-if="scope.row.Status==2">淘汰</span>
<span v-if="scope.row.Status==3">未评比</span> <span v-if="scope.row.Status==3">未评比</span>
</template> </template>
</el-table-column> </el-table-column> -->
<el-table-column label="操作" width="180"> <el-table-column label="操作" width="180">
...@@ -103,9 +108,7 @@ ...@@ -103,9 +108,7 @@
<el-dialog title="关联图片/视频" :visible.sync="dialogTableVisible"> <el-dialog title="关联图片/视频" :visible.sync="dialogTableVisible">
<div style="display: flex;flex-wrap: wrap;" v-if='joinData'> <div style="display: flex;flex-wrap: wrap;" v-if='joinData'>
<div v-for="(x,y) in joinData.images" :key='y'> <div v-for="(x,y) in joinData.images" :key='y'>
<el-image <el-image style="width: 100px; height: 100px;margin-right: 10px;margin-bottom: 10px;" :src="x"
style="width: 100px; height: 100px;margin-right: 10px;margin-bottom: 10px;"
:src="x"
:preview-src-list="joinData.images"> :preview-src-list="joinData.images">
</el-image> </el-image>
</div> </div>
...@@ -129,33 +132,64 @@ ...@@ -129,33 +132,64 @@
msg: { msg: {
pageIndex: 1, pageIndex: 1,
pageSize: 15, pageSize: 15,
UserId: 0, // 用户id ListId: 0, //
BranchName: '', // 品牌 UserId: 0, // 用户
CarrierName: '', // 对标载体 ObjectType: 0,
CandidateState: 0,//1报名中 2候选 3淘汰
}, },
total: 0, total: 0,
tableData: [{ tableData: [], //数据列表
EnterpriseName:'四川和平旅行社', joinData: null,
Name:"旅游", userList: [],
Logo:'https://viitto-1301420277.cos.ap-chengdu.myqcloud.com/Test/Upload/Goods/1616557590000_450.png', usermsg: {
images:['https://viitto-1301420277.cos.ap-chengdu.myqcloud.com/Test/Upload/Goods/1616557590000_450.png'], pageIndex: 1,
video:'http://192.168.20.214:8130/Upload/Video/202108301146507760000000003.mp4', pageSize: 20,
description:'我们呢撒洪都拉斯看家里的积分劳动局两地分居登录；发几个了打飞机给；的了房价高；东方丽景；东哥房间个；来得及高；砥砺奋进；哦给大家发；了京东方；老规矩的；发链接给对方；链接给对方', Name: '',
Telephone:'12112131231', Source: 0,
Status:1,//1入榜（第x名），2淘汰，3未评比 MemberGrade: 0,
}], //数据列表 Id: 0,
joinData:null Moblie: ''
},
ListObjectType:[]
}; };
}, },
created() { created() {
if (this.$route.query.Id) {
this.msg.ListId = this.$route.query.Id
this.getList();
}
this.getuserList()
this.getListObject()//面向群体 枚举
// this.getList(); // this.getList();
}, },
methods: { methods: {
getListObject() {
this.apipost("/api/Trade/GetListObjectTypeEnumList", {}, res => {
if (res.data.resultCode == 1) {
this.ListObjectType = res.data.data
}
})
},
ChangeListName(val) {
this.usermsg.Name = val;
this.getuserList();
},
getuserList() {
this.apipost("/api/user/GetMemberUserDropDownList", this.usermsg, res => {
if (res.data.resultCode == 1) {
let pageData = res.data.data.pageData;
this.userList = pageData;
}
})
},
getList() { getList() {
this.loading = true; this.loading = true;
this.apipost("/api/Trade/GetFirstShopWishPageList", this.msg, res => { this.apipost("/api/Trade/GetFirstShopEnrollPageList", this.msg, res => {
this.loading = false; this.loading = false;
if (res.data.resultCode == 1) { if (res.data.resultCode == 1) {
this.total = res.data.data.count; this.total = res.data.data.count;
...@@ -168,13 +202,13 @@ ...@@ -168,13 +202,13 @@
this.msg.pageIndex = val; this.msg.pageIndex = val;
this.getList(); this.getList();
}, },
eliminate(row){//淘汰对象 eliminate(row) {//淘汰对象
let that = this; let that = this;
that.Confirm("你确定要将改对象淘汰吗?", function () { that.Confirm("你确定要将改对象淘汰吗?", function () {
console.log('你确定要将改对象淘汰吗') console.log('你确定要将改对象淘汰吗')
}); });
}, },
candidate(row){//候选对象 candidate(row) {//候选对象
let that = this; let that = this;
that.Confirm("你确定将该对象纳入为候选吗?", function () { that.Confirm("你确定将该对象纳入为候选吗?", function () {
console.log('你确定将该对象纳入为候选吗') console.log('你确定将该对象纳入为候选吗')
......
src/components/tradePavilion/plugin/dropdown.vue
View file @ fbcdf3a1
...@@ -34,8 +34,12 @@ ...@@ -34,8 +34,12 @@
</el-form-item> </el-form-item>
<el-form-item label="下拉选项列表"> <el-form-item label="下拉选项列表">
<template v-if="searchData.CompData.OptionList" v-for="(item,index) in searchData.CompData.OptionList"> <template v-if="searchData.CompData.OptionList" v-for="(item,index) in searchData.CompData.OptionList">
<el-input v-model="item.Name" size="small" :key="index"></el-input> <a style="cursor:pointer" <div style="display: flex;align-items: center;">
@click="DeleteOption(index)"> 删除</a> <el-input v-model="item.Name" size="small" class="w400" :key="index"></el-input>
<!-- <a style="cursor:pointer" @click="DeleteOption(index)"> 删除</a> -->
<img src="../../../assets/img/userman/del.png" alt="" @click="DeleteOption(index)" style="width: 26px;height: 26px;margin-left: 10px;"/>
</div>
</template> </template>
<el-button class="button-new-tag" size="small" @click="addOptionItem">添加选项</el-button> <el-button class="button-new-tag" size="small" @click="addOptionItem">添加选项</el-button>
</el-form-item> </el-form-item>
......
src/components/tradePavilion/publishAlist.vue
View file @ fbcdf3a1
...@@ -8,8 +8,10 @@ ...@@ -8,8 +8,10 @@
<div v-for="(x,y) in msgList" :key='y' style="margin-bottom: 15px;border-bottom: 1px solid #e2e2e2;"> <div v-for="(x,y) in msgList" :key='y' style="margin-bottom: 15px;border-bottom: 1px solid #e2e2e2;">
<div style="display: flex;align-items: flex-start;"> <div style="display: flex;align-items: flex-start;">
<span v-if="dataobj.rankingType==1" style="line-height: 32px;margin-right: 15px;">{{y+1}}:</span> <span v-if="dataobj.rankingType==1" style="line-height: 32px;margin-right: 15px;">{{y+1}}:</span>
<el-select class="w300" v-model="x.Id" size="small" placeholder="请选择" @change="selectdis()" clearable> <el-select class="w300" v-model="x.Id" size="small" placeholder="请选择" @change="selectdis()"
<el-option v-for="item in enterpriseList" :key="item.Id" :label="item.Name" :value="item.Id" :disabled="item.disabled" > clearable>
<el-option v-for="item in enterpriseList" :key="item.Id" :label="item.Name" :value="item.Id"
:disabled="item.disabled">
</el-option> </el-option>
</el-select> </el-select>
<span style="margin-left: 15px;line-height: 32px">小奖章</span> <span style="margin-left: 15px;line-height: 32px">小奖章</span>
...@@ -22,7 +24,7 @@ ...@@ -22,7 +24,7 @@
</el-image> </el-image>
</div> </div>
</div> </div>
<span style="margin-left: 15px;line-height: 32px;">大奖章</span> <!-- <span style="margin-left: 15px;line-height: 32px;">大奖章</span>
<div style="margin-left: 5px"> <div style="margin-left: 5px">
<el-button @click="openChangeDig(2,y)" size="small">选择文件</el-button> <el-button @click="openChangeDig(2,y)" size="small">选择文件</el-button>
<div class="app-gallery-item" style="position: relative; width: 100px; margin-top: 10px"> <div class="app-gallery-item" style="position: relative; width: 100px; margin-top: 10px">
...@@ -31,14 +33,14 @@ ...@@ -31,14 +33,14 @@
<el-image v-else style="width: 80px; height: 80px" :src="x.GrandMedal"> <el-image v-else style="width: 80px; height: 80px" :src="x.GrandMedal">
</el-image> </el-image>
</div> </div>
</div> </div> -->
<!-- <el-button @click="synchro()" size="small" type="primary" style="margin-left: 15px">奖章同步</el-button> --> <!-- <el-button @click="synchro()" size="small" type="primary" style="margin-left: 15px">奖章同步</el-button> -->
<el-tooltip class="item" effect="dark" content="奖章同步" placement="top"> <el-tooltip class="item" effect="dark" content="奖章同步" placement="top">
<img src="../../assets/img/userman/reset.png" alt="" class="imgstyle" <img src="../../assets/img/userman/reset.png" alt="" class="imgstyle" @click="synchro(y)" />
@click="synchro(y)" />
</el-tooltip> </el-tooltip>
<span style="margin-left: 15px;line-height: 32px;">评语</span> <span style="margin-left: 15px;line-height: 32px;">评语</span>
<el-input type="textarea" :rows="2" placeholder="请输入内容" v-model="x.comment" class='w400' style='margin-left: 15px;'> <el-input type="textarea" :rows="2" placeholder="请输入内容" v-model="x.comment" class='w400'
style='margin-left: 15px;'>
</el-input> </el-input>
</div> </div>
...@@ -82,7 +84,7 @@ ...@@ -82,7 +84,7 @@
}, },
msgList: [], msgList: [],
enterpriseList: [],//入围企业 enterpriseList: [],//入围企业
msgListindex:0 msgListindex: 0
}; };
}, },
...@@ -98,8 +100,8 @@ ...@@ -98,8 +100,8 @@
} }
let obj2 = { let obj2 = {
Name: '企业' + i, Name: '企业' + i,
Id: i+1, Id: i + 1,
disabled:false disabled: false
} }
this.msgList.push(obj) this.msgList.push(obj)
this.enterpriseList.push(obj2) this.enterpriseList.push(obj2)
...@@ -107,8 +109,9 @@ ...@@ -107,8 +109,9 @@
} }
}, },
mounted() { mounted() {
if (this.$route.query.ID) { if (this.$route.query.Id) {
this.getData(this.$route.query.ID); this.getData(this.$route.query.Id);
this.GetFirstShopEnrollCandidateList(this.$route.query.Id)
} }
}, },
methods: { methods: {
...@@ -118,41 +121,41 @@ ...@@ -118,41 +121,41 @@
let url = this.getIconLink(msg.url); let url = this.getIconLink(msg.url);
if (this.imgType == 1) { if (this.imgType == 1) {
this.msgList[this.msgListindex].SmallMedal = url this.msgList[this.msgListindex].SmallMedal = url
}else{ } else {
this.msgList[this.msgListindex].GrandMedal = url this.msgList[this.msgListindex].GrandMedal = url
} }
this.changeState = false; this.changeState = false;
}, },
openChangeDig(num,index) { openChangeDig(num, index) {
this.changeState = true; this.changeState = true;
this.imgType = num; this.imgType = num;
this.msgListindex = index this.msgListindex = index
}, },
synchro(index){//奖章同步 synchro(index) {//奖章同步
let Small=''; let Small = '';
let Grand=''; let Grand = '';
this.msgList.forEach((x,y)=>{ this.msgList.forEach((x, y) => {
if(y== index){ if (y == index) {
Small = x.SmallMedal Small = x.SmallMedal
Grand = x.GrandMedal Grand = x.GrandMedal
} }
if(y>index){//之后同步数据 if (y > index) {//之后同步数据
x.SmallMedal = Small x.SmallMedal = Small
x.GrandMedal = Grand x.GrandMedal = Grand
} }
}) })
}, },
selectdis(){//企业下拉禁止选择处理 selectdis() {//企业下拉禁止选择处理
this.enterpriseList.forEach((x,y)=>{ this.enterpriseList.forEach((x, y) => {
let ishow= false let ishow = false
this.msgList.map((j,ji)=>{ this.msgList.map((j, ji) => {
if(ishow == false){ if (ishow == false) {
if(x.Id== j.Id){ if (x.Id == j.Id) {
x.disabled = true; x.disabled = true;
ishow= true ishow = true
return return
}else{ } else {
x.disabled = false; x.disabled = false;
} }
} }
...@@ -170,20 +173,31 @@ ...@@ -170,20 +173,31 @@
}, },
//获取详情 //获取详情
getData(ID) { getData(ID) {
this.loading = true;
this.apipost( this.apipost(
"/api/Trade/GetBrandDetails", "/api/Trade/GetFirstShopConfirmListList",
{ {
ID: ID, ListId: ID,
}, },
(res) => { (res) => {
this.loading = false;
if (res.data.resultCode == 1) { if (res.data.resultCode == 1) {
} }
} }
); );
}, },
GetFirstShopEnrollCandidateList(ID) {
this.apipost(
"/api/Trade/GetFirstShopEnrollCandidateList",
{
ListId: ID,
},
(res) => {
if (res.data.resultCode == 1) {
}
}
);
}
}, },
}; };
</script> </script>
......
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