diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_NewWorkFlow/Views/NWFProcess/NWFContainerForm.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_NewWorkFlow/Views/NWFProcess/NWFContainerForm.cshtml
index de96112fd..fba3e170c 100644
--- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_NewWorkFlow/Views/NWFProcess/NWFContainerForm.cshtml
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_NewWorkFlow/Views/NWFProcess/NWFContainerForm.cshtml
@@ -74,8 +74,8 @@
创建流程
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_NewWorkFlow/Views/NWFProcess/NWFContainerForm.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_NewWorkFlow/Views/NWFProcess/NWFContainerForm.js
index 084abe992..cf33caa41 100644
--- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_NewWorkFlow/Views/NWFProcess/NWFContainerForm.js
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_NewWorkFlow/Views/NWFProcess/NWFContainerForm.js
@@ -675,10 +675,10 @@ var bootstrap = function ($, learun) {
//需要填写审批意见时,验证审批意见的必填性
var des = $('#des').val();
- if ( !des) {//btnData.isOpinion == '1' &&
- learun.alert.warning('请签署审批意见!');
- return false;
- }
+ //if ( !des) {//btnData.isOpinion == '1' &&
+ // learun.alert.warning('请签署审批意见!');
+ // return false;
+ //}
top.flowAuditfn = function (signUrl, stamp) {
// 下个流程是否需要可以手动选择审核人
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_NewWorkFlow/Views/NWFProcess/SignForm.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_NewWorkFlow/Views/NWFProcess/SignForm.js
index ca7f9f7a6..7eb53d78f 100644
--- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_NewWorkFlow/Views/NWFProcess/SignForm.js
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_NewWorkFlow/Views/NWFProcess/SignForm.js
@@ -15,8 +15,8 @@ var bootstrap = function ($, learun) {
page.bind();
},
bind: function () {
- $sigdiv = $("#signature").jSignature({ 'UndoButton': false, height:'100%',width:'100%' });
- console.log($sigdiv.jSignature("getSettings"));
+ $sigdiv = $("#signature").jSignature({ 'UndoButton': false, height: '100%', width: '100%' });
+ console.log($sigdiv.jSignature("getSettings"));
$('#btn_reset').on('click', function () {
$sigdiv.jSignature("reset");
@@ -74,11 +74,11 @@ var bootstrap = function ($, learun) {
//$('#btn_finish').on('click', debounce(function () {
// console.log('123456')
-
+
// var datapair = $sigdiv.jsignature("getdata");
// top.flowauditfn(datapair,stampurl);
// learun.layerclose(window.name);
-
+
//},500))
function debounce(fn, delay) {
@@ -95,11 +95,11 @@ var bootstrap = function ($, learun) {
//$('#btn_finish').on('click', debounce(function () {
// console.log('123456')
-
+
// var datapair = $sigdiv.jsignature("getdata");
// top.flowauditfn(datapair,stampurl);
// learun.layerclose(window.name);
-
+
//},500))
function debounce(fn, delay) {
@@ -116,22 +116,23 @@ var bootstrap = function ($, learun) {
//$('#btn_finish').on('click', debounce(function () {
// console.log('123456')
-
+
// var datapair = $sigdiv.jsignature("getdata");
// top.flowauditfn(datapair,stampurl);
// learun.layerclose(window.name);
-
+
//},500))
$('#btn_finish').on('click', function () {
- if (!$sigdiv.jSignature("isModified")){
+ if (!$sigdiv.jSignature("isModified")) {
+ learun.alert.warning('请签字!');
return false;
}
- console.log( $sigdiv.jSignature("isModified"))
+ console.log($sigdiv.jSignature("isModified"))
learun.loading(true, '正在提交');
- var datapair = $sigdiv.jSignature("getData");
- top.flowAuditfn(datapair,stampUrl);
- learun.layerClose(window.name);
+ var datapair = $sigdiv.jSignature("getData");
+ top.flowAuditfn(datapair, stampUrl);
+ learun.layerClose(window.name);
setTimeout(function () {
learun.loading(false);
});