diff --git a/com.actionsoft.apps.coe.pal.publisher/web/com.actionsoft.apps.coe.pal.publisher/js/coe.pal.process.publish.multiple.js b/com.actionsoft.apps.coe.pal.publisher/web/com.actionsoft.apps.coe.pal.publisher/js/coe.pal.process.publish.multiple.js index 53d167ae..6eef79fa 100644 --- a/com.actionsoft.apps.coe.pal.publisher/web/com.actionsoft.apps.coe.pal.publisher/js/coe.pal.process.publish.multiple.js +++ b/com.actionsoft.apps.coe.pal.publisher/web/com.actionsoft.apps.coe.pal.publisher/js/coe.pal.process.publish.multiple.js @@ -569,7 +569,7 @@ function showlist(data, type, pageNumber, start){ var reportName = '' + fileName + "-" + outputName + ''; var quickCreate = "立即创建"; var processNumber = '提交后生成文件编号'; - if(curr.processNumber != undefined){ + if(curr.processNumber != undefined&&curr.processNumber != ''){ processNumber = curr.processNumber; } reportName = (curr.taskId == undefined || curr.taskId == '') ? '无' : curr.taskId == 'submit_create' ? quickCreate : reportName; @@ -613,7 +613,7 @@ function showlist(data, type, pageNumber, start){ var fName = ''; var upFileId = curr.upfileId; var changNumer = '提交后生成文件编号'; - if(curr.changedNumber != undefined){ + if(curr.changedNumber != undefined&&curr.changedNumber != ''){ changNumer = curr.changedNumber; } if(upFileId!=''&&upFileId!=undefined){ @@ -2039,7 +2039,7 @@ function saveFormData(type) { data : param, success : function(r) { if (r.result == 'error') { - flag = true; + flag = false; tempData = r.data.data; } }, diff --git a/com.actionsoft.apps.coe.pal.publisher/web/com.actionsoft.apps.coe.pal.publisher/js/coe.pal.process.publish.multiple.mobile.js b/com.actionsoft.apps.coe.pal.publisher/web/com.actionsoft.apps.coe.pal.publisher/js/coe.pal.process.publish.multiple.mobile.js index 0f681f50..14775f28 100644 --- a/com.actionsoft.apps.coe.pal.publisher/web/com.actionsoft.apps.coe.pal.publisher/js/coe.pal.process.publish.multiple.mobile.js +++ b/com.actionsoft.apps.coe.pal.publisher/web/com.actionsoft.apps.coe.pal.publisher/js/coe.pal.process.publish.multiple.mobile.js @@ -22,8 +22,11 @@ function initMobileData() { if(openState=="11"){ $("#BTN_ADHOC_TASK_OK").text("批准"); $("#BTN_ADHOC_TASK").text("加签"); - $("#saveButtons").children()[0].remove(); - $("#saveButtons").children()[0].remove(); + $("#saveButtons").children()[1].remove(); + $("#saveButtons").children()[2].remove(); + $("#saveButtons").append("
"); + + } } diff --git a/com.actionsoft.apps.coe.pal/manifest.xml b/com.actionsoft.apps.coe.pal/manifest.xml index f2b9572e..a4c15cab 100755 --- a/com.actionsoft.apps.coe.pal/manifest.xml +++ b/com.actionsoft.apps.coe.pal/manifest.xml @@ -3,7 +3,7 @@ CoE PAL流程资产库 6.5 - 86 + 94 北京炎黄盈动科技发展有限责任公司 false @@ -53,40 +53,40 @@ AWS PAL(Process Asset Library)流程资产库是AWS CoE平台的重要产品组 true _bpm.platform - 0 - 0 - false - address - - -1 - 1 - false - false - true - 1 - true - PAL - true - all - false - - false - true - duty_r - false - true - - true - true - true - - false - close - [{"name":"分类1","url":"","children":[{"name":"打开流程1","url":"./w?sid=@sid&uuid=87584321-df10-419b-9601-2519216b09d8&teamId=&cmd=com.actionsoft.apps.coe.pal_pl_repository_designer"},{"name":"腾讯链接","url":"https://www.tencent.com/zh-cn/"}]},{"name":"分类2","url":"","children":[{"name":"搜狐网链接","url":"https://www.sohu.com/"},{"name":"人民网链接","url":"http://www.people.com.cn/"}]},{"name":"凤凰网链接","url":"https://www.ifeng.com/"},{"name":"打开流程2","url":"./w?sid=@sid&uuid=87584321-df10-419b-9601-2519216b09d8&teamId=&cmd=com.actionsoft.apps.coe.pal_pl_repository_designer"}] - {"control.risk":{"risk":{"desc":"描述企业内部流程涉及的各级风险点"},"control":{"desc":"描述企业内部流程涉及的各级风险的控制措施"}},"itsystem.normal":{"cloudServer":{"desc":"描述企业接入的云服务设施"},"database":{"desc":"描述企业提供的数据库服务类型，如某Oracle数据库"},"appSystem":{"desc":"描述企业提供的应用系统，如某供应链管理系统、业务流程管理平台"},"device":{"desc":"描述企业提供的各种IT设备"}},"control.kpi":{"kpi":{"desc":"从流程的目标（业务的目标、管理的要求等）出发设计流程绩效指标，用于衡量和评估末级流程的执行效果和对流程业务的支撑作用。"}},"process.evc":{"valueChain6":{"desc":"一个基本增值活动或辅助增值活动"},"valueChain5":{"desc":"一个基本增值活动或辅助增值活动"},"valueChain4":{"desc":"一个基本增值活动或辅助增值活动"},"valueChain3":{"desc":"一个基本增值活动或辅助增值活动"},"valueChain2":{"desc":"一个基本增值活动或辅助增值活动"},"valueChain1":{"desc":"一个基本增值活动或辅助增值活动"}},"control.policy":{"item":{"desc":"描述企业内部各级管理制度的具体条款"},"regulation":{"desc":"描述企业内部流程涉及的各级管理制度"}},"data.form":{"form":{"desc":"输入或输出的数据是一个完整的数据结构（或单据）"},"forms":{"desc":"输入或输出的数据由多个数据结构（或单据）组成"}},"process.flowchart":{"internalStorage":{"desc":"存储在存储器中的数据"},"predefinedProcess":{"desc":"在另外地方已得到详细说明的一个操作或一组操作"},"data":{"desc":"表示数据"},"document":{"desc":"表示属于该过程的书面信息"},"paperTape":{"desc":"旧式电脑使用的穿孔纸带输入"},"storedData":{"desc":"表示一般的数据存储"},"preparation":{"desc":"表示修改一条指令或一组指令以影响随后的活动"},"horizontalPool":{"desc":"包含多个泳道，对元素进行区分"},"verticalLane":{"desc":"对泳池里的流程元素的进行组织和分类"},"parallelMode":{"desc":"表示同步进行两个或两个以上并行方式的操作"},"terminator":{"desc":"表示过程的开始或结束"},"offPageReference":{"desc":"表示一组流程，可以用跨页引用进行标识"},"horizontalLane":{"desc":"对泳池里的流程元素的进行组织和分类"},"annotation":{"desc":"标识注解的内容"},"manualInput":{"desc":"人工输入的数据"},"onPageReference":{"desc":"表示流程图的待续，圈内有一子字母或数字"},"process":{"desc":"表示过程中的一个单独步骤"},"manualOperation":{"desc":"由人工完成的操作"},"loopLimit":{"desc":"去上角的上限值和去下角的下限值分别表示循环的开始和结束"},"decision":{"desc":"表示过程中的一项判定或一个分岔点"},"display":{"desc":"在机器上显示"},"verticalPool":{"desc":"包含多个泳道，对元素进行区分"},"sequentialData":{"desc":"老式磁带存储的数据"},"directData":{"desc":"表示流程图中存储在硬盘上的数据源"},"card":{"desc":"旧式电脑使用的打孔卡"}},"process.epc":{"or":{"desc":"表示一件事情可能产生的几个结果中，至少有一个会发生"},"method_service_node":{"desc":"描述流程中的手工活动"},"verticalPool":{"desc":"包含多个泳道，对元素进行区分"},"procedure":{"desc":"本流程的某个环节后引用的其它流程"},"method_approval_node":{"desc":"流程中审核、审批性质的活动"},"horizontalPool":{"desc":"包含多个泳道，对元素进行区分"},"verticalLane":{"desc":"对泳池里的流程元素的进行组织和分类"},"method_approval_node3":{"desc":"流程中需要执行某种操作的活动"},"and":{"desc":"表示一件事情可能产生的几个结果或后续活动，全部发生；或表示一件事情的发生需要几个条件同时满足"},"method_service_node4":{"desc":"描述流程中的手工活动"},"xor":{"desc":"表示一件事情可能产生的几个结果中，有且只有一个会发生"},"event":{"desc":"描述流程运行的状态"},"horizontalLane":{"desc":"对泳池里的流程元素的进行组织和分类"}},"org.role":{"role":{"desc":"一般用于表示执行某一流程步骤的流程角色"}},"process.bpmn2":{"signalIntermediateThrowingEvent":{"desc":"向外广播信号后，流程继续向后执行"},"callActivityCallingProcess":{"desc":"调用定义的全局过程"},"textAnnotation":{"desc":"给元素附加信息，便于理解"},"timerStartEvent":{"desc":"到达设置的日期/时间后，触发流程执行"},"horizontalPool":{"desc":"包含多个泳道，对元素进行区分"},"signalEndEvent":{"desc":"向外广播信号，结束所在分支的执行"},"verticalLane":{"desc":"对泳池里的流程元素的进行组织和分类"},"errorBoundaryInterrputingEvent":{"desc":"捕获活动内部抛出的错误信息，中断正常流程，触发错误处理流程"},"endEvent":{"desc":"结束所在分支的执行"},"serviceTask":{"desc":"使用Web服务或自动化应用的任务"},"exclusiveGateway":{"desc":""},"startEvent":{"desc":"触发流程的执行"},"receiveTask":{"desc":"等待并接受外部参与者发送的消息，消息接受完毕则任务执行完毕"},"signalStartEvent":{"desc":"接收信息，并触发流程的执行"},"messageIntermediateCatchEvent":{"desc":"捕获到特定消息后，该事件被触发，流程继续向后执行"},"messageIntermediateThrowingEvent":{"desc":"向其他参与方发送消息后，流程继续向后执行"},"signalIntermediateCatchEvent":{"desc":"捕获到其他参与方广播的信号后，该事件被触发，流程继续向后执行"},"errorEndEvent":{"desc":"错误结束事件"},"horizontalLane":{"desc":"对泳池里的流程元素的进行组织和分类"},"group":{"desc":"对元素进行分类，不影响流程的执行"},"scriptTask":{"desc":"定义一段执行脚本，由流程引擎执行，脚本执行完毕则任务执行完毕"},"businessRuleTask":{"desc":"调用业务规则引擎进行数据的计算并获得计算结果"},"manualTask":{"desc":"没有任何流程引擎和应用程序协助的纯手工任务"},"signalBoundaryInterrputingEvent":{"desc":"捕获特定信号，中断正常流程，触发异常处理流程"},"verticalPool":{"desc":"包含多个泳道，对元素进行区分"},"compensationBoundaryInterrputingEvent":{"desc":"捕获活动内部抛出的补偿信息，中断正常流程，触发执行补偿活动"},"userTask":{"desc":"在应用程序的协助下，由人工完成的任务"},"terminateEndEvent":{"desc":"结束所有分支的执行"},"messageStartEvent":{"desc":"接收消息，并触发流程的执行"},"messageEndEvent":{"desc":"向其他参与方发送消息，结束所在分支的执行"},"sendTask":{"desc":"向外部参与者发送消息，消息发送完毕则任务执行完毕"},"messageBoundaryInterrputingEvent":{"desc":"捕获特定消息，中断正常流程，触发异常处理流程"},"transaction":{"desc":"遵循特定事务规约的一系列活动"},"timerIntermediateCatchEvent":{"desc":"到达某个特定时间/日期后，触发该事件，流程继续向后执行"}},"org.normal":{"role":{"desc":"一般用于表示执行某一流程步骤的流程角色"},"organization":{"desc":"描述企业内部固定的组织单位"},"position":{"desc":"描述企业内部各部门的实际岗位"},"employee":{"desc":"表示企业的具体员工"}}} - false + 0 + 0 + false + address + + -1 + 1 + false + false + true + 1 + true + PAL + true + all + false + + false + true + duty_r + false + true + + true + true + true + + false + close + [{"name":"建模操作快速引导","url":"","children":[{"name":"1.如何创建符号与连线","url":"./w?sid=@sid&cmd=com.actionsoft.apps.cms_get_message&messageId=e0606a45-56d3-4cff-b51f-e0a9d64e522a"},{"name":"2.快速调整布局","url":"./w?sid=@sid&cmd=com.actionsoft.apps.cms_get_message&messageId=6e58d212-fb95-4483-93b7-17499d632805"},{"name":"3.术语的新建与删除","url":"./w?sid=@sid&cmd=com.actionsoft.apps.cms_get_message&messageId=e5ef6605-3bc0-44b9-8bb8-a252fe20837b"},{"name":"4.流程绩效指标的新建与修改","url":"./w?sid=@sid&cmd=com.actionsoft.apps.cms_get_message&messageId=59b638b6-7e3a-4a79-bd71-cd739259c89d"},{"name":"5.新建表单模型","url":"./w?sid=@sid&cmd=com.actionsoft.apps.cms_get_message&messageId=0b964b9e-6701-44a8-8159-91b4ceba9c80"},{"name":"6.新建制度模型","url":"./w?sid=@sid&cmd=com.actionsoft.apps.cms_get_message&messageId=c1e30c18-db59-4bde-ab60-b9589922ab2e"},{"name":"7.流程文件的生成","url":"./w?sid=@sid&cmd=com.actionsoft.apps.cms_get_message&messageId=d799ced4-2313-45ba-911f-03cdb6db9e06"},{"name":"8.新建角色与岗位","url":"./w?sid=@sid&cmd=com.actiosoft.apps.cms_get_message&messageId=93559257-8280-444c-bd88-116748b919bf"}]}] + {"control.risk":{"risk":{"desc":"描述企业内部流程涉及的各级风险点"},"control":{"desc":"描述企业内部流程涉及的各级风险的控制措施"}},"itsystem.normal":{"cloudServer":{"desc":"描述企业接入的云服务设施"},"database":{"desc":"描述企业提供的数据库服务类型，如某Oracle数据库"},"appSystem":{"desc":"描述企业提供的应用系统，如某供应链管理系统、业务流程管理平台"},"device":{"desc":"描述企业提供的各种IT设备"}},"control.kpi":{"kpi":{"desc":"从流程的目标（业务的目标、管理的要求等）出发设计流程绩效指标，用于衡量和评估末级流程的执行效果和对流程业务的支撑作用。"}},"process.evc":{"valueChain6":{"desc":"一个基本增值活动或辅助增值活动"},"valueChain5":{"desc":"一个基本增值活动或辅助增值活动"},"valueChain4":{"desc":"一个基本增值活动或辅助增值活动"},"valueChain3":{"desc":"一个基本增值活动或辅助增值活动"},"valueChain2":{"desc":"一个基本增值活动或辅助增值活动"},"valueChain1":{"desc":"一个基本增值活动或辅助增值活动"}},"control.policy":{"item":{"desc":"描述企业内部各级管理制度的具体条款"},"regulation":{"desc":"描述企业内部流程涉及的各级管理制度"}},"data.form":{"form":{"desc":"输入或输出的数据是一个完整的数据结构（或单据）"},"forms":{"desc":"输入或输出的数据由多个数据结构（或单据）组成"}},"process.flowchart":{"internalStorage":{"desc":"存储在存储器中的数据"},"predefinedProcess":{"desc":"在另外地方已得到详细说明的一个操作或一组操作"},"data":{"desc":"表示数据"},"document":{"desc":"表示属于该过程的书面信息"},"paperTape":{"desc":"旧式电脑使用的穿孔纸带输入"},"storedData":{"desc":"表示一般的数据存储"},"preparation":{"desc":"表示修改一条指令或一组指令以影响随后的活动"},"horizontalPool":{"desc":"包含多个泳道，对元素进行区分"},"verticalLane":{"desc":"对泳池里的流程元素的进行组织和分类"},"parallelMode":{"desc":"表示同步进行两个或两个以上并行方式的操作"},"terminator":{"desc":"表示过程的开始或结束"},"offPageReference":{"desc":"表示一组流程，可以用跨页引用进行标识"},"horizontalLane":{"desc":"对泳池里的流程元素的进行组织和分类"},"annotation":{"desc":"标识注解的内容"},"manualInput":{"desc":"人工输入的数据"},"onPageReference":{"desc":"表示流程图的待续，圈内有一子字母或数字"},"process":{"desc":"表示过程中的一个单独步骤"},"manualOperation":{"desc":"由人工完成的操作"},"loopLimit":{"desc":"去上角的上限值和去下角的下限值分别表示循环的开始和结束"},"decision":{"desc":"表示过程中的一项判定或一个分岔点"},"display":{"desc":"在机器上显示"},"verticalPool":{"desc":"包含多个泳道，对元素进行区分"},"sequentialData":{"desc":"老式磁带存储的数据"},"directData":{"desc":"表示流程图中存储在硬盘上的数据源"},"card":{"desc":"旧式电脑使用的打孔卡"}},"process.epc":{"or":{"desc":"表示一件事情可能产生的几个结果中，至少有一个会发生"},"method_service_node":{"desc":"描述流程中的手工活动"},"verticalPool":{"desc":"包含多个泳道，对元素进行区分"},"procedure":{"desc":"本流程的某个环节后引用的其它流程"},"method_approval_node":{"desc":"流程中审核、审批性质的活动"},"horizontalPool":{"desc":"包含多个泳道，对元素进行区分"},"verticalLane":{"desc":"对泳池里的流程元素的进行组织和分类"},"method_approval_node3":{"desc":"流程中需要执行某种操作的活动"},"and":{"desc":"表示一件事情可能产生的几个结果或后续活动，全部发生；或表示一件事情的发生需要几个条件同时满足"},"method_service_node4":{"desc":"描述流程中的手工活动"},"xor":{"desc":"表示一件事情可能产生的几个结果中，有且只有一个会发生"},"event":{"desc":"描述流程运行的状态"},"horizontalLane":{"desc":"对泳池里的流程元素的进行组织和分类"}},"org.role":{"role":{"desc":"一般用于表示执行某一流程步骤的流程角色"}},"process.bpmn2":{"signalIntermediateThrowingEvent":{"desc":"向外广播信号后，流程继续向后执行"},"callActivityCallingProcess":{"desc":"调用定义的全局过程"},"textAnnotation":{"desc":"给元素附加信息，便于理解"},"timerStartEvent":{"desc":"到达设置的日期/时间后，触发流程执行"},"horizontalPool":{"desc":"包含多个泳道，对元素进行区分"},"signalEndEvent":{"desc":"向外广播信号，结束所在分支的执行"},"verticalLane":{"desc":"对泳池里的流程元素的进行组织和分类"},"errorBoundaryInterrputingEvent":{"desc":"捕获活动内部抛出的错误信息，中断正常流程，触发错误处理流程"},"endEvent":{"desc":"结束所在分支的执行"},"serviceTask":{"desc":"使用Web服务或自动化应用的任务"},"exclusiveGateway":{"desc":""},"startEvent":{"desc":"触发流程的执行"},"receiveTask":{"desc":"等待并接受外部参与者发送的消息，消息接受完毕则任务执行完毕"},"signalStartEvent":{"desc":"接收信息，并触发流程的执行"},"messageIntermediateCatchEvent":{"desc":"捕获到特定消息后，该事件被触发，流程继续向后执行"},"messageIntermediateThrowingEvent":{"desc":"向其他参与方发送消息后，流程继续向后执行"},"signalIntermediateCatchEvent":{"desc":"捕获到其他参与方广播的信号后，该事件被触发，流程继续向后执行"},"errorEndEvent":{"desc":"错误结束事件"},"horizontalLane":{"desc":"对泳池里的流程元素的进行组织和分类"},"group":{"desc":"对元素进行分类，不影响流程的执行"},"scriptTask":{"desc":"定义一段执行脚本，由流程引擎执行，脚本执行完毕则任务执行完毕"},"businessRuleTask":{"desc":"调用业务规则引擎进行数据的计算并获得计算结果"},"manualTask":{"desc":"没有任何流程引擎和应用程序协助的纯手工任务"},"signalBoundaryInterrputingEvent":{"desc":"捕获特定信号，中断正常流程，触发异常处理流程"},"verticalPool":{"desc":"包含多个泳道，对元素进行区分"},"compensationBoundaryInterrputingEvent":{"desc":"捕获活动内部抛出的补偿信息，中断正常流程，触发执行补偿活动"},"userTask":{"desc":"在应用程序的协助下，由人工完成的任务"},"terminateEndEvent":{"desc":"结束所有分支的执行"},"messageStartEvent":{"desc":"接收消息，并触发流程的执行"},"messageEndEvent":{"desc":"向其他参与方发送消息，结束所在分支的执行"},"sendTask":{"desc":"向外部参与者发送消息，消息发送完毕则任务执行完毕"},"messageBoundaryInterrputingEvent":{"desc":"捕获特定消息，中断正常流程，触发异常处理流程"},"transaction":{"desc":"遵循特定事务规约的一系列活动"},"timerIntermediateCatchEvent":{"desc":"到达某个特定时间/日期后，触发该事件，流程继续向后执行"}},"org.normal":{"role":{"desc":"一般用于表示执行某一流程步骤的流程角色"},"organization":{"desc":"描述企业内部固定的组织单位"},"position":{"desc":"描述企业内部各部门的实际岗位"},"employee":{"desc":"表示企业的具体员工"}}} + false - {"default":{"code":"","color":"#FFB718"},"process.businessLevel":{"code":"","color":"#FFB718"},"process.businessArea":{"code":"","color":"#FFB718"},"process.processGroup":{"code":"","color":"#FFB718"},"control.kpi":{"code":"","color":"#ff9421"},"control.ma":{"code":"","color":"#ff9421"},"control.policy":{"code":"","color":"#009b52"},"control.risk":{"code":"&#xe73e","color":"#dc4f39"},"data.form":{"code":"","color":"#009b52"},"itsystem.normal":{"code":"","color":"#4E7FF9"},"org.normal":{"code":"","color":"#ff9421"},"process.bpmn2":{"code":"","color":"#4E7FF9"},"process.evc":{"code":"","color":"#4E7FF9"}} + {"default":{"code":"","color":"#FFB718"},"process.businessLevel":{"code":"","color":"#FFB718"},"process.businessArea":{"code":"","color":"#FFB718"},"process.processGroup":{"code":"","color":"#FFB718"},"control.kpi":{"code":"","color":"#ff9421"},"control.ma":{"code":"","color":"#ff9421"},"control.policy":{"code":"","color":"#009b52"},"control.risk":{"code":"&#xe73e","color":"#dc4f39"},"data.form":{"code":"","color":"#009b52"},"itsystem.normal":{"code":"","color":"#4E7FF9"},"org.normal":{"code":"","color":"#ff9421"},"process.bpmn2":{"code":"","color":"#4E7FF9"},"process.evc":{"code":"","color":"#4E7FF9"}}