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

commit

Browse Source
This commit is contained in:
@jyuhsin
2025-07-02 17:43:22 +08:00
parent ad0b8c558d
commit 9ba46d1908
7 changed files with 57 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/resources/static/components/module/trainSignUp/TrainDynamicForm.vue
-1
View File
@@ -16,7 +16,6 @@
:clickable="['SELECT'].includes(column.columnFormType)"
:label="column.columnName"
:name="column.columnCode"
:error="errors.has(column.columnCode)"
:type="['INT'].includes(column.columnType) ? 'digit' : ''"
:placeholder="(['SELECT'].includes(column.columnFormType) ? '请选择' : '请填写') + column.columnName"
:readonly="['SELECT'].includes(column.columnFormType)"
src/main/resources/views/platform/zhgh/activity/trainSingUp/add/include_activity_edit.html
+1 -1
View File
@@ -206,7 +206,7 @@
<el-table-column label="校区" prop="campus">
<template v-slot="{row}">
<el-select size="small" v-model="row.campus" style="width: 100%">
<el-option :label="item.name" :value="item.code" :key="item.code" v-for="item in campusList"></el-option>
<el-option :label="item.name" :value="item.name" :key="item.code" v-for="item in campusList"></el-option>
</el-select>
</template>
</el-table-column>
src/main/resources/views/platform/zhgh/activity/trainSingUp/userAdjust/index.html
+1
View File
@@ -256,6 +256,7 @@ layout("/layouts/platform.html"){
adjust(o) {
this.userInfo = o
this.afterAdjustCourse = ""
this.getCourse(this.pageForm.activityId)
this.adjustDialogVisible = true
},
deleteSignUser(o) {
src/main/resources/views/platform/zhgh/dayofficework/honor/registration/index.html
+16 -9
View File
@@ -34,7 +34,7 @@ layout("/layouts/platform.html"){
v-model="formData.userId"
@change="userChange"
ref="beComfortedUserRef"
api="/platform/condolence/apply/listBeComfortedUser"
api="/platform/honor/registration/listBeComfortedUser"
api_input_key_name="keyWord"
:option_label_func="(item)=>{return item.userName + item.loginName + '(' + item.unitName + ')'}"
style="width: 100%"
@@ -62,7 +62,7 @@ layout("/layouts/platform.html"){
clearable
filterable
>
<el-option v-for="item in units" :label="item.name" :value="item.id"></el-option>
<el-option v-for="item in units" :label="item.name" :value="item.id" :key="item.id"></el-option>
</el-select>
</el-form-item>
</el-col>
@@ -76,7 +76,7 @@ layout("/layouts/platform.html"){
clearable
filterable
>
<el-option v-for="item in unions" :label="item.name" :value="item.id"></el-option>
<el-option v-for="item in unions" :label="item.name" :value="item.id" :key="item.id"></el-option>
</el-select>
</el-form-item>
</el-col>
@@ -146,7 +146,7 @@ layout("/layouts/platform.html"){
filterable
@change="searchUnionInfo(formData.unionId)"
>
<el-option v-for="item in unions" :label="item.name" :value="item.id"></el-option>
<el-option v-for="item in unions" :label="item.name" :value="item.id" :key="item.id"></el-option>
</el-select>
</el-form-item>
</el-col>
@@ -339,6 +339,14 @@ layout("/layouts/platform.html"){
const data = this.honorTypeList.find((v) => v.id === val)
if (data) {
this.$set(this.formData, "queryTypeCode", data.queryTypeCode)
if(data.queryTypeCode === 'HONOR_LIST') {
this.$set(this.formData, "unionId", this.$store.state.user.union ? this.$store.state.user.union.id : "")
if (this.formData.unionId) {
this.searchUnionInfo(this.formData.unionId)
}
} else {
this.$set(this.formData, "unionId", "")
}
}
},
async getHonorPrize(honorType) {
@@ -349,7 +357,6 @@ layout("/layouts/platform.html"){
this.$axios.post("/platform/honor/basic/settings/getHonorType").then((res) => {
if (res.code === 0) {
this.honorTypeList = res.data
console.log(this.honorTypeList)
}
})
},
@@ -401,14 +408,14 @@ layout("/layouts/platform.html"){
this.getHonorAwardType()
this.unions = await this.$businessTool.listUnion()
this.units = await this.$businessTool.listUnit()
this.$set(this.formData, "unionId", this.$store.state.user.union ? this.$store.state.user.union.id : "")
/*this.$set(this.formData, "unionId", this.$store.state.user.union ? this.$store.state.user.union.id : "")
if (this.formData.unionId) {
this.searchUnionInfo(this.formData.unionId)
}
if (this.honorTypeList && this.honorLevelList.length > 0) {
}*/
if (this.honorTypeList && this.honorTypeList.length > 0) {
this.formData = {
honorType: this.honorTypeList[0].id,
queryTypeCode: this.honorLevelList[0].queryTypeCode
queryTypeCode: this.honorTypeList[0].queryTypeCode
}
this.honorPrizeList = await this.getHonorPrize(this.formData.honorType)
}
src/main/resources/views/platform/zhghh5/activity/trainSignUp/trainInfo/index.html
+1 -1
View File
@@ -325,7 +325,7 @@ layout("/layouts/platform_h5.html"){
<van-nav-bar @click-left="joinPopup = false" left-text="返回" fixed left-arrow placeholder title="活动报名"></van-nav-bar>
<div class="join_content">
<van-form @submit="joinSubmit" :show-error-message="false">
<div class="van-doc-card-two" style="margin: 36px 0 16px 0">
<div class="van-doc-card-two" style="margin: 0 0 16px 0">
<div></div>
<div class="van-card-header">基础信息</div>
<div class="van-card-body">