Pre Merge pull request !233 from reset/feature/cl

src/com/engine/organization/service/impl/GradeServiceImpl.java

@@ -128,7 +128,7 @@ public class GradeServiceImpl extends Service implements GradeService {
         gradeNameCondition.setRules("required|string");
         SearchConditionItem gradeNoCondition = OrganizationFormItemUtil.inputItem(user, 2, 17, 3, 50, "编号", "gradeNo");
         gradeNoCondition.setRules("required|string");
-        SearchConditionItem descriptionCondition = OrganizationFormItemUtil.textareaItem(user, 2, 17, true, 2, 60, "描述说明", "description");
+        SearchConditionItem descriptionCondition = OrganizationFormItemUtil.textareaItem(user, 2, 17, true, 2, 200, "描述说明", "description");
         SearchConditionItem schemeBrowserItem = OrganizationFormItemUtil.browserItem(user, 2, 17, 3, false, "等级方案", "161", "schemeId", "schemeBrowser");
         schemeBrowserItem.setRules("required|string");
         BrowserBean schemeBrowserBean = schemeBrowserItem.getBrowserConditionParam();

src/com/engine/organization/service/impl/LevelServiceImpl.java

@@ -125,7 +125,7 @@ public class LevelServiceImpl extends Service implements LevelService {
         levelNameCondition.setRules("required|string");
         SearchConditionItem levelNoCondition = OrganizationFormItemUtil.inputItem(user, 2, 17, 3, 50, "编号", "levelNo");
         levelNoCondition.setRules("required|string");
-        SearchConditionItem descriptionCondition = OrganizationFormItemUtil.textareaItem(user, 2, 17, true, 2, 60, "描述说明", "description");
+        SearchConditionItem descriptionCondition = OrganizationFormItemUtil.textareaItem(user, 2, 17, true, 2, 200, "描述说明", "description");
         SearchConditionItem browserItem = OrganizationFormItemUtil.browserItem(user, 2, 17, 3, false, "等级方案", "161", "schemeId", "schemeBrowser");
         BrowserBean browserBean = browserItem.getBrowserConditionParam();
         if (StringUtils.isNotBlank(schemeId) && !"-1".equals(schemeId) && StringUtil.isEmpty(id)) {

src/com/engine/organization/service/impl/PostInfoServiceImpl.java

@@ -137,7 +137,7 @@ public class PostInfoServiceImpl extends Service implements PostInfoService {
         SearchConditionItem postIdBrowser = OrganizationFormItemUtil.browserItem(user, 2, 17, 3, false, "职务分类", "161", "postId", "postBrowser");
         postIdBrowser.setRules("required|string");
         // 说明
-        SearchConditionItem descriptionItem = OrganizationFormItemUtil.textareaItem(user, 2, 17, true, 2, 60, "描述说明", "description");
+        SearchConditionItem descriptionItem = OrganizationFormItemUtil.textareaItem(user, 2, 17, true, 2, 200, "描述说明", "description");
 
         // 编辑状态下赋值操作
         String id = Util.null2String(params.get("id"));

src/com/engine/organization/service/impl/PostServiceImpl.java

@@ -60,7 +60,7 @@ public class PostServiceImpl extends Service implements PostService {
         List<SearchConditionGroup> addGroups = new ArrayList<>();
         SearchConditionItem postNameItem = OrganizationFormItemUtil.inputItem(user, 2, 17, 3, 50, "名称", "postName");
         postNameItem.setRules("required|string");
-        SearchConditionItem descriptionItem = OrganizationFormItemUtil.textareaItem(user, 2, 17, true, 2, 60, "描述说明", "description");
+        SearchConditionItem descriptionItem = OrganizationFormItemUtil.textareaItem(user, 2, 17, true, 2, 200, "描述说明", "description");
 
         // 编辑状态下赋值操作
         String id = Util.null2String(params.get("id"));

src/com/engine/organization/service/impl/SchemeServiceImpl.java

@@ -122,7 +122,7 @@ public class SchemeServiceImpl extends Service implements SchemeService {
         schemeNameCondition.setRules("required|string");
         SearchConditionItem schemeNoCondition = OrganizationFormItemUtil.inputItem(user, 2, 17, 3, 50, "方案编号", "schemeNo");
         schemeNoCondition.setRules("required|string");
-        SearchConditionItem textareaItem = OrganizationFormItemUtil.textareaItem(user, 2, 17, true, 2, 60, "方案说明", "schemeDescription");
+        SearchConditionItem textareaItem = OrganizationFormItemUtil.textareaItem(user, 2, 17, true, 2, 200, "方案说明", "schemeDescription");
 
         // 编辑状态下赋值操作
         String id = Util.null2String(params.get("id"));

src/com/engine/organization/service/impl/SequenceServiceImpl.java

@@ -126,7 +126,7 @@ public class SequenceServiceImpl extends Service implements SequenceService {
         sequenceNameCondition.setRules("required|string");
         SearchConditionItem sequenceNoCondition = OrganizationFormItemUtil.inputItem(user, 2, 17, 3, 50, "编号", "sequenceNo");
         sequenceNoCondition.setRules("required|string");
-        SearchConditionItem descriptionCondition = OrganizationFormItemUtil.textareaItem(user, 2, 17, true, 2, 60, "描述说明", "description");
+        SearchConditionItem descriptionCondition = OrganizationFormItemUtil.textareaItem(user, 2, 17, true, 2, 200, "描述说明", "description");
         SearchConditionItem browserItem = OrganizationFormItemUtil.browserItem(user, 2, 17, 3, false, "等级方案", "161", "schemeId", "schemeBrowser");
         browserItem.setRules("required|string");
 

src/com/engine/organization/service/impl/StaffServiceImpl.java

@@ -281,6 +281,7 @@ public class StaffServiceImpl extends Service implements StaffService {
                 item.setRules(null);
             });
             SearchConditionItem changeNumItem = OrganizationFormItemUtil.inputNumberItem(user, 2, 16, 3, "调整数量", "changeNum");
+            changeNumItem.setHelpfulTip("提示:正数为增加，负数为减少编制数");
             staffNumItem.setRules("required");
             selectItems.add(changeNumItem);
             SearchConditionItem changeDescriptionItem = OrganizationFormItemUtil.textareaItem(user, 2, 16, false, 2, 50, "变更说明", "changeDescription");