Skip to content

Y
YX_IDENT_beijing_auxiliary_YD
Commit 91cbc36d authored by guantiantian's avatar guantiantian
Browse files
Options

添加受理区县查询参数

parent 8e921815
Show whitespace changes
Inline Side-by-side
Showing with 223 additions and 73 deletions
src/main/resources/static/views/uploadExcelAndSearch/uploadExcelAndSearch.html
View file @ 91cbc36d
<style> <style>
.table th, .table td { .table th,
.table td {
text-align: center; text-align: center;
vertical-align: middle!important; vertical-align: middle !important;
} }
.select2-search__field { .select2-search__field {
height:30px; height: 30px;
} }
.ul li{ .ul li {
cursor: pointer; cursor: pointer;
} }
.page-list .pagination {float:left;} .page-list .pagination {
.page-list .pagination span {cursor: pointer;} float: left;
.page-list .pagination .separate span{cursor: default; border-top:none;border-bottom:none;} }
.page-list .pagination .separate span:hover {background: none;} .page-list .pagination span {
.page-list .page-total {float:left; margin: 25px 20px;} cursor: pointer;
.page-list .page-total input, .page-list .page-total select{height: 26px; border: 1px solid #ddd;} }
.page-list .page-total input {width: 40px; padding-left:3px;} .page-list .pagination .separate span {
.page-list .page-total select {width: 50px;} cursor: default;
border-top: none;
border-bottom: none;
}
.page-list .pagination .separate span:hover {
background: none;
}
.page-list .page-total {
float: left;
margin: 25px 20px;
}
.page-list .page-total input,
.page-list .page-total select {
height: 26px;
border: 1px solid #ddd;
}
.page-list .page-total input {
width: 40px;
padding-left: 3px;
}
.page-list .page-total select {
width: 50px;
}
.page-list:after { .page-list:after {
display: block; display: block;
clear: both; clear: both;
content: "" content: "";
} }
.page-list{ .page-list {
zoom: 1 zoom: 1;
} }
</style> </style>
<div class="content row"> <div class="content row">
<div class="col-md-12" style="margin-top:17px;"> <div class="col-md-12" style="margin-top: 17px">
<div class="box " > <div class="box">
<strong class="box-header">快递单信息管理</strong> <strong class="box-header">快递单信息管理</strong>
<div class="box box-primary"> <div class="box box-primary">
<table class="table table-bordered" style="margin-bottom: 0;"> <table class="table table-bordered" style="margin-bottom: 0">
<tr> <tr>
<td>申请人姓名:</td> <td>申请人姓名:</td>
<td><input type="text" class="form-control" ng-model="applicantName" placeholder="申请人姓名"></td> <td>
<input
type="text"
class="form-control"
ng-model="applicantName"
placeholder="申请人姓名"
/>
</td>
<td>订单号:</td> <td>订单号:</td>
<td><input type="text" class="form-control" ng-model="orderNo" placeholder="订单号"></td> <td>
<input
type="text"
class="form-control"
ng-model="orderNo"
placeholder="订单号"
/>
</td>
<td>正向邮件号:</td> <td>正向邮件号:</td>
<td><input type="text" class="form-control" ng-model="emailNo" placeholder="邮件号"></td> <td>
<input
type="text"
class="form-control"
ng-model="emailNo"
placeholder="邮件号"
/>
</td>
</tr> </tr>
<tr> <tr>
<td>数据状态:</td> <td>数据状态:</td>
<td style="text-align: left;"> <td style="text-align: left">
<select class="form-control select2" id="notNull" ng-model="isValid"> <select
class="form-control select2"
id="notNull"
ng-model="isValid"
>
<option value="">--请选择数据状态--</option> <option value="">--请选择数据状态--</option>
<option value="1">取消邮寄</option> <option value="1">取消邮寄</option>
<option value="0">有效订单</option> <option value="0">有效订单</option>
<option value="3">待定订单</option> <option value="3">待定订单</option>
</select> </select>
</td> </td>
<td >格口:</td> <td>格口:</td>
<td><input type="text" class="form-control" ng-model="gkxx" placeholder="格口"></td> <td>
<input
type="text"
class="form-control"
ng-model="gkxx"
placeholder="格口"
/>
</td>
<td>区县:</td> <td>区县:</td>
<td style="text-align: left;"> <td style="text-align: left">
<select class="form-control select2" <select
class="form-control select2"
id="county" id="county"
multiple="multiple" multiple="multiple"
data-placeholder="--请选择区县--" data-placeholder="--请选择区县--"
style="width: 100%;" style="width: 100%"
ng-model="currentCounty"> ng-model="currentCounty"
<option value="东城区" >东城区</option> >
<option value="西城区" >西城区</option> <option value="东城区">东城区</option>
<option value="朝阳区" >朝阳区</option> <option value="西城区">西城区</option>
<option value="海淀区" >海淀区</option> <option value="朝阳区">朝阳区</option>
<option value="丰台区" >丰台区</option> <option value="海淀区">海淀区</option>
<option value="石景山区" >石景山区</option> <option value="丰台区">丰台区</option>
<option value="房山区" >房山区</option> <option value="石景山区">石景山区</option>
<option value="门头沟区" >门头沟区</option> <option value="房山区">房山区</option>
<option value="顺义区" >顺义区</option> <option value="门头沟区">门头沟区</option>
<option value="平谷区" >平谷区</option> <option value="顺义区">顺义区</option>
<option value="怀柔区" >怀柔区</option> <option value="平谷区">平谷区</option>
<option value="密云区" >密云区</option> <option value="怀柔区">怀柔区</option>
<option value="昌平区" >昌平区</option> <option value="密云区">密云区</option>
<option value="延庆区" >延庆区</option> <option value="昌平区">昌平区</option>
<option value="大兴区" >大兴区</option> <option value="延庆区">延庆区</option>
<option value="通州区" >通州区</option> <option value="大兴区">大兴区</option>
<option value="中关村科技园区" >中关村科技园区</option> <option value="通州区">通州区</option>
<option value="中关村科技园区">中关村科技园区</option>
</select> </select>
</td> </td>
</tr> </tr>
...@@ -88,8 +145,16 @@ ...@@ -88,8 +145,16 @@
<div class="input-group-addon"> <div class="input-group-addon">
<i class="fa fa-calendar"></i> <i class="fa fa-calendar"></i>
</div> </div>
<input type="text" class="form-control pull-right" value="{{choseDate}}" id="datepicker" readonly/> <input
<span class="input-group-addon"><span class="glyphicon glyphicon-remove"></span></span> type="text"
class="form-control pull-right"
value="{{choseDate}}"
id="datepicker"
readonly
/>
<span class="input-group-addon"
><span class="glyphicon glyphicon-remove"></span
></span>
</div> </div>
</td> </td>
<td>Excel导入截止日期:</td> <td>Excel导入截止日期:</td>
...@@ -98,14 +163,25 @@ ...@@ -98,14 +163,25 @@
<div class="input-group-addon"> <div class="input-group-addon">
<i class="fa fa-calendar"></i> <i class="fa fa-calendar"></i>
</div> </div>
<input type="text" class="form-control pull-right" value="{{choseDate}}" id="datepicker1" readonly/> <input
<span class="input-group-addon"><span class="glyphicon glyphicon-remove"></span></span> type="text"
class="form-control pull-right"
value="{{choseDate}}"
id="datepicker1"
readonly
/>
<span class="input-group-addon"
><span class="glyphicon glyphicon-remove"></span
></span>
</div> </div>
</td> </td>
<td>打印状态:</td> <td>打印状态:</td>
<td style="text-align: left;"> <td style="text-align: left">
<select class="form-control select2" id="print" <select
ng-model="isPrint"> class="form-control select2"
id="print"
ng-model="isPrint"
>
<option value="">--请选择打印状态--</option> <option value="">--请选择打印状态--</option>
<option value="1">已打印</option> <option value="1">已打印</option>
<option value="0">未打印</option> <option value="0">未打印</option>
...@@ -119,25 +195,77 @@ ...@@ -119,25 +195,77 @@
<div class="input-group-addon"> <div class="input-group-addon">
<i class="fa fa-calendar"></i> <i class="fa fa-calendar"></i>
</div> </div>
<input type="text" class="form-control pull-right" value="" id="printDate" readonly/> <input
<span class="input-group-addon"><span class="glyphicon glyphicon-remove"></span></span> type="text"
class="form-control pull-right"
value=""
id="printDate"
readonly
/>
<span class="input-group-addon"
><span class="glyphicon glyphicon-remove"></span
></span>
</div> </div>
</td> </td>
<td>受理区县:</td> <td>受理区县:</td>
<td style="text-align: left;"> <td style="text-align: left">
<select class="form-control select2" id="district" <select
ng-model="district"> class="form-control select2"
id="district"
ng-model="district"
>
<option value="">--请选择受理区县--</option> <option value="">--请选择受理区县--</option>
<option value="1">密云</option> <option value="1">密云</option>
<option value="0">其他（除密云外所有区县）</option> <option value="0">其他（除密云外所有区县）</option>
</select> </select>
</td> </td>
<td>分拣信息:</td>
<td style="text-align: left">
<select
class="form-control select2"
id="gk"
style="width: 100%"
ng-model="gk"
>
<option value="">--请选择分拣信息--</option>
<option value="1">城区</option>
<option value="5">远郊</option>
<option value="0">其他</option>
</select>
</td>
</tr>
<tr>
<td colspan="2"> <td colspan="2">
<div style="float: left"> <div style="float: left">
<button class="btn btn-primary" style="margin-right: 7px;" ng-click="doQuery()">查询</button> <button
<button class="btn btn-primary" style="margin-right: 7px;" ng-click="subSomething()">读卡查询</button> class="btn btn-primary"
<button type="submit" class="btn btn-info" style="margin-right: 7px;" ng-click="downloadExcel()"> 下载Excel</button> style="margin-right: 7px"
<button type="submit" class="btn btn-danger" ng-click="deleteRecords()"> 删除</button> ng-click="doQuery()"
>
查询
</button>
<button
class="btn btn-primary"
style="margin-right: 7px"
ng-click="subSomething()"
>
读卡查询
</button>
<button
type="submit"
class="btn btn-info"
style="margin-right: 7px"
ng-click="downloadExcel()"
>
下载Excel
</button>
<button
type="submit"
class="btn btn-danger"
ng-click="deleteRecords()"
>
删除
</button>
</div> </div>
</td> </td>
</tr> </tr>
...@@ -145,11 +273,17 @@ ...@@ -145,11 +273,17 @@
</div> </div>
</div> </div>
<div class="box box-default"> <div class="box box-default">
<div class="box-header with-border"><strong>邮寄单详情</strong> <div class="box-header with-border">
(<span style="color:#0b93d5;">每页显示{{paginationConf.itemsPerPage}}条/共 <strong>邮寄单详情</strong> (<span style="color: #0b93d5"
{{paginationConf.totalItems}}条</span>)</div> >每页显示{{paginationConf.itemsPerPage}}条/共
<div class="box-info" style="padding: 7px;padding-top: 0px;"> {{paginationConf.totalItems}}条</span
<table class="table table-bordered table-hover" ng-if="postData.length>0"> >)
</div>
<div class="box-info" style="padding: 7px; padding-top: 0px">
<table
class="table table-bordered table-hover"
ng-if="postData.length>0"
>
<thead> <thead>
<tr> <tr>
<th>NO.</th> <th>NO.</th>
...@@ -169,19 +303,19 @@ ...@@ -169,19 +303,19 @@
<tr ng-repeat="item in postData"> <tr ng-repeat="item in postData">
<td>{{$index+1}}</td> <td>{{$index+1}}</td>
<td>{{item.orderNumber}}</td> <td>{{item.orderNumber}}</td>
<td>{{item.waybillNumber}} - <td>{{item.waybillNumber}} - {{item.backWaybillNumber}}</td>
{{item.backWaybillNumber}}
</td>
<td>{{item.firstWhite}}</td> <td>{{item.firstWhite}}</td>
<td>{{item.applicantName}}</td> <td>{{item.applicantName}}</td>
<!--<td>{{item.idCard}}</td>--> <!--<td>{{item.idCard}}</td>-->
<td>{{item.recipientName}}</td> <td>{{item.recipientName}}</td>
<td>{{item.recipientPhone}}</td> <td>{{item.recipientPhone}}</td>
<td ng-click="showDetail(item)"><a>{{item.recipientAddress}}</a></td> <td ng-click="showDetail(item)">
<a>{{item.recipientAddress}}</a>
</td>
<td>{{item.printDate | date:'yyyy-MM-dd hh:mm:ss'}}</td> <td>{{item.printDate | date:'yyyy-MM-dd hh:mm:ss'}}</td>
<td ng-click="addNote(item.firstWhite)"> <td ng-click="addNote(item.firstWhite)">
<a style="color: black">{{item.note}}</a> <a style="color: black">{{item.note}}</a>
<a ng-if="item.note==null" >更新</a> <a ng-if="item.note==null">更新</a>
</td> </td>
</tr> </tr>
</tbody> </tbody>
...@@ -189,7 +323,7 @@ ...@@ -189,7 +323,7 @@
<!--<div class="box-footer" ng-if="postData.length>0"> <!--<div class="box-footer" ng-if="postData.length>0">
<button class="pull-right btn btn-primary" ng-click="addNote()">添加备注</button> <button class="pull-right btn btn-primary" ng-click="addNote()">添加备注</button>
</div>--> </div>-->
<div style="padding-left: 27%;" ng-if="postData.length>0"> <div style="padding-left: 27%" ng-if="postData.length>0">
<tm-pagination conf="paginationConf" class="ul"></tm-pagination> <tm-pagination conf="paginationConf" class="ul"></tm-pagination>
</div> </div>
<h4 ng-if="postData.length==0">暂无记录。</h4> <h4 ng-if="postData.length==0">暂无记录。</h4>
......
src/main/resources/static/views/uploadExcelAndSearch/uploadExcelAndSearch.js
View file @ 91cbc36d
...@@ -92,6 +92,12 @@ angular.module('AvatarCheck.uploadExcelAndSearch', ['ngRoute', 'AvatarCheck.http ...@@ -92,6 +92,12 @@ angular.module('AvatarCheck.uploadExcelAndSearch', ['ngRoute', 'AvatarCheck.http
}else { }else {
json.district=$("#district").val() ; json.district=$("#district").val() ;
} }
if ($("#gk").val() == "") {
json.gk = -1
} else {
json.gk = $("#gk").val()
}
if(angular.isUndefined($scope.emailNo)){ if(angular.isUndefined($scope.emailNo)){
json.emailNo = '' json.emailNo = ''
}else{ }else{
...@@ -156,6 +162,11 @@ angular.module('AvatarCheck.uploadExcelAndSearch', ['ngRoute', 'AvatarCheck.http ...@@ -156,6 +162,11 @@ angular.module('AvatarCheck.uploadExcelAndSearch', ['ngRoute', 'AvatarCheck.http
}else { }else {
json.district=$("#district").val() ; json.district=$("#district").val() ;
} }
if ($("#gk").val() == "") {
json.gk = -1
} else {
json.gk = $("#gk").val()
}
if(angular.isUndefined($scope.emailNo)){ if(angular.isUndefined($scope.emailNo)){
json.emailNo = '' json.emailNo = ''
}else{ }else{
...@@ -250,6 +261,11 @@ angular.module('AvatarCheck.uploadExcelAndSearch', ['ngRoute', 'AvatarCheck.http ...@@ -250,6 +261,11 @@ angular.module('AvatarCheck.uploadExcelAndSearch', ['ngRoute', 'AvatarCheck.http
}else { }else {
url = url + 'district=-1&'; url = url + 'district=-1&';
} }
if ($("#gk").val() != "") {
url = url + "gk=" + $("#gk").val() + "&"
} else {
url = url + "gk=-1&"
}
if(angular.isUndefined($scope.emailNo)){ if(angular.isUndefined($scope.emailNo)){
url = url + 'emailNo=&'; url = url + 'emailNo=&';
}else{ }else{
......
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