Skip to content

Y
YX_IDENT_beijing_auxiliary_YD
Commit 70f3cdbb authored by ad's avatar ad
Browse files
Options

Merge remote-tracking branch 'origin/dev' into dev

parents 2595600e 28b7f30b
Expand all Show whitespace changes
Inline Side-by-side
Showing with 119 additions and 14 deletions
src/main/java/com/yxproject/start/mapper/TaskListMapper.java
View file @ 70f3cdbb
...@@ -476,7 +476,7 @@ public interface TaskListMapper { ...@@ -476,7 +476,7 @@ public interface TaskListMapper {
"left join (\n" + "left join (\n" +
" select substr(accept_no,0,8) group_no, sum(decode(accept_no,null,0,1)) faileCount \n" + " select substr(accept_no,0,8) group_no, sum(decode(accept_no,null,0,1)) faileCount \n" +
" from FAILED_CARD \n" + " from FAILED_CARD \n" +
" where FAILED_CARD.state <4 and FAILED_CARD.state != FAILED_CARD.INITIATOR \n" + " where FAILED_CARD.state <=4 and FAILED_CARD.state != FAILED_CARD.INITIATOR \n" +
" and accept_no not in (select accept_no from special_card ) \n" + " and accept_no not in (select accept_no from special_card ) \n" +
" group by substr(accept_no,0,8) ) fc \n" + " group by substr(accept_no,0,8) ) fc \n" +
" on fc.group_no= group_no.group_no \n" + " on fc.group_no= group_no.group_no \n" +
......
src/main/resources/static/js/service.js
View file @ 70f3cdbb
...@@ -959,8 +959,6 @@ angular.module('AvatarCheck.http', ['ngDialog', 'LocalStorageModule']) ...@@ -959,8 +959,6 @@ angular.module('AvatarCheck.http', ['ngDialog', 'LocalStorageModule'])
url: "../exportExcel/printReceiptExcelData", url: "../exportExcel/printReceiptExcelData",
data: body, data: body,
headers: {'Content-Type': 'application/json'} headers: {'Content-Type': 'application/json'}
// transformRequest: angular.identity,
// responseType:'arraybuffer'
}).then(function successCallback(response) { }).then(function successCallback(response) {
success(response.data) success(response.data)
}) })
......
src/main/resources/static/views/receitp/receitp.html
View file @ 70f3cdbb
<div class="content row"> <div class="content row">
<div class="col-md-12" style="margin-top:20px;"> <div class="col-md-12" style="margin-top:20px;">
<div class="row"> <div class="row">
<!-- /.col --> <!-- /.col -->
...@@ -147,4 +147,87 @@ ...@@ -147,4 +147,87 @@
</div> </div>
</div> </div>
</div> </div>
<div id="divPrint">
<div class="title" style="text-align: center;">
北京市公安局证件制作管理中心交接岗位<br />
身份证交接单</div>
<div>交接日期：{{receitpDataToPrint.date}}</div>
<div>送至：</div>
<table cellpadding="0" cellspacing="0" border="1" style="text-align: center;">
<thead>
<tr>
<th width="60">
序号
</th>
<th width="130">
身份证受理组号
</th>
<th colspan="2">
身份证所属派出所名称
</th>
<th width="80">
数量
</th>
<th width="145">
备注
</th>
</tr>
</thead>
<tbody>
<tr ng-repeat="item in receitpDataToPrint.list">
<td width="60">
{{$index+1}}
</td>
<td width="130">
{{item.QR_CODE}}
</td>
<td colspan="2" style="text-align: left;">
异地居民身份证{{item.COUNTYNAME}}{{item.GAJG_MC}}
</td>
<td width="80">
{{item.FINISH_COUNT}}
</td>
<td width="145">
</td>
</tr>
</tbody>
<tfoot>
<tr>
<td colspan="2" class="center">
合计
</td>
<td colspan="2">
</td>
<td class="center">
{{receitpDataToPrint.total}}
</td>
<td>
</td>
</tr>
<tr>
<td colspan="3" style="height: 110px;">
<div class="sign">
交付人（签字）：</div>
<br />
<br />
<br />
<br />
<div class="signdate">
日期：</div>
</td>
<td colspan="3" style="height: 110px;">
<div class="sign">
接收人（签字）：</div>
<br />
<br />
<br />
<br />
<div class="signdate">
日期：</div>
</td>
</tr>
</tfoot>
</table>
</div>
src/main/resources/static/views/receitp/receitp.js
View file @ 70f3cdbb
...@@ -117,7 +117,7 @@ angular.module('AvatarCheck.receitp', ['ngRoute', 'AvatarCheck.http']) ...@@ -117,7 +117,7 @@ angular.module('AvatarCheck.receitp', ['ngRoute', 'AvatarCheck.http'])
} }
} }
} }
var iRadioValue=1;
$scope.printReceitp = function(typeCode) { $scope.printReceitp = function(typeCode) {
var startDate=$('#datepicker1').val(); var startDate=$('#datepicker1').val();
var endDate=$('#datepicker2').val(); var endDate=$('#datepicker2').val();
...@@ -135,14 +135,37 @@ angular.module('AvatarCheck.receitp', ['ngRoute', 'AvatarCheck.http']) ...@@ -135,14 +135,37 @@ angular.module('AvatarCheck.receitp', ['ngRoute', 'AvatarCheck.http'])
} }
console.log(json) console.log(json)
HttpService.printReceitpData(json,function (data) { HttpService.printReceitpData(json,function (data) {
console.log(data) $scope.receitpDataToPrint = data;
// var blob = new Blob([data], {type: "application/vnd.ms-excel"}); $timeout(function () {
// var a = document.createElement("a"); var LODOP = getLodop();
// document.body.appendChild(a); LODOP.SET_LICENSES("", "15F0BE661E7F32F37491843CB2510905", "C94CEE276DB2187AE6B65D56B3FC2848", "");
// a.href = URL.createObjectURL(blob); //初始化
// // a.download = fileName; LODOP.PRINT_INIT("打印交接单");
// a.click(); LODOP.SET_PRINT_PAGESIZE(1, 0, 0, "A4");
LODOP.ADD_PRINT_TEXT(10, 0, "100%", 20, "北京市公安局证件制作管理中心交接岗位");
LODOP.SET_PRINT_STYLEA(0, "Bold", 1);
LODOP.SET_PRINT_STYLEA(0, "Alignment", 2);
LODOP.SET_PRINT_STYLEA(0, "FontSize", 15);
LODOP.ADD_PRINT_TEXT(35, 0, "100%", 20, "身份证交接单");
LODOP.SET_PRINT_STYLEA(0, "Bold", 1);
LODOP.SET_PRINT_STYLEA(0, "Alignment", 2);
LODOP.SET_PRINT_STYLEA(0, "FontSize", 15);
LODOP.ADD_PRINT_TEXT(70, 30, "100%", 20, "交接日期："+$scope.receitpDataToPrint.date);
LODOP.SET_PRINT_STYLEA(0, "Bold", 1);
LODOP.SET_PRINT_STYLEA(0, "Alignment", 1);
LODOP.SET_PRINT_STYLEA(0, "FontSize", 12);
LODOP.ADD_PRINT_TEXT(90, 30, "100%", 20, "送至：");
LODOP.SET_PRINT_STYLEA(0, "Bold", 1);
LODOP.SET_PRINT_STYLEA(0, "Alignment", 1);
LODOP.SET_PRINT_STYLEA(0, "FontSize", 12);
LODOP.ADD_PRINT_TABLE(110, 3, 740, "100%", document.getElementById("divPrint").innerHTML);
LODOP.SET_PRINT_STYLEA(0, "HOrient", 2);
LODOP.SET_PRINT_STYLEA(0, "Vorient", 3);
LODOP.PREVIEW();
// LODOP.PRINT();
})
}) })
} }
}); });
\ No newline at end of file
src/main/resources/static/views/report/report.html
View file @ 70f3cdbb
...@@ -27,8 +27,8 @@ ...@@ -27,8 +27,8 @@
<table class="table table-hover postTable"> <table class="table table-hover postTable">
<thead> <thead>
<tr> <tr>
<th ng-if="2">打印日期</th> <th ng-if="state==2">打印日期</th>
<th ng-if="3">预定位日期</th> <th ng-if="state==3">预定位日期</th>
<th>大批证</th> <th>大批证</th>
<th>邮寄证</th> <th>邮寄证</th>
<th>军人证</th> <th>军人证</th>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment