提交文件

# Conflicts:
#	v5/apps-customize/src/main/java/com/seeyon/apps/src_leasebill/controller/LeaseBillController.java
#	v5/apps-customize/src/main/java/com/seeyon/apps/src_leasebill/dao/impl/LeaseBillDaoImpl.java
#	v5/apps-customize/src/main/java/com/seeyon/apps/src_leasebill/util/LeaseBillUtil.java

.idea/.gitignore

@@ -0,0 +1,5 @@
+# Default ignored files
+/shelf/
+/workspace.xml
+# Environment-dependent path to Maven home directory
+/mavenHomeManager.xml

src/main/java/com/seeyon/apps/src_leasebill/config/FieldDisplayNameQueryService.java

@@ -0,0 +1,18 @@
+package com.seeyon.apps.src_leasebill.config;
+
+import com.seeyon.aicloud.common.JsonUtils;
+import com.seeyon.apps.src_leasebill.constant.LeaseBillConstant;
+import com.seeyon.ctp.common.AppContext;
+
+import java.util.Map;
+
+public class FieldDisplayNameQueryService {
+
+    private LeaseBillConfigProvider configProvider = (LeaseBillConfigProvider) AppContext.getBean("leaseBillConfigProvider");
+
+    public String getDisplayName(String fieldName) {
+        String jsonStr = configProvider.getBizConfigByKey(LeaseBillConstant.fieldDisplayMap);
+        Map<String,String> map = (Map<String,String>)JsonUtils.parseObject(jsonStr, Map.class);
+        return map.get(fieldName);
+    }
+}

src/main/java/com/seeyon/apps/src_leasebill/controller/LeaseBillController.java

@@ -258,4 +258,4 @@ public class LeaseBillController extends BaseController {
     public String getPluginId() {
         return LeaseBillConstant.getPluginId();
     }
-}
+}

src/main/webapp/apps_res/cap/customCtrlResources/leaseBillResources/js/openUnflow.js

@@ -81,19 +81,19 @@
 									if(targetObj[key].display === "年缴费方案选项") {
 										njiaofeifs = targetObj[key].showValue
 									}
-									if(targetObj[key].display === "实租单价") {
+									if(targetObj[key].display === "租赁单价") {
 										mjzj = targetObj[key].showValue
 									}
 									if(targetObj[key].display === "固定租金标准") {
 										gdzj = targetObj[key].showValue
 									}
-									if(targetObj[key].display === "计租开始日期") {
+									if(targetObj[key].display === "计租日期") {
 										startDate = targetObj[key].showValue
 									}
 									if(targetObj[key].display === "合同截止日期") {
 										endDate = targetObj[key].showValue
 									}
-									if(targetObj[key].display === "租赁总面积") {
+									if(targetObj[key].display === "租赁面积") {
 										mj = targetObj[key].showValue
 									}
 									if(targetObj[key].display === "账单编号") {