Merge branch '黑龙江艺术高中职' of http://123.57.209.16:3000/bjquanjiang/DigitalScholl into 黑龙江艺术高中职

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_NewWorkFlow/Views/NWFProcess/NWFContainerForm.cshtml

@@ -74,8 +74,8 @@
                 </div>
             </div>
             <div class="col-xs-12 lr-form-item flow-item" style="padding:0;" id="flow-des">
-                <div class="lr-form-item-title" style="position:relative;width:100%;text-align:left;">审批意见<font face="宋体">*</font></div>
-                <textarea id="des" class="form-control" style="height: 120px;" isvalid="yes" checkexpession="NotNull"></textarea>
+                <div class="lr-form-item-title" style="position:relative;width:100%;text-align:left;">审批意见</div>
+                <textarea id="des" class="form-control" style="height: 120px;"></textarea>
             </div>
             <div class="col-xs-12 flow-btn">
                 <a id="release" class="btn btn-success">创建流程</a>

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) {
                             // 下个流程是否需要可以手动选择审核人

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);
                 });