diff --git a/com.actionsoft.apps.coe.pal/lib/com.actionsoft.apps.coe.pal.jar b/com.actionsoft.apps.coe.pal/lib/com.actionsoft.apps.coe.pal.jar index 939de17c..9c7b24d8 100644 Binary files a/com.actionsoft.apps.coe.pal/lib/com.actionsoft.apps.coe.pal.jar and b/com.actionsoft.apps.coe.pal/lib/com.actionsoft.apps.coe.pal.jar differ diff --git a/com.actionsoft.apps.coe.pal/src/com/actionsoft/apps/coe/pal/pal/repository/web/CoeProcessLevelWeb.java b/com.actionsoft.apps.coe.pal/src/com/actionsoft/apps/coe/pal/pal/repository/web/CoeProcessLevelWeb.java index 4d395ae5..da1404fb 100755 --- a/com.actionsoft.apps.coe.pal/src/com/actionsoft/apps/coe/pal/pal/repository/web/CoeProcessLevelWeb.java +++ b/com.actionsoft.apps.coe.pal/src/com/actionsoft/apps/coe/pal/pal/repository/web/CoeProcessLevelWeb.java @@ -9002,7 +9002,12 @@ public class CoeProcessLevelWeb extends ActionWeb { Boolean flag2=true; StringBuilder sb = new StringBuilder(); StringBuffer sb1=new StringBuffer(); + StringBuffer sb2=new StringBuffer(); + StringBuffer sb3=new StringBuffer(); sb.append("质量校验
"); + sb1.append("文件属性:"); + sb2.append("节点名称:"); + for (PALRepositoryPropertyModel property : propertys) { String id = property.getPropertyId(); if (!attributeModelMap.containsKey(id) || !attributeModelMap.get(id).getUse()) { @@ -9019,17 +9024,20 @@ public class CoeProcessLevelWeb extends ActionWeb { if (list == null || list.isEmpty()) { flag1 = false; } - } else { + } /*else { flag1 = UtilString.isNotEmpty(property.getPropertyValue()); - } + }*/ if (!flag1) {// 校验不通过 - sb.append("''"+attributeModel.getTitle()+"''").append(","); + sb1.append("''"+attributeModel.getTitle()+"''").append(","); flag1 = false; } } /***************************************************数据属性校验*************************************************/ - + if(flag1==false){ + sb.append(sb1.substring(0, sb1.length()-1)); + sb.append("未填写,请检查!").append("
"); + } Map methodAttributeModelMap = new HashMap<>(); // 校验形状 @@ -9065,23 +9073,23 @@ public class CoeProcessLevelWeb extends ActionWeb { if (list == null || list.isEmpty()) { flag2 = false; } - } else { + } /*else { flag2 = UtilString.isNotEmpty(value); - } + }*/ if (!flag2) { - sb.append("''"+attrModel.getNewTitle()+"''").append(","); + sb2.append("【"+o.get("text")+"】"+"''"+attrModel.getNewTitle()+"''").append(","); } } } } - if(flag1==false || flag2==false){ - sb1.append(sb.substring(0, sb.length()-1)); - sb1.append("未填写,请检查!"); + if( flag2==false){ + sb.append(sb2.substring(0, sb2.length()-1)); + sb.append("未填写,请检查!"); } - int index=sb1.indexOf("未填写"); + int index=sb.indexOf("未填写"); if(index==-1 ){ ro.put("result","ok"); }else{ @@ -9089,7 +9097,7 @@ public class CoeProcessLevelWeb extends ActionWeb { } - ro.put("sb",sb1); + ro.put("sb",sb); return ro.toString(); } diff --git a/com.actionsoft.apps.coe.pal/web/com.actionsoft.apps.coe.pal/js/coe.pal.designer.shapes.js b/com.actionsoft.apps.coe.pal/web/com.actionsoft.apps.coe.pal/js/coe.pal.designer.shapes.js index f0a5823d..a25c47e3 100755 --- a/com.actionsoft.apps.coe.pal/web/com.actionsoft.apps.coe.pal/js/coe.pal.designer.shapes.js +++ b/com.actionsoft.apps.coe.pal/web/com.actionsoft.apps.coe.pal/js/coe.pal.designer.shapes.js @@ -433,7 +433,7 @@ function writeRelationListHtml() { relationShapeText = relationShapeText.replace("<", "<").replace(">", ">").replace("\"", """); html += "
  • " + "
    " - + "
    " + relationShapeText + "
    " + + "
    " + relationShapeText + "
    " + " " + "
    " + "
  • "; diff --git a/com.actionsoft.apps.coe.pal/web/com.actionsoft.apps.coe.pal/js/coe.team.pal.designer.js b/com.actionsoft.apps.coe.pal/web/com.actionsoft.apps.coe.pal/js/coe.team.pal.designer.js index d7e0aa4c..46fbfc02 100644 --- a/com.actionsoft.apps.coe.pal/web/com.actionsoft.apps.coe.pal/js/coe.team.pal.designer.js +++ b/com.actionsoft.apps.coe.pal/web/com.actionsoft.apps.coe.pal/js/coe.team.pal.designer.js @@ -219,7 +219,6 @@ $(function() { */ $("#QualityInspection").off("click").on("click", function () { $.simpleAlert("正在校验", "loading"); - debugger; var obj=Model.define; $.ajax({ type : "POST",