|
|
@@ -95,7 +95,8 @@
|
|
|
<div class="modal-dialog">
|
|
|
<div class="modal-content">
|
|
|
<div class="modal-body">
|
|
|
- <h4>完成后不可更改，确认完成签署？</h4>
|
|
|
+ <h4 id="signtips"></h4>
|
|
|
+ <!--<h4>完成后不可更改，确认完成签署？</h4>-->
|
|
|
</div>
|
|
|
<div class="modal-footer">
|
|
|
<button type="button" class="btn btn-default" data-dismiss="modal">取消</button>
|
|
|
@@ -124,7 +125,7 @@
|
|
|
}
|
|
|
});
|
|
|
$( ".draggable" ).draggable({ containment: "parent" },{stop: function( event, ui ) {
|
|
|
- }}).resizable({ maxWidth: 600 },{ maxHeight: 300 },{ aspectRatio: true },{ autoHide: true },{
|
|
|
+ }}).resizable({ maxWidth: 600 },{ maxHeight: 300 },{ aspectRatio: true },{
|
|
|
stop: function( event, ui ) {
|
|
|
// localStorage.setItem('sign_'+$(this).attr('data-num'),$(this).attr('style'));
|
|
|
}
|
|
|
@@ -237,6 +238,7 @@
|
|
|
var maxwidth = $('#maxwidth').val();
|
|
|
var maxheight = $('#maxheight').val();
|
|
|
$('.warp-printer').css("max-width",maxwidth+"px");
|
|
|
+ $('.img-bar').hide();
|
|
|
var headstr = '<html><head><title></title><link rel="stylesheet" href="https://code.jquery.com/ui/1.10.4/themes/smoothness/jquery-ui.css"><style type="text/css" media="print">' +
|
|
|
'@page {size: {{style}}; margin: 0mm; padding: 0mm; border:0mm; } @media print body {margin:0mm;padding:0mm;border: 0mm} .warp-printer .page{margin:0mm;padding:0mm;border: 0mm;widows:0 orphans:0} .sign-content .page{margin:0mm;padding:0mm;border: 0mm;widows:0 orphans:0}' +
|
|
|
'</style></head><body>';
|
|
|
@@ -259,10 +261,12 @@
|
|
|
function judagedonesign()
|
|
|
{
|
|
|
var flag = false;
|
|
|
+ var num = 0;
|
|
|
$('.page .draggable').each(function(k,v){
|
|
|
if(localStorage.getItem('sign_'+$(this).attr('data-num'))){
|
|
|
flag = true;
|
|
|
- return;
|
|
|
+// return;
|
|
|
+ num++;
|
|
|
}
|
|
|
// if($(this).attr('style') && $(this).css('display') == 'block'){
|
|
|
// flag = true;
|
|
|
@@ -270,6 +274,11 @@
|
|
|
// }
|
|
|
});
|
|
|
if(flag){
|
|
|
+ if(num < {{signmsg.pagenum}}){
|
|
|
+ $('#signtips').html('<span class="text-danger">报表存在未签署或未点击确认的签名，确认提交吗？</span><img src="{{rootUrl}}global/images/signtipsimg.png">');
|
|
|
+ }else{
|
|
|
+ $('#signtips').text('完成后不可更改，确认完成签署？');
|
|
|
+ }
|
|
|
$('#donesign').modal('show');
|
|
|
|
|
|
}else{
|
