commit

src/main/java/io/v/nutz/base/utils/Roles.java

@@ -289,4 +289,9 @@ public interface Roles {
      * 分工会主席
      */
     String GH01 = "9c1f19e385914fef82bc35da7c9ded36";
+
+    /**
+     * 校工会活动报销管理员
+     */
+    String SchoolUnionActivityReimburseAdmin = "9426526f497542cb8351e0cac8fc9816";
 }

src/main/java/io/v/nutz/zhgh/jf/handle/reimbursement/ReimbursementToHandler.java

@@ -1,7 +1,10 @@
 package io.v.nutz.zhgh.jf.handle.reimbursement;
 
+import io.v.nutz.base.utils.Roles;
 import io.v.nutz.base.utils.Vi;
 import io.v.nutz.base.utils.ViResource;
+import io.v.nutz.sys.models.Sys_user;
+import io.v.nutz.sys.models.Sys_user_role;
 import io.v.nutz.sys.models.User;
 import io.v.nutz.sys.services.SysLocalProcessService;
 import io.v.nutz.sys.services.impl.SysLocalProcessServiceImpl;
@@ -189,13 +192,16 @@ public enum ReimbursementToHandler {
     CREATE_SCHOOL_DIRECTOR_TASK() {
         @Override
         public void exec(String reimbursementId, NutMap extra) {
-            //校工会负责人；暂时只有一人、姜学军：1019911404（工号）
+            List<Sys_user_role> userRoles = dao.query(Sys_user_role.class, Cnd.where("roleId", "=", Roles.SchoolUnionActivityReimburseAdmin));
+            List<String> list = userRoles.stream().map(Sys_user_role::getUserId).toList();
+            List<Sys_user> userList = dao.query(Sys_user.class, Cnd.where("id", "in", list));
+            List<String> userLoginNameList = userList.stream().map(Sys_user::getLoginname).toList();
             localProcessService.createTask(
                     "activity_reimbursement@" + reimbursementId,
                     "activity_reimbursement_school_director_audit",
                     "校工会负责人审核",
                     ShiroUtil.getUserId(),
-                    List.of("1019911404"),
+                    userLoginNameList,
                     "/platform/jf/reimbursement/schoolDirector",
                     "/platform/jf/reimbursement/schoolDirector",
                     "/platform/jf/reimbursement/schoolDirector",

src/main/resources/views/platform/jf/reimbursement/apply.html

@@ -77,10 +77,10 @@ layout("/layouts/platform.html"){
                                 </el-button>
                                 <el-button type="primary" size="small" style="margin-left: 10px"
                                            @click="doExportReimbursementVoucher">导出报销凭证
-                                </el-button>-->
+                                </el-button>
                                 <el-button type="primary" size="small" style="margin-left: 10px"
                                            @click="doExportActivitySignUpUser">导出活动参加人员
-                                </el-button>
+                                </el-button>-->
                             </div>
                         </el-col>
                     </el-row>
@@ -125,10 +125,10 @@ layout("/layouts/platform.html"){
                                         </el-form-item>
                                     </template>
                                 </el-table-column>
-                                <el-table-column label="收款人" prop="payeeId" width="200">
+                                <el-table-column label="收款人" prop="username" width="200">
                                     <template scope="{row,$index}">
                                         <el-form-item label-width="0"
-                                                      :prop="'budgets.'+$index+'.payeeId'">
+                                                      :prop="'budgets.'+$index+'.username'">
                                             <el-input v-model="row.username" maxlength="50"
                                                       @input="getCardNumberByPayeeId(row)"
                                                       placeholder="请输入收款人"></el-input>
@@ -162,7 +162,7 @@ layout("/layouts/platform.html"){
                                 </el-table-column>
                                 <el-table-column label="报销卡号" prop="bankCardNum" width="250">
                                     <template scope="{row,$index}">
-                                        <el-form-item label-width="0">
+                                        <el-form-item label-width="0" :prop="'budgets.'+$index+'.bankCardNum'">
                                             <el-input type="number" v-model="row.bankCardNum"
                                                       maxlength="50"
                                                       placeholder="请输入报销卡号"></el-input>
@@ -391,11 +391,11 @@ layout("/layouts/platform.html"){
             },
             //导出活动申请表
             doExportActivityApply() {
-                window.open('/platform/jf/activity_bx/reimbursementview/doExport?id=' + this.formData.id)
+                window.open('/platform/jf/activity_bx/reimbursementview/doExport?id=' + this.formData.activity_id)
             },
             //导出活动参加人员
             doExportActivitySignUpUser() {
-                window.open('/platform/jf/reimbursement/mine/exportActivityJoinUser?id=' + this.formData.id)
+                window.open('/platform/jf/reimbursement/mine/exportActivityJoinUser?id=' + this.formData.activity_id)
             },
             blur() {
                 let num = 0