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
Expand all Hide 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/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,45 +121,45 @@ ...@@ -118,45 +121,45 @@
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;
} }
} }
}) })
}) })
...@@ -165,25 +168,36 @@ ...@@ -165,25 +168,36 @@
//保存品牌 //保存品牌
Save(formName) { Save(formName) {
}, },
//获取详情 //获取详情
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