yujialong 11 months ago
parent 096e21b740
commit ccf21096c2
  1. 4
      src/api/index.js
  2. 4
      src/pages/activity/add/index.vue
  3. 16
      src/pages/activity/list/index.vue
  4. 135
      src/pages/activity/manage/matchSignup.vue
  5. 21
      src/pages/miniProgramMg/index/hot/add/index.vue
  6. 4
      src/plugins/requests/index.js
  7. 2
      src/setting.js

@ -24,6 +24,9 @@ export default {
editCompetition: `competition/competition/management/editCompetition`,
getCompetition: `competition/competition/management/getCompetition`,
queryRegistrationByCondition: `competition/competition/registration/queryRegistrationByCondition`,
disableRegistration: `competition/competition/registration/disableRegistration`,
excelExportCom: `${host}competition/competition/registration/excelExport`,
exportDataInBatchesCom: `${host}competition/competition/registration/exportDataInBatches`,
enterpriseCertificationDetails: `nakadai/enterprise/certification/enterpriseCertificationDetails`,
delCertification: `nakadai/enterprise/certification/batchDeletion`,
@ -64,4 +67,5 @@ export default {
saveExplosive: `nakadai/explosiveRecommendation/save`,
sortExplosive: `nakadai/explosiveRecommendation/sort`,
updateExplosive: `nakadai/explosiveRecommendation/update`,
prodList: `nakadai/prod/page`,
}

@ -29,7 +29,8 @@
</div>
</el-upload>
</el-form-item>
<el-form-item prop="source"
<el-form-item class="req"
prop="source"
label="活动分类">
<el-select v-model="classificationId"
clearable>
@ -568,6 +569,7 @@ export default {
if (!form.name) return Util.warningMsg("请填写活动名称");
//
if (status) {
if (!form.classificationId) return Util.warningMsg("请选择活动分类");
if (!this.sponsorList.length) return Util.warningMsg("请填写主办方");
if (!form.signUpStartTime) return Util.warningMsg("请选择报名时间");
let now = new Date().getTime();

@ -61,10 +61,8 @@
</ul>
<div>
<el-button type="primary"
@click="add"
v-auth>创建活动</el-button>
<el-button @click="delAllSelection"
v-auth>批量删除</el-button>
@click="add">创建活动</el-button>
<el-button @click="delAllSelection">批量删除</el-button>
</div>
</div>
@ -88,7 +86,9 @@
</template>
</el-table-column>
<el-table-column prop="competitionName"
show-overflow-tooltip
label="活动名称"
min-width="220"
align="center"></el-table-column>
<el-table-column prop="founderName"
label="创建人"
@ -126,7 +126,7 @@
width="160"></el-table-column>
<el-table-column label="操作"
align="center"
width="260">
width="170">
<template slot-scope="scope">
<el-button type="text"
@click="manage(scope.row)"
@ -175,6 +175,10 @@ export default {
},
],
rangeList: [
{
id: 1,
name: "全平台"
},
{
id: 6,
name: "供应商"
@ -192,7 +196,7 @@ export default {
endTime: "",
platformSource: null,
competitionScope: [],
createSource: null
createSource: 0
},
multipleSelection: [],
dateList: [

@ -3,17 +3,58 @@
style="padding: 24px">
<div class="tool">
<ul class="filter">
<li>
<label>报名人员状态</label>
<el-select v-model="form.isDisable"
clearable
@change="initData">
<el-option v-for="(item, i) in isDisable"
:key="i"
:label="item.name"
:value="item.id"></el-option>
</el-select>
</li>
<li>
<label>组织类型</label>
<el-select v-model="form.platformId"
clearable
@change="initData">
<el-option v-for="(item, i) in platformId"
:key="i"
:label="item.name"
:value="item.id"></el-option>
</el-select>
</li>
</ul>
</div>
<div class="tool">
<ul class="filter">
<li>
<label>签到情况</label>
<el-select v-model="form.signInStatus"
clearable
@change="initData">
<el-option v-for="(item, i) in signInStatus"
:key="i"
:label="item.name"
:value="item.id"></el-option>
</el-select>
</li>
<li>
<label>搜索</label>
<el-input placeholder="请输入姓名、姓名进行查询"
prefix-icon="el-icon-search"
v-model="keyword"
v-model="form.keyWord"
clearable
size="mini"
style="width: 250px"></el-input>
</li>
</ul>
<div></div>
<div>
<!-- <el-button type="primary"
@click="add">新增</el-button> -->
<el-button @click="exportAll">批量导出</el-button>
</div>
</div>
<el-table ref="table"
@ -36,22 +77,30 @@
{{ scope.$index + (page - 1) * pageSize + 1 }}
</template>
</el-table-column>
<el-table-column prop="schoolName"
<el-table-column prop="username"
label="姓名">
</el-table-column>
<el-table-column prop="organizationName"
label="组织名称"
sortable="custom">
</el-table-column>
<el-table-column prop="username"
label="姓名">
<el-table-column prop="platformId"
label="组织类型"></el-table-column>
<el-table-column prop="createTime"
label="报名时间">
</el-table-column>
<el-table-column prop="signInStatus"
label="签到情况">
</el-table-column>
<el-table-column prop="phone"
label="手机号">
</el-table-column>
<!-- <el-table-column label="操作"
<el-table-column label="操作"
align="center"
width="320">
<template slot-scope="scope">
<el-button type="text"
@click="delData(scope.row)">删除</el-button>
<!-- <el-button type="text"
@click="delData(scope.row)">删除</el-button> -->
<el-switch v-model="scope.row.isDisable"
:active-text="scope.row.isDisable ? '关' : '开'"
:active-value="0"
@ -59,7 +108,7 @@
style="margin-left: 5px"
@change="switchOff($event,scope.row,scope.$index)"></el-switch>
</template>
</el-table-column> -->
</el-table-column>
</el-table>
<div class="pagination">
<el-pagination background
@ -80,8 +129,61 @@ export default {
name: "matchSignup",
data () {
return {
token: util.local.get(Setting.tokenKey),
id: this.$route.query.id,
teamId: this.$route.query.teamId,
form: {
isDisable: '',
platformId: '',
signInStatus: '',
keyWord: '',
},
isDisable: [
{
id: '',
name: '不限'
},
{
id: 1,
name: '已禁用'
},
{
id: 0,
name: '未禁用'
},
],
platformId: [
{
id: '',
name: '不限'
},
{
id: 7,
name: '无组织'
},
{
id: 6,
name: '供应商'
},
{
id: 5,
name: '幼儿园'
},
],
signInStatus: [
{
id: '',
name: '不限'
},
{
id: 1,
name: '已签到'
},
{
id: 0,
name: '未签到'
},
],
keyword: "",
list: [],
multipleSelection: [],
@ -91,7 +193,7 @@ export default {
};
},
watch: {
keyword: function (val) {
'form.keyWord': function (val) {
clearTimeout(this.searchTimer);
this.searchTimer = setTimeout(() => {
this.initData();
@ -107,14 +209,11 @@ export default {
pageNum: this.page,
pageSize: this.pageSize,
competitionId: this.id,
keyWord: this.keyword,
isDisable: this.isDisable,
teamOrder: this.teamOrder,
...this.form
}).then(({ data }) => {
this.list = data.records;
this.total = data.total;
}).catch(res => {
});
}).catch(res => { });
},
initData () {
this.page = 1
@ -128,7 +227,7 @@ export default {
this.getData();
},
switchOff (val, row, index) {
this.$put(`${this.api.disableActivityApplicant}?competitionRegistrationId=${row.id}&isDisable=${val}`).then(res => { }).catch(err => { });
this.$put(`${this.api.disableRegistration}?competitionRegistrationId=${row.id}&isDisable=${val}`).then(res => { }).catch(err => { });
},
delData (row) {
this.$confirm("此删除操作不可逆,是否确认删除选中项?", "提示", {
@ -155,7 +254,7 @@ export default {
const data = this.multipleSelection
if (data.length) {
data.map((e, i) => e.id = i + 1)
axios.post(this.api.exportDataInBatchesApplicant, data, {
axios.post(this.api.exportDataInBatchesCom, data, {
headers: {
token: this.token
},
@ -164,7 +263,7 @@ export default {
util.downloadFileDirect(`报名人员.xls`, new Blob([res.data]))
}).catch(res => { })
} else {
axios.get(`${this.api.excelExportApplicant}?activityId=${this.id}`, {
axios.get(`${this.api.excelExportCom}?competitionId=${this.id}`, {
headers: {
token: this.token
},

@ -39,10 +39,10 @@
v-model="form.description"
:init="editorConfig" />
</el-form-item>
<el-form-item class="req"
<!-- <el-form-item class="req"
label="关联产品">
<el-button>选择</el-button>
</el-form-item>
</el-form-item> -->
</template>
<template v-else>
@ -187,8 +187,19 @@ export default {
async getDetails (id) {
if (id) this.form.correspondingLinkId = ''
const { selectLinkId } = this.form
//
if (selectLinkId === '2') {
// if (selectLinkId === '1') {
// const { data } = await this.$get(this.api.prodList, {
// current: 1,
// size: 1000,
// status: '',
// })
// data.records.forEach(e => {
// e.name = e.competitionName
// e.id = +e.id
// })
// this.linkDetails = data.records
// } else
if (selectLinkId === '2') { //
const { data } = await this.$post(this.api.postLoginActivity, {
pageNum: 1,
pageSize: 1000,
@ -207,7 +218,7 @@ export default {
})
data.records.forEach(e => {
e.name = e.companyName
e.id = +e.id
e.id = +e.teamId
})
this.linkDetails = data.records
} else {

@ -30,9 +30,11 @@ service.interceptors.request.use(config => {
service.interceptors.response.use(
response => {
const res = response.data
const { status } = res
const { status, code } = res
if (status === 200) {
return Promise.resolve(res).catch(e => {});
} else if (code === '200') {
return Promise.resolve(res).catch(e => {});
} else if (status === 401) {
Util.errorMsg(res.message)
setTimeout(() => {

@ -5,7 +5,7 @@ const isDev = process.env.NODE_ENV === 'development' // 开发环境
let host = `${location.origin}/`
if (isDev) {
host = 'http://124.71.79.122/'
// host = 'http://192.168.31.217:10010/'
host = 'http://192.168.31.217:10010/'
}
const Setting = {

Loading…
Cancel
Save