Skip to content

Y
YX_IDENT_beijing_auxiliary_YD
Commit 69cd7224 authored by dahai's avatar dahai
Browse files
Options

push

parent 631a70c4
Show whitespace changes
Inline Side-by-side
Showing with 339 additions and 67 deletions
src/main/java/com/yxproject/start/api/FailedCardApi.java
View file @ 69cd7224
......@@ -104,14 +104,14 @@ public class FailedCardApi {
for (Object o : jsonarray) {
JSONObject jsonObject = (JSONObject) o;
String name = ((JSONObject) o).getString("name");
String result = failedCardService.selectSpecialCard(((JSONObject) o).getString("cardId"));
String acceptNo = formateAcceptNo(((JSONObject) o).getString("cardId"));
String result = failedCardService.selectSpecialCard(acceptNo);
Map<String, Object> idMap;
//判断是否是特殊证件
if (result != null && result != "") {
idMap = failedCardService.selectDataById(jsonObject.getString("cardId"));
idMap = failedCardService.selectDataById(acceptNo);
} else {
idMap = failedCardService.selectCountIdByCardId(jsonObject.getString("cardId"));
idMap = failedCardService.selectCountIdByCardId(acceptNo);
}
int initiator = 5;
failedCardService.insertFailedCard(jsonObject.getString("failedCardReasonId"), idMap.get("ACCEPT_NO").toString(), idMap.get("TASK_ID").toString(), String.valueOf(initiator), jsonObject.getString("note"), idMap.get("WORK_GROUP").toString(),name);
......@@ -229,5 +229,14 @@ public class FailedCardApi {
return str.replace("-", "").replace(" ","").replace(":","");
}
/**
* 格式化受理组号
* @param acceptNo
* @return
*/
private String formateAcceptNo(String acceptNo){
return acceptNo.replace("e", "E").replace("g", "G").replace("l","L");
}
}
src/main/java/com/yxproject/start/api/ReceiptApi.java
View file @ 69cd7224
......@@ -38,13 +38,13 @@ public class ReceiptApi {
@Transactional(rollbackFor = Exception.class)
public Map<String,Object> createReceiptList(String id,String name,String beginDate,String expireDate) {
//判断是否是特证
if (receiptService.selectSpecialCardByAcceptNo(id,beginDate,expireDate) == 1) {
if (receiptService.selectSpecialCardByAcceptNo(id,replaceDate(beginDate),replaceDate(expireDate)) == 1) {
//查询这个受理号是否生成了交接单
List<Map<String, Object>> mapList = receiptService.selectCountById(id,beginDate,expireDate);
List<Map<String, Object>> mapList = receiptService.selectCountById(id,replaceDate(beginDate),replaceDate(expireDate));
//判断是否生成了交接单
if (mapList.size() == 0) {
//查询特证交接单所需数据
Map<String, Object> resultDate = receiptService.selectReceiptListDate(id,beginDate,expireDate);
Map<String, Object> resultDate = receiptService.selectReceiptListDate(id,replaceDate(beginDate),replaceDate(expireDate));
ReceiptListEntity receiptListEntity = new ReceiptListEntity();
receiptListEntity.setPoliceCode(resultDate.get("GAJG_DM").toString());
receiptListEntity.setCardTypeId(Long.valueOf((BigDecimal) resultDate.get("CARD_TYPE") + ""));
......@@ -60,7 +60,7 @@ public class ReceiptApi {
long S = receiptService.createReceiptList(receiptListEntity);
//查询特证详单所需数据
Map<String, Object> detailedData = receiptService.selectDetailedData2(id,beginDate,expireDate);
Map<String, Object> detailedData = receiptService.selectDetailedData2(id,replaceDate(beginDate),replaceDate(expireDate));
String uploadNo = (String) detailedData.get("UPLOAD_NO");
String acceptNo2 = (String) detailedData.get("ACCEPT_NO");
String name2 = (String) detailedData.get("NAME");
......@@ -89,7 +89,7 @@ public class ReceiptApi {
}
} else {
//根据身份证号查组号
String groupNo = receiptService.selectGroupNoById(id,beginDate,expireDate);
String groupNo = receiptService.selectGroupNoById(id,replaceDate(beginDate),replaceDate(expireDate));
//查询详单所需数据
List<Map<String, Object>> receiptListDate = receiptService.selectReceiptListDate2(groupNo);
......
src/main/java/com/yxproject/start/api/SelectApi.java
View file @ 69cd7224
......@@ -24,7 +24,8 @@ public class SelectApi {
private SelectSerialNumberService selectSerialNumberService;
@RequestMapping(value = "selectByCard")
public Map<String, Object> selectByCard(@RequestParam("id") String id) {
public Map<String, Object> selectByCard(@RequestParam("id") String string) {
String id = formateAcceptNo(string);
Map<String, Object> resultMap = new HashMap<>();
if (id.length() == 11) {
List<Map<String, Object>> workOrderData = selectSerialNumberService.selectByWorkOrderFromYX(id);
......@@ -63,4 +64,13 @@ public class SelectApi {
return resultMap;
}
/**
* 格式化受理组号
* @param acceptNo
* @return
*/
private String formateAcceptNo(String acceptNo){
return acceptNo.replace("e", "E").replace("g", "G").replace("l","L");
}
}
src/main/java/com/yxproject/start/api/TaskListApi.java
View file @ 69cd7224
......@@ -440,6 +440,23 @@ public class TaskListApi {
return printOutCount;
}
/**
* 更改废证任务单工作组
* （打印转出）
* taskId 任务单ID
* workGroup 工作组
*
* @return
*/
@RequestMapping("updateFailedCardWorkGroup")
public boolean updateFailedCardWorkGroup(@RequestBody String json) {
JSONObject jsonObject = JSONObject.fromObject(json);
JSONArray jsonArray = (JSONArray) jsonObject.get("taskIdList");
String workGroup = jsonObject.get("workGroup").toString();
List<String> list = (List<String>) jsonArray;
return taskListService.updateFailedCardWorkGroup(list, workGroup);
}
/**
* 去除字符串中中线
*
......
src/main/java/com/yxproject/start/mapper/TaskListMapper.java
View file @ 69cd7224
......@@ -1515,6 +1515,8 @@ public interface TaskListMapper {
"order by SPECIAL_CARD.accept_no")
public List<Map<String, Object>> selectRemainderCardInfo(String date, String name);
@Update("update failed_card set work_group = ${workGroup} where failed_card_ID = ${taskId}")
public boolean updateFailedCardWorkGroup(@Param("taskId")String taskId,@Param("workGroup") long workGroup);
......
src/main/java/com/yxproject/start/service/TaskListService.java
View file @ 69cd7224
......@@ -103,4 +103,6 @@ public interface TaskListService {
public boolean updateWorkGroup(List<String> list,String workGroup);
public List<Map<String,Object>> selectRemainderCardInfo(String date ,String name);
public boolean updateFailedCardWorkGroup(List<String> list, String workGroup);
}
src/main/java/com/yxproject/start/service/impl/TaskListServiceImpl.java
View file @ 69cd7224
......@@ -973,6 +973,15 @@ public class TaskListServiceImpl implements TaskListService {
return taskListMapper.selectRemainderCardInfo(date,name);
}
@Override
@Transactional
public boolean updateFailedCardWorkGroup(List<String> list, String workGroup) {
for (String taskId:list){
taskListMapper.updateFailedCardWorkGroup(taskId,Long.valueOf(workGroup));
}
return true;
}
private String createGroupNo(List<Integer> c, List<Integer> nsList) {
try {
String groupNo = "";
......
src/main/resources/mapper/config/mybatis-config.xml
View file @ 69cd7224
......@@ -6,6 +6,6 @@ PUBLIC "-//mybatis.org//DTD Config 3.0//EN"
<settings>
<setting name="mapUnderscoreToCamelCase" value="true"/>
<setting name="callSettersOnNulls" value="true"/>
<!--<setting name="logImpl" value="STDOUT_LOGGING" />-->
<setting name="logImpl" value="STDOUT_LOGGING" />
</settings>
</configuration>
\ No newline at end of file
src/main/resources/static/dialogs/confirmDeleteFailed.html 0 → 100644
View file @ 69cd7224
<div class="ui-dialog-title">
提示
</div>
<div class="ui-dialog-content">
<div>确认删除身份证号为{{idCard}}的废证吗？</div>
</div>
<div class="ui-dialog-confirm">
<button type="submit" class="btn btn-info" ng-click="confirmDelete()">确认删除</button>
<button type="submit" class="btn btn-danger" ng-click="closeThisDialog()">取消</button>
</div>
src/main/resources/static/index.html
View file @ 69cd7224
......@@ -154,7 +154,7 @@
<strong>北京制证辅助平台</strong>
</footer>
</div>
<div ng-if="loginData.login == false" class="wrapper" style="background-image:url(newTheme/dist/img/download.jpg);background-repeat:repeat;height:100%;">
<div ng-if="loginData.login == false" class="wrapper" style="background-image:url(newTheme/dist/img/download.jpg);background-size:100% 100%;background-repeat:no-repeat;">
<div style="min-height: 1000px;" ng-view></div>
</div>
......
src/main/resources/static/js/app.js
View file @ 69cd7224
......@@ -50,6 +50,10 @@ angular.module('AvatarCheck', [
DebugService.debug("appCtrl:" + "AvatarCheck initial.")
$scope.jumpToPolice = function () {
window.open("http://localhost:8081/#!searchCardMsg/zhangsan/10010001/2",'_blank');
};
$rootScope.loginData = localStorageService.get('loginData')
......
src/main/resources/static/js/service.js
View file @ 69cd7224
......@@ -587,6 +587,18 @@ angular.module('AvatarCheck.http', ['ngDialog', 'LocalStorageModule'])
success(response.data)
})
},
updateFailedCardWorkGroup:function(data,success){
var body = JSON.stringify(data);
console.log("data:",body)
$http({
method: 'POST',
url: "../TaskList/updateFailedCardWorkGroup",
data: body,
headers: {'Content-Type': 'application/json'}
}).then(function successCallback(response) {
success(response.data)
})
},
getFjHistoryTask:function(date,success){
console.log(date)
$http({
......@@ -875,6 +887,18 @@ angular.module('AvatarCheck.http', ['ngDialog', 'LocalStorageModule'])
success(response.data)
})
},
printExcelData:function(data,success){
var body = JSON.stringify(data);
$http({
method: 'POST',
url: "../exportExcel/printExcelData" + urlTimeStamp(),
data: body,
transformRequest: angular.identity,
responseType:'arraybuffer'
}).then(function successCallback(response) {
success(response.data)
})
},
getHistoryReceitp:function(startDate,endDate,success){
$http({
method: 'GET',
......@@ -920,6 +944,19 @@ angular.module('AvatarCheck.http', ['ngDialog', 'LocalStorageModule'])
success(response.data)
})
},
aselectRestInfo:function(date,name,success){
$http({
method: 'GET',
url: "../TaskList/queryRemainderCardInfo",
params:{
date:date,
name:name
},
headers: {'Content-Type': 'application/json'}
}).then(function successCallback(response) {
success(response.data)
})
},
giveBackCard:function(data,success) {
var body = JSON.stringify(data);
$http({
......@@ -1365,5 +1402,17 @@ angular.module('AvatarCheck.http', ['ngDialog', 'LocalStorageModule'])
success(response.data)
})
},
deleteFailedCard:function(failedCardId,success){
console.log(failedCardId)
$http({
method: 'GET',
url: "../FailedCardApi/deleteFailedCardInfo" + urlTimeStamp(),
params:{
failedCardId:cardid
}
}).then(function successCallback(response) {
success(response.data)
})
}
}
});
\ No newline at end of file
src/main/resources/static/views/addFailed/addFailed.html
View file @ 69cd7224
......@@ -94,7 +94,7 @@
<span>日期:</span>
</td>
<td width="200px;">
<input type="text" class="form-control" ng-model="choseDate" id="datepicker1" readonly/>
<input type="text" class="form-control" ng-model="choseDate" id="datepicker" readonly/>
</td>
<td>
<div style="text-align: left;">
......@@ -109,18 +109,23 @@
<tr>
<th>NO.</th>
<th>受理组号</th>
<th>身份证号</th>
<th>姓名</th>
<th>废证原因</th>
<th>保存时间</th>
<th>工作组</th>
<th>提交人</th>
<th>状态</th>
<th>备注</th>
<th>操作</th>
</tr>
</thead>
<tbody>
<tr ng-repeat="item in failedInfo">
<td>{{item.FAILED_CARD_ID}}</td>
<td>{{$index+1}}</td>
<th>{{item.ACCEPT_NO}}</th>
<td>{{item.CARD_NAME}}</td>
<td>{{item.ID_NO}}</td>
<th>{{item.FAILED_CARD_REASON_ID}}</th>
<td>{{item.SUBMIT_DATE | date:'yyyy-MM-dd HH:mm:ss'}}</td>
<td ng-if="item.WORK_GROUP == 1">A组</td>
......@@ -128,6 +133,7 @@
<td>{{item.NAME}}</td>
<td>{{item.STATE}}</td>
<td>{{item.NOTE}}</td>
<td><a ng-click="deleteFailed(item.FAILED_CARD_ID,item.ID_NO)">删除</a></td>
</tr>
</tbody>
<tbody ng-if="failedInfo.length==0">
......
src/main/resources/static/views/addFailed/addFailed.js
View file @ 69cd7224
......@@ -21,12 +21,14 @@ angular.module('AvatarCheck.addFailed', ['ngRoute', 'AvatarCheck.http'])
});
$scope.choseDate = $filter("date")(new Date(), "yyyy-MM-dd");
//查询废证
$scope.aselectFailedInfo = function () {
var date = $('#datepicker').val();
if(angular.isUndefined(date)){
if(date==""){
console.log("???????")
date=$scope.choseDate
}
//查询废证
$scope.aselectFailedInfo = function () {
HttpService.selectFailedInfo(date,$rootScope.loginData.name,function(data){
$scope.failedInfo = data;
console.log($scope.failedInfo)
......@@ -125,6 +127,23 @@ angular.module('AvatarCheck.addFailed', ['ngRoute', 'AvatarCheck.http'])
}]
});
}
}
$scope.deleteFailed = function(failedCardId,cardId) {
ngDialog.open({
template: 'dialogs/confirmDeleteFailed.html' + urlTimeStamp(),
width: 600,
cache: false,
closeByDocument:false,
controller: ['$scope', function ($scope) {
$scope.idCard = cardId;
$scope.confirmDelete = function () {
HttpService.deleteFailedCard(failedCardId,function(data) {
$scope.closeThisDialog();
$scope.aselectFailedInfo();
})
};
}]
});
}
});
\ No newline at end of file
src/main/resources/static/views/addRest/addRest.html
View file @ 69cd7224
......@@ -31,5 +31,62 @@
</form>
</div>
</div>
</div>
<div class="box">
<div class="box-header">
<strong>余证提交详情</strong>
</div>
<div class="box box-primary">
<table class="table table-bordered" style="margin-bottom: 0;">
<tr>
<td width="200px;">
<span>日期:</span>
</td>
<td width="200px;">
<input type="text" class="form-control" ng-model="choseDate" id="datepicker" readonly/>
</td>
<td>
<div style="text-align: left;">
<button class="btn btn-primary" ng-click="aselectRestInfo()">查询</button>
</div>
</td>
</tr>
</table>
<div class="box-info" style="padding: 7px;padding-top: 0px;">
<table class="table table-bordered table-hover postTable" ng-if="restInfo.length>0">
<thead>
<tr>
<th>NO.</th>
<th>受理组号</th>
<th>身份证号</th>
<th>姓名</th>
<th>保存时间</th>
<th>工作组</th>
<th>提交人</th>
<th>状态</th>
<th>备注</th>
</tr>
</thead>
<tbody>
<tr ng-repeat="item in restInfo">
<td>{{$index+1}}</td>
<th>{{item.ACCEPT_NO}}</th>
<td>{{item.CARD_NAME}}</td>
<td>{{item.ID_NO}}</td>
<td>{{item.FILL_IN_DATE | date:'yyyy-MM-dd HH:mm:ss'}}</td>
<td ng-if="item.WORK_GROUP == 1">A组</td>
<td ng-if="item.WORK_GROUP == 2">B组</td>
<td>{{item.INITIATOR}}</td>
<td>{{item.TASK_STATE}}</td>
<td>{{item.NOTE}}</td>
</tr>
</tbody>
<tbody ng-if="restInfo.length==0">
<h4 style="padding-left: 10px;">暂无数据</h4>
</tbody>
</table>
</div>
</div>
</div>
</div>
</div>
\ No newline at end of file
src/main/resources/static/views/addRest/addRest.js
View file @ 69cd7224
......@@ -10,6 +10,29 @@ angular.module('AvatarCheck.addRest', ['ngRoute', 'AvatarCheck.http'])
}])
.controller('addRestCtrl', function ($scope, $rootScope, $timeout, HttpService, ngDialog, MessageService, $filter) {
//Date picker
$('#datepicker').datetimepicker({
minView: "month", //选择日期后，不会再跳转去选择时分秒
language: 'zh-CN',
format: 'yyyy-mm-dd',
todayBtn: 1,
autoclose: 1
});
$scope.choseDate = $filter("date")(new Date(), "yyyy-MM-dd");
//查询余证
$scope.aselectRestInfo = function () {
var date = $('#datepicker').val();
if(date==""){
date=$scope.choseDate
}
HttpService.aselectRestInfo(date,$rootScope.loginData.name,function(data){
$scope.restInfo = data;
console.log($scope.restInfo)
})
}
$scope.aselectRestInfo();
$scope.createInputs = function(){
if($scope.restCount>0){
......
src/main/resources/static/views/createTaskList/createTaskList.js
View file @ 69cd7224
......@@ -138,8 +138,9 @@ angular.module('AvatarCheck.createTaskList', ['ngRoute', 'AvatarCheck.http', 'tm
var action = (checkbox.checked ? 'add' : 'remove');
for (var i = 0; i < task.length; i++) {
var contact = task[i];
if(task[i].DEAL_FLAG==='3'){
updateSelected(action, contact);
}
$rootScope.groupCardsTotal=0
}
var sum = 0;
......
src/main/resources/static/views/insertCardBody/insertCardBody.html
View file @ 69cd7224
......@@ -44,7 +44,7 @@
<td>
<select class="form-control select2" id="cardBodyType">
<option value="1">身份证卡体</option>
<option value="2">香港居住证卡体</option>
<option value="2">台湾居住证卡体</option>
<option value="3">港澳居住证卡体</option>
</select>
</td>
......
src/main/resources/static/views/insertCardBody/insertCardBody.js
View file @ 69cd7224
......@@ -46,7 +46,9 @@ angular.module("AvatarCheck.insertCardBody",['ngRoute', 'AvatarCheck.http'])
if(data==false){
MessageService.showAlert("添加失败")
}else{
MessageService.showAlert("添加成功，请等待审核")
//查询 身份证卡体耗材出入库
$scope.selectCardBodyManagement();
console.log("selectCardBodyManagement") ;
}
})
}else {
......@@ -54,7 +56,6 @@ angular.module("AvatarCheck.insertCardBody",['ngRoute', 'AvatarCheck.http'])
}
}
$scope.selectCardBodyManagement=function(){
......
src/main/resources/static/views/insertFilm/insertFilm.js
View file @ 69cd7224
......@@ -34,7 +34,8 @@ angular.module("AvatarCheck.insertFilm",['ngRoute', 'AvatarCheck.http'])
if(data==false){
MessageService.showAlert("添加失败")
}else{
MessageService.showAlert("添加成功，请等待审核")
// 查询 身份证膜耗材出入库
$scope.selectPlasticFilmManagement();
}
})
}
......
src/main/resources/static/views/receitp/receitp.html
View file @ 69cd7224
......@@ -71,7 +71,7 @@
<div class="box-footer" ng-if="receitpData.length>0">
<div class="pull-right" style="margin-left: 10px;">
<button class="btn btn-primary" ng-click="printReceitp(type.typeCode)">打印交接单</button>
<button class="btn btn-primary" ng-click="downloadGAinfo()">下载公安网反馈信息</button>
<button class="btn btn-primary" ng-click="downloadGAinfo(type.typeCode)">下载公安网反馈信息</button>
</div>
</div>
</div>
......@@ -147,22 +147,22 @@
</div>
</div>
</div>
<div id="divPrint{{$index}}" ng-repeat="idx in result">
<div id="divPrint{{$index}}" ng-repeat="idx in result" style="display: none">
<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;">
<table cellpadding="0" cellspacing="0" border="1" style="text-align: center;font-size: 10pt;">
<thead>
<tr>
<tr height="24">
<th width="60" style="text-align: center;">
序号
</th>
<th width="130" style="text-align: center;">
<th width="150" style="text-align: center;">
身份证受理组号
</th>
<th colspan="2" style="text-align: center;">
<th width="300" style="text-align: center;">
身份证所属派出所名称
</th>
<th width="80" style="text-align: center;">
......@@ -174,14 +174,14 @@
</tr>
</thead>
<tbody>
<tr ng-repeat="item in idx">
<tr ng-repeat="item in idx" height="20">
<td width="60">
{{item.id}}
</td>
<td width="130">
<td width="150">
{{item.QR_CODE}}
</td>
<td colspan="2" style="text-align: left;">
<td width="300" style="text-align: left;">
异地居民身份证{{item.COUNTYNAME}}{{item.GAJG_MC}}
</td>
<td width="80">
......
src/main/resources/static/views/receitp/receitp.js
View file @ 69cd7224
......@@ -29,14 +29,43 @@ angular.module('AvatarCheck.receitp', ['ngRoute', 'AvatarCheck.http'])
$scope.choseDate = $filter("date")(new Date(), "yyyy-MM-dd HH:mm:ss");
$scope.downloadGAinfo = function(){
var date = $("#datepicker").val();
var url = "../exportExcel/printExcelData?date="+date;
// $scope.downloadGAinfo = function(){
// var date = $("#datepicker").val();
// var url = "../exportExcel/printExcelData?date="+date;
// var a = document.createElement("a");
// document.body.appendChild(a);
// a.href = encodeURI(url);
// console.log(a.href)
// a.click();
// };
$scope.downloadGAinfo = function(typeCode){
var json={
type:typeCode,
list:[]
}
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].ID)
}
}
if(json.list.length==0){
MessageService.showAlert("请选择要打印的分局")
}else{
console.log(json)
HttpService.printExcelData(json,function (data) {
var blob = new Blob([data], {type: "application/vnd.ms-excel"});
var a = document.createElement("a");
document.body.appendChild(a);
a.href = encodeURI(url);
a.href = URL.createObjectURL(blob);
a.click();
})
}
};
$scope.currentTab = 0;
$scope.func = function (index) {
......@@ -55,7 +84,19 @@ angular.module('AvatarCheck.receitp', ['ngRoute', 'AvatarCheck.http'])
}
}
$scope.currentTab = index;
};
HttpService.getReceitp("","",function(data){
$scope.receitpData=data;
for(var i=0;i<$scope.receitpData.length;i++){
if(i==$scope.currentTab){
$scope.receitpData[i].isActive=true;
}else{
$scope.receitpData[i].isActive=false;
}
}
console.log($scope.receitpData,"初始化");
});
$scope.isHistory = 0;
$scope.doSearchReceitp = function () {
......@@ -71,10 +112,10 @@ angular.module('AvatarCheck.receitp', ['ngRoute', 'AvatarCheck.http'])
$scope.receitpData[i].isActive=false;
}
}
console.log($scope.receitpData);
console.log($scope.receitpData,"点击查询");
})
}
$scope.doSearchReceitp();
$scope.searchHistory = function () {
$scope.isHistory = 1;
......@@ -107,21 +148,21 @@ angular.module('AvatarCheck.receitp', ['ngRoute', 'AvatarCheck.http'])
}
var iRadioValue=1;
$scope.printReceitp = function(typeCode) {
var startDate=$('#datepicker1').val();
var endDate=$('#datepicker2').val();
var json={
type:typeCode,
startDate:startDate,
endDate:endDate,
list:[]
}
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)
json.list.push(JSON.parse(checks[i].value)[j].ID)
}
}
if(json.list.length==0){
MessageService.showAlert("请选择要打印的分局")
}else{
console.log(json)
HttpService.printReceitpData(json,function (data) {
$scope.receitpDataToPrint = data;
......@@ -148,15 +189,11 @@ angular.module('AvatarCheck.receitp', ['ngRoute', 'AvatarCheck.http'])
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.ADD_PRINT_TEXT(70, 33, "100%", 20, "交接日期："+$scope.receitpDataToPrint.date);
LODOP.SET_PRINT_STYLEA(0, "FontSize", 10);
LODOP.ADD_PRINT_TEXT(90, 33, "100%", 20, "送至：");
LODOP.SET_PRINT_STYLEA(0, "FontSize", 10);
LODOP.ADD_PRINT_TABLE(110, 30, 700, "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);
......@@ -165,6 +202,8 @@ angular.module('AvatarCheck.receitp', ['ngRoute', 'AvatarCheck.http'])
}
})
})
}
}
......
src/main/resources/static/views/task/task.js
View file @ 69cd7224
......@@ -186,7 +186,8 @@ angular.module('AvatarCheck.task', ['ngRoute', 'AvatarCheck.http'])
name:'B组'
}
]
$scope.updateGroup = function() {
$scope.updateGroup = function(typeCode) {
console.log(typeCode,"-=-=-=-=-=-=-=-=-=-")
var groupSelected = $("#groupSelected").val();
console.log(groupSelected)
var checks = $("#checkOneBox:checked");
......@@ -199,10 +200,20 @@ angular.module('AvatarCheck.task', ['ngRoute', 'AvatarCheck.http'])
workGroup:groupSelected,
taskIdList:arr
}
if (typeCode==100){
HttpService.updateFailedCardWorkGroup(json,function(data) {
console.log("===================")
console.log(data)
$scope.searchTaskList();
})
}else {
HttpService.updateWorkGroup(json,function(data) {
console.log("------------------------")
console.log(data)
$scope.searchTaskList();
})
}
}else{
MessageService.showAlert("请选择要更新的任务单")
}
......
src/main/resources/static/views/task/taskListPrint.html
View file @ 69cd7224
......@@ -14,7 +14,9 @@
<!-- /.box-tools -->
</div>
<!-- /.box-header -->
<div class="box-body" ng-if="isHistory==0">
<div class="box-body" >
<!-- 查询当前--->
<div ng-if="isHistory==0">
<div ng-if="cycleSheetData.length>0">
<div class="nav-tabs-custom clearfix" style="margin-bottom: 0;">
<ul class="nav nav-tabs">
......@@ -106,18 +108,18 @@
</select>
</div>
<div class="pull-left" style="margin-left: 10px;">
<button class="btn btn-info" ng-click="updateGroup()">更新工作组</button>
<button class="btn btn-info" ng-click="updateGroup(type.typeCode)">更新工作组</button>
</div>
<div class="pull-right" style="margin-left: 10px;">
<button class="btn btn-primary" ng-click="goes()">转出任务单</button>
</div>
</div>
<!-- /.mail-box-messages -->
<div ng-if="cycleSheetData.length==0">
<h4>暂无数据</h4>
</div>
</div>
<div class="box-body" ng-if="isHistory==1">
</div>
<!-- 查询历史--->
<div ng-if="isHistory==1">
<div ng-if="cycleSheetData.length>0">
<div class="nav-tabs-custom clearfix" style="margin-bottom: 0;">
<ul class="nav nav-tabs">
......@@ -189,12 +191,12 @@
</div>
</div>
<!-- /.mail-box-messages -->
</div>
<div ng-if="cycleSheetData.length==0">
<h4>暂无数据</h4>
</div>
</div>
<!-- /.box-body -->
</div>
<!-- /. box -->
</div>
<!-- /.col -->
......
src/main/resources/static/views/xmlAndSearch/xmlAndSearch.js
View file @ 69cd7224
......@@ -124,10 +124,6 @@ angular.module('AvatarCheck.xmlAndSearch', ['ngRoute', 'AvatarCheck.http', 'tm.p
}
}
var reGet = $scope.getXmlPackage;
$scope.deleteDataById = function(uploadDate,packageCount){
ngDialog.open({
......@@ -141,12 +137,11 @@ angular.module('AvatarCheck.xmlAndSearch', ['ngRoute', 'AvatarCheck.http', 'tm.p
$scope.importDate =uploadDate;
$scope.confirmDelete = function () {
HttpService.deleteProdDataByFileId(uploadDate, function (data) {
if(data){
// MessageService.showAlert("删除成功");
if(data.state==1){
$scope.closeThisDialog();
reGet();
}else{
$scope.wrongMsg = "删除失败"
$scope.wrongMsg = data.msg;
}
})
......
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