From ac624a2fd8737e84a3aacdcc48cdf09ce98e6e91 Mon Sep 17 00:00:00 2001 From: yulin <240160934@qq.com> Date: Tue, 9 Jan 2024 10:18:15 +0800 Subject: [PATCH] =?UTF-8?q?=E5=B8=A6=E5=87=BA=E4=B8=8A=E6=9C=9F=E6=95=B0?= =?UTF-8?q?=E6=8D=AE=20=E6=98=BE=E7=A4=BA=E9=97=AE=E9=A2=98=EF=BC=8C?= =?UTF-8?q?=E9=A1=B5=E9=9D=A2=E5=BE=AE=E8=B0=83?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../biz/mztb/web/base/partyDataFill/PartyDataFillHandler.java | 9 +++++++-- .../static/event/mztb/base/partyDataFill/partyDataFillList.js | 2 +- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/mztb/src/main/java/cc/smtweb/biz/mztb/web/base/partyDataFill/PartyDataFillHandler.java b/mztb/src/main/java/cc/smtweb/biz/mztb/web/base/partyDataFill/PartyDataFillHandler.java index 33e1652..bc093d6 100644 --- a/mztb/src/main/java/cc/smtweb/biz/mztb/web/base/partyDataFill/PartyDataFillHandler.java +++ b/mztb/src/main/java/cc/smtweb/biz/mztb/web/base/partyDataFill/PartyDataFillHandler.java @@ -94,8 +94,8 @@ public class PartyDataFillHandler { // bean.setUpdateAt(DateUtil.nowDateLong()); DbEngine instance = DbEngine.getInstance(); // bean.setUser(us.getUserId()); - if(params.readString("outOldData").equals("1")) { // 如果带出上期数据 就不执行初始化 - // 通过填报类型 找到最近填报的一条数据， + if(params.readString("outOldData").equals("1")) { // 如果带出上期数据,并且能找到最近的数据 就不执行初始化 + // 通过填报类型 找到当前机构最近填报的一条数据， int state = params.readInt("type") == 1 ? 1 : 2; String foIdStr = instance.queryString("select fo_id from " + EntityHelper.getSchemaTableName(FillOut.ENTITY_NAME) @@ -115,6 +115,11 @@ public class PartyDataFillHandler { financeInfo.setFoId(bean.getId()); businessInfo = addViewBean(retMap,BUSINESS_DS_NAME,new BusinessInfo(), foId," bi_fo_id = ? "); businessInfo.setFoId(bean.getId()); + // 页面下拉字段转换 + businessInfo.getData().put("bi_type_text",DictsCache.getInstance().getItemName("tbBusinessType",businessInfo.getType())); + businessInfo.getData().put("bi_property_text",DictsCache.getInstance().getItemName("tbNature",businessInfo.getProperty())); + businessInfo.getData().put("bi_initiate_text",DictsCache.getInstance().getItemName("tbSubject",businessInfo.getInitiate())); + businessInfo.getData().put("bi_execute_regimen_text",DictsCache.getInstance().getItemName("tbKJZD",businessInfo.getExecuteRegimen())); return; } initPageDateset(); diff --git a/mztb/src/main/resources/static/event/mztb/base/partyDataFill/partyDataFillList.js b/mztb/src/main/resources/static/event/mztb/base/partyDataFill/partyDataFillList.js index 6097c79..60e113b 100644 --- a/mztb/src/main/resources/static/event/mztb/base/partyDataFill/partyDataFillList.js +++ b/mztb/src/main/resources/static/event/mztb/base/partyDataFill/partyDataFillList.js @@ -26,7 +26,7 @@ window.$swEvent.setup("mztb.base.partyDataFill.partyDataFillList", { $$message.notify.warning("请选择任务") return false } - $api.closeDialog("tb") + $api.closeDialog("tb_dialog") $api.toPage("mztb.partyDataFillCard",{ $fromAction: 'button:add' ,task:$model.ds_1.data.form.task