下一节点审核人*
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_NewWorkFlow/Views/NWFScheme/ButtonForm.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_NewWorkFlow/Views/NWFScheme/ButtonForm.js
index 901d84676..8b7624d2e 100644
--- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_NewWorkFlow/Views/NWFScheme/ButtonForm.js
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_NewWorkFlow/Views/NWFScheme/ButtonForm.js
@@ -23,11 +23,14 @@ var bootstrap = function ($, learun) {
placeholder: false,
data: [{ 'id': '1', 'text': '是' }, { 'id': '2', 'text': '否' }]
}).lrselectSet('2');
- $('#isSign').lrselect({// 是否可编辑1.是2.否
+ $('#isSign').lrselect({
+ placeholder: false,
+ data: [{ 'id': '1', 'text': '需要' }, { 'id': '2', 'text': '不需要' }]
+ }).lrselectSet('2');
+ $('#isOpinion').lrselect({
placeholder: false,
data: [{ 'id': '1', 'text': '需要' }, { 'id': '2', 'text': '不需要' }]
}).lrselectSet('2');
-
},
initData: function () {
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_NewWorkFlow/Views/NWFScheme/Form.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_NewWorkFlow/Views/NWFScheme/Form.js
index 56bd3aaec..12eb5636f 100644
--- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_NewWorkFlow/Views/NWFScheme/Form.js
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_NewWorkFlow/Views/NWFScheme/Form.js
@@ -322,6 +322,8 @@ var bootstrap = function ($, learun) {
var formdata = $('#step-1').lrGetFormData(keyValue);
var shcemeData = $('#step-3').lrworkflowGet();
+ //console.log(JSON.stringify(shcemeData));
+
if (authorizeType == 1) {
schemeAuthorizes = [];
schemeAuthorizes.push({
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_NewWorkFlow/Views/NWFScheme/NodeForm.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_NewWorkFlow/Views/NWFScheme/NodeForm.js
index 17c49f579..867c6dfde 100644
--- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_NewWorkFlow/Views/NWFScheme/NodeForm.js
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_NewWorkFlow/Views/NWFScheme/NodeForm.js
@@ -16,7 +16,7 @@ var auditors = [];
var workforms = [];
var workformMap = {};
// 按钮
-var btnList = [{ id: '1', name: '同意', code: 'agree', file: '1', next: '1' }, { id: '2', name: '不同意', code: 'disagree', file: '1', next: '1' }];
+var btnList = [{ id: '1', name: '同意', code: 'agree', file: '1', option: '1', next: '1' }, { id: '2', name: '不同意', code: 'disagree', file: '1', option: '1', next: '1' }];
// 条件节点
var conditions = [];
@@ -69,7 +69,7 @@ var bootstrap = function ($, learun) {
$('.div_batchAudit').show();
$('.div_agreeGz').show();
$('.div_noPeopleGz').show();
-
+
$('#name').removeAttr('readonly');
break;
case 'auditornode': // 传阅节点
@@ -344,7 +344,7 @@ var bootstrap = function ($, learun) {
$('#lr_form_schoolmaster').on('click', function () {
learun.layerConfirm('是否确认增加分管校长？', function (res) {
if (res) {
- var data = { auditorId:'fgxzid', type: '7', auditorName:'分管校长'};
+ var data = { auditorId: 'fgxzid', type: '7', auditorName: '分管校长' };
if (!isRepeat(data.auditorId)) {
data.id = learun.newGuid();
auditors.push(data);
@@ -387,120 +387,120 @@ var bootstrap = function ($, learun) {
subGridExpanded: function (subid, rowdata) {
$('#' + subid).jfGrid({
headData: [
- {
- label: "字段名称", name: "fieldName", width: 240, align: "left",
- edit: {
- type: rowdata.type == '0' ? 'input' : 'label',
- change: function (data, num) {// 行数据和行号
- workformMap[rowdata.id].authorize[data.id] = data;
- }
- }
- },
- {
- label: "字段ID", name: "fieldId", width: 240, align: "left",
- edit: {
- type: rowdata.type == '0' ? 'input' : 'label',
- change: function (data, num) {// 行数据和行号
- workformMap[rowdata.id].authorize[data.id] = data;
- }
- }
- },
- {
- label: "查看", name: "isLook", width: 70, align: "center",
- formatter: function (cellvalue, row, dfop, $dcell) {
- $dcell.on('click', function () {
+ {
+ label: "字段名称", name: "fieldName", width: 240, align: "left",
+ edit: {
+ type: rowdata.type == '0' ? 'input' : 'label',
+ change: function (data, num) {// 行数据和行号
+ workformMap[rowdata.id].authorize[data.id] = data;
+ }
+ }
+ },
+ {
+ label: "字段ID", name: "fieldId", width: 240, align: "left",
+ edit: {
+ type: rowdata.type == '0' ? 'input' : 'label',
+ change: function (data, num) {// 行数据和行号
+ workformMap[rowdata.id].authorize[data.id] = data;
+ }
+ }
+ },
+ {
+ label: "查看", name: "isLook", width: 70, align: "center",
+ formatter: function (cellvalue, row, dfop, $dcell) {
+ $dcell.on('click', function () {
- if (row.isLook == 1) {
- if (dfop.isEdit) {// 系统表单
- workformMap[rowdata.id].authorize[row.id].isLook = 0;
- }
- else {// 自定义表单
- var _formAuthorize = workformMap[row.formId].authorize;
- _formAuthorize[row.fieldId] = _formAuthorize[row.fieldId] || { isLook: 1, isEdit: 1 };
- _formAuthorize[row.fieldId].isLook = 0;
- }
- row.isLook = 0;
- $(this).html('
否');
- }
- else {
- if (dfop.isEdit) {// 系统表单
- workformMap[rowdata.id].authorize[row.id].isLook = 1;
- }
- else {// 自定义表单
- var _formAuthorize = workformMap[row.formId].authorize;
- _formAuthorize[row.fieldId] = _formAuthorize[row.fieldId] || { isLook: 1, isEdit: 1 };
- _formAuthorize[row.fieldId].isLook = 1;
- }
+ if (row.isLook == 1) {
+ if (dfop.isEdit) {// 系统表单
+ workformMap[rowdata.id].authorize[row.id].isLook = 0;
+ }
+ else {// 自定义表单
+ var _formAuthorize = workformMap[row.formId].authorize;
+ _formAuthorize[row.fieldId] = _formAuthorize[row.fieldId] || { isLook: 1, isEdit: 1 };
+ _formAuthorize[row.fieldId].isLook = 0;
+ }
+ row.isLook = 0;
+ $(this).html('
否');
+ }
+ else {
+ if (dfop.isEdit) {// 系统表单
+ workformMap[rowdata.id].authorize[row.id].isLook = 1;
+ }
+ else {// 自定义表单
+ var _formAuthorize = workformMap[row.formId].authorize;
+ _formAuthorize[row.fieldId] = _formAuthorize[row.fieldId] || { isLook: 1, isEdit: 1 };
+ _formAuthorize[row.fieldId].isLook = 1;
+ }
- row.isLook = 1;
- $(this).html('
是');
- }
- });
+ row.isLook = 1;
+ $(this).html('
是');
+ }
+ });
- //默认绑定授权值
- if (dfop.isEdit) {// 系统表单
- workformMap[rowdata.id].authorize[row.id].isLook = cellvalue;
- }
- else {// 自定义表单
- var _formAuthorize = workformMap[row.formId].authorize;
- _formAuthorize[row.fieldId] = _formAuthorize[row.fieldId] || { isLook: 1, isEdit: 1 };
- }
+ //默认绑定授权值
+ if (dfop.isEdit) {// 系统表单
+ workformMap[rowdata.id].authorize[row.id].isLook = cellvalue;
+ }
+ else {// 自定义表单
+ var _formAuthorize = workformMap[row.formId].authorize;
+ _formAuthorize[row.fieldId] = _formAuthorize[row.fieldId] || { isLook: 1, isEdit: 1 };
+ }
- if (cellvalue == 1) {
- return '
是';
- } else if (cellvalue == 0) {
- return '
否';
- }
- }
- },
- {
- label: "编辑", name: "isEdit", width: 70, align: "center",
- formatter: function (cellvalue, row, dfop, $dcell) {
- $dcell.on('click', function () {
- if (row.isEdit == 1) {
- if (dfop.isEdit) {// 系统表单
- workformMap[rowdata.id].authorize[row.id].isEdit = 0;
- }
- else {// 自定义表单
- var _formAuthorize = workformMap[row.formId].authorize;
- _formAuthorize[row.fieldId] = _formAuthorize[row.fieldId] || { isLook: 1, isEdit: 1 };
- _formAuthorize[row.fieldId].isEdit = 0;
- }
+ if (cellvalue == 1) {
+ return '
是';
+ } else if (cellvalue == 0) {
+ return '
否';
+ }
+ }
+ },
+ {
+ label: "编辑", name: "isEdit", width: 70, align: "center",
+ formatter: function (cellvalue, row, dfop, $dcell) {
+ $dcell.on('click', function () {
+ if (row.isEdit == 1) {
+ if (dfop.isEdit) {// 系统表单
+ workformMap[rowdata.id].authorize[row.id].isEdit = 0;
+ }
+ else {// 自定义表单
+ var _formAuthorize = workformMap[row.formId].authorize;
+ _formAuthorize[row.fieldId] = _formAuthorize[row.fieldId] || { isLook: 1, isEdit: 1 };
+ _formAuthorize[row.fieldId].isEdit = 0;
+ }
- row.isEdit = 0;
- $(this).html('
否');
- }
- else {
- if (dfop.isEdit) {// 系统表单
- workformMap[rowdata.id].authorize[row.id].isEdit = 1;
- }
- else {// 自定义表单
- var _formAuthorize = workformMap[row.formId].authorize;
- _formAuthorize[row.fieldId] = _formAuthorize[row.fieldId] || { isLook: 1, isEdit: 1 };
- _formAuthorize[row.fieldId].isEdit = 1;
- }
+ row.isEdit = 0;
+ $(this).html('
否');
+ }
+ else {
+ if (dfop.isEdit) {// 系统表单
+ workformMap[rowdata.id].authorize[row.id].isEdit = 1;
+ }
+ else {// 自定义表单
+ var _formAuthorize = workformMap[row.formId].authorize;
+ _formAuthorize[row.fieldId] = _formAuthorize[row.fieldId] || { isLook: 1, isEdit: 1 };
+ _formAuthorize[row.fieldId].isEdit = 1;
+ }
- row.isEdit = 1;
- $(this).html('
是');
- }
- });
+ row.isEdit = 1;
+ $(this).html('
是');
+ }
+ });
- //默认绑定授权值
- if (dfop.isEdit) {// 系统表单
- workformMap[rowdata.id].authorize[row.id].isEdit = cellvalue;
- }
- else {// 自定义表单
- var _formAuthorize = workformMap[row.formId].authorize;
- _formAuthorize[row.fieldId] = _formAuthorize[row.fieldId] || { isLook: 1, isEdit: 1 };
- }
+ //默认绑定授权值
+ if (dfop.isEdit) {// 系统表单
+ workformMap[rowdata.id].authorize[row.id].isEdit = cellvalue;
+ }
+ else {// 自定义表单
+ var _formAuthorize = workformMap[row.formId].authorize;
+ _formAuthorize[row.fieldId] = _formAuthorize[row.fieldId] || { isLook: 1, isEdit: 1 };
+ }
- if (cellvalue == 1) {
- return '
是';
- } else if (cellvalue == 0) {
- return '
否';
- }
- }
- }
+ if (cellvalue == 1) {
+ return '
是';
+ } else if (cellvalue == 0) {
+ return '
否';
+ }
+ }
+ }
],
onAddRow: function (row, rows) {//行数据和所有行数据
row.isLook = 0;
@@ -679,7 +679,7 @@ var bootstrap = function ($, learun) {
value: 'F_StrategyCode',
url: top.$.rootUrl + '/LR_Message/LR_StrategyInfo/GetList'
});
-
+
/*按钮设置*/
$('#btn_girdtable').jfGrid({
headData: [
@@ -709,6 +709,16 @@ var bootstrap = function ($, learun) {
}
}
},
+ {
+ label: "需要填写意见", name: "isOpinion", width: 100, align: "left",
+ formatter: function (cellvalue, row) {
+ if (cellvalue == '1') {
+ return '需要';
+ } else {
+ return '不需要';
+ }
+ }
+ },
{
label: "下一节点审核人", name: "next", width: 100, align: "left",
formatter: function (cellvalue, row) {
@@ -728,11 +738,11 @@ var bootstrap = function ($, learun) {
title: '添加按钮',
url: top.$.rootUrl + '/LR_NewWorkFlow/NWFScheme/ButtonForm',
width: 400,
- height: 320,
+ height: 350,
callBack: function (id) {
return top[id].acceptClick(function (data) {
var _flag = true;
- $.each(btnList, function (_index,_item) {
+ $.each(btnList, function (_index, _item) {
if (_item.code == data.code) {
learun.alert.error('按钮编码重复！');
_flag = false;
@@ -761,7 +771,7 @@ var bootstrap = function ($, learun) {
title: '编辑按钮',
url: top.$.rootUrl + '/LR_NewWorkFlow/NWFScheme/ButtonForm?id=' + _id,
width: 400,
- height: 320,
+ height: 350,
callBack: function (id) {
return top[id].acceptClick(function (data) {
for (var i = 0, l = btnList.length; i < l; i++) {
@@ -974,7 +984,7 @@ var bootstrap = function ($, learun) {
if (currentNode.auditors) {
auditors = currentNode.auditors;
}
- if (currentNode.btnList && currentNode.btnList.length >0) {
+ if (currentNode.btnList && currentNode.btnList.length > 0) {
btnList = currentNode.btnList;
}
if (currentNode.conditions) {
@@ -1000,7 +1010,7 @@ var bootstrap = function ($, learun) {
$('#iocName').val(currentNode.iocName);
break;
}
-
+
}
};
// 保存数据
@@ -1024,7 +1034,7 @@ var bootstrap = function ($, learun) {
currentNode.auditorAgainType = baseInfo.auditorAgainType;
currentNode.auditorType = baseInfo.auditorType;
currentNode.auditExecutType = baseInfo.auditExecutType;
-
+
currentNode.isSign = baseInfo.isSign;
currentNode.isBatchAudit = baseInfo.isBatchAudit;
@@ -1086,7 +1096,6 @@ var bootstrap = function ($, learun) {
}
break;
};
-
callBack();
return true;
};