Skip to content

Y
YX_IDENT_REFACTORING
Commit aadfafdc authored by Administrator's avatar Administrator
Browse files
Options

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

parents 0298d6d4 6afbba91
Hide whitespace changes
Inline Side-by-side
Showing with 87 additions and 62 deletions
src/main/resources/static/js/services/service.js
View file @ aadfafdc
......@@ -428,9 +428,9 @@ app.service('MessageService', function (ngDialog) {
getCountyListByTaskListId:function(taskStateId,success){
$http({
method: 'GET',
url: "../user/getCountyListByTaskListId" + urlTimeStamp(),
url: "../user/getCountyList" + urlTimeStamp(),
params:{
taskStateId:taskStateId
taskId:taskStateId
}
}).then(function successCallback(response) {
success(response.data)
......@@ -474,10 +474,11 @@ app.service('MessageService', function (ngDialog) {
method: 'GET',
url: "../user/getReceiptList" + urlTimeStamp(),
params:{
startTime:startTime,
endTime:endTime
startDate:startTime,
endDate:endTime
}
}).then(function successCallback(response) {
console.log(response.data,"-------------response.data------")
success(response.data)
},function(err){
var errA = {Error:true, ReturnCode:err.status, ReturnMsg:"API访问返回错误"}
......@@ -487,10 +488,10 @@ app.service('MessageService', function (ngDialog) {
getprintReceipt:function(startTime, endTime,success){
$http({
method: 'GET',
url: "../user/getConnectList" + urlTimeStamp(),
url: "../user/printReceiptList" + urlTimeStamp(),
params:{
startTime:startTime,
endTime:endTime
startDate:startTime,
endDate:endTime
}
}).then(function successCallback(response) {
success(response.data)
......
src/main/resources/static/tpl/layout/cycleSheet/cycleSheet.html
View file @ aadfafdc
......@@ -74,7 +74,7 @@
</td>
<td>{{city.state}}</td>
<td ng-if="userState<=4"><a ng-click="showTable(city.taskId)">组号列表</a></td>
<td ng-if="userState>4"><a ng-click="showTable(city.taskId)">区县列表</a></td>
<td ng-if="userState>4"><a ng-click="showTableCounty(city.taskId)">区县列表</a></td>
<td><a ng-click="finishClick(city.taskId,userState)">完成</a></td>
</tr>
<tr ng-show="showtable==city.taskId && userState<=4">
......@@ -101,7 +101,7 @@
</td>
</tr>
<tr ng-show="showtable==city.taskId && userState>4">
<tr ng-show="showtableCounty==city.taskId && userState>4">
<td></td>
<td colspan="4">
<table style="font-size:0.9em;color: #000;" class="table">
......
src/main/resources/static/tpl/layout/cycleSheet/cycleSheet.js
View file @ aadfafdc
......@@ -348,6 +348,18 @@ app.controller('cycleSheetCtrl', ['$scope', '$rootScope', '$http', '$state', '$f
getGroupListData($scope.showtable);
}
$scope.showtableCounty = -1;
$scope.showTableCounty = function (taskID) {
if ($scope.showtableCounty != taskID) {
$scope.showtableCounty = taskID;
} else {
$scope.showtableCounty = -1;
}
console.log($scope.showtableCounty,"---$scope.showtableCounty--");
getCountyListData($scope.showtableCounty);
}
$scope.showTableGroup = function (specialCardList) {
console.log("--specialCardList--",specialCardList);
ngDialog.open({
......
src/main/resources/static/tpl/layout/receipt/receipt.html
View file @ aadfafdc
......@@ -10,53 +10,67 @@
<input type="text" ng-model="nowDate" value="currentDetailDate" id="wdate2" class="Wdate" onClick="WdatePicker({el:this,dateFmt:'yyyy-MM-dd HH:mm',autoPickDate:'true'})">
<input type="submit" class="btn btn-primary" value="查询" ng-click="myClick()">
</div>
<div style="padding: 10px;background-color: #fff;border: 1px solid #CCC;border-radius: 10px;">
<div>
<div ng-if="receiptData.length>0">
<table class="table table-hover" style="margin-top:10px;">
<thead>
<th></th>
<th>普通证</th>
<!--<th><a ng-click="showSpecialCardInfo()">快证</a></th>-->
<th>快证</th>
<th>异地KS邮</th>
<th>异地KS普</th>
<th>异地邮</th>
<th>异地普</th>
<th>军人证</th>
<th>KS普</th>
<th>KS邮</th>
<th>邮寄证</th>
<th>小计</th>
<th>盒数</th>
</thead>
<tbody>
<tr ng-repeat="county in receiptData">
<td width="100px">{{county.countyName}}</td>
<td width="100px">{{county.PTZ}}</td>
<td width="100px">{{county.KZ}}</td>
<td width="100px">{{county.YDKSY}}</td>
<td width="100px">{{county.YDKSP}}</td>
<td width="100px">{{county.YDY}}</td>
<td width="100px">{{county.YDP}}</td>
<td width="100px">{{county.JRZ}}</td>
<td width="100px">{{county.KSP}}</td>
<td width="100px">{{county.KSY}}</td>
<td width="100px">{{county.YJZ}}</td>
<td width="100px">{{county.sum}}</td>
<td width="100px">{{county.boxCount}}</td>
<!--<td width="100px" ng-repeat="item in county track by $index" ng-if="$index!=12 && $index!=13">-->
<!--<span ng-if="item!=0">{{item}}</span>-->
<!--<span ng-if="item==0"></span>-->
<!--</td>-->
</tr>
</tbody>
</table>
</div>
<div ng-if="receiptData.length==0" style="font-size:1.5em;">
当天暂无报表数据。
</div>
<div ng-if="receiptData.length!=0" style="font-size:1.5em;">
<input type="button" class="btn btn-primary" value="下载交接单" ng-click="printReceipt()">
<input type="button" class="btn btn-primary" value="下载回执单" ng-click="printOfficialReceipt()">
</div>
</div>
</div>
</div>
</div>
<div class="loading">
<span></span>
<span></span>
<span></span>
<span></span>
<span></span>
</div>
<!--<div class="loading">-->
<!--<span></span>-->
<!--<span></span>-->
<!--<span></span>-->
<!--<span></span>-->
<!--<span></span>-->
<!--</div>-->
</div>
<div style="padding: 10px;background-color: #fff;border: 1px solid #CCC;border-radius: 10px;">
<div>
<div ng-if="receiptData.length>0">
<table class="table table-hover" style="margin-top:10px;">
<thead>
<th></th>
<th>普通证</th>
<!--<th><a ng-click="showSpecialCardInfo()">快证</a></th>-->
<th>快证</th>
<th>异地KS邮</th>
<th>异地KS普</th>
<th>异地邮</th>
<th>异地普</th>
<th>军人证</th>
<th>KS普</th>
<th>KS邮</th>
<th>邮寄证</th>
<th>小计</th>
<th>盒数</th>
</thead>
<tbody>
<tr ng-repeat="county in receiptData">
<td width="100px">{{county[12]}}</td>
<td width="100px" ng-repeat="item in county track by $index" ng-if="$index!=12 && $index!=13">
<span ng-if="item!=0">{{item}}</span>
<span ng-if="item==0"></span>
</td>
</tr>
</tbody>
</table>
</div>
<div ng-if="receiptData.length==0" style="font-size:1.5em;">
当天暂无报表数据。
</div>
<div ng-if="receiptData.length!=0 && receiptData[0][11] != 0" style="font-size:1.5em;">
<input type="button" class="btn btn-primary" value="下载交接单" ng-click="printReceipt()">
<input type="button" class="btn btn-primary" value="下载回执单" ng-click="printOfficialReceipt()">
</div>
</div>
</div>
\ No newline at end of file
src/main/resources/static/tpl/layout/receipt/receipt.js
View file @ aadfafdc
......@@ -32,8 +32,8 @@ app.controller('receiptCtrl', ['$scope', '$rootScope', '$http', '$state', '$filt
$scope.currentDetailDate = getNowFormatDetailDate();
// $scope.nowDataEight = new Date().format("yyyy-MM-dd 08:00");
var date = new Date();
$scope.nowDataEight = $filter('date')("yyyy-MM-dd 08:00");
$scope.nowDate = $filter('date')("yyyy-MM-dd hh:mm");
$scope.nowDataEight = $filter('date')(date,"yyyy-MM-dd 08:00");
$scope.nowDate = $filter('date')(date,"yyyy-MM-dd hh:mm");
var changeDataFormat = function (date) {
var yyyyMMdd = date.split(" ")[0];
......@@ -45,12 +45,11 @@ app.controller('receiptCtrl', ['$scope', '$rootScope', '$http', '$state', '$filt
var mm = hhmm.split(":")[1];
return yyyy + MM + dd + hh + mm;
}
$scope.receiptData =[];
var getReceiptData = function (startTime, endTime) {
HttpService.getReceiptData(startTime, endTime, function (data) {
$scope.receiptData = data.respData;
console.log($scope.receiptData)
})
}
getReceiptData(changeDataFormat($scope.nowDataEight), changeDataFormat($scope.nowDate))
......
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