yili/apps
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

制度、表单建模数据提交/快捷发布功能/文件属性增加L4架构数据

Browse Source
This commit is contained in:
zhal 2023-06-01 17:49:43 +08:00
parent 1436ab758c
commit 88f94eac90
8 changed files with 46 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
com.actionsoft.apps.coe.pal/lib/com.actionsoft.apps.coe.pal.jar
View File

Binary file not shown.

8
com.actionsoft.apps.coe.pal/method/control.policy/diagram.attribute.custom.xml
View File

@ -7,8 +7,9 @@
<attribute key="Drafted_and_revised_by" title="拟制/修订人" type="string" value="" desc="拟制/修订人" isRequired="true" ref="" readonly="false" groupPath="baseAttribute" scope="%" isValid="true"/>
<attribute key="Process_Architecture_L1" title="流程架构L1" type="string" value="" desc="流程架构L1" isRequired="true" ref="" readonly="false" groupPath="baseAttribute" scope="%,*" isValid="true"/>
<attribute key="Process_Architecture_L2" title="流程架构L2" type="string" value="" desc="流程架构L2" isRequired="true" ref="" readonly="false" groupPath="baseAttribute" scope="%,*" isValid="true"/>
<attribute key="Process_Architecture_L3" title="流程架构L3" type="string" value="" desc="流程架构L3" isRequired="true" ref="" readonly="false" groupPath="baseAttribute" scope="%,*" isValid="true"/>
<attribute key="auditor" title="审核人" type="string" value="" desc="审核人" isRequired="true" ref="" readonly="false" groupPath="baseAttribute" scope="%" isValid="true"/>
<attribute key="Process_Architecture_L3" title="流程架构L3" type="string" value="" desc="流程架构L3" isRequired="true" ref="" readonly="false" groupPath="baseAttribute" scope="%,*" isValid="true"/>
<attribute key="Process_Architecture_L4" title="流程架构L4" type="string" value="" desc="流程架构L4" isRequired="true" ref="" readonly="false" groupPath="baseAttribute" scope="%,*" isValid="true"/>
<attribute key="auditor" title="审核人" type="string" value="" desc="审核人" isRequired="true" ref="" readonly="false" groupPath="baseAttribute" scope="%" isValid="true"/>
<attribute key="reviewer" title="复核人" type="string" value="" desc="复核人" isRequired="true" ref="" readonly="false" groupPath="baseAttribute" scope="%" isValid="true"/>
<attribute key="approver" title="审批人" type="string" value="" desc="审批人" isRequired="true" ref="" readonly="false" groupPath="baseAttribute" scope="%" isValid="true"/>
<attribute key="related_files" title="相关文件" type="relation" value="" desc="相关文件" isRequired="false" ref="{&quot;method&quot;:&quot;process&quot;,&quot;type&quot;:&quot;file&quot;,&quot;multiple&quot;:true}" readonly="true" groupPath="baseAttribute" scope="%" isValid="true"/>
@ -27,5 +28,6 @@
<attribute key="Contents_and_reasons_for_revision" title="修订内容及理由" type="textarea" value="" desc="修订内容及理由" isRequired="false" ref="" readonly="false" groupPath="baseAttribute" scope="%" isValid="true"/>
<attribute key="T_supplementary_articles" title="附则" type="textarea" value="" desc="附则" isRequired="false" ref="" readonly="false" groupPath="baseAttribute" scope="%" isValid="true"/>
<attribute key="activity_number" title="活动序号" type="string" value="" desc="活动序号" isRequired="false" ref="" readonly="false" groupPath="baseAttribute" scope="*" isValid="true"/>
<attribute key="Out_related_files" title="外部相关文件" type="textarea" value="" desc="填写外部相关文件名称，多个用逗号隔开" isRequired="false" ref="" readonly="false" groupPath="baseAttribute" scope="%" isValid="true"/>
<attribute key="Out_related_files" title="外部相关文件" type="textarea" value="" desc="填写外部相关文件名称，多个用逗号隔开" isRequired="false" ref="" readonly="false" groupPath="baseAttribute" scope="%" isValid="true"/>
<attribute key="JYGLGY" title="相关经营管理纲要" type="select_m" value="" desc="请选择" isRequired="false" ref="【集团】全面价值经营,【集团】全面创新驱动,【奶粉】以消费者为中心，提供极致满意的消费体验,【奶粉】以高目标为引领，快速发展，只争第一,【奶粉】以共赢为指引，与合作伙伴建立长期利益共同体,【奶粉】以结果为导向，付出不亚于任何人的努力,【奶粉】以赢得市场竞争为驱动，成为一支有理想、有信念的强大团队,【酸奶】始终以消费者为中心，提供最优品质产品与最佳消费体验,【酸奶】视品牌为核心资产，让我们的品牌成为消费者的挚爱与首选,【酸奶】打造厂商命运共同体，构建稳固可持续发展的厂商生态圈,【酸奶】坚持高目标引领，直面竞争，只争第一,【酸奶】人人都是企业的经营者，不达目标誓不罢休,【酸奶】成为心中有理想、胸中有目标、敢打硬仗、能打胜仗、追求卓越的高绩效团队" readonly="false" groupPath="baseAttribute" scope="%" isValid="true"/>
</attributes>

8
com.actionsoft.apps.coe.pal/method/data.form/diagram.attribute.custom.xml
View File

@ -6,9 +6,11 @@
<attribute key="P_versions" title="版本" type="string" value="" desc="版本" isRequired="false" ref="" readonly="false" groupPath="baseAttribute" scope="%" isValid="true"/>
<attribute key="Drafted_and_revised_by" title="拟制/修订人" type="string" value="" desc="拟制/修订人" isRequired="true" ref="" readonly="false" groupPath="baseAttribute" scope="%" isValid="true"/>
<attribute key="Process_Architecture_L1" title="流程架构L1" type="string" value="" desc="流程架构L1" isRequired="true" ref="" readonly="false" groupPath="baseAttribute" scope="%" isValid="true"/>
<attribute key="Process_Architecture_L2" title="流程架构L2" type="string" value="" desc="流程架构L2" isRequired="true" ref="" readonly="false" groupPath="baseAttribute" scope="%" isValid="true"/>
<attribute key="Drafted_and_revised_date" title="拟制/修订日期" type="DateTimePicker" value="" desc="拟制/修订日期" isRequired="true" ref="" readonly="false" groupPath="baseAttribute" scope="%,*" isValid="true"/>
<attribute key="Process_Architecture_L3" title="流程架构L3" type="string" value="" desc="流程架构L3" isRequired="true" ref="" readonly="false" groupPath="baseAttribute" scope="%" isValid="true"/>
<attribute key="Process_Architecture_L2" title="流程架构L2" type="string" value="" desc="流程架构L2" isRequired="true" ref="" readonly="false" groupPath="baseAttribute" scope="%" isValid="true"/>
<attribute key="Process_Architecture_L3" title="流程架构L3" type="string" value="" desc="流程架构L3" isRequired="true" ref="" readonly="false" groupPath="baseAttribute" scope="%" isValid="true"/>
<attribute key="Process_Architecture_L4" title="流程架构L4" type="string" value="" desc="流程架构L4" isRequired="true" ref="" readonly="false" groupPath="baseAttribute" scope="%" isValid="true"/>
<attribute key="Drafted_and_revised_date" title="拟制/修订日期" type="DateTimePicker" value="" desc="拟制/修订日期" isRequired="true" ref="" readonly="false" groupPath="baseAttribute" scope="%,*" isValid="true"/>
<attribute key="auditor" title="审核人" type="string" value="" desc="审核人" isRequired="true" ref="" readonly="false" groupPath="baseAttribute" scope="%" isValid="true"/>
<attribute key="reviewer" title="复核人" type="string" value="" desc="复核人" isRequired="true" ref="" readonly="false" groupPath="baseAttribute" scope="%" isValid="true"/>
<attribute key="approver" title="审批人" type="string" value="" desc="审批人" isRequired="true" ref="" readonly="false" groupPath="baseAttribute" scope="%" isValid="true"/>

15
com.actionsoft.apps.coe.pal/src/com/actionsoft/apps/coe/pal/pal/repository/web/CoeProcessLevelWeb.java
View File

@ -10758,11 +10758,12 @@ public String deleteReply(String replyid, String messageid) {
* @param targetObj
*/
public void updateLevelData(List<PALRepositoryModel> sourceList, JSONObject targetObj) {
//根据targetObj 获取出L1 L2 L3的数据
//根据targetObj 获取出L1 L2 L3 L4的数据
String targetId = targetObj.getString("id");
String L1 = null;
String L2 = null;
String L3 = null;
String L4 = null;
String L=null;
JSONArray pathArray = CoeProcessLevelUtil.getRepositoryPath(targetId);
String updateSql = "update APP_ACT_COE_PAL_PROP set PROPERTYVALUE ='%s' where PLID ='%s' and PROPERTYID='%s'";
@ -10787,8 +10788,8 @@ public String deleteReply(String replyid, String messageid) {
}*/
// 一级架构默认值处理
if(pathArray.size()>0){
//设置三级架构，如果没有填充值为/
for(int i=1;i<=3;i++){
//设置四级架构，如果没有填充值为/
for(int i=1;i<=4;i++){
if(i<=pathArray.size()-1){
String name1=((JSONObject) pathArray.get(i)).getString("name");
String str1=name1.substring(0, name1.lastIndexOf(".")+1);
@ -10812,10 +10813,13 @@ public String deleteReply(String replyid, String messageid) {
if (i == 3) {
L3 = L;
}
if (i == 4) {
L4 = L;
}
}
}
//遍历source并设置这三个的属性值
//遍历source并设置这四个的属性值
for (PALRepositoryModel palRepositoryModel : sourceList) {
String id = palRepositoryModel.getId();
if (L1 != null) {
@ -10827,6 +10831,9 @@ public String deleteReply(String replyid, String messageid) {
if (L3 != null) {
DBSql.update(String.format(updateSql, L3.trim(), id, "Process_Architecture_L3"));
}
if (L4 != null) {
DBSql.update(String.format(updateSql, L4.trim(), id, "Process_Architecture_L4"));
}
/**
* 查看改流程是否关联流程绩效
* 如果有，要更新关联流程的这三个参数

21
com.actionsoft.apps.coe.pal/web/com.actionsoft.apps.coe.pal/js/coe.team.pal.designer.js
View File

@ -256,19 +256,32 @@ $(function() {
});
/**
* 快捷发布
*/
$("#QuickPublishing").off("click").on("click", function () {
$.ajax({
type : "POST",
url : "./jd",
data : {
sid : CLB.sid,
cmd:"com.awspaas.user.apps.publish.createProcess",
processDefId:"obj_fb1c7a54b98b412187388c8bab407362",
},
success:function(r) {
window.open(r.url);
},
error:function(r) {
}
});
var url="https://bpm.yili.com:8088/portal/r/w?sid="+$("#sid").val()+"&wsId="+$("#wsId").val()+"&teamId=&clazzName=com.actionsoft.apps.coe.pal.publisher.client.web.ProcessPublishWeb&cmd=com.actionsoft.apps.coe.pal_app_page#/";
window.open(url,'fullscreen');
/*var url="https://bpm.yili.com:8088/portal/r/w?sid="+$("#sid").val()+"&wsId="+$("#wsId").val()+"&teamId=&clazzName=com.actionsoft.apps.coe.pal.publisher.client.web.ProcessPublishWeb&cmd=com.actionsoft.apps.coe.pal_app_page#/";
window.open(url,'fullscreen');*/
});
/**
* 流程清单列表按钮
*/

7
com.actionsoft.apps.coe.pal/web/com.actionsoft.apps.coe.pal/lib/designer/extend/css/designer.extend.css
View File

@ -210,7 +210,12 @@
background: url(../images/QualityInspection.png) no-repeat;
background-size: contain;
}
.ico.quickPublish{
width: 40px;
background-position: 0px 0px;
background: url(../images/quickPublish.png) no-repeat;
background-size: contain;
}
.ico.extend_activityNoDisable{
background-position: 0px 0px;
background: url(../images/activityNoDisable.png) no-repeat;

22
com.actionsoft.apps.coe.pal/web/com.actionsoft.apps.coe.pal/lib/designer/extend/js/designer.extend.link.view.portal.js
View File

@ -1795,7 +1795,7 @@ function initUpfileData(obj) {
t += '<div>';
t +='<strong>文件附件:</strong>';
var appendFlag=true;
processFile=processFile.sort(function(x,y){
processFile.sort(function(x,y){
if(x.name.substr(0,2)=='附件' && y.name.substr(0,2)=='附件') {
return parseInt(x.name.substr(2)) - parseInt(y.name.substr(2));
}
@ -1993,26 +1993,6 @@ function initUpfileData(obj) {
}
function maopao(array){
if(Array.isArray(array)){
if (array.length == 1) {
return array;
}
var temp = null;
for (var i = 0; i < array.length; i++) {
for (var j = 0; j < array.length - i - 1; j++) {
if (array[j] > array[j + 1]) {
temp = array[j];
array[j] = array[j + 1];
array[j + 1] = temp;
}
}
}
return array;
}
}
//根据节点名称排序
function sortModelByName1() {

1
com.actionsoft.apps.coe.pal/web/com.actionsoft.apps.coe.pal/lib/designer/scripts/diagraming/designer.ui.js
View File

@ -66,6 +66,7 @@ var UI = {
method:methodId
},
success: function (r, textStatus, jqXHR) {
debugger;
if (r.data.result == 'ok') {
changeTitle(newTitle);
} else {