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

Merge branch 'main' of https://dd3skj.picp.vip/JyuHsin/zhgh_jshvc

Browse Source
This commit is contained in:
=
2026-06-27 17:20:25 +08:00
parent f8a55316b5 04a100f99c
commit 830aa06b2f
2 changed files with 7 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pom.xml
+1 -1
View File
@@ -2,7 +2,7 @@
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
<packaging>jar</packaging> <packaging>jar</packaging>
<groupId>com.budwk</groupId> <groupId>com.budwk</groupId>
<artifactId>zhgh_jshvc</artifactId> <artifactId>mini</artifactId>
<version>5.6.0-plus</version> <version>5.6.0-plus</version>
<properties> <properties>
<nutzboot.version>2.6.0-SNAPSHOT</nutzboot.version> <nutzboot.version>2.6.0-SNAPSHOT</nutzboot.version>
src/main/resources/views/platform/zhgh/activity/declarereimbursement/reimbursement/apply/index.html
+6 -3
View File
@@ -117,10 +117,10 @@ layout("/layouts/platform.html"){
</el-form-item> </el-form-item>
</el-descriptions-item> </el-descriptions-item>
<el-descriptions-item v-if="formData.activityReimbursementMode!=='activity' <!-- <el-descriptions-item v-if="formData.activityReimbursementMode!=='activity'
&& &&
!['ACTIVITY_BUDGET_TYPE_THREE'].includes(formData.outlayManageSource) !['ACTIVITY_BUDGET_TYPE_THREE'].includes(formData.outlayManageSource)
&&formData.reimbursementIdentity!=='club'"></el-descriptions-item> &&formData.reimbursementIdentity!=='club'"></el-descriptions-item>-->
<template v-if="formData.activityReimbursementMode==='activity'"> <template v-if="formData.activityReimbursementMode==='activity'">
<el-descriptions-item label="实际活动时间"> <el-descriptions-item label="实际活动时间">
@@ -154,9 +154,12 @@ layout("/layouts/platform.html"){
</el-date-picker> </el-date-picker>
</el-form-item> </el-form-item>
</el-descriptions-item> </el-descriptions-item>
<el-descriptions-item></el-descriptions-item>
</template> </template>
<el-descriptions-item v-if="['ACTIVITY_BUDGET_TYPE_ONE'].includes(formData.outlayManageSource)
&&formData.reimbursementIdentity!=='club'"></el-descriptions-item>
<el-descriptions-item v-if="['ACTIVITY_BUDGET_TYPE_TWO'].includes(formData.outlayManageSource)"></el-descriptions-item>
<el-descriptions-item label="费用" :span="2"> <el-descriptions-item label="费用" :span="2">
<el-form-item prop="budgets" label="费用"> <el-form-item prop="budgets" label="费用">