Skip to content

Y
YX_IDENT_beijing_auxiliary_YD
Commit 62b4390d authored by dahai's avatar dahai
Browse files
Options

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

parents b933e36e 707ddd93
Hide whitespace changes
Inline Side-by-side
Showing with 144 additions and 22 deletions
src/main/resources/static/js/service.js
View file @ 62b4390d
......@@ -959,8 +959,6 @@ angular.module('AvatarCheck.http', ['ngDialog', 'LocalStorageModule'])
url: "../exportExcel/printReceiptExcelData",
data: body,
headers: {'Content-Type': 'application/json'}
// transformRequest: angular.identity,
// responseType:'arraybuffer'
}).then(function successCallback(response) {
success(response.data)
})
......
src/main/resources/static/views/receitp/receitp.html
View file @ 62b4390d
<div class="content row">
<div class="content row">
<div class="col-md-12" style="margin-top:20px;">
<div class="row">
<!-- /.col -->
......@@ -147,4 +147,87 @@
</div>
</div>
</div>
<div id="divPrint{{$index}}" ng-repeat="idx in result">
<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" style="text-align: center;">
序号
</th>
<th width="130" style="text-align: center;">
身份证受理组号
</th>
<th colspan="2" style="text-align: center;">
身份证所属派出所名称
</th>
<th width="80" style="text-align: center;">
数量
</th>
<th width="145" style="text-align: center;">
备注
</th>
</tr>
</thead>
<tbody>
<tr ng-repeat="item in idx">
<td width="60">
{{item.id}}
</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 ng-if="$index==result.length-1">
<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 @ 62b4390d
......@@ -13,14 +13,14 @@ angular.module('AvatarCheck.receitp', ['ngRoute', 'AvatarCheck.http'])
//Date picker
$('#datepicker1').datetimepicker({
minView: "month", //选择日期后，不会再跳转去选择时分秒
minView: 0, //选择到分钟
language: 'zh-CN',
format: 'yyyy-MM-dd HH:mm:ss',
todayBtn: 1,
autoclose: 1
});
$('#datepicker2').datetimepicker({
minView: "month", //选择日期后，不会再跳转去选择时分秒
minView: 0, //选择到分钟
language: 'zh-CN',
format: 'yyyy-MM-dd HH:mm:ss',
todayBtn: 1,
......@@ -117,7 +117,7 @@ angular.module('AvatarCheck.receitp', ['ngRoute', 'AvatarCheck.http'])
}
}
}
var iRadioValue=1;
$scope.printReceitp = function(typeCode) {
var startDate=$('#datepicker1').val();
var endDate=$('#datepicker2').val();
......@@ -127,7 +127,8 @@ angular.module('AvatarCheck.receitp', ['ngRoute', 'AvatarCheck.http'])
endDate:endDate,
list:[]
}
var checks = $(".checkAllPolice:checked")
var checks = $(".checkAllPolice:checked");
for (var i=0;i<checks.length;i++){
for(var j=0;j<JSON.parse(checks[i].value).length;j++){
json.list.push(JSON.parse(checks[i].value)[j].POLICE_CODE)
......@@ -135,14 +136,49 @@ angular.module('AvatarCheck.receitp', ['ngRoute', 'AvatarCheck.http'])
}
console.log(json)
HttpService.printReceitpData(json,function (data) {
console.log(data)
// var blob = new Blob([data], {type: "application/vnd.ms-excel"});
// var a = document.createElement("a");
// document.body.appendChild(a);
// a.href = URL.createObjectURL(blob);
// // a.download = fileName;
// a.click();
$scope.receitpDataToPrint = data;
for (var i=0;i<$scope.receitpDataToPrint.list.length;i++){
$scope.receitpDataToPrint.list[i].id = i+1
}
$scope.result = [];
for(var i=0;i<$scope.receitpDataToPrint.list.length;i+=37){
$scope.result.push($scope.receitpDataToPrint.list.slice(i,i+37));
}
console.log($scope.result)
$timeout(function () {
for (var i=0;i<$scope.result.length;i++){
var LODOP = getLodop();
LODOP.SET_LICENSES("", "15F0BE661E7F32F37491843CB2510905", "C94CEE276DB2187AE6B65D56B3FC2848", "");
//初始化
LODOP.PRINT_INIT("打印交接单");
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"+i).innerHTML);
LODOP.SET_PRINT_STYLEA(0, "HOrient", 2);
LODOP.SET_PRINT_STYLEA(0, "Vorient", 3);
LODOP.SET_PRINTER_INDEXA(-1);
// LODOP.PREVIEW();
LODOP.PRINT();
}
})
})
}
});
\ No newline at end of file
src/main/resources/static/views/report/report.html
View file @ 62b4390d
......@@ -5,8 +5,7 @@
<div class="col-md-12">
<div class="box box-primary" >
<div class="box-header">
<strong ng-if="state==2">膜打印数据报表</strong>
<strong ng-if="state==3">工作组数据报表</strong>
<strong>膜打印数据报表</strong>
<div class="box-tools pull-right">
<span>查询日期:</span><input type="text" style="height: 30px;margin-right: 10px;border-radius: 4px;background-color: #eee;cursor: not-allowed;border: 1px solid #ccc;" ng-model="choseDate1" id="datepicker1" readonly/> <span>至</span>
<input type="text" style="height: 30px;margin-right: 10px;border-radius: 4px;background-color: #eee;cursor: not-allowed;border: 1px solid #ccc;" ng-model="choseDate2" id="datepicker2" readonly/>
......@@ -27,8 +26,7 @@
<table class="table table-hover postTable">
<thead>
<tr>
<th ng-if="2">打印日期</th>
<th ng-if="3">预定位日期</th>
<th>打印日期</th>
<th>大批证</th>
<th>邮寄证</th>
<th>军人证</th>
......
src/main/resources/static/views/report/report.js
View file @ 62b4390d
......@@ -10,7 +10,6 @@ angular.module('AvatarCheck.report', ['ngRoute', 'AvatarCheck.http'])
}])
.controller('reportCtrl', function ($scope, $rootScope, $timeout, HttpService, ngDialog, MessageService, $filter) {
$scope.state = 3;
//Date picker
$('#datepicker1').datetimepicker({
minView: "month", //选择日期后，不会再跳转去选择时分秒
......@@ -41,6 +40,7 @@ angular.module('AvatarCheck.report', ['ngRoute', 'AvatarCheck.http'])
}
HttpService.getReport(date1,date2,function(data){
$scope.reportData=data;
console.log($scope.reportData)
})
}
$scope.searchReport();
......
src/main/resources/static/views/tagPrint/tagPrint.js
View file @ 62b4390d
......@@ -238,18 +238,18 @@ angular.module('AvatarCheck.tagPrint', ['ngRoute', 'AvatarCheck.http', 'tm.pagin
LODOP.SET_PRINT_PAGESIZE(1, "80mm", "50mm", "");
// LODOP.SET_PRINT_STYLE("FontName", "黑体");
//设定该条形码在纸张内的位置和大小【Top, Left,Width, Height, CodeType, CodeValue】
LODOP.ADD_PRINT_BARCODE(15,9, "78mm", "20mm", "128A", $scope.json.policeCardsList[0].ACCEPT_NO.toString());
LODOP.ADD_PRINT_BARCODE(24,12, "78mm", "20mm", "128A", $scope.json.policeCardsList[0].ACCEPT_NO.toString());
LODOP.SET_PRINT_STYLEA(0, "FontSize", 14);
LODOP.SET_PRINT_STYLEA(0, "Alignment", 2);
//设定该打印项在纸张内的位置和区域大小【Top,Left,Width,Height,strHtmlContent】
// LODOP.ADD_PRINT_HTM("24mm", "0", "80mm", "24mm", document.getElementById("tagDiv").innerHTML);
LODOP.ADD_PRINT_TEXT(102, 0, "100%", 20, $scope.json.policeData.toString());
LODOP.ADD_PRINT_TEXT(107, 0, "100%", 20, $scope.json.policeData.toString());
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(132, 0, "100%", 20, $scope.json.policeName.toString());
LODOP.ADD_PRINT_TEXT(137, 0, "100%", 20, $scope.json.policeName.toString());
LODOP.SET_PRINT_STYLEA(0, "Bold", 1);
LODOP.SET_PRINT_STYLEA(0, "Alignment", 2);
LODOP.SET_PRINT_STYLEA(0, "VOrient", 0);
......
src/main/resources/static/views/task/taskListPrint.html
View file @ 62b4390d
......@@ -103,6 +103,12 @@
<div class="pull-right" style="margin-left: 10px;">
<button class="btn btn-primary" ng-click="goes()">转出任务单</button>
</div>
<div class="pull-right">
<select class="form-control select2" id="group" style="border-radius:5px">
<option value="1">A组</option>
<option value="2">B组</option>
</select>
</div>
</div>
</div>
</div>
......
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