带出上期数据 显示问题，页面微调

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();

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