c-zhouhf1/zhgh_ncu
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

commit

Browse Source
This commit is contained in:
@jyuhsin
2025-09-23 17:30:54 +08:00
parent e2e5de203a
commit 6243a033eb
64 changed files with 3696 additions and 180 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/resources/views/platform/zhgh/activity/trainSingUp/apply/applyForm.js → src/main/resources/views/platform/zhgh/activity/trainSignUp/apply/applyForm.js
+4 -4
View File
@@ -121,7 +121,7 @@ const applyForm = {
},
methods: {
async getCourseTimeSelectList(o) {
const resp = await $.post('/platform/trainSingUp/apply/getCourseTimeSelectList',{ courseId: o.id })
const resp = await $.post('/platform/trainSignUp/apply/getCourseTimeSelectList',{ courseId: o.id })
if (resp.code === 0) {
this.courseTimeSelectList = resp.data
} else {
@@ -144,14 +144,14 @@ const applyForm = {
let familyCount = this.formData.trainMobileSignColumnList.filter(o => o.columnCode === 'xdqsrs').reduce((sum, item) => {
return sum + (Number(item.columnValue) || 0)
}, 0)
const res = await this.$axios.post("/platform/trainSingUp/apply/validateSignUp", {
const res = await this.$axios.post("/platform/trainSignUp/apply/validateSignUp", {
courseId: this.formData.courseId,
currentFamilyNumber: familyCount
})
return res.code === 0
},
async validateCourseTime() {
const res = await this.$axios.post('/platform/trainSingUp/apply/validateSourceSignUp', {
const res = await this.$axios.post('/platform/trainSignUp/apply/validateSourceSignUp', {
activityCourseId: this.formData.activityCourseId,
courseId: this.courseRow.id
})
@@ -177,7 +177,7 @@ const applyForm = {
}
})
this.formData.mobileColumnsValue = JSON.stringify(mobileColumnsValue)
const resp = await this.$axios.post("/platform/trainSingUp/apply/doSignUp", this.formData)
const resp = await this.$axios.post("/platform/trainSignUp/apply/doSignUp", this.formData)
if (resp.code === 0) {
this.signDialog = false
this.$message.success(resp.msg)
src/main/resources/views/platform/zhgh/activity/trainSingUp/apply/courseList.js → src/main/resources/views/platform/zhgh/activity/trainSignUp/apply/courseList.js
+3 -3
View File
@@ -188,7 +188,7 @@ const courseList = {
},
onSign(row) {
const course = this.courseTypeList.find((v) => v.id === row.courseType)
this.$axios.post("/platform/trainSingUp/apply/validateSignUp", {courseId: row.id})
this.$axios.post("/platform/trainSignUp/apply/validateSignUp", {courseId: row.id})
.then((res) => {
if (res.code !== 0) {
this.$alert(res.msg, "提示", {
@@ -213,7 +213,7 @@ const courseList = {
cancelButtonText: "取消",
type: "info"
}).then(async () => {
const resp = await this.$axios.post("/platform/trainSingUp/apply/cancelSignUp", {
const resp = await this.$axios.post("/platform/trainSignUp/apply/cancelSignUp", {
activityId: row.activityId,
courseId: row.id
})
@@ -226,7 +226,7 @@ const courseList = {
})
},
async getCourseTypeList() {
const resp = await this.$axios.post("/platform/trainSingUp/type/getAllType")
const resp = await this.$axios.post("/platform/trainSignUp/type/getAllType")
if (resp.code === 0) {
this.courseTypeList = resp.data
}
src/main/resources/views/platform/zhgh/activity/trainSingUp/apply/index.html → src/main/resources/views/platform/zhgh/activity/trainSignUp/apply/index.html
+10 -6
View File
@@ -24,8 +24,7 @@ layout("/layouts/platform.html"){
<el-select v-model="pageForm.activityType" @change="doSearch" style="width: 100%"
placeholder="请选择活动状态" filterable>
<el-option :value="1" label="全部"></el-option>
<el-option :value="4" label="即将开始"></el-option>
<el-option :value="2" label="报名中"></el-option>
<el-option :value="2" label="即将开始 & 报名中"></el-option>
<el-option :value="3" label="已结束"></el-option>
</el-select>
</search-item>
@@ -59,8 +58,13 @@ layout("/layouts/platform.html"){
</el-table-column>
<el-table-column label="操作" width="300">
<template v-slot="{row}">
<el-button @click="onView(row)" size="mini" type="primary">查看介绍</el-button>
<el-button @click="onOpen(row)" size="mini" type="primary">去报名</el-button>
<template v-if="$moment().isBefore($moment(row.activitySignUpEndTime))">
<el-button @click="onView(row)" size="mini" type="primary">查看介绍</el-button>
<el-button @click="onOpen(row)" size="mini" type="primary">去报名</el-button>
</template>
<template v-if="$moment().isAfter($moment(row.activitySignUpEndTime))">
<el-button size="mini" type="info">已结束</el-button>
</template>
</template>
</el-table-column>
</el-table>
@@ -111,7 +115,7 @@ layout("/layouts/platform.html"){
return {
pageForm: {
year: this.$moment().format("YYYY"),
activityType: 4
activityType: 2
},
tableColumns: [
{ label: "活动名称", prop: "activityName", width: 600},
@@ -144,7 +148,7 @@ layout("/layouts/platform.html"){
})
},
pageData() {
this.$axios.post("/platform/trainSingUp/apply/activityPageData", this.pageForm).then((res) => {
this.$axios.post("/platform/trainSignUp/apply/activityPageData", this.pageForm).then((res) => {
if (res.code === 0) {
this.tableData = res.data.list
this.pageForm.totalCount = res.data.totalCount
src/main/resources/views/platform/zhgh/activity/trainSingUp/manage/basicForm.js → src/main/resources/views/platform/zhgh/activity/trainSignUp/manage/basicForm.js
+6 -6
View File
@@ -371,7 +371,7 @@ const basicForm = {
}
},
async getRegisterUserCount(courseId) {
const resp = await this.$axios.post("/platform/trainSingUp/manage/getRegisterUserCount", { courseId })
const resp = await this.$axios.post("/platform/trainSignUp/manage/getRegisterUserCount", { courseId })
return resp.code === 0 ? resp.data : 0
},
courseTypeChange(val, row) {
@@ -444,7 +444,7 @@ const basicForm = {
this.formData.courseList.push({ courseTimeList: [], isMobileSign: false, isReceiveGift: false, reserveMode: 1, courseIsLimitApply: false })
},
async historicalActChange(val) {
const resp = await this.$axios.post("/platform/trainSingUp/manage/findOne", {id: val})
const resp = await this.$axios.post("/platform/trainSignUp/manage/findOne", {id: val})
if (resp.code === 0) {
this.formData = resp.data
this.typeChange(this.formData.trainType)
@@ -468,7 +468,7 @@ const basicForm = {
return data
},
async getHistoricalActList() {
const resp = await this.$axios.post("/platform/trainSingUp/manage/getHistoricalActList", {})
const resp = await this.$axios.post("/platform/trainSignUp/manage/getHistoricalActList", {})
return resp.data
},
async onSave() {
@@ -543,7 +543,7 @@ const basicForm = {
type: "warning"
})
if (confirm !== "confirm") return
const resp = await this.$axios.post("/platform/trainSingUp/manage/doHandle", cloneData)
const resp = await this.$axios.post("/platform/trainSignUp/manage/doHandle", cloneData)
if (resp.code === 0) {
this.$message.success(resp.msg)
this.step = 1
@@ -554,12 +554,12 @@ const basicForm = {
}
},
async getAllType() {
const resp = await this.$axios.post("/platform/trainSingUp/type/getAllType", {})
const resp = await this.$axios.post("/platform/trainSignUp/type/getAllType", {})
return resp.data
},
async init(row) {
if (row && row.id) {
const resp = await this.$axios.post("/platform/trainSingUp/manage/findOne", {id: row.id})
const resp = await this.$axios.post("/platform/trainSignUp/manage/findOne", {id: row.id})
if (resp.code === 0) {
this.formData = resp.data
this.typeChange(this.formData.trainType)
src/main/resources/views/platform/zhgh/activity/trainSingUp/manage/courseTime.js → src/main/resources/views/platform/zhgh/activity/trainSignUp/manage/courseTime.js
View File
src/main/resources/views/platform/zhgh/activity/trainSingUp/manage/customForm.js → src/main/resources/views/platform/zhgh/activity/trainSignUp/manage/customForm.js
View File
src/main/resources/views/platform/zhgh/activity/trainSingUp/manage/index.html → src/main/resources/views/platform/zhgh/activity/trainSignUp/manage/index.html
+1 -1
View File
@@ -165,7 +165,7 @@ layout("/layouts/platform.html"){
})
},
openActivityCode(id) {
this.activityUrl = location.origin + "/platform/trainSingUp/apply/h5?id=" + id
this.activityUrl = location.origin + "/platform/trainSignUp/apply/h5?id=" + id
this.codeDialogVisible = true
},
makeCode(row) {
src/main/resources/views/platform/zhgh/activity/trainSingUp/manage/info.js → src/main/resources/views/platform/zhgh/activity/trainSignUp/manage/info.js
+1 -1
View File
@@ -66,7 +66,7 @@ const info = {
},
methods: {
initData(id) {
this.$axios.post("/platform/trainSingUp/manage/findOne", { id: id })
this.$axios.post("/platform/trainSignUp/manage/findOne", { id: id })
.then((resp) => {
if (resp.code === 0) {
this.viewData = resp.data
src/main/resources/views/platform/zhgh/activity/trainSingUp/manage/makeQrcode.js → src/main/resources/views/platform/zhgh/activity/trainSignUp/manage/makeQrcode.js
+1 -1
View File
@@ -66,7 +66,7 @@ const makeQrcode = {
this.courseDialog = true
},
makeCourseCode(row) {
const url = '/platform/trainSingUp/mine/drivingScan'
const url = '/platform/trainSignUp/mine/drivingScan'
const data = url + '?courseId=' + row.id
console.log(data)
const content = jrQrcode.getQrBase64(data)
src/main/resources/views/platform/zhgh/activity/trainSingUp/manage/unionForm.js → src/main/resources/views/platform/zhgh/activity/trainSignUp/manage/unionForm.js
+1 -1
View File
@@ -150,7 +150,7 @@ const unionForm = {
!this.formData.courseList[this.unionLimitIndex].unionLimit ||
this.formData.courseList[this.unionLimitIndex].unionLimit.length === 0
) {
const resp = await this.$axios.get("/platform/trainSingUp/manage/getUnionLimit", {
const resp = await this.$axios.get("/platform/trainSignUp/manage/getUnionLimit", {
activityScopeId: this.formData.activityGroupId
})
if (resp.code === 0) {
src/main/resources/views/platform/zhgh/activity/trainSingUp/statistics/index.html → src/main/resources/views/platform/zhgh/activity/trainSignUp/statistics/index.html
View File
src/main/resources/views/platform/zhgh/activity/trainSingUp/statistics/info.js → src/main/resources/views/platform/zhgh/activity/trainSignUp/statistics/info.js
View File
src/main/resources/views/platform/zhgh/activity/trainSingUp/type/basicForm.js → src/main/resources/views/platform/zhgh/activity/trainSignUp/type/basicForm.js
View File
src/main/resources/views/platform/zhgh/activity/trainSingUp/type/index.html → src/main/resources/views/platform/zhgh/activity/trainSignUp/type/index.html
View File
src/main/resources/views/platform/zhgh/activity/trainSingUp/userAdjust/index.html → src/main/resources/views/platform/zhgh/activity/trainSignUp/userAdjust/index.html
View File
src/main/resources/views/platform/zhgh/activity/trainSingUp/userAdjust/userInfo.js → src/main/resources/views/platform/zhgh/activity/trainSignUp/userAdjust/userInfo.js
View File
src/main/resources/views/platform/zhgh/activity/trainSingUp/userManage/index.html → src/main/resources/views/platform/zhgh/activity/trainSignUp/userManage/index.html
+3 -3
View File
@@ -133,7 +133,7 @@ layout("/layouts/platform.html"){
})
return
}
const resp = await this.$axios.post("/platform/trainSingUp/userManage/getReserveUser", { courseId: this.course.id })
const resp = await this.$axios.post("/platform/trainSignUp/userManage/getReserveUser", { courseId: this.course.id })
this.reserveTableData = resp.data
this.reserveDialogVisible = true
},
@@ -149,7 +149,7 @@ layout("/layouts/platform.html"){
})
.then(async () => {
const ids = this.multipleSelection.map((o) => o.userId)
const resp = await this.$axios.post("/platform/trainSingUp/userManage/reserveSingUp", {
const resp = await this.$axios.post("/platform/trainSignUp/userManage/reserveSingUp", {
ids: JSON.stringify(ids),
courseId: this.course.id
})
@@ -212,7 +212,7 @@ layout("/layouts/platform.html"){
await this.doSearch()
},
async getActivityList() {
const resp = await this.$axios.post("/platform/trainSingUp/statistics/activityList", { year: this.pageForm.year })
const resp = await this.$axios.post("/platform/trainSignUp/statistics/activityList", { year: this.pageForm.year })
this.activityList = resp.data
if (this.activityList && this.activityList.length > 0) {
this.pageForm.activityId = this.activityList[0].id
src/main/resources/views/platform/zhghh5/activity/trainSignUp/apply/index.html
+14 -13
View File
@@ -37,7 +37,7 @@ layout("/layouts/platform_h5.html"){
</van-dropdown-menu>
</van-sticky>
<table-list api="/platform/trainSingUp/apply/activityPageData"
<table-list api="/platform/trainSignUp/apply/activityPageData"
:page_form.sync="pageForm"
ref="tableListRef"
title="activityName"
@@ -54,14 +54,16 @@ layout("/layouts/platform_h5.html"){
</table-column>
</template>
<template #actions="{index,row}">
<div class="action-btn" @click="onView(row)">
<i class="fa fa-eye"></i>
<span>查看介绍</span>
</div>
<div class="action-btn" @click="onApply(row)">
<i class="fa fa-edit"></i>
<span>去报名</span>
</div>
<template v-if="$moment().isBefore($moment(row.activitySignUpEndTime))">
<div class="action-btn" @click="onView(row)">
<i class="fa fa-eye"></i>
<span>查看介绍</span>
</div>
<div class="action-btn" @click="onApply(row)">
<i class="fa fa-edit"></i>
<span>去报名</span>
</div>
</template>
</template>
</table-list>
@@ -105,12 +107,11 @@ layout("/layouts/platform_h5.html"){
totalCount: 0,
searchKeyword: '',
year: new Date().getFullYear(),
activityType: 4,
activityType: 2,
},
typeOptions: [
{text: '全部', value: 1},
{text: '即将开始', value: 4},
{text: '报名中', value: 2},
{text: '即将开始 & 报名中', value: 2},
{text: '已结束', value: 3},
],
infoVisible: false,
@@ -128,7 +129,7 @@ layout("/layouts/platform_h5.html"){
this.onView(row)
return
}
this.$pjaxReplace('/platform/trainSingUp/apply/list/h5?id=' + row.id)
this.$pjaxReplace('/platform/trainSignUp/apply/list/h5?id=' + row.id)
},
onReady() {
this.doSearch()
src/main/resources/views/platform/zhghh5/activity/trainSignUp/common/times.js
+1 -1
View File
@@ -73,7 +73,7 @@ const times = {
}
},
makeCode() {
const url = '/platform/trainSingUp/mine/passiveScan'
const url = '/platform/trainSignUp/mine/passiveScan'
const data = url + '?id=' + this.selectCourseTime.id
console.log(data)
const content = jrQrcode.getQrBase64(data)
src/main/resources/views/platform/zhghh5/activity/trainSignUp/list/applyForm.js
+4 -4
View File
@@ -89,7 +89,7 @@ const applyForm = {
this.showCoursePicker = false
},
async getCourseTimeSelectList(o) {
const resp = await this.$axios.post('/platform/trainSingUp/apply/getCourseTimeSelectList',{courseId: o.id})
const resp = await this.$axios.post('/platform/trainSignUp/apply/getCourseTimeSelectList',{courseId: o.id})
if (resp.code === 0) {
this.courseTimeSelectList = resp.data
} else {
@@ -104,14 +104,14 @@ const applyForm = {
return sum + (Number(item.columnValue) || 0)
}, 0)
const res = await this.$axios.post("/platform/trainSingUp/apply/validateSignUp", {
const res = await this.$axios.post("/platform/trainSignUp/apply/validateSignUp", {
courseId: this.formData.courseId,
currentFamilyNumber: familyCount
})
return res.code === 0
},
async validateCourseTime() {
const res = await this.$axios.post('/platform/trainSingUp/apply/validateSourceSignUp', {
const res = await this.$axios.post('/platform/trainSignUp/apply/validateSourceSignUp', {
activityCourseId: this.formData.activityCourseId,
courseId: this.row.id
})
@@ -138,7 +138,7 @@ const applyForm = {
}
})
this.formData.mobileColumnsValue = JSON.stringify(mobileColumnsValue)
this.$axios.post("/platform/trainSingUp/apply/doSignUp", this.formData).then(res => {
this.$axios.post("/platform/trainSignUp/apply/doSignUp", this.formData).then(res => {
if (res.code === 0) {
this.$toast(res.msg)
this.visible = false
src/main/resources/views/platform/zhghh5/activity/trainSignUp/list/index.html
+6 -6
View File
@@ -24,7 +24,7 @@ layout("/layouts/platform_h5.html"){
</van-dropdown-menu>
</van-sticky>
<table-list api="/platform/trainSingUp/apply/pageData"
<table-list api="/platform/trainSignUp/apply/pageData"
:page_form.sync="pageForm"
ref="tableListRef"
@ready="onReady"
@@ -129,7 +129,7 @@ layout("/layouts/platform_h5.html"){
async onTime(row) {
// 如果设置签到，并且也报名的话
if(row.isMobileSign === true && row.isSign === true) {
const res = await this.$axios.post('/platform/trainSingUp/mine/queryCourseSign', {
const res = await this.$axios.post('/platform/trainSignUp/mine/queryCourseSign', {
courseId: row.id
})
row.courseTimes = res.data
@@ -138,7 +138,7 @@ layout("/layouts/platform_h5.html"){
},
onApply(row) {
const courseType = this.sourceTypeOptions.find((v) => v.id === row.courseType)
this.$axios.post('/platform/trainSingUp/apply/validateSignUp', {
this.$axios.post('/platform/trainSignUp/apply/validateSignUp', {
courseId: row.id
})
.then((res) => {
@@ -167,7 +167,7 @@ layout("/layouts/platform_h5.html"){
message: "您确定要<span style='color: red'>取消【" + row.courseName + "】</span>吗？",
confirmButtonColor: '#1867b0',
}).then(async () => {
const resp = await this.$axios.post('/platform/trainSingUp/apply/cancelSignUp', {
const resp = await this.$axios.post('/platform/trainSignUp/apply/cancelSignUp', {
activityId: row.activityId,
courseId: row.id
})
@@ -206,13 +206,13 @@ layout("/layouts/platform_h5.html"){
this.fetchActivity()
},
fetchActivity() {
this.$axios.post('/platform/trainSingUp/manage/findOne', {id: this.pageForm.activityId})
this.$axios.post('/platform/trainSignUp/manage/findOne', {id: this.pageForm.activityId})
.then((res) => {
this.activity = res.data
})
},
async getCourseTypeList() {
const resp = await this.$axios.post("/platform/trainSingUp/type/getAllType")
const resp = await this.$axios.post("/platform/trainSignUp/type/getAllType")
return resp.data
},
doSearch() {
src/main/resources/views/platform/zhghh5/activity/trainSignUp/mine/index.html
+2 -2
View File
@@ -37,7 +37,7 @@ layout("/layouts/platform_h5.html"){
</van-dropdown-menu>
</van-sticky>
<table-list api="/platform/trainSingUp/apply/activityPageData"
<table-list api="/platform/trainSignUp/apply/activityPageData"
:page_form.sync="pageForm"
ref="tableListRef"
title="activityName"
@@ -111,7 +111,7 @@ layout("/layouts/platform_h5.html"){
this.infoVisible = true
},
onApply(row) {
this.$pjaxReplace('/platform/trainSingUp/apply/list/h5?id=' + row.id + '&dataType=mine')
this.$pjaxReplace('/platform/trainSignUp/apply/list/h5?id=' + row.id + '&dataType=mine')
},
onReady() {
this.doSearch()