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

commit

Browse Source
This commit is contained in:
@jyuhsin
2025-03-28 15:44:48 +08:00
parent 50aa04192a
commit 6881a944ad
16 changed files with 610 additions and 735 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/io/v/nutz/zhgh/jf/controller/activitybx/ReimbursementCon.java
+14 -10
View File
@@ -11,6 +11,7 @@ import com.deepoove.poi.data.PictureRenderData;
import com.deepoove.poi.data.PictureType;
import com.deepoove.poi.policy.HackLoopTableRenderPolicy;
import io.v.nutz.base.annontation.ViReturn;
import io.v.nutz.base.model.Audit;
import io.v.nutz.base.model.Goods;
import io.v.nutz.base.utils.DateUtil;
import io.v.nutz.base.utils.Html2Text;
@@ -28,6 +29,7 @@ import org.apache.shiro.authz.annotation.RequiresPermissions;
import org.nutz.aop.interceptor.ioc.TransAop;
import org.nutz.boot.starter.ftp.FtpService;
import org.nutz.dao.Cnd;
import org.nutz.dao.Dao;
import org.nutz.dao.Sqls;
import org.nutz.dao.sql.Sql;
import org.nutz.ioc.aop.Aop;
@@ -271,27 +273,29 @@ public class ReimbursementCon {
/*基层工会主席签字*/
if (one.get("dc_s") != null) {
one.setv("dc_sign", getImage((String) one.get("dc_s")));
if (one.get("reimbursement_union_audit") != null) {
Audit reimbursementUnionChairman = one.getAs("reimbursement_union_audit", Audit.class);
one.setv("dc_sign", getImage(reimbursementUnionChairman.getAuditSign()));
}
/*协会负责人*/
if (one.get("ap_c") != null) {
one.setv("ap_sign", getImage((String) one.get("ap_c")));
if (one.get("reimbursement_club_audit") != null) {
Audit reimbursementClubChairman = one.getAs("reimbursement_club_audit", Audit.class);
one.setv("ap_sign", getImage(reimbursementClubChairman.getAuditSign()));
}
/*校工会主席签字*/
if (one.get("ucc_s") != null) {
one.setv("ucc_sign", getImage((String) one.get("ucc_s")));
if (one.get("reimbursement_school_chairman") != null) {
Audit reimbursementSchoolChairman = one.getAs("reimbursement_school_chairman", Audit.class);
one.setv("ucc_sign", getImage(reimbursementSchoolChairman.getAuditSign()));
}
/*会计*/
if (one.get("a_s") != null) {
one.setv("a_sign", getImage((String) one.get("a_s")));
if (one.get("user_signature") != null) {
Sys_signature sysSignature = sysSignatureService.dao().fetch(Sys_signature.class, Cnd.where("id", "=", one.getString("user_signature")));
one.setv("a_sign", getImage(sysSignature.getData()));
}
/*
// 基层工会活动
if (one.getString("activity_type").equals("1")) {
src/main/java/io/v/nutz/zhgh/jf/controller/activitybx/ReimbursementViewCon.java
+3
View File
@@ -15,6 +15,7 @@ import io.v.nutz.zhgh.jf.service.ActivityBxService;
import io.v.nutz.sys.services.SysUnionService;
import io.v.nutz.web.commons.base.Globals;
import io.v.nutz.web.commons.utils.ShiroUtil;
import net.sf.ehcache.transaction.xa.processor.XAThreadPool;
import org.apache.shiro.authz.annotation.RequiresPermissions;
import org.nutz.boot.starter.ftp.FtpService;
import org.nutz.dao.Cnd;
@@ -29,6 +30,8 @@ import org.nutz.mvc.annotation.Ok;
import org.nutz.mvc.annotation.Param;
import javax.servlet.http.HttpServletResponse;
import javax.xml.xpath.XPath;
import javax.xml.xpath.XPathFactory;
import java.io.BufferedOutputStream;
import java.io.ByteArrayOutputStream;
import java.io.IOException;
src/main/java/io/v/nutz/zhgh/jf/controller/reimbursement/ActivityReimbursementApplyController.java
+45 -26
View File
@@ -4,7 +4,10 @@ import cn.hutool.core.date.DateUtil;
import cn.hutool.core.util.ArrayUtil;
import cn.hutool.core.util.StrUtil;
import io.v.nutz.base.annontation.ViReturn;
import io.v.nutz.sys.models.Sys_signature;
import io.v.nutz.sys.services.SysSignatureService;
import io.v.nutz.zhgh.activity.models.ActivityTissue;
import io.v.nutz.zhgh.activity.services.ActivityTissueService;
import io.v.nutz.zhgh.jf.handle.reimbursement.ReimbursementToHandler;
import io.v.nutz.zhgh.jf.model.ActivityBx;
import io.v.nutz.zhgh.jf.service.ActivityBxService;
@@ -20,6 +23,7 @@ import org.nutz.ioc.aop.Aop;
import org.nutz.ioc.loader.annotation.Inject;
import org.nutz.ioc.loader.annotation.IocBean;
import org.nutz.lang.Lang;
import org.nutz.lang.Strings;
import org.nutz.lang.util.NutMap;
import org.nutz.mvc.annotation.At;
import org.nutz.mvc.annotation.Ok;
@@ -46,6 +50,10 @@ public class ActivityReimbursementApplyController {
private Dao dao;
@Inject
private ActivityBxService activityBxService;
@Inject
private ActivityTissueService activityTissueService;
@Inject
private SysSignatureService sysSignatureService;
@At("")
@Ok("beetl:/platform/jf/reimbursement/apply.html")
@@ -58,34 +66,31 @@ public class ActivityReimbursementApplyController {
@ViReturn
@RequiresPermissions("sys.jf.reimbursement.apply")
@Aop(TransAop.READ_COMMITTED)
public Object doSave(@Param("activityBx") ActivityBx activityBx) {
List<ActivityBx.Budget> budgets = activityBx.getBudgets();
if (ArrayUtil.isNotEmpty(budgets)) {
double sum = budgets.stream().mapToDouble(ActivityBx.Budget::getActualPrice).sum();
activityBx.setActivity_money(sum);
activityBx.setReimbursement_apply_time(DateUtil.today());
public Object doSave(@Param("activityBx") ActivityBx activityBx, @Param(value = "sign", required = false) String sign) {
if (Strings.isNotBlank(sign)) {
activityBx.setUser_signature(sysSignatureService.insert(new Sys_signature(sign)).getId());
}
activityBx.setFiles(null);
activityBx.setActivity_content(null);
activityBx.setReimbursement_state_id(999);
activityBxService.updateIgnoreNull(activityBx);
this.setEntityValue(activityBx);
activityBxService.insertOrUpdate(activityBx);
return null;
}
@At
@ViReturn
@RequiresPermissions("sys.jf.reimbursement.apply")
@Aop(TransAop.READ_COMMITTED)
public Object doEdit(@Param("activityBx") ActivityBx activityBx, @Param(value = "sign", required = false) String sign) {
private void setEntityValue(ActivityBx activityBx) {
int count = activityBxService.count(Cnd.where("id", "=", activityBx.getId()));
switch (activityBx.getActivity_type()) {
case 40001 -> activityBx.setReimbursement_state_id(1020);
case 40002 -> activityBx.setReimbursement_state_id(1010);
case 40003 -> activityBx.setReimbursement_state_id(1000);
}
activityBx.setReimbursement_state_id(999);
ActivityTissue tissue = dao.fetch(ActivityTissue.class, activityBx.getActivity_id());
activityBx.setApply_time(DateUtil.now());
activityBx.setReimbursement_apply_time(DateUtil.now());
activityBx.setUser_id(ShiroUtil.getUserId());
activityBx.setYear(DateUtil.year(DateUtil.parseDate(tissue.getApplyTime())));
activityBx.setActivity_name(tissue.getName());
activityBx.setUser_name(ShiroUtil.getPlatformUsername());
activityBx.setActivity_type(tissue.getType());
activityBx.setProjectTypeCode(tissue.getProjectTypeCode());
activityBx.setMobile(tissue.getMobile());
activityBx.setProjectCode(tissue.getActivityCode());
activityBx.setActivity_content(tissue.getActivityContent());
List<ActivityBx.Budget> budgets = activityBx.getBudgets();
double sum = budgets.stream().mapToDouble(ActivityBx.Budget::getActualPrice).sum();
@@ -97,11 +102,24 @@ public class ActivityReimbursementApplyController {
if (StrUtil.isNotBlank(activityBx.getId()) && count > 0) {
activityBx.setFiles(null);
activityBx.setActivity_content(null);
activityBxService.updateIgnoreNull(activityBx);
} else {
// activityBxService.doAdd(activityBx);
}
}
@At
@ViReturn
@RequiresPermissions("sys.jf.reimbursement.apply")
@Aop(TransAop.READ_COMMITTED)
public Object doEdit(@Param("activityBx") ActivityBx activityBx, @Param(value = "sign", required = false) String sign) {
if (Strings.isNotBlank(sign)) {
activityBx.setUser_signature(sysSignatureService.insert(new Sys_signature(sign)).getId());
}
this.setEntityValue(activityBx);
switch (activityBx.getActivity_type()) {
case 40001 -> activityBx.setReimbursement_state_id(1020);
case 40002 -> activityBx.setReimbursement_state_id(1010);
case 40003 -> activityBx.setReimbursement_state_id(1000);
}
activityBxService.insertOrUpdate(activityBx);
NutMap map = new NutMap();
map.put("userId", ShiroUtil.getUserId());
//流程开始
@@ -171,6 +189,7 @@ public class ActivityReimbursementApplyController {
@ViReturn
@RequiresPermissions("sys.jf.reimbursement.apply")
public Object findOne(String id) {
return activityBxService.queryOne(id);
//return activityTissueService.findOne(id);
return activityBxService.fetch(id);
}
}
src/main/java/io/v/nutz/zhgh/jf/controller/reimbursement/ActivityReimbursementMineController.java
-2
View File
@@ -61,7 +61,6 @@ import java.util.List;
@At("/platform/jf/reimbursement/mine")
public class ActivityReimbursementMineController {
@Inject
private Vi vi;
@@ -77,7 +76,6 @@ public class ActivityReimbursementMineController {
public void index() {
}
@At
@ViReturn
@RequiresPermissions("sys.jf.reimbursement.mine")
src/main/java/io/v/nutz/zhgh/jf/controller/reimbursement/ActivityReimbursementSchoolChairmanController.java
+1 -1
View File
@@ -87,7 +87,7 @@ public class ActivityReimbursementSchoolChairmanController {
activityBxService.dao().insert(audit);
Chain chain = Chain.make("reimbursement_school_chairman_id", audit.getId());
chain.add("reimbursement_state_id", audit.getAuditPass() ? 1061 : 1045);
chain.add("reimbursement_state_id", audit.getAuditPass() ? 1060 : 1045);
activityBxService.update(chain,Cnd.where("id","=",id));
ReimbursementToHandler.COMPLETE_SCHOOL_CHAIRMAN_TASK.exec(id, NutMap.NEW().addv("nodeName",audit.getAuditPass() ? "校工会主席通过" : "校工会主席拒绝"));
src/main/java/io/v/nutz/zhgh/jf/controller/reimbursement/ActivityReimbursementStatisticsController.java
+3 -3
View File
@@ -1,5 +1,6 @@
package io.v.nutz.zhgh.jf.controller.reimbursement;
import cn.hutool.core.convert.Convert;
import cn.hutool.core.util.StrUtil;
import io.v.nutz.base.annontation.ViReturn;
import io.v.nutz.zhgh.jf.model.ActivityBx;
@@ -41,7 +42,6 @@ public class ActivityReimbursementStatisticsController {
public void index() {
}
@At
@ViReturn
@RequiresPermissions("sys.jf.reimbursement.statistics")
@@ -66,7 +66,7 @@ public class ActivityReimbursementStatisticsController {
cnd.andEX("u.unionid","=",unionId);
cnd.andEX("u.unitId","=",unitId);
cnd.andEX("act.clubId","=",clubId);
cnd.andEX("act.reimbursement_state_id","=",1061);
cnd.andEX("act.reimbursement_state_id","=",1060);
sql.setCondition(cnd);
return activityBxService.listPageMap(pageForm.getPageNumber(),pageForm.getPageSize(),sql);
}
@@ -77,7 +77,7 @@ public class ActivityReimbursementStatisticsController {
@ViReturn
@RequiresPermissions("sys.jf.reimbursement.statistics")
public Object getActivityTypeNum(Integer year){
List<ActivityBx> list = activityBxService.query(Cnd.where("`year`", "=", year).and("reimbursement_state_id","=",1061));
List<ActivityBx> list = activityBxService.query(Cnd.where("`year`", "=", year).and("reimbursement_state_id","=",1060));
Integer schoolNum = (int) list.stream().filter(v -> v.getActivity_type() == 40001).count();
Integer unionNum = (int) list.stream().filter(v -> v.getActivity_type() == 40002).count();
Integer clubNum = (int) list.stream().filter(v -> v.getActivity_type() == 40003).count();
src/main/java/io/v/nutz/zhgh/jf/service/ActivityBxService.java
+1 -1
View File
@@ -41,7 +41,7 @@ public interface ActivityBxService extends ViService<ActivityBx> {
LEFT JOIN `user` u ON act.user_id = u.id
LEFT JOIN sys_unit un ON u.unitid = un.id
LEFT JOIN state s ON act.reimbursement_state_id = s.state_id
LEFT JOIN activity_basic_settings abs ON abs.`code` = act.projectJfCode
LEFT JOIN activity_basic_settings abs ON abs.`code` = act.projectTypeCode
LEFT JOIN sys_club sc on act.clubId = sc.id
$condition
""");
src/main/resources/docTemplate/funds3.docx
BIN
View File
Binary file not shown.
src/main/resources/static/components/activityBx/ActivityBxInfo.vue
+500 -514
View File
File diff suppressed because it is too large Load Diff
src/main/resources/views/platform/jf/reimbursement/apply.html
+35 -166
View File
@@ -38,12 +38,14 @@ layout("/layouts/platform.html"){
<el-form :model="formData" ref="form" :rules="formRules" label-width="120px">
<vi-title title="请选择活动"></vi-title>
<el-row :gutter="20">
<el-col :span="12">
<el-form-item prop="id" label="活动名称">
<el-select v-model="formData.id"
<el-form-item prop="activity_id" label="活动名称">
<el-select v-model="formData.activity_id"
style="width: 100%;"
@change="activityChange(formData.id)"
filterable placeholder="请选择活动">
<el-option
v-for="item in activityOptions"
@@ -54,24 +56,21 @@ layout("/layouts/platform.html"){
</el-select>
</el-form-item>
</el-col>
<el-col :span="12">
<div style="margin-top: 10px">
<span style="color: red">选择活动后自动填充活动基本信息，选择右侧小箭头可展开或折叠</span>
</div>
<el-col :span="12" v-if="formData.activity_id != null && formData.activity_id !== ''">
<el-button @click="openView" type="primary">查看活动详细信息</el-button>
</el-col>
</el-row>
<el-row :gutter="20" v-if="formData.id != null && formData.id !== ''">
<el-row :gutter="20" v-if="formData.activity_id != null && formData.activity_id !== ''">
<el-col :span="12">
<el-form-item prop="id" label="实际参与人数">
<el-form-item prop="activity_number" label="实际参与人数">
<el-input-number v-model="formData.activity_number"
style="width: 100%"
placeholder="请输入实际参与人数"></el-input-number>
</el-form-item>
</el-col>
<el-col :span="12">
<!--<el-col :span="12">
<div style="padding: 4px 0 20px 0">
<el-button type="primary" size="small" @click="doExportActivityApply">
导出活动申请方案表
@@ -83,155 +82,13 @@ layout("/layouts/platform.html"){
@click="doExportActivitySignUpUser">导出活动参加人员
</el-button>
</div>
</el-col>
</el-col>-->
</el-row>
<el-collapse v-model="activeNames">
<el-collapse-item title="活动基本信息" name="1">
<el-row :gutter="20">
<el-col :span="12">
<el-form-item prop="user_name" label="申请人姓名">
<el-input readonly v-model="formData.user_name" type="text"></el-input>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item prop="apply_time" label="申请时间">
<el-input readonly v-model="formData.apply_time" type="text"></el-input>
</el-form-item>
</el-col>
<el-row :gutter="20" v-if="formData.activity_id != null && formData.activity_id !== ''">
<el-col :span="12">
<el-form-item prop="mobile" label="联系方式">
<el-input readonly v-model="formData.mobile" type="text"></el-input>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item prop="activity_type" label="活动主体类型">
{{ formData.activity_type == 40002 ? "分工会活动" : formData.activity_type ==
40003 ? "协会活动"
: "校工会活动"}}
</el-form-item>
</el-col>
<vi-title title="活动费用预算及报销信息表"></vi-title>
<el-col :span="12">
<el-form-item prop="projectCode" label="项目编号">
<el-input readonly v-model="formData.projectCode"></el-input>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item prop="fundsUnitName" label="申请(承办)单位"
v-if="formData.activity_type!=40003">
<el-input readonly v-model="formData.fundsUnitName" type="text"></el-input>
</el-form-item>
<el-form-item prop="clubId" label="申请协会"
v-else-if="formData.activity_type==40003">
<el-select placeholder="请选择申请协会"
disabled
style="width: 100%;" v-model="formData.clubId">
<el-option
:key="item.id"
:label="item.name+' ('+item.code+')'"
:value="item.id"
v-for="item in fundsUnitNameOption">
</el-option>
</el-select>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="活动计划时间" prop="plannedDate">
<el-date-picker
end-placeholder="结束日期"
range-separator="-"
start-placeholder="开始日期"
style="width: 100%"
disabled
type="daterange"
v-model="formData.plannedDate"
value-format="yyyy-MM-dd">
</el-date-picker>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item prop="address" label="活动地点">
<el-input v-model="formData.address" readonly type="text"></el-input>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item prop="funds_money" label="预算总费用">
<el-input-number style="width: 100%" disabled v-model="formData.funds_money"
:precision="2"></el-input-number>
</el-form-item>
</el-col>
<!--<el-col :span="12">
<el-form-item prop="payee_username" label="收款人">
<el-input v-model="formData.payee_username" readonly></el-input>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="支行名称" prop="activity_card_name">
<el-input readonly v-model="formData.activity_card_name"></el-input>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item prop="activity_card_number" label="报销卡号">
<el-input readonly v-model="formData.activity_card_number"
type="number"></el-input>
</el-form-item>
</el-col>-->
</el-row>
<!--<el-table :data="formData.goods" border size="mini" style="width: 100%">
<el-table-column sortable type="index" width="100" label="序号"
align="center" header-align="center">
</el-table-column>
<el-table-column prop="name" readonly label="物品名称" align="center"
header-align="center">
<template slot-scope="{row}">
<el-input maxlength="50" readonly placeholder="费用项目名称" v-model="row.name"
type="text"></el-input>
</template>
</el-table-column>
<el-table-column prop="budgets" label="预算费用" align="center"
header-align="center">
<template slot-scope="{row}">
<el-input maxlength="50" readonly placeholder="预算费用" v-model="row.budgets"
type="number" @input="blur"></el-input>
</template>
</el-table-column>
</el-table>-->
</el-form-item>
<el-divider content-position="left" class="dia"><span
style="color: #3ea1ec;">活动内容</span>
</el-divider>
<el-form-item prop="activity_content" class="is-required">
<text-editor v-model="formData.activity_content"></text-editor>
</el-form-item>
<el-divider content-position="left" class="dia"><span style="color: #3ea1ec;">附件</span>
</el-divider>
<el-row :gutter="40">
<el-col :span="24" class="mb25">
<el-form-item prop="files" label="附件">
<file-upload :view="true" :files.sync="formData.files" card></file-upload>
</el-form-item>
</el-col>
</el-row>
</el-collapse-item>
</el-collapse>
<el-row :gutter="20" v-if="formData.id != null && formData.id !== ''">
<el-divider content-position="left" class="dia"><span
style="color: #3ea1ec;">活动费用预算及报销信息表</span></el-divider>
<el-form-item label-width="40px">
<span style="color: red">如有收款人请填写收款人、支行名称及报销卡号；如无收款人，请在备注栏中说明报销情况</span>
<el-table :data="formData.budgets" border max-height="500" size="mini" style="width: 100%">
@@ -337,8 +194,8 @@ layout("/layouts/platform.html"){
</el-form-item>
</el-row>
<el-divider content-position="left" class="dia"><span style="color: #3ea1ec;">其他报销附件</span>
</el-divider>
<vi-title title="其他报销附件"></vi-title>
<el-row :gutter="40">
<el-col :span="12" class="mb25">
<el-form-item prop="billFiles" label="发票">
@@ -399,9 +256,8 @@ layout("/layouts/platform.html"){
</el-col>
</el-row>-->
<el-divider content-position="left" class="dia"><span
style="color: #3ea1ec;">签&emsp;&emsp;字</span>
</el-divider>
<vi-title title="签字"></vi-title>
<el-form-item label="签字" prop="sign">
<sign prefix="medicalAid" :qz.sync="formData.sign"></sign>
</el-form-item>
@@ -416,6 +272,12 @@ layout("/layouts/platform.html"){
</template>
</guava>
<el-dialog
title="活动详细信息"
:visible.sync="activityDialogVisible"
width="70%" top="2%">
<tissue-info ref="info"></tissue-info>
</el-dialog>
<!--<el-dialog
title="活动报销须知"
@@ -469,7 +331,6 @@ layout("/layouts/platform.html"){
formData: {
budgets: [{}]
},
formSign: {},
pageForm: {
searchName: "username",
year: new Date().getFullYear() + ""
@@ -484,15 +345,24 @@ layout("/layouts/platform.html"){
activeNames: [],
activityOptions: [],
dialogVisible: false,
activityDialogVisible: false,
}
},
components: {
'search': httpVueLoader('/components/activityBx/ActivityBxSearch.vue'),
'file-upload': httpVueLoader('/components/plugins/FileUpload.vue'),
'activity-bx-info': httpVueLoader('/components/activityBx/ActivityBxInfo.vue?v=' + new Date().getTime()),
'sign': httpVueLoader('/components/sign/sign.vue?v=2.0.1')
'sign': httpVueLoader('/components/sign/sign.vue?v=2.0.1'),
'tissue-info': httpVueLoader('/components/activity/school/tissueInfo.vue'),
},
methods: {
openView() {
this.activityDialogVisible = true
this.$nextTick(() => {
this.$refs.info.getInfo(this.formData.activity_id)
})
},
async remoteMethod(query) {
if (query) {
this.selectLoading = true;
@@ -568,7 +438,7 @@ layout("/layouts/platform.html"){
}
},
doSave() {
if (!this.formData.id) {
if (!this.formData.activity_id) {
this.$message.warning("请选择活动后才能保存")
}
// 确定要保存吗？保存后可在【我的报销】页面选中设置按钮的【编辑】按钮进行修改或提交
@@ -663,10 +533,9 @@ layout("/layouts/platform.html"){
await this.getActivityReimbursementByUser()
const id = GetQueryString('id')
if (id != null && id !== '') {
this.formData.id = id
//this.formData.id = id
await this.activityChange(id);
}
this.dialogVisible = true
await this.getUserClub();
}
})
src/main/resources/views/platform/jf/reimbursement/clubChairman.html
+1 -2
View File
@@ -106,7 +106,7 @@ layout("/layouts/platform.html"){
<el-table-column align="center" header-align="center" label="操作" fixed="right"
width="220px">
<template slot-scope="scope">
<el-button @click="openView(scope.row)" size="mini">查看</el-button>
<el-button @click="openView(scope.row)" size="mini" type="primary">查看</el-button>
<el-button @click="openAudit(scope.row.id)"
v-if="scope.row.reimbursement_state_id == 1000"
size="mini" type="primary">审核</el-button>
@@ -123,7 +123,6 @@ layout("/layouts/platform.html"){
<el-form :model="formData" ref="auditForm" :rules="formRules" label-position="right"
style="padding: 20px 0"
label-width="120px">
<el-form-item label="审核信息&emsp;" label-width="135px" class="view-header"></el-form-item>
<el-row gutter="20">
<el-col :span="12">
src/main/resources/views/platform/jf/reimbursement/mine.html
+2 -2
View File
@@ -145,9 +145,9 @@ layout("/layouts/platform.html"){
:command="{type:'delete',data:row}">
删除
</el-dropdown-item>
<el-dropdown-item :command="{type:'exportWwj',data:row,apply_type:1}">
<!--<el-dropdown-item :command="{type:'exportWwj',data:row,apply_type:1}">
导出申请方案表
</el-dropdown-item>
</el-dropdown-item>-->
<el-dropdown-item :command="{type:'exportWwj',data:row,apply_type:2}">
导出活动报销凭证
</el-dropdown-item>
src/main/resources/views/platform/jf/reimbursement/schoolChairman.html
+1 -2
View File
@@ -128,7 +128,7 @@ layout("/layouts/platform.html"){
<el-table-column align="center" header-align="center" label="操作" fixed="right"
width="220px">
<template slot-scope="scope">
<el-button @click="openView(scope.row)" size="mini">查看</el-button>
<el-button @click="openView(scope.row)" size="mini" type="primary">查看</el-button>
<el-button @click="openAudit(scope.row.id)" size="mini"
v-if="scope.row.reimbursement_state_id == 1040"
type="primary">审核</el-button>
@@ -145,7 +145,6 @@ layout("/layouts/platform.html"){
<el-form :model="formData" ref="auditForm" :rules="formRules" label-position="right"
style="padding: 20px 0"
label-width="120px">
<el-form-item label="审核信息&emsp;" label-width="135px" class="view-header"></el-form-item>
<el-row gutter="20">
<el-col :span="12">
src/main/resources/views/platform/jf/reimbursement/schoolDirector.html
+1 -2
View File
@@ -128,7 +128,7 @@ layout("/layouts/platform.html"){
<el-table-column align="center" header-align="center" label="操作" fixed="right"
width="220px">
<template slot-scope="scope">
<el-button @click="openView(scope.row)" size="mini">查看</el-button>
<el-button @click="openView(scope.row)" size="mini" type="primary">查看</el-button>
<el-button @click="openAudit(scope.row.id)" size="mini"
v-if="scope.row.reimbursement_state_id == 1020"
type="primary">审核</el-button>
@@ -145,7 +145,6 @@ layout("/layouts/platform.html"){
<el-form :model="formData" ref="auditForm" :rules="formRules" label-position="right"
style="padding: 20px 0"
label-width="120px">
<el-form-item label="审核信息&emsp;" label-width="135px" class="view-header"></el-form-item>
<el-row gutter="20">
<el-col :span="12">
src/main/resources/views/platform/jf/reimbursement/statistics.html
+2 -2
View File
@@ -134,9 +134,9 @@ layout("/layouts/platform.html"){
<el-dropdown-item :command="{type:'view',data:row}">
查看
</el-dropdown-item>
<el-dropdown-item :command="{type:'exportWwj',data:row,apply_type:1}">
<!--<el-dropdown-item :command="{type:'exportWwj',data:row,apply_type:1}">
导出申请方案表
</el-dropdown-item>
</el-dropdown-item>-->
<el-dropdown-item :command="{type:'exportWwj',data:row,apply_type:2}">
导出活动报销凭证
</el-dropdown-item>
src/main/resources/views/platform/jf/reimbursement/unionChairman.html
+1 -2
View File
@@ -113,7 +113,7 @@ layout("/layouts/platform.html"){
<el-table-column align="center" header-align="center" label="操作" fixed="right"
width="220px">
<template slot-scope="scope">
<el-button @click="openView(scope.row)" size="mini">查看</el-button>
<el-button @click="openView(scope.row)" size="mini" type="primary">查看</el-button>
<el-button @click="openAudit(scope.row.id)"
v-if="scope.row.reimbursement_state_id == 1010"
size="mini" type="primary">审核</el-button>
@@ -130,7 +130,6 @@ layout("/layouts/platform.html"){
<el-form :model="formData" ref="auditForm" :rules="formRules" label-position="right"
style="padding: 20px 0"
label-width="120px">
<el-form-item label="审核信息&emsp;" label-width="135px" class="view-header"></el-form-item>
<el-row gutter="20">
<el-col :span="12">