diff --git a/com.actionsoft.apps.coe.pal/template/page/pal.pl.repository.designer.view.portal.html b/com.actionsoft.apps.coe.pal/template/page/pal.pl.repository.designer.view.portal.html index b2f19256..7a451731 100755 --- a/com.actionsoft.apps.coe.pal/template/page/pal.pl.repository.designer.view.portal.html +++ b/com.actionsoft.apps.coe.pal/template/page/pal.pl.repository.designer.view.portal.html @@ -813,8 +813,9 @@ #designer_layout{background: none!important;margin:10px!important;} .awsui-table-bordered td{border:0!important;} .awsui-table-bordered{border:0!important;line-height: 20px;} - .tableContent{float:left; width:38%;padding:5px 0!important; } - .tableright{width:59%;padding-left:2%!important;} + .tableContent{padding:5px 0!important; } + .tableleft{float:left; width:38%;} + .tableright{width:59%;padding-left:2%!important; float: left} #designer_canvas{background: none!important;} .task-box { border: 1px solid #f1f5f7;border-top:2px solid #f1f5f7; padding: 10px; @@ -843,7 +844,6 @@ .suofang{height:40px;background-color:white;border-top:1px solid #efefef;vertical-align:middle;position: relative;border-bottom-left-radius: 10px;border-bottom-right-radius: 10px;} .processfiledown li{line-height: 20px;} .awsui-table td{border:0!important;} - /********样式***********/ .borderbottom{border-bottom:1px dashed #999b9f!important; display: -webkit-box; @@ -867,6 +867,7 @@ align-items: center;/*新版本*/ } + .iconTabClass{ float: left;display: block; width: 18px; height: 18px; background:url("iconnew.png") no-repeat; background-size: 100%;} #ProcessManual{ @@ -1016,7 +1017,6 @@
相关/支持文件
-
diff --git a/com.actionsoft.apps.coe.pal/web/com.actionsoft.apps.coe.pal/lib/designer/extend/js/designer.extend.link.view.portal.js b/com.actionsoft.apps.coe.pal/web/com.actionsoft.apps.coe.pal/lib/designer/extend/js/designer.extend.link.view.portal.js index 7d43ae5e..a1574f3e 100755 --- a/com.actionsoft.apps.coe.pal/web/com.actionsoft.apps.coe.pal/lib/designer/extend/js/designer.extend.link.view.portal.js +++ b/com.actionsoft.apps.coe.pal/web/com.actionsoft.apps.coe.pal/lib/designer/extend/js/designer.extend.link.view.portal.js @@ -299,7 +299,7 @@ function getPrivateAttributeHtml(attributesJsonArray, tbodyId, shape) { } var constr = ''; /*constr += '' + obj.name + '';*/ - constr += '' + obj.name + ':' + obj.value + ''; + constr += '' + obj.name + ': ' +obj.value+ ''; constr += ''; if ((!obj.readonly && obj.type == "string") || (!obj.readonly && obj.type == "list")) { @@ -312,7 +312,7 @@ function getPrivateAttributeHtml(attributesJsonArray, tbodyId, shape) { constr = ''; /*constr += '' + obj.name + '';*/ // constr += '' + obj.value + ''; - constr += '' + '【' + obj.name + '】'+' '+ '' + obj.value + '' + ''; + constr += '' + '【' + obj.name + '】'+' ' + '' + obj.value + '' + ''; constr += ''; } else if (!obj.readonly && obj.type == "number") { constr = ''; @@ -322,7 +322,7 @@ function getPrivateAttributeHtml(attributesJsonArray, tbodyId, shape) { } else if (!obj.readonly && obj.type == "boolean") { constr = ''; /*constr += '' + obj.name + '';*/ - constr += '' + '【' + obj.name + '】'+' '+ ''; + constr += '' + '【' + obj.name + '】'+' '+''; constr += ''; } else if (!obj.readonly && obj.type == "textarea") { constr = ''; @@ -330,7 +330,7 @@ function getPrivateAttributeHtml(attributesJsonArray, tbodyId, shape) { if (obj.value == undefined) { obj.value = ''; } - constr += '' + '【' + obj.name + '】'+' '+ obj.value.replace(/\n/g, '
') + ''; + constr += '' + '【' + obj.name + '】'+' '+ obj.value.replace(/\n/g, '
') +''; constr += ''; } else if (obj.readonly && obj.type == "relation") { var relationValue = ""; @@ -339,12 +339,12 @@ function getPrivateAttributeHtml(attributesJsonArray, tbodyId, shape) { } constr = ''; /*constr += '' + obj.name + '';*/ - constr += '' + '【' + obj.name + '】'+' '+ relationValue + ''; + constr += '' + '【' + obj.name + '】'+' '+ relationValue +''; constr += ''; } else if (obj.type == "select" || obj.type == "select_m") { constr = ''; /*constr += '' + obj.name + '';*/ - constr += '' + '【' + obj.name + '】'+' '+ obj.value + ''; + constr += '' + '【' + obj.name + '】'+ ' '+ obj.value +''; constr += ''; selectFlag = true; @@ -363,7 +363,7 @@ function getPrivateAttributeHtml(attributesJsonArray, tbodyId, shape) { } constr = ''; /*constr += '' + obj.name + '';*/ - constr += '' + '【' + obj.name +'】'+' '+ relationValue + ''; + constr += '' + '【' + obj.name +'】'+ ' '+ relationValue +''; constr += ''; } else if (obj.readonly && obj.type == "deptAddress") { deptAddress = true; @@ -375,7 +375,7 @@ function getPrivateAttributeHtml(attributesJsonArray, tbodyId, shape) { } constr = ''; /*constr += '' + obj.name + '';*/ - constr += '' + '【' + obj.name +'】'+' '+ relationValue + ''; + constr += '' + '【' + obj.name +'】'+ ' '+ relationValue +''; constr += ''; } else if (obj.readonly && obj.type == "awsorg") { var relationValue = ""; @@ -384,7 +384,7 @@ function getPrivateAttributeHtml(attributesJsonArray, tbodyId, shape) { } constr = ''; /*constr += '' + obj.name + '';*/ - constr += '' + '【' + obj.name +'】'+' '+ relationValue + ''; + constr += '' + '【' + obj.name +'】'+ ' '+ relationValue +''; constr += ''; } else if (obj.readonly && obj.type == "hidden") { constr = '' @@ -400,7 +400,7 @@ function getPrivateAttributeHtml(attributesJsonArray, tbodyId, shape) { } constr = ''; /*constr += '' + obj.name + '';*/ - constr += '' + '【' + obj.name +'】'+' '+ ' ' + tableInput + '' + ''; + constr += '' + '【' + obj.name +'】'+ ' ' + tableInput + '' +''; constr += ''; } $('#' + tbodyId + ' table[name=' + shape.id + ']').append(constr); @@ -1457,6 +1457,7 @@ function initProcessDesc() { var b=''; for(var i = 1; i <= length; i++) { var obj = processDesc[i]; + //判断如果为相关文件/支持文件显示在右侧区域 if(obj.name=="相关文件" || obj.name=="支持文件"){ b += ''; @@ -1467,7 +1468,7 @@ function initProcessDesc() { b += '
'; }else{ t += ''; - t += '' + "【"+obj.name +"】"+ ''; + t += '' + "【"+obj.name +"】"+ ''; var value = obj.value; if (value == undefined) { @@ -1487,26 +1488,25 @@ function initProcessDesc() { t += '' +''+tableFlag+''+''; t += ''; } - } - else { + } else { value = value.replace(/\n/g,'
') t += '' + value + ''; t += ''; } - // t += '' + value + ''; - // t += ''; } + // t += '' + value + ''; + // t += ''; } - if(b.length>0){ - $('#relevantDocument').append(b); - } - $('#portalDescDock').find('table').append(t); + if(b.length>0){ + $('#relevantDocument').append(b); + } + + $('#portalDescDock').find('table').append(t); // $('#portalDescDock').append('
 
'); } - function autoClickAttr() { // 属性自动切换 if ($('#openTab').is(':hidden')) { @@ -1593,6 +1593,7 @@ function ProcessManual(obj) { t += ''; $('#processFileDock').append(t); + //相关文件/相关附件 initUpfileData(obj); @@ -1645,28 +1646,6 @@ function downloadProcessFile(taskId) { }); } -function downloadReport(uuid, taskId) { - awsui.ajax.request({ - type: "POST", - url: "./jd", - async: false, - data: { - sid: sid, - cmd: "com.actionsoft.apps.coe.pal.publisher_output_download", - taskId: taskId, - uuid: uuid - }, - success : function(r) { - debugger; - if (r.result == "ok") { - debugger; - window.open (r.data.url); - } else { - - } - } - }); -} /** * 相关文件/制度文件下载