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-18 10:01:59 +08:00
parent d377676758
commit b05de4830c
113 changed files with 2305 additions and 682 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/resources/views/platform/zhgh/activity/culture/common/applyActivity.js
+9 -9
View File
@@ -617,11 +617,11 @@ const ACTIVITY_CULTURE_APPLY_ACTIVITY = {
if (res.code === 0) {
this.$message.success("保存成功")
if (this.activity_type === 40002) {
window.location.href = "/platform/activity/culture/infoManage/union"
commonUtil.pjaxPush("/platform/activity/culture/infoManage/union")
} else if (this.activity_type === 40003) {
window.location.href = "/platform/activity/culture/infoManage/club"
commonUtil.pjaxPush("/platform/activity/culture/infoManage/club")
} else {
window.location.href = "/platform/activity/culture/infoManage/school"
commonUtil.pjaxPush("/platform/activity/culture/infoManage/school")
}
}
})
@@ -658,11 +658,11 @@ const ACTIVITY_CULTURE_APPLY_ACTIVITY = {
if (res.code === 0) {
this.$message.success("提交成功")
if (this.activity_type === 40002) {
window.location.href = "/platform/activity/culture/infoManage/union"
commonUtil.pjaxPush("/platform/activity/culture/infoManage/union")
} else if (this.activity_type === 40003) {
window.location.href = "/platform/activity/culture/infoManage/club"
commonUtil.pjaxPush("/platform/activity/culture/infoManage/club")
} else {
window.location.href = "/platform/activity/culture/infoManage/school"
commonUtil.pjaxPush("/platform/activity/culture/infoManage/school")
}
}
})
@@ -700,11 +700,11 @@ const ACTIVITY_CULTURE_APPLY_ACTIVITY = {
if (res.code === 0) {
this.$message.success("提交成功")
if (this.activity_type === 40002) {
window.location.href = "/platform/activity/culture/infoManage/union"
commonUtil.pjaxPush("/platform/activity/culture/infoManage/union")
} else if (this.activity_type === 40003) {
window.location.href = "/platform/activity/culture/infoManage/club"
commonUtil.pjaxPush("/platform/activity/culture/infoManage/club")
} else {
window.location.href = "/platform/activity/culture/infoManage/school"
commonUtil.pjaxPush("/platform/activity/culture/infoManage/school")
}
}
})
src/main/resources/views/platform/zhgh/activity/culture/common/infoMange.js
+1 -1
View File
@@ -203,7 +203,7 @@ const ACTIVITY_CULTURE_INFO_MANAGE = {
this.url = location.origin + "/platform/h5/activity/culture/applyUser"
this.codeDialogVisible = true
} else if (type === "export") {
location.href = "/platform/activity/info/mange/export?id=" + row.id
commonUtil.pjaxPush("/platform/activity/info/mange/export?id=" + row.id)
}
},
goBack() {
src/main/resources/views/platform/zhgh/activity/declarereimbursement/declare/apply/index.html
+19 -19
View File
@@ -5,7 +5,7 @@ layout("/layouts/platform.html"){
.el-descriptions-item__label.is-bordered-label {
width: 15% !important;
}
.el-descriptions-item__label {
width: 15% !important;
}
@@ -34,13 +34,13 @@ layout("/layouts/platform.html"){
</el-select>
</el-form-item>
</el-descriptions-item>
<el-descriptions-item label="申请人姓名">
<el-form-item prop="userName">
<el-input disabled type="text" v-model="formData.userName"></el-input>
</el-form-item>
</el-descriptions-item>
<template v-if="formData.activityType == 'CLUB'">
<el-descriptions-item label="申请协会">
<el-form-item prop="clubId" label="申请协会">
@@ -63,7 +63,7 @@ layout("/layouts/platform.html"){
</el-form-item>
</el-descriptions-item>
</template>
<el-descriptions-item label="联系方式">
<el-form-item prop="mobile">
<el-input type="text" v-model="formData.mobile" placeholder="请输入联系方式" maxlength="11"></el-input>
@@ -74,8 +74,8 @@ layout("/layouts/platform.html"){
<el-input disabled type="text" v-model="formData.applyTime"></el-input>
</el-form-item>
</el-descriptions-item>
<el-descriptions-item label="活动计划时间">
<el-form-item prop="planDate">
<el-date-picker
@@ -94,14 +94,14 @@ layout("/layouts/platform.html"){
<el-input-number v-model="formData.activityNumber" placeholder="请输入活动人数"></el-input-number>
</el-form-item>
</el-descriptions-item>
<el-descriptions-item label="活动地址" :span="2">
<el-form-item prop="activityAddress">
<el-input maxlength="150" placeholder="请填写活动地址" type="text"
v-model="formData.activityAddress"></el-input>
</el-form-item>
</el-descriptions-item>
<el-descriptions-item label="活动预算费用" :span="2">
<el-form-item prop="budgets">
<el-table :data="formData.budgets" border max-height="500" size="mini" style="width: 95%">
@@ -143,13 +143,13 @@ layout("/layouts/platform.html"){
</el-table>
</el-form-item>
</el-descriptions-item>
<el-descriptions-item label="活动方案及简介" :span="2">
<el-form-item prop="activityContent">
<text-editor v-model="formData.activityContent"></text-editor>
</el-form-item>
</el-descriptions-item>
<el-descriptions-item label="附件" :span="2">
<el-form-item prop="files">
<file-upload :value.sync="formData.files"
@@ -159,7 +159,7 @@ layout("/layouts/platform.html"){
complete_result></file-upload>
</el-form-item>
</el-descriptions-item>
<el-descriptions-item label="签字" :span="2">
<el-form-item prop="sign">
<pc-signature v-model="formData.sign"></pc-signature>
@@ -167,7 +167,7 @@ layout("/layouts/platform.html"){
</el-descriptions-item>
</el-descriptions>
</el-form>
<el-row type="flex" justify="end" class="mt20">
<el-button type="primary" plain @click="onSave">保存</el-button>
<el-button type="primary" @click="onSubmit" v-if="!taskId">提交</el-button>
@@ -219,12 +219,12 @@ layout("/layouts/platform.html"){
this.$axios.post('/platform/activityDeclare/apply/save', {data: JSON.stringify(this.formData)}).then(res => {
if (res.code === 0) {
this.$message.success("保存成功")
window.location.href = '/platform/activityDeclare/mine'
commonUtil.pjaxPush('/platform/activityDeclare/mine')
}
})
})
},
// 提交
onSubmit() {
this.$confirm("您确定要提交吗？", "提示", {
@@ -241,12 +241,12 @@ layout("/layouts/platform.html"){
}).then(res => {
if (res.code === 0) {
this.$message.success("提交成功")
window.location.href = '/platform/activityDeclare/mine'
commonUtil.pjaxPush('/platform/activityDeclare/mine')
}
})
})
},
onFinishTask() {
this.$confirm("您确定要提交吗？", "提示", {
confirmButtonText: "确定",
@@ -263,12 +263,12 @@ layout("/layouts/platform.html"){
}).then(res => {
if (res.code === 0) {
this.$message.success("提交成功")
window.location.href = '/platform/activityDeclare/mine'
commonUtil.pjaxPush('/platform/activityDeclare/mine')
}
})
})
},
// 设置申报主体名称
setDeclareUnitName(val){
const club = this.clubList.find(v => v.id === val)
@@ -291,7 +291,7 @@ layout("/layouts/platform.html"){
if (res.data.clubId) {
this.setDeclareUnitName(res.data.clubId)
}
if (res.data.planStartTime && res.data.planEndTime) {
this.$set(this.formData, "planDate", [res.data.planStartTime, res.data.planEndTime])
}
src/main/resources/views/platform/zhgh/activity/declarereimbursement/declare/mine/index.html
+3 -3
View File
@@ -147,7 +147,7 @@ layout("/layouts/platform.html"){
this.$downLoad('/platform/activityDeclare/mine/doExportDeclare?id=' + row.id)
},
onApply() {
window.location.href = '/platform/activityDeclare/apply'
commonUtil.pjaxPush('/platform/activityDeclare/apply')
},
openView(row) {
this.$refs.guava.view(() => {
@@ -155,8 +155,8 @@ layout("/layouts/platform.html"){
})
},
onEdit(row) {
window.location.href = '/platform/activityDeclare/apply?taskId=' + (row.startTaskId || '') + "&bizId=" + row.id
},
commonUtil.pjaxPush('/platform/activityDeclare/apply?taskId=' + (row.startTaskId || '') + "&bizId=" + row.id)
},
onRevoke(row) {
this.$confirm("您确定要撤回吗?", "提示", {
confirmButtonText: "确定",
src/main/resources/views/platform/zhgh/activity/declarereimbursement/reimbursement/apply/index.html
+26 -26
View File
@@ -27,7 +27,7 @@ layout("/layouts/platform.html"){
</el-select>
</el-form-item>
</el-descriptions-item>
<template v-if="formData.declareId">
<el-descriptions-item label="相关数据">
<el-button size="small" type="primary" @click="viewDeclare">查看申报信息</el-button>
@@ -36,7 +36,7 @@ layout("/layouts/platform.html"){
<template v-else>
<el-descriptions-item></el-descriptions-item>
</template>
<el-descriptions-item label="实际活动时间">
<el-form-item prop="activityTime">
<el-date-picker
@@ -50,8 +50,8 @@ layout("/layouts/platform.html"){
</el-date-picker>
</el-form-item>
</el-descriptions-item>
<el-descriptions-item label="活动计划时间">
<el-form-item prop="planDate">
<el-date-picker
@@ -66,8 +66,8 @@ layout("/layouts/platform.html"){
</el-date-picker>
</el-form-item>
</el-descriptions-item>
<el-descriptions-item label="活动预算费用" :span="2">
<el-form-item prop="budgets">
<el-table :data="formData.budgets" border max-height="500" size="mini" style="width: 100%">
@@ -156,7 +156,7 @@ layout("/layouts/platform.html"){
</el-table>
</el-form-item>
</el-descriptions-item>
<el-descriptions-item label="发票" :span="2">
<el-form-item prop="billFiles">
<file-upload :value.sync="formData.billFiles"
@@ -175,7 +175,7 @@ layout("/layouts/platform.html"){
complete_result></file-upload>
</el-form-item>
</el-descriptions-item>
<el-descriptions-item label="奖品/纪念品/服装/道具等活动人员名单" :span="2">
<el-form-item prop="otherFiles">
<file-upload :value.sync="formData.otherFiles"
@@ -185,7 +185,7 @@ layout("/layouts/platform.html"){
complete_result></file-upload>
</el-form-item>
</el-descriptions-item>
<el-descriptions-item label="签字" :span="2">
<el-form-item prop="sign">
<pc-signature v-model="formData.sign"></pc-signature>
@@ -193,15 +193,15 @@ layout("/layouts/platform.html"){
</el-descriptions-item>
</el-descriptions>
</el-form>
<el-row type="flex" justify="end" class="mt20">
<el-button type="primary" plain @click="onSave">保存</el-button>
<el-button type="primary" @click="onSubmit" v-if="!taskId">提交</el-button>
<el-button type="primary" @click="onFinishTask" v-else>提交1</el-button>
</el-row>
</el-card>
<el-dialog title="申报数据" :visible.sync="declareDialogVisible" width="60%">
<div style="max-height: 68vh;overflow-y: auto">
<info ref="infoRef"></info>
@@ -210,13 +210,13 @@ layout("/layouts/platform.html"){
<el-button @click="declareDialogVisible = false">关闭</el-button>
</div>
</el-dialog>
</div>
</div>
<script>
<!--#include("../../declare/common/info.js"){}#-->
new Vue({
el: "#app",
mixins: [initTableMixins],
@@ -225,7 +225,7 @@ layout("/layouts/platform.html"){
return {
bizId: GetQueryString("bizId"),
taskId: GetQueryString("taskId"),
formData: {
id: GetQueryString("businessId"),
activityTime: [],
@@ -235,9 +235,9 @@ layout("/layouts/platform.html"){
formRules: {
id: [{required: true, message: "必填", trigger: ['change', 'blur']}]
},
activityOptions: [],
declareDialogVisible: false
}
},
@@ -259,12 +259,12 @@ layout("/layouts/platform.html"){
this.$axios.post('/platform/activityReimbursement/apply/save', {data: JSON.stringify(this.formData)}).then(res => {
if (res.code === 0) {
this.$message.success("保存成功")
window.location.href = '/platform/activityReimbursement/mine'
commonUtil.pjaxPush('/platform/activityReimbursement/mine')
}
})
})
},
// 提交
onSubmit() {
this.$confirm("您确定要提交吗？", "提示", {
@@ -281,12 +281,12 @@ layout("/layouts/platform.html"){
}).then(res => {
if (res.code === 0) {
this.$message.success("提交成功")
window.location.href = '/platform/activityReimbursement/mine'
commonUtil.pjaxPush('/platform/activityReimbursement/mine')
}
})
})
},
onFinishTask() {
this.$confirm("您确定要提交吗？", "提示", {
confirmButtonText: "确定",
@@ -303,12 +303,12 @@ layout("/layouts/platform.html"){
}).then(res => {
if (res.code === 0) {
this.$message.success("提交成功")
window.location.href = '/platform/activityReimbursement/mine'
commonUtil.pjaxPush('/platform/activityReimbursement/mine')
}
})
})
},
// 查看申报数据
viewDeclare() {
this.declareDialogVisible = true
@@ -316,7 +316,7 @@ layout("/layouts/platform.html"){
this.$refs.infoRef.onOpen({id: this.formData.declareId})
})
},
async getCardNumberByPayeeId(row) {
const resp = await this.$axios.post('/platform/activityReimbursement/apply/getCardNumberByPayeeId', {username:row.username})
if (resp.code === 0) {
@@ -333,9 +333,9 @@ layout("/layouts/platform.html"){
...this.formData,
...data
}
this.formData.id = this.bizId ? this.bizId : null
if (data.planStartTime && data.planEndTime) {
this.formData.planDate = [data.planStartTime, data.planEndTime]
}
src/main/resources/views/platform/zhgh/activity/declarereimbursement/reimbursement/mine/index.html
+3 -3
View File
@@ -152,7 +152,7 @@ layout("/layouts/platform.html"){
this.$downLoad('/platform/activityReimbursement/mine/doExportReimbursement?id=' + row.id)
},
onApply() {
window.location.href = '/platform/activityReimbursement/apply'
commonUtil.pjaxPush('/platform/activityReimbursement/apply')
},
openView(row) {
this.$refs.guava.view(() => {
@@ -160,8 +160,8 @@ layout("/layouts/platform.html"){
})
},
onEdit(row) {
window.location.href = '/platform/activityReimbursement/apply?taskId=' + (row.startTaskId || '') + "&bizId=" + row.id
},
commonUtil.pjaxPush('/platform/activityReimbursement/apply?taskId=' + (row.startTaskId || '') + "&bizId=" + row.id)
},
onRevoke(row) {
this.$confirm("您确定要撤回吗?", "提示", {
confirmButtonText: "确定",
src/main/resources/views/platform/zhgh/activity/family/apply/signForm.js
+5 -5
View File
@@ -59,13 +59,13 @@ const signForm = {
<div class="left-span-label"
style="display: flex; justify-content: space-between; align-items: center">
<div>家属信息</div>
<div>{{activity.keyWord}}信息</div>
<div>
<el-button type="danger" size="mini" @click="delFamily">
删除家属
删除{{activity.keyWord}}
</el-button>
<el-button type="primary" size="mini" @click="addFamily">
添加家属
添加{{activity.keyWord}}
</el-button>
</div>
</div>
@@ -74,7 +74,7 @@ const signForm = {
<el-tabs v-model="active" type="card">
<el-tab-pane v-for="(item, index) in formData.mobileColumnsValue"
:name="index + ''"
:label="'家属' + (index + 1)"
:label="activity.keyWord + (index + 1)"
:key="index">
<el-row class="mt20">
<el-col :span="24">
@@ -130,7 +130,7 @@ const signForm = {
</el-tabs>
</div>
<div v-if="formData.mobileColumnsValue.length === 0" style="text-align: center">
<span style="font-size: 15px;color: grey">如有家属，请添加家属</span>
<span style="font-size: 15px;color: grey">如有{{activity.keyWord}}，请添加{{activity.keyWord}}</span>
</div>
</el-form>
src/main/resources/views/platform/zhgh/activity/family/statistics/info.js
+1 -1
View File
@@ -3,7 +3,7 @@ const info = {
<div>
<el-tabs>
<el-tab-pane label="报名人员">
<el-table :data="registerUserTableData" class="mt20">
<el-table :data="registerUserTableData" class="mt20" max-height="600">
<el-table-column
:label="column.label"
:prop="column.prop"
src/main/resources/views/platform/zhgh/activity/trainSingUp/statistics/info.js
+1 -1
View File
@@ -3,7 +3,7 @@ const info = {
<div>
<el-tabs>
<el-tab-pane label="报名人员">
<el-table :data="registerUserTableData" class="mt20">
<el-table :data="registerUserTableData" class="mt20" max-height="600">
<el-table-column
:label="column.label"
:prop="column.prop"