Commit be69798b authored by liboyang's avatar liboyang

已下发数量显示

parent 5cee27ce
...@@ -838,6 +838,19 @@ angular.module('AvatarCheck.http', ['ngDialog', 'LocalStorageModule']) ...@@ -838,6 +838,19 @@ angular.module('AvatarCheck.http', ['ngDialog', 'LocalStorageModule'])
}).then(function successCallback(response) { }).then(function successCallback(response) {
success(response.data) success(response.data)
}) })
},
getHasDistributeCount:function(date,success){
console.log(date)
$http({
method: 'GET',
url: "../TaskList/selectCountHistory"+urlTimeStamp(),
params:{
date:date,
state:$rootScope.loginData.roleList[0].process
}
}).then(function successCallback(response) {
success(response.data)
})
} }
} }
}); });
\ No newline at end of file
...@@ -88,6 +88,7 @@ ...@@ -88,6 +88,7 @@
</table> </table>
<!-- /.table --> <!-- /.table -->
<div class="box-footer" style="text-align: right;"> <div class="box-footer" style="text-align: right;">
<h5>今日已下发任务量:{{distributedCount}}</h5>
<button class="btn btn-primary" ng-click="goes()">下发任务单</button> <button class="btn btn-primary" ng-click="goes()">下发任务单</button>
</div> </div>
</div> </div>
......
...@@ -26,6 +26,14 @@ angular.module('AvatarCheck.dispatchTask', ['ngRoute', 'AvatarCheck.http', 'tm.p ...@@ -26,6 +26,14 @@ angular.module('AvatarCheck.dispatchTask', ['ngRoute', 'AvatarCheck.http', 'tm.p
$scope.isHistory=0; $scope.isHistory=0;
$scope.searchTaskList = function(){ $scope.searchTaskList = function(){
var date=$('#datepicker').val();
if(date==''){
date=$scope.choseDate;
}
HttpService.getHasDistributeCount(date,function (data) {
$scope.distributedCount = data;
console.log(data)
})
$scope.isHistory=0; $scope.isHistory=0;
HttpService.getTaskListByProcess(function(data){ HttpService.getTaskListByProcess(function(data){
$scope.cycleSheetData = data; $scope.cycleSheetData = data;
...@@ -158,6 +166,8 @@ angular.module('AvatarCheck.dispatchTask', ['ngRoute', 'AvatarCheck.http', 'tm.p ...@@ -158,6 +166,8 @@ angular.module('AvatarCheck.dispatchTask', ['ngRoute', 'AvatarCheck.http', 'tm.p
} }
$scope.goes = function(){ $scope.goes = function(){
var checks = $(".checkOneBox:checked"); var checks = $(".checkOneBox:checked");
if(checks.length>0){ if(checks.length>0){
...@@ -184,7 +194,6 @@ angular.module('AvatarCheck.dispatchTask', ['ngRoute', 'AvatarCheck.http', 'tm.p ...@@ -184,7 +194,6 @@ angular.module('AvatarCheck.dispatchTask', ['ngRoute', 'AvatarCheck.http', 'tm.p
}else{ }else{
MessageService.showAlert("请选择下发的任务单") MessageService.showAlert("请选择下发的任务单")
} }
} }
}); });
......
...@@ -63,15 +63,12 @@ ...@@ -63,15 +63,12 @@
<th>受理号</th> <th>受理号</th>
<th>区县</th> <th>区县</th>
<th>姓名</th> <th>姓名</th>
<th>制证类型</th>
<th>身份证号</th> <th>身份证号</th>
<th>性别</th> <th>性别</th>
<th>签发机关</th> <th>签发机关</th>
<th>起始有效期</th> <th>起始有效期</th>
<th>终止有效期</th> <th>终止有效期</th>
<th>上报受理单位</th> <th>上报受理单位</th>
<th>数据状态</th>
<th>时间</th>
</tr> </tr>
</thead> </thead>
<tbody> <tbody>
...@@ -80,7 +77,6 @@ ...@@ -80,7 +77,6 @@
<td>{{item.ACCEPT_NO}}</td> <td>{{item.ACCEPT_NO}}</td>
<td>{{item.COUNTYNAME}}</td> <td>{{item.COUNTYNAME}}</td>
<td>{{item.NAME}}</td> <td>{{item.NAME}}</td>
<td>{{item.CARD_TYPE}}</td>
<td>{{item.ID_NO}}</td> <td>{{item.ID_NO}}</td>
<td ng-if="item.SEX_NO==1"></td> <td ng-if="item.SEX_NO==1"></td>
<td ng-if="item.SEX_NO==2"></td> <td ng-if="item.SEX_NO==2"></td>
...@@ -88,8 +84,6 @@ ...@@ -88,8 +84,6 @@
<td>{{item.BEGIN_DATE | myDateFilter}}</td> <td>{{item.BEGIN_DATE | myDateFilter}}</td>
<td>{{item.EXPIRE_DATE | myDateFilter}}</td> <td>{{item.EXPIRE_DATE | myDateFilter}}</td>
<td>{{item.SIGN_GOVT}}</td> <td>{{item.SIGN_GOVT}}</td>
<td></td>
<td></td>
</tr> </tr>
</tbody> </tbody>
</table> </table>
...@@ -114,7 +108,6 @@ ...@@ -114,7 +108,6 @@
<th>受理号</th> <th>受理号</th>
<th>区县</th> <th>区县</th>
<th>姓名</th> <th>姓名</th>
<th>制证类型</th>
<th>身份证号</th> <th>身份证号</th>
<th>性别</th> <th>性别</th>
<th>签发机关</th> <th>签发机关</th>
...@@ -122,7 +115,6 @@ ...@@ -122,7 +115,6 @@
<th>终止有效期</th> <th>终止有效期</th>
<th>上报受理单位</th> <th>上报受理单位</th>
<th>数据状态</th> <th>数据状态</th>
<th>时间</th>
</tr> </tr>
</thead> </thead>
<tbody> <tbody>
...@@ -131,7 +123,6 @@ ...@@ -131,7 +123,6 @@
<td>{{item.ACCEPT_NO}}</td> <td>{{item.ACCEPT_NO}}</td>
<td>{{item.COUNTYNAME}}</td> <td>{{item.COUNTYNAME}}</td>
<td>{{item.NAME}}</td> <td>{{item.NAME}}</td>
<td>{{item.CARD_TYPE}}</td>
<td>{{item.ID_NO}}</td> <td>{{item.ID_NO}}</td>
<td ng-if="item.SEX_NO==1"></td> <td ng-if="item.SEX_NO==1"></td>
<td ng-if="item.SEX_NO==2"></td> <td ng-if="item.SEX_NO==2"></td>
...@@ -140,7 +131,6 @@ ...@@ -140,7 +131,6 @@
<td>{{item.EXPIRE_DATE | myDateFilter}}</td> <td>{{item.EXPIRE_DATE | myDateFilter}}</td>
<td>{{item.SIGN_GOVT}}</td> <td>{{item.SIGN_GOVT}}</td>
<td></td> <td></td>
<td></td>
</tr> </tr>
</tbody> </tbody>
</table> </table>
......
...@@ -47,6 +47,14 @@ angular.module('AvatarCheck.task', ['ngRoute', 'AvatarCheck.http']) ...@@ -47,6 +47,14 @@ angular.module('AvatarCheck.task', ['ngRoute', 'AvatarCheck.http'])
$scope.isHistory=0; $scope.isHistory=0;
$scope.searchTaskList = function(){ $scope.searchTaskList = function(){
var date=$('#datepicker').val();
if(date==''){
date=$scope.choseDate;
}
HttpService.getHasDistributeCount(date,function (data) {
$scope.distributedCount = data;
console.log(data)
})
$scope.isHistory=0; $scope.isHistory=0;
HttpService.getTaskListByProcess(function(data){ HttpService.getTaskListByProcess(function(data){
$scope.cycleSheetData = data; $scope.cycleSheetData = data;
...@@ -231,6 +239,14 @@ angular.module('AvatarCheck.task', ['ngRoute', 'AvatarCheck.http']) ...@@ -231,6 +239,14 @@ angular.module('AvatarCheck.task', ['ngRoute', 'AvatarCheck.http'])
$scope.isHistory=0; $scope.isHistory=0;
$scope.searchTaskList = function(){ $scope.searchTaskList = function(){
$scope.isHistory=0; $scope.isHistory=0;
var date=$('#datepicker').val();
if(date==''){
date=$scope.choseDate;
}
HttpService.getHasDistributeCount(date,function (data) {
$scope.distributedCount = data;
console.log(data)
})
HttpService.getPingTaskListByProcess(function(data){ HttpService.getPingTaskListByProcess(function(data){
$scope.cycleSheetData = data.typeList; $scope.cycleSheetData = data.typeList;
$scope.total = data.total; $scope.total = data.total;
...@@ -386,6 +402,14 @@ angular.module('AvatarCheck.task', ['ngRoute', 'AvatarCheck.http']) ...@@ -386,6 +402,14 @@ angular.module('AvatarCheck.task', ['ngRoute', 'AvatarCheck.http'])
$scope.isHistory=0; $scope.isHistory=0;
$scope.searchTaskList = function(){ $scope.searchTaskList = function(){
$scope.isHistory=0; $scope.isHistory=0;
var date=$('#datepicker').val();
if(date==''){
date=$scope.choseDate;
}
HttpService.getHasDistributeCount(date,function (data) {
$scope.distributedCount = data;
console.log(data)
})
HttpService.getFjTaskListByProcess(function(data){ HttpService.getFjTaskListByProcess(function(data){
$scope.cycleSheetData = data; $scope.cycleSheetData = data;
for(var i=0;i<$scope.cycleSheetData.length;i++){ for(var i=0;i<$scope.cycleSheetData.length;i++){
...@@ -533,6 +557,14 @@ angular.module('AvatarCheck.task', ['ngRoute', 'AvatarCheck.http']) ...@@ -533,6 +557,14 @@ angular.module('AvatarCheck.task', ['ngRoute', 'AvatarCheck.http'])
$scope.isHistory=0; $scope.isHistory=0;
$scope.searchTaskList = function(){ $scope.searchTaskList = function(){
$scope.isHistory=0; $scope.isHistory=0;
var date=$('#datepicker').val();
if(date==''){
date=$scope.choseDate;
}
HttpService.getHasDistributeCount(date,function (data) {
$scope.distributedCount = data;
console.log(data)
})
HttpService.getFjTaskListByProcess(function(data){ HttpService.getFjTaskListByProcess(function(data){
$scope.cycleSheetData = data; $scope.cycleSheetData = data;
for(var i=0;i<$scope.cycleSheetData.length;i++){ for(var i=0;i<$scope.cycleSheetData.length;i++){
......
...@@ -27,6 +27,9 @@ ...@@ -27,6 +27,9 @@
</ul> </ul>
</a> </a>
</li> </li>
<li style="float: right; padding-right: 30px;">
<h5>今日已转出数量:{{distributedCount}}</h5>
</li>
</ul> </ul>
</div> </div>
<div ng-repeat="type in cycleSheetData track by $index" class="table-responsive mailbox-messages" ng-show="currentTab==$index"> <div ng-repeat="type in cycleSheetData track by $index" class="table-responsive mailbox-messages" ng-show="currentTab==$index">
...@@ -97,6 +100,7 @@ ...@@ -97,6 +100,7 @@
</table> </table>
<!-- /.table --> <!-- /.table -->
<div class="box-footer" style="text-align: right;"> <div class="box-footer" style="text-align: right;">
<h5>今日已转出数量:{{distributedCount}}</h5>
<button class="btn btn-primary" ng-click="goes()">转出任务单</button> <button class="btn btn-primary" ng-click="goes()">转出任务单</button>
</div> </div>
</div> </div>
......
...@@ -94,6 +94,7 @@ ...@@ -94,6 +94,7 @@
</table> </table>
<!-- /.table --> <!-- /.table -->
<div class="box-footer" style="text-align: right;"> <div class="box-footer" style="text-align: right;">
<h5>今日已转出数量:{{distributedCount}}</h5>
<button class="btn btn-primary" ng-click="goes()">转出任务单</button> <button class="btn btn-primary" ng-click="goes()">转出任务单</button>
</div> </div>
</div> </div>
......
...@@ -28,7 +28,7 @@ ...@@ -28,7 +28,7 @@
</a> </a>
</li> </li>
<li class="pull-right" style="padding-right: 20px;"> <li class="pull-right" style="padding-right: 20px;">
<h5>任务总数:{{cardsTotal}}</h5> <h5>已选数量:{{cardsTotal}}</h5>
<h4>余证数:{{restCount}}</h4> <h4>余证数:{{restCount}}</h4>
</li> </li>
</ul> </ul>
...@@ -95,6 +95,7 @@ ...@@ -95,6 +95,7 @@
</table> </table>
<!-- /.table --> <!-- /.table -->
<div class="box-footer"> <div class="box-footer">
<h4 style="text-align: right;">已转出任务量:{{distributedCount}}</h4>
<div class="pull-right" style="margin-left: 10px;"> <div class="pull-right" style="margin-left: 10px;">
<button class="btn btn-primary" ng-click="goes()">转出任务单</button> <button class="btn btn-primary" ng-click="goes()">转出任务单</button>
</div> </div>
......
...@@ -94,6 +94,7 @@ ...@@ -94,6 +94,7 @@
</table> </table>
<!-- /.table --> <!-- /.table -->
<div class="box-footer" style="text-align: right;"> <div class="box-footer" style="text-align: right;">
<h5>今日已转出数量:{{distributedCount}}</h5>
<button class="btn btn-primary" ng-click="goes()">转出任务单</button> <button class="btn btn-primary" ng-click="goes()">转出任务单</button>
</div> </div>
</div> </div>
......
...@@ -99,6 +99,7 @@ ...@@ -99,6 +99,7 @@
</table> </table>
<!-- /.table --> <!-- /.table -->
<div class="box-footer" style="text-align: right;"> <div class="box-footer" style="text-align: right;">
<h5>今日已转出数量:{{distributedCount}}</h5>
<button class="btn btn-primary" ng-click="goes()">转出任务单</button> <button class="btn btn-primary" ng-click="goes()">转出任务单</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