Ver a proveniência

【修改】流程任务、流程监控:标题列显示自定义标题或者流程模板名称;允许自定义标题后设置必填;

塔里木分支
dyy há 3 meses
ascendente
cometimento
f2c841a4c2
5 ficheiros alterados com 11 adições e 9 eliminações
  1. +2
    -3
      Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_NewWorkFlow/Views/NWFProcess/Index.js
  2. +2
    -2
      Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_NewWorkFlow/Views/NWFProcess/MonitorIndex.js
  3. +2
    -2
      Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_NewWorkFlow/Views/NWFProcess/MonitorIndexStatistics.js
  4. +2
    -2
      Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_NewWorkFlow/Views/NWFProcess/NWFContainerForm.cshtml
  5. +3
    -0
      Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_NewWorkFlow/Views/NWFProcess/NWFContainerForm.js

+ 2
- 3
Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_NewWorkFlow/Views/NWFProcess/Index.js Ver ficheiro

@@ -281,9 +281,8 @@ var bootstrap = function ($, learun) {
},
{
label: "标题", name: "F_Title", width: 300, align: "left", formatter: function (cellvalue, row) {
if (row.F_SchemeName != row.F_Title && row.F_Title) {
//return row.F_SchemeName + "(" + row.F_Title + ")";
return row.F_SchemeName + row.F_Title;
if (row.F_Title) {
return row.F_Title;
}
else {
return row.F_SchemeName;


+ 2
- 2
Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_NewWorkFlow/Views/NWFProcess/MonitorIndex.js Ver ficheiro

@@ -134,8 +134,8 @@ var bootstrap = function ($, learun) {
headData: [
{
label: "标题", name: "F_Title", width: 300, align: "left", formatter: function (cellvalue, row) {
if (row.F_SchemeName != row.F_Title && row.F_Title) {
return row.F_SchemeName + "(" + row.F_Title + ")";
if (row.F_Title) {
return row.F_Title;
}
else {
return row.F_SchemeName;


+ 2
- 2
Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_NewWorkFlow/Views/NWFProcess/MonitorIndexStatistics.js Ver ficheiro

@@ -146,8 +146,8 @@ var bootstrap = function ($, learun) {
headData: [
{
label: "标题", name: "F_Title", width: 300, align: "left", formatter: function (cellvalue, row) {
if (row.F_SchemeName != row.F_Title && row.F_Title) {
return row.F_SchemeName + "(" + row.F_Title + ")";
if (row.F_Title) {
return row.F_Title;
}
else {
return row.F_SchemeName;


+ 2
- 2
Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_NewWorkFlow/Views/NWFProcess/NWFContainerForm.cshtml Ver ficheiro

@@ -53,8 +53,8 @@
</div>
<div class="lr-rblock" style="overflow:auto;padding:10px 10px 0 10px;">
<div class="col-xs-12 lr-form-item flow-item" style="padding:0;" id="flow-title">
<div class="lr-form-item-title" style="position:relative;width:100%;text-align:left;">流程标题</div>
<input id="F_Title" type="text" class="form-control" />
<div class="lr-form-item-title" style="position:relative;width:100%;text-align:left;">流程标题<font face="宋体">*</font></div>
<input id="F_Title" type="text" class="form-control" isvalid="yes" checkexpession="NotNull" />
</div>
<div class="col-xs-12 lr-form-item flow-item" style="padding:0;" id="flow-level">
<div class="lr-form-item-title" style="position:relative;width:100%;text-align:left;">重要等级</div>


+ 3
- 0
Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_NewWorkFlow/Views/NWFProcess/NWFContainerForm.js Ver ficheiro

@@ -72,6 +72,7 @@ var bootstrap = function ($, learun) {
// 初始化
init: function () {
$("#des").attr('isvalid', 'no');
$("#F_Title").attr('isvalid', 'no');
switch (type) {
case 'look': // 流程信息查看
nwflow.initLook();
@@ -340,6 +341,7 @@ var bootstrap = function ($, learun) {

if (nwflow.currentNode.isTitle == '1') {
$('#flow-title').show();
$("#F_Title").attr('isvalid', 'yes');
}
}
});
@@ -525,6 +527,7 @@ var bootstrap = function ($, learun) {

if (nwflow.currentNode.isTitle == '1') {
$('#flow-title').show();
$("#F_Title").attr('isvalid', 'yes');
}
}
});


Carregando…
Cancelar
Guardar