diff --git a/src/main/webapp/WEB-INF/cfgHome/plugin/src_leasebill/pluginCfg.xml b/seeyon/WEB-INF/cfgHome/plugin/src_leasebill/pluginCfg.xml
similarity index 100%
rename from src/main/webapp/WEB-INF/cfgHome/plugin/src_leasebill/pluginCfg.xml
rename to seeyon/WEB-INF/cfgHome/plugin/src_leasebill/pluginCfg.xml
diff --git a/src/main/webapp/WEB-INF/cfgHome/plugin/src_leasebill/spring/spring-controller.xml b/seeyon/WEB-INF/cfgHome/plugin/src_leasebill/spring/spring-controller.xml
similarity index 100%
rename from src/main/webapp/WEB-INF/cfgHome/plugin/src_leasebill/spring/spring-controller.xml
rename to seeyon/WEB-INF/cfgHome/plugin/src_leasebill/spring/spring-controller.xml
diff --git a/src/main/webapp/WEB-INF/cfgHome/plugin/src_leasebill/spring/spring-dao.xml b/seeyon/WEB-INF/cfgHome/plugin/src_leasebill/spring/spring-dao.xml
similarity index 100%
rename from src/main/webapp/WEB-INF/cfgHome/plugin/src_leasebill/spring/spring-dao.xml
rename to seeyon/WEB-INF/cfgHome/plugin/src_leasebill/spring/spring-dao.xml
diff --git a/src/main/webapp/WEB-INF/cfgHome/plugin/src_leasebill/spring/spring-fieldCtrl.xml b/seeyon/WEB-INF/cfgHome/plugin/src_leasebill/spring/spring-fieldCtrl.xml
similarity index 100%
rename from src/main/webapp/WEB-INF/cfgHome/plugin/src_leasebill/spring/spring-fieldCtrl.xml
rename to seeyon/WEB-INF/cfgHome/plugin/src_leasebill/spring/spring-fieldCtrl.xml
diff --git a/src/main/webapp/WEB-INF/cfgHome/plugin/src_leasebill/spring/spring-financing.xml b/seeyon/WEB-INF/cfgHome/plugin/src_leasebill/spring/spring-financing.xml
similarity index 100%
rename from src/main/webapp/WEB-INF/cfgHome/plugin/src_leasebill/spring/spring-financing.xml
rename to seeyon/WEB-INF/cfgHome/plugin/src_leasebill/spring/spring-financing.xml
diff --git a/src/main/webapp/apps_res/cap/customCtrlResources/leaseBillResources/css/formQueryBtn.css b/seeyon/apps_res/cap/customCtrlResources/leaseBillResources/css/formQueryBtn.css
similarity index 100%
rename from src/main/webapp/apps_res/cap/customCtrlResources/leaseBillResources/css/formQueryBtn.css
rename to seeyon/apps_res/cap/customCtrlResources/leaseBillResources/css/formQueryBtn.css
diff --git a/src/main/webapp/apps_res/cap/customCtrlResources/leaseBillResources/css/img/icon16.png b/seeyon/apps_res/cap/customCtrlResources/leaseBillResources/css/img/icon16.png
similarity index 100%
rename from src/main/webapp/apps_res/cap/customCtrlResources/leaseBillResources/css/img/icon16.png
rename to seeyon/apps_res/cap/customCtrlResources/leaseBillResources/css/img/icon16.png
diff --git a/src/main/webapp/apps_res/cap/customCtrlResources/leaseBillResources/css/setCondition.css b/seeyon/apps_res/cap/customCtrlResources/leaseBillResources/css/setCondition.css
similarity index 100%
rename from src/main/webapp/apps_res/cap/customCtrlResources/leaseBillResources/css/setCondition.css
rename to seeyon/apps_res/cap/customCtrlResources/leaseBillResources/css/setCondition.css
diff --git a/src/main/webapp/apps_res/cap/customCtrlResources/leaseBillResources/css/setTemplate.css b/seeyon/apps_res/cap/customCtrlResources/leaseBillResources/css/setTemplate.css
similarity index 100%
rename from src/main/webapp/apps_res/cap/customCtrlResources/leaseBillResources/css/setTemplate.css
rename to seeyon/apps_res/cap/customCtrlResources/leaseBillResources/css/setTemplate.css
diff --git a/src/main/webapp/apps_res/cap/customCtrlResources/leaseBillResources/html/setTemplate.html b/seeyon/apps_res/cap/customCtrlResources/leaseBillResources/html/setTemplate.html
similarity index 100%
rename from src/main/webapp/apps_res/cap/customCtrlResources/leaseBillResources/html/setTemplate.html
rename to seeyon/apps_res/cap/customCtrlResources/leaseBillResources/html/setTemplate.html
diff --git a/src/main/webapp/apps_res/cap/customCtrlResources/leaseBillResources/js/LodopFuncs.js b/seeyon/apps_res/cap/customCtrlResources/leaseBillResources/js/LodopFuncs.js
similarity index 100%
rename from src/main/webapp/apps_res/cap/customCtrlResources/leaseBillResources/js/LodopFuncs.js
rename to seeyon/apps_res/cap/customCtrlResources/leaseBillResources/js/LodopFuncs.js
diff --git a/src/main/webapp/apps_res/cap/customCtrlResources/leaseBillResources/js/openUnflow.js b/seeyon/apps_res/cap/customCtrlResources/leaseBillResources/js/openUnflow.js
similarity index 97%
rename from src/main/webapp/apps_res/cap/customCtrlResources/leaseBillResources/js/openUnflow.js
rename to seeyon/apps_res/cap/customCtrlResources/leaseBillResources/js/openUnflow.js
index f4de38c..db36727 100644
--- a/src/main/webapp/apps_res/cap/customCtrlResources/leaseBillResources/js/openUnflow.js
+++ b/seeyon/apps_res/cap/customCtrlResources/leaseBillResources/js/openUnflow.js
@@ -140,8 +140,8 @@
 					return;
 				}
 
-				// 当缴费方式为年缴费时年缴费类型必填
-				if (jiaofeifs == '年') {
+				// 当缴费方式为年缴费时年缴费类型必填（前缀匹配：年、年缴、年付等）
+				if (jiaofeifs && jiaofeifs.indexOf('年') === 0) {
 					if (isEmpty(njiaofeifs)) {
 						$.alert("请选择年缴费方式选项");
 						return;
diff --git a/src/main/webapp/apps_res/cap/customCtrlResources/leaseBillResources/js/openUnflow.js.bak b/seeyon/apps_res/cap/customCtrlResources/leaseBillResources/js/openUnflow.js.bak
similarity index 100%
rename from src/main/webapp/apps_res/cap/customCtrlResources/leaseBillResources/js/openUnflow.js.bak
rename to seeyon/apps_res/cap/customCtrlResources/leaseBillResources/js/openUnflow.js.bak
diff --git a/src/main/webapp/apps_res/cap/customCtrlResources/leaseBillResources/js/setTemplate.js b/seeyon/apps_res/cap/customCtrlResources/leaseBillResources/js/setTemplate.js
similarity index 100%
rename from src/main/webapp/apps_res/cap/customCtrlResources/leaseBillResources/js/setTemplate.js
rename to seeyon/apps_res/cap/customCtrlResources/leaseBillResources/js/setTemplate.js
diff --git a/src/main/java/com/seeyon/apps/src_leasebill/util/LeaseBillUtil.java b/src/main/java/com/seeyon/apps/src_leasebill/util/LeaseBillUtil.java
index 48b75df..2c089ed 100644
--- a/src/main/java/com/seeyon/apps/src_leasebill/util/LeaseBillUtil.java
+++ b/src/main/java/com/seeyon/apps/src_leasebill/util/LeaseBillUtil.java
@@ -269,7 +269,7 @@ public class LeaseBillUtil {
      */
     private String calculateRent(int months, JSONObject params, String chargeType) {
         BigDecimal rent = BigDecimal.ZERO;
-        boolean isAreaCharge = "面积计费".equals(chargeType);
+        boolean isAreaCharge = "面积计费".equals(chargeType) || "面积计租".equals(chargeType);
         boolean isFixedRent = "固定租金".equals(chargeType);
 
         if (isAreaCharge) {
@@ -280,6 +280,8 @@ public class LeaseBillUtil {
         } else if (isFixedRent) {
             // 固定租金：直接取固定金额
             rent = parseBigDecimal(params.getString("gdzj"));
+        }else {
+            throw new RuntimeException("未匹配到正确的计费方式");
         }
 
         // 固定租金不乘月数，其他计费方式 × 月数