Skip to content

Y
YX_IDENT_beijing_auxiliary_YD
Commit 411154e5 authored by suichenguang's avatar suichenguang
Browse files
Options

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

parents e8485e4a dbf0d279
Hide whitespace changes
Inline Side-by-side
Showing with 71 additions and 30 deletions
src/main/resources/static/js/app.js
View file @ 411154e5
...@@ -198,8 +198,31 @@ angular.module('AvatarCheck', [ ...@@ -198,8 +198,31 @@ angular.module('AvatarCheck', [
$location.path("/createTaskList"); $location.path("/createTaskList");
} }
$scope.addQuickCard = function(){ $scope.addQuickCardAccu = function(){
var check = $(".accu:checked").val();
console.log(check);
var json={};
json.acceptNo=check.ACCEPT_NO;
json.cardType=check.CARD_TYPE;
json.countyCode=check.COUNTY_CODE;
json.name=check.NAME;
HttpService.addSpecialCard(json,function (data) {
console.log($scope.searchInput)
$scope.doSearch($scope.searchInput)
})
}
$scope.addQuickCardProd = function(){
var check = $(".prod:checked").val();
console.log(check);
var json={};
json.acceptNo=check.ACCEPT_NO;
json.cardType=check.CARD_TYPE;
json.countyCode=check.COUNTY_CODE;
json.name=check.NAME;
HttpService.addSpecialCard(json,function (data) {
console.log($scope.searchInput)
$scope.doSearch($scope.searchInput)
})
} }
......
src/main/resources/static/js/service.js
View file @ 411154e5
...@@ -527,6 +527,17 @@ angular.module('AvatarCheck.http', ['ngDialog', 'LocalStorageModule']) ...@@ -527,6 +527,17 @@ angular.module('AvatarCheck.http', ['ngDialog', 'LocalStorageModule'])
}).then(function successCallback(response) { }).then(function successCallback(response) {
success(response.data) success(response.data)
}) })
},
addSpecialCard:function(data,success){
var body = JSON.stringify(data);
$http({
method: 'POST',
url: "../TaskList/createFastTask",
data: body,
headers: {'Content-Type': 'application/json'}
}).then(function successCallback(response) {
success(response.data)
})
} }
} }
}); });
\ No newline at end of file
src/main/resources/static/views/searchCard/searchCard.html
View file @ 411154e5
...@@ -59,6 +59,7 @@ ...@@ -59,6 +59,7 @@
<table class="table table-hover table-bordered"> <table class="table table-hover table-bordered">
<thead> <thead>
<tr> <tr>
<th></th>
<th>受理号</th> <th>受理号</th>
<th>区县</th> <th>区县</th>
<th>姓名</th> <th>姓名</th>
...@@ -74,25 +75,27 @@ ...@@ -74,25 +75,27 @@
</tr> </tr>
</thead> </thead>
<tbody> <tbody>
<tr> <tr ng-repeat="item in searchResult.ACCdata">
<td>02213546871</td> <td><input type="checkbox" value="{{item}}" class="accu"></td>
<td>海淀区</td> <td>{{item.ACCEPT_NO}}</td>
<td>伯阳</td> <td>{{item.COUNTYNAME}}</td>
<td>普通证</td> <td>{{item.NAME}}</td>
<td>130133199405250011</td> <td>{{item.CARD_TYPE}}</td>
<td>男</td> <td>{{item.ID_NO}}</td>
<td>赵县公安局</td> <td ng-if="item.SEX_NO==1">男</td>
<td>20090228</td> <td ng-if="item.SEX_NO==2">女</td>
<td>20190228</td> <td>{{item.GAJG1}}</td>
<td>赵县派出所</td> <td>{{item.BEGIN_DATE | date:'yyyy-MM-dd HH:mm:ss'}}</td>
<td>快证</td> <td>{{item.EXPIRE_DATE | date:'yyyy-MM-dd HH:mm:ss'}}</td>
<td>2019-03-03 13:58:30</td> <td>{{item.SIGN_GOVT}}</td>
<td></td>
<td></td>
</tr> </tr>
</tbody> </tbody>
</table> </table>
</div> </div>
<div style="text-align:right;padding: 10px;padding-top: 0;"> <div style="text-align:right;padding: 10px;padding-top: 0;">
<button class="btn btn-info" ng-click="addQuickCard()">添加快证</button> <button class="btn btn-info" ng-click="addQuickCardAccu()">添加快证</button>
<button class="btn btn-danger">退证</button> <button class="btn btn-danger">退证</button>
</div> </div>
</div> </div>
...@@ -107,6 +110,7 @@ ...@@ -107,6 +110,7 @@
<table class="table table-hover table-bordered"> <table class="table table-hover table-bordered">
<thead> <thead>
<tr> <tr>
<th></th>
<th>受理号</th> <th>受理号</th>
<th>区县</th> <th>区县</th>
<th>姓名</th> <th>姓名</th>
...@@ -122,25 +126,27 @@ ...@@ -122,25 +126,27 @@
</tr> </tr>
</thead> </thead>
<tbody> <tbody>
<tr> <tr ng-repeat="item in searchResult.PRODData">
<td>02213546871</td> <td><input type="checkbox" value="{{item}}" class="prod"></td>
<td>海淀区</td> <td>{{item.ACCEPT_NO}}</td>
<td>伯阳</td> <td>{{item.COUNTYNAME}}</td>
<td>普通证</td> <td>{{item.NAME}}</td>
<td>130133199405250011</td> <td>{{item.CARD_TYPE}}</td>
<td>男</td> <td>{{item.ID_NO}}</td>
<td>赵县公安局</td> <td ng-if="item.SEX_NO==1">男</td>
<td>20090228</td> <td ng-if="item.SEX_NO==2">女</td>
<td>20190228</td> <td>{{item.GAJG1}}</td>
<td>赵县派出所</td> <td>{{item.BEGIN_DATE}}</td>
<td>快证</td> <td>{{item.EXPIRE_DATE}}</td>
<td>2019-03-03 13:58:30</td> <td>{{item.SIGN_GOVT}}</td>
<td></td>
<td></td>
</tr> </tr>
</tbody> </tbody>
</table> </table>
</div> </div>
<div style="text-align:right;padding: 10px;padding-top: 0;"> <div style="text-align:right;padding: 10px;padding-top: 0;">
<button class="btn btn-info">添加快证</button> <button class="btn btn-info" ng-click="addQuickCardProd()">添加快证</button>
<button class="btn btn-danger">退证</button> <button class="btn btn-danger">退证</button>
</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