潘钊 / bsth_control · Commits

Commit b07324dfb5706b30bdd8d727da63e318331ad157

Authored by 廖磊
1 parent afde4d99

添加公司查询

Inline Side-by-side
Showing 13 changed files with 442 additions and 45 deletions
src/main/java/com/bsth/controller/oil/CwjyController.java
  View file @b07324d
... ... @@ -5,7 +5,6 @@ import java.util.Date;
5 5 import java.util.Map;
6 6  
7 7 import org.springframework.beans.factory.annotation.Autowired;
8   -import org.springframework.web.bind.annotation.PathVariable;
9 8 import org.springframework.web.bind.annotation.RequestMapping;
10 9 import org.springframework.web.bind.annotation.RequestMethod;
11 10 import org.springframework.web.bind.annotation.RequestParam;
... ... @@ -62,5 +61,4 @@ public class CwjyController extends BaseController<Cwjy, Integer>{
62 61 return map;
63 62 }
64 63  
65   -
66 64 }
... ...
src/main/java/com/bsth/controller/oil/CylController.java
  View file @b07324d
... ... @@ -22,7 +22,6 @@ public class CylController extends BaseController<Cyl, Integer>{
22 22 @RequestMapping(value = "/save",method = RequestMethod.POST)
23 23 public Map<String, Object> saveYlb(Cyl t){
24 24 // SysUser user = SecurityUtils.getCurrentUser();
25   - t.setGsdm("77");
26 25 t.setUpdatetime(new Date());
27 26 /*SimpleDateFormat sdf=new SimpleDateFormat("yyyy-MM-dd");
28 27 try {
... ...
src/main/java/com/bsth/entity/oil/Cwjy.java
  View file @b07324d
... ... @@ -6,6 +6,9 @@ import javax.persistence.Entity;
6 6 import javax.persistence.GeneratedValue;
7 7 import javax.persistence.Id;
8 8 import javax.persistence.Table;
  9 +import javax.persistence.Transient;
  10 +
  11 +import com.bsth.data.BasicData;
9 12  
10 13 @Entity
11 14 @Table(name = "bsth_c_cwjy")
... ... @@ -24,6 +27,11 @@ public class Cwjy {
24 27  
25 28 private Date createDate;
26 29  
  30 + @Transient
  31 + private String gsname;
  32 +
  33 + @Transient
  34 + private String fgsname;
27 35 public Integer getId() {
28 36 return id;
29 37 }
... ... @@ -71,6 +79,22 @@ public class Cwjy {
71 79 public void setCreateDate(Date createDate) {
72 80 this.createDate = createDate;
73 81 }
  82 +
  83 + public String getGsname() {
  84 + return BasicData.businessCodeNameMap.get(this.gsdm);
  85 + }
  86 +
  87 + public void setGsname(String gsname) {
  88 + this.gsname = gsname;
  89 + }
  90 +
  91 + public String getFgsname() {
  92 + return BasicData.businessFgsCodeNameMap.get(this.fgsdm+"_"+this.gsdm);
  93 + }
  94 +
  95 + public void setFgsname(String fgsname) {
  96 + this.fgsname = fgsname;
  97 + }
74 98  
75 99  
76 100 }
... ...
src/main/java/com/bsth/entity/oil/Cyl.java
  View file @b07324d
... ... @@ -6,6 +6,9 @@ import javax.persistence.Entity;
6 6 import javax.persistence.GeneratedValue;
7 7 import javax.persistence.Id;
8 8 import javax.persistence.Table;
  9 +import javax.persistence.Transient;
  10 +
  11 +import com.bsth.data.BasicData;
9 12  
10 13 @Entity
11 14 @Table(name = "bsth_c_cyl")
... ... @@ -25,6 +28,16 @@ public class Cyl {
25 28 private Double cxrl;
26 29 //公司代码
27 30 private String gsdm;
  31 +
  32 + @Transient
  33 + private String gsname;
  34 +
  35 + @Transient
  36 + private String fgsname;
  37 +
  38 + //分公司代码
  39 + private String fgsdm;
  40 +
28 41 public Integer getId() {
29 42 return id;
30 43 }
... ... @@ -72,4 +85,30 @@ public class Cyl {
72 85 public void setGsdm(String gsdm){
73 86 this.gsdm=gsdm;
74 87 }
  88 +
  89 + public String getFgsdm() {
  90 + return fgsdm;
  91 + }
  92 +
  93 + public void setFgsdm(String fgsdm) {
  94 + this.fgsdm = fgsdm;
  95 + }
  96 +
  97 + public String getGsname() {
  98 + return BasicData.businessCodeNameMap.get(this.gsdm);
  99 + }
  100 +
  101 + public void setGsname(String gsname) {
  102 + this.gsname = gsname;
  103 + }
  104 +
  105 + public String getFgsname() {
  106 + return BasicData.businessFgsCodeNameMap.get(this.fgsdm+"_"+this.gsdm);
  107 + }
  108 +
  109 + public void setFgsname(String fgsname) {
  110 + this.fgsname = fgsname;
  111 + }
  112 +
  113 +
75 114 }
... ...
src/main/java/com/bsth/entity/oil/Ylxxb.java
  View file @b07324d
... ... @@ -25,6 +25,7 @@ public class Ylxxb {
25 25 private String stationid;
26 26 private Date createtime;
27 27 private String gsdm;
  28 + private String fgsdm;
28 29 private String yp;
29 30 private String jyggh;
30 31 private Double yj;
... ... @@ -93,6 +94,14 @@ public class Ylxxb {
93 94 public void setGsdm(String gsdm) {
94 95 this.gsdm = gsdm;
95 96 }
  97 +
  98 +
  99 + public String getFgsdm() {
  100 + return fgsdm;
  101 + }
  102 + public void setFgsdm(String fgsdm) {
  103 + this.fgsdm = fgsdm;
  104 + }
96 105 public String getYp() {
97 106 return yp;
98 107 }
... ...
src/main/java/com/bsth/entity/search/PredicatesBuilder.java
  View file @b07324d
... ... @@ -8,7 +8,9 @@ import javax.persistence.criteria.Predicate;
8 8 import java.text.NumberFormat;
9 9 import java.text.ParseException;
10 10 import java.text.SimpleDateFormat;
  11 +import java.util.ArrayList;
11 12 import java.util.Date;
  13 +import java.util.List;
12 14  
13 15 /**
14 16 *
... ... @@ -58,6 +60,15 @@ public class PredicatesBuilder {
58 60 return cb.notEqual(expression, object);
59 61 }
60 62  
  63 + public static Predicate in(CriteriaBuilder cb,Path<?> expression, Object object){
  64 + String[] obj=object.toString().split(",");
  65 + List<String> list=new ArrayList<String>();
  66 + for(int i=0;i<obj.length;i++){
  67 + list.add(obj[i]);
  68 + }
  69 + return cb.in(expression).value(list);
  70 + }
  71 +
61 72 public static Predicate gt(CriteriaBuilder cb,Path<Number> expression, Object object){
62 73 try {
63 74 return cb.gt(expression, nf.parse(object.toString()));
... ...
src/main/java/com/bsth/entity/search/SearchOperator.java
  View file @b07324d
... ... @@ -26,5 +26,6 @@ public enum SearchOperator {
26 26 isNotNull, // 非空
27 27 isf, //假 isFalse，boolean
28 28 ist, //真 isTrue，boolean
29   - date //时间
  29 + date, //时间
  30 + in //数组
30 31 }
... ...
src/main/resources/static/pages/oil/cylAdd.html
  View file @b07324d
... ... @@ -25,6 +25,20 @@
25 25 您的输入有误，请检查下面的输入项
26 26 </div>
27 27 <div class="form-body">
  28 + <div class="form-group" id="gsdmDivId">
  29 + <label class="col-md-3 control-label">公司</label>
  30 + <div class="col-md-4">
  31 + <select class="form-control" name="gsdm" id="gsdm" ></select>
  32 + <span class="help-block"> 公司</span>
  33 + </div>
  34 + </div>
  35 + <div class="form-group" id="fgsdmDivId">
  36 + <label class="col-md-3 control-label">分公司</label>
  37 + <div class="col-md-4">
  38 + <select class="form-control" name="fgsdm" id="fgsdm" ></select>
  39 + <span class="help-block"> 分公司</span>
  40 + </div>
  41 + </div>
28 42 <div class="form-group">
29 43 <label class="col-md-3 control-label">内部编号</label>
30 44 <div class="col-md-4">
... ... @@ -63,11 +77,64 @@
63 77 var form = $('#cyl_add_form');
64 78 var error = $('.alert-danger', form);
65 79  
  80 + var obj = [];
  81 + $.get('/user/companyData', function(result){
  82 + obj = result;
  83 + var options = '';
  84 + for(var i = 0; i < obj.length; i++){
  85 + options += '<option value="'+obj[i].companyCode+'">'+obj[i].companyName+'</option>';
  86 + }
  87 +
  88 + if(obj.length ==0){
  89 + $("#gsdmDivId").css('display','none');
  90 + $('#fgsdmDivId').css('display','none');
  91 + }else if(obj.length ==1){
  92 + $("#gsdmDivId").css('display','none');
  93 + if(obj[0].children.length == 1 || obj[0].children.length ==0)
  94 + $('#fgsdmDivId').css('display','none');
  95 + }
  96 + $('#gsdm').html(options);
  97 + updateCompany();
  98 + });
  99 +
  100 + $("#gsdm").on("change",updateCompany);
  101 + function updateCompany(){
  102 + var company = $('#gsdm').val();
  103 + var options = '';
  104 + for(var i = 0; i < obj.length; i++){
  105 + if(obj[i].companyCode == company){
  106 + var children = obj[i].children;
  107 + for(var j = 0; j < children.length; j++){
  108 + options += '<option value="'+children[j].code+'">'+children[j].name+'</option>';
  109 + }
  110 + }
  111 + }
  112 + $('#fgsdm').html(options);
  113 + }
  114 +
  115 +
66 116 //表单 validate
67 117 form.validate({
68 118 errorElement : 'span',
69 119 errorClass : 'help-block help-block-error',
70 120 focusInvalid : false,
  121 + rules : {
  122 + 'nbbm' : {
  123 + minlength : 2,
  124 + required : true,
  125 + maxlength : 10
  126 + },
  127 + 'cyl' : {
  128 + number:true,
  129 + required : true,
  130 + min:0
  131 + },
  132 + 'cxrl' : {
  133 + number:true,
  134 + required : true,
  135 + min:0
  136 + }
  137 + },
71 138 invalidHandler : function(event, validator) {
72 139 error.show();
73 140 App.scrollTo(error, -200);
... ... @@ -88,7 +155,7 @@
88 155 submitHandler : function(f) {
89 156 var params = form.serializeJSON();
90 157 error.hide();
91   - //检查一下用户是否存在
  158 + //检查一下车辆是否存在
92 159 $get('/cyl/all', {nbbm_eq: params.nbbm}, function(list){
93 160 if(!list || list.length == 0){
94 161 console.log(params);
... ...
src/main/resources/static/pages/oil/cylList.html
  View file @b07324d
... ... @@ -55,16 +55,20 @@
55 55 <tr role="row" class="heading">
56 56 <th width="3%">#</th>
57 57 <th width="15%">公司</th>
58   - <th width="15%">车辆编码</th>
59   - <th width="15%">油箱存油</th>
60   - <th width="15%">车辆容量</th>
  58 + <th width="15%">分公司</th>
  59 + <th width="14%">车辆编码</th>
  60 + <th width="8%">油箱存油</th>
  61 + <th width="8%">车辆容量</th>
61 62 <th width="18%">最后更新时间</th>
62 63 <th width="19%">操作</th>
63 64 </tr>
64 65 <tr role="row" class="filter">
65 66 <td></td>
66 67 <td>
67   - <input type="text" class="form-control form-filter input-sm" name="gsdm_like">
  68 + <select class="form-control" name="gsdm_like" id="cylListGsdmId" ></select>
  69 + </td>
  70 + <td>
  71 + <select class="form-control" name="fgsdm_like" id="cylListFgsdmId" ></select>
68 72 </td>
69 73 <td>
70 74 <input type="text" class="form-control form-filter input-sm" name="nbbm_like">
... ... @@ -100,7 +104,10 @@
100 104 <input type="checkbox" class="group-checkable icheck" data-id="{{obj.id}}">
101 105 </td>
102 106 <td>
103   - {{obj.gsdm}}
  107 + {{obj.gsname}}
  108 + </td>
  109 + <td>
  110 + {{obj.fgsname}}
104 111 </td>
105 112 <td>
106 113 {{obj.nbbm}}
... ... @@ -115,7 +122,7 @@
115 122 {{obj.updatetime}}
116 123 </td>
117 124 <td>
118   - <a class="btn btn-sm blue btn-outline" href="edit.html?no={{obj.id}}" data-pjax><i class="fa fa-edit"></i> 编辑</a>
  125 + <!--<a class="btn btn-sm blue btn-outline" href="edit.html?no={{obj.id}}" data-pjax><i class="fa fa-edit"></i> 编辑</a>-->
119 126 </td>
120 127 </tr>
121 128 {{/each}}
... ... @@ -133,9 +140,52 @@ $(function(){
133 140 checkboxClass: 'icheckbox_flat-blue',
134 141 increaseArea: '20%'
135 142 }
  143 + var gsqx="";
  144 + var fgsqx="";
  145 +
136 146  
137   - jsDoQuery(null,true);
138 147  
  148 + $.get('/user/companyData', function(result){
  149 + obj = result;
  150 + var options = '<option value="">请选择</option>';
  151 + for(var i = 0; i < obj.length; i++){
  152 + options += '<option value="'+obj[i].companyCode+'">'+obj[i].companyName+'</option>';
  153 + setFgsqx(obj[i].companyCode);
  154 + gsqx +=obj[i].companyCode+",";
  155 + }
  156 + $('#cylListGsdmId').html(options);
  157 + updateCompany();
  158 + jsDoQuery(null,true);
  159 + });
  160 +
  161 + function setFgsqx(gs){
  162 + var company =gs
  163 + var options = '';
  164 + for(var i = 0; i < obj.length; i++){
  165 + if(obj[i].companyCode == company){
  166 + var children = obj[i].children;
  167 + for(var j = 0; j < children.length; j++){
  168 + fgsqx +=children[j].code+",";
  169 + }
  170 + }
  171 + }
  172 + }
  173 +
  174 + $("#cylListGsdmId").on("change",updateCompany);
  175 + function updateCompany(){
  176 + var company = $('#cylListGsdmId').val();
  177 + var options = '<option value="">请选择</option>';
  178 + for(var i = 0; i < obj.length; i++){
  179 + if(obj[i].companyCode == company){
  180 + var children = obj[i].children;
  181 + for(var j = 0; j < children.length; j++){
  182 + options += '<option value="'+children[j].code+'">'+children[j].name+'</option>';
  183 + }
  184 + }
  185 + }
  186 + $('#cylListFgsdmId').html(options);
  187 + }
  188 +
139 189 //重置
140 190 $('tr.filter .filter-cancel').on('click', function(){
141 191 $('tr.filter input, select').val('').change();
... ... @@ -160,6 +210,8 @@ $(function(){
160 210 jsDoQuery(params, true);
161 211 });
162 212  
  213 +
  214 +
163 215 /*
164 216 * 获取数据 p: 要提交的参数， pagination: 是否重新分页
165 217 */
... ... @@ -170,7 +222,28 @@ $(function(){
170 222 //更新时间排序
171 223 params['order'] = 'nbbm';
172 224 params['page'] = page;
173   - var i = layer.load(2);
  225 + var i = 2;
  226 + console.log(i);
  227 + var cylGsdm=$("#cylListGsdmId").val();
  228 + var cylFgsdm=$("#cylListFgsdmId").val();
  229 + if(cylGsdm==''|| cylGsdm==null){
  230 + params['gsdm_in']=gsqx;
  231 + params['fgsdm_in']=fgsqx;
  232 + }else{
  233 + if(cylFgsdm==''||cylFgsdm==null){
  234 + var fgsqx1='';
  235 + for(var i = 0; i < obj.length; i++){
  236 + if(obj[i].companyCode == cylGsdm){
  237 + var children = obj[i].children;
  238 + for(var j = 0; j < children.length; j++){
  239 + fgsqx1 +=children[j].code+",";
  240 + }
  241 + }
  242 + }
  243 + params['fgsdm_in']=fgsqx1;
  244 + }
  245 + }
  246 + console.log(params);
174 247 $get('/cyl' ,params, function(data){
175 248 $.each(data.content, function(i, obj) {
176 249 obj.updatetime = moment(obj.updatetime).format("YYYY-MM-DD");
... ... @@ -219,7 +292,19 @@ $(function(){
219 292 return;
220 293 }
221 294 page = num - 1;
222   - jsDoQuery(null, false);
  295 + var cells = $('tr.filter')[0].cells
  296 + ,params = {}
  297 + ,name;
  298 + $.each(cells, function(i, cell){
  299 + var items = $('input,select', cell);
  300 + for(var j = 0, item; item = items[j++];){
  301 + name = $(item).attr('name');
  302 + if(name){
  303 + params[name] = $(item).val();
  304 + }
  305 + }
  306 + });
  307 + jsDoQuery(params, false);
223 308 }
224 309 });
225 310 }
... ...
src/main/resources/static/pages/oil/jyglList.html
  View file @b07324d
... ... @@ -22,7 +22,7 @@
22 22 class="caption-subject font-dark sbold uppercase">场外加油管理</span>
23 23 </div>
24 24 <div class="actions">
25   - <a class="btn btn-circle blue" href="cylAdd.html" data-pjax><i class="fa fa-plus"></i> 添加</a>
  25 +<!-- <a class="btn btn-circle blue" href="cylAdd.html" data-pjax><i class="fa fa-plus"></i> 添加</a> -->
26 26 <button type="button" class="btn btn-circle blue" id="saveButton"><i class="fa fa-minus-square"></i> 保存</button>
27 27 <!-- <button type="button" class="btn btn-circle red" disabled="disabled" id="removeButton"><i class="fa fa-trash"></i> 删除用户</button> -->
28 28 <!-- <div class="btn-group">
... ... @@ -176,9 +176,7 @@ $(function(){
176 176 radioClass: 'iradio_square-blue icheck',
177 177 increaseArea: '20%'
178 178 }
179   - if($("#rq").val()!=""){
180   - jsDoQuery(null,true);
181   - }
  179 +
182 180 //重置
183 181 $('tr.filter .filter-cancel').on('click', function(){
184 182 $('tr.filter input, select').val('').change();
... ... @@ -273,7 +271,20 @@ $(function(){
273 271 return;
274 272 }
275 273 page = num - 1;
276   - jsDoQuery(null, false);
  274 + var cells = $('tr.filter')[0].cells
  275 + ,params = {}
  276 + ,name;
  277 + $.each(cells, function(i, cell){
  278 + var items = $('input,select', cell);
  279 + for(var j = 0, item; item = items[j++];){
  280 + name = $(item).attr('name');
  281 + if(name){
  282 + params[name] = $(item).val();
  283 + }
  284 + }
  285 + });
  286 + page = 0;
  287 + jsDoQuery(params, true);
277 288 }
278 289 });
279 290 }
... ...
src/main/resources/static/pages/oil/jyszAdd.html
  View file @b07324d
... ... @@ -17,15 +17,18 @@
17 17 您的输入有误，请检查下面的输入项
18 18 </div>
19 19 <div class="form-body">
20   - <div class="form-group">
  20 + <div class="form-group" id="gsdmDivId">
21 21 <label class="col-md-3 control-label">公司</label>
22   - <div class="col-md-9">
23   - <select class="form-control input-medium " name="gsdm">
24   - <option value="22">金高公交</option>
25   - <option value="05">杨高公交</option>
26   - <option value="55">上南公交</option>
27   - <option value="26">南汇公交</option>
28   - </select>
  22 + <div class="col-md-4">
  23 + <select class="form-control" name="gsdm" id="gsdm" ></select>
  24 + <span class="help-block"> 公司</span>
  25 + </div>
  26 + </div>
  27 + <div class="form-group" id="fgsdmDivId">
  28 + <label class="col-md-3 control-label">分公司</label>
  29 + <div class="col-md-4">
  30 + <select class="form-control" name="fgsdm" id="fgsdm" ></select>
  31 + <span class="help-block"> 分公司</span>
29 32 </div>
30 33 </div>
31 34 <div class="form-group">
... ... @@ -51,7 +54,41 @@ $(function(){
51 54  
52 55 var form = $('#jysz_add_form');
53 56 var error = $('.alert-danger', form);
54   -
  57 + var obj = [];
  58 + $.get('/user/companyData', function(result){
  59 + obj = result;
  60 + var options = '';
  61 + for(var i = 0; i < obj.length; i++){
  62 + options += '<option value="'+obj[i].companyCode+'">'+obj[i].companyName+'</option>';
  63 + }
  64 +
  65 + if(obj.length ==0){
  66 + $("#gsdmDivId").css('display','none');
  67 + $('#fgsdmDivId').css('display','none');
  68 + }else if(obj.length ==1){
  69 + $("#gsdmDivId").css('display','none');
  70 + if(obj[0].children.length == 1 || obj[0].children.length ==0)
  71 + $('#fgsdmDivId').css('display','none');
  72 + }
  73 + $('#gsdm').html(options);
  74 + updateCompany();
  75 + });
  76 +
  77 + $("#gsdm").on("change",updateCompany);
  78 + function updateCompany(){
  79 + var company = $('#gsdm').val();
  80 + var options = '';
  81 + for(var i = 0; i < obj.length; i++){
  82 + if(obj[i].companyCode == company){
  83 + var children = obj[i].children;
  84 + for(var j = 0; j < children.length; j++){
  85 + options += '<option value="'+children[j].code+'">'+children[j].name+'</option>';
  86 + }
  87 + }
  88 + }
  89 + $('#fgsdm').html(options);
  90 + }
  91 +
55 92 //提交
56 93 $('#addJyszModuleButton').on('click', function() {
57 94 form.submit();
... ... @@ -95,6 +132,11 @@ $(function(){
95 132 });
96 133 }
97 134 });
  135 +
  136 + function refreshJsTree(){
  137 + var pjaxContainer = '#monde-page';
  138 + $.pjax({url: "/pages/oil/jyszList.html", container: pjaxContainer})
  139 + }
98 140 /* $('#nbbm').select2({
99 141 placeholder: '搜索车辆...',
100 142 ajax: {
... ...
src/main/resources/static/pages/oil/jyszList.html
  View file @b07324d
... ... @@ -57,8 +57,9 @@
57 57 <thead>
58 58 <tr role="row" class="heading">
59 59 <th width="3%">#</th>
60   - <th width="18%">公司</th>
61   - <th width="20%">车辆</th>
  60 + <th width="15%">公司</th>
  61 + <th width="13%">分公司</th>
  62 + <th width="10%">车辆</th>
62 63 <th width="10%">修改人</th>
63 64 <th width="20%">日期</th>
64 65 <th width="19%">操作</th>
... ... @@ -66,7 +67,10 @@
66 67 <tr role="row" class="filter">
67 68 <td></td>
68 69 <td>
69   - <input type="text" class="form-control form-filter input-sm" name="gsdm_like">
  70 + <select class="form-control" name="gsdm_like" id="jyszListGsdmId" ></select>
  71 + </td>
  72 + <td>
  73 + <select class="form-control" name="fgsdm_like" id="jyszListFgsdmId" ></select>
70 74 </td>
71 75 <td>
72 76 <input type="text" class="form-control form-filter input-sm" name="nbbm_like">
... ... @@ -100,7 +104,8 @@
100 104 <td style="vertical-align: middle;">
101 105 <input type="checkbox" class="group-checkable icheck" data-id="{{obj.id}}">
102 106 </td>
103   - <td>{{obj.gsdm}}</td>
  107 + <td>{{obj.gsname}}</td>
  108 + <td>{{obj.fgsname}}</td>
104 109 <td>{{obj.nbbm}}</td>
105 110 <td>{{obj.xgr}}</td>
106 111 <td>{{obj.createDate}}</td>
... ... @@ -122,8 +127,48 @@ $(function(){
122 127 checkboxClass: 'icheckbox_flat-blue',
123 128 increaseArea: '20%'
124 129 }
  130 + var gsqx="";
  131 + var fgsqx="";
  132 + $.get('/user/companyData', function(result){
  133 + obj = result;
  134 + var options = '<option value="">请选择</option>';
  135 + for(var i = 0; i < obj.length; i++){
  136 + options += '<option value="'+obj[i].companyCode+'">'+obj[i].companyName+'</option>';
  137 + setFgsqx(obj[i].companyCode);
  138 + gsqx +=obj[i].companyCode+",";
  139 + }
  140 + $('#jyszListGsdmId').html(options);
  141 + updateCompany();
  142 + jsDoQuery(null,true);
  143 + });
  144 +
  145 + function setFgsqx(gs){
  146 + var company =gs
  147 + for(var i = 0; i < obj.length; i++){
  148 + if(obj[i].companyCode == company){
  149 + var children = obj[i].children;
  150 + for(var j = 0; j < children.length; j++){
  151 + fgsqx +=children[j].code+",";
  152 + }
  153 + }
  154 + }
  155 + }
  156 + $("#jyszListGsdmId").on("change",updateCompany);
  157 + function updateCompany(){
  158 + var company = $('#jyszListGsdmId').val();
  159 + var options = '';
  160 + for(var i = 0; i < obj.length; i++){
  161 + if(obj[i].companyCode == company){
  162 + var children = obj[i].children;
  163 + options += '<option value="">请选择</option>';
  164 + for(var j = 0; j < children.length; j++){
  165 + options += '<option value="'+children[j].code+'">'+children[j].name+'</option>';
  166 + }
  167 + }
  168 + }
  169 + $('#jyszListFgsdmId').html(options);
  170 + }
125 171  
126   - jsDoQuery(null,true);
127 172  
128 173 //重置
129 174 $('tr.filter .filter-cancel').on('click', function(){
... ... @@ -153,6 +198,7 @@ $(function(){
153 198 * 获取数据 p: 要提交的参数， pagination: 是否重新分页
154 199 */
155 200 function jsDoQuery(p, pagination){
  201 +
156 202 var params = {};
157 203 if(p)
158 204 params = p;
... ... @@ -160,6 +206,25 @@ $(function(){
160 206 params['order'] = 'nbbm';
161 207 params['page'] = page;
162 208 var i = layer.load(2);
  209 + var jyszGsdm=$("#jyszListGsdmId").val();
  210 + var jyszFgsdm=$("#jyszListFgsdmId").val();
  211 + if(jyszGsdm==''|| jyszGsdm==null){
  212 + params['gsdm_in']=gsqx;
  213 + params['fgsdm_in']=fgsqx;
  214 + }else{
  215 + if(jyszFgsdm==''||jyszFgsdm==null){
  216 + var fgsqx1='';
  217 + for(var i = 0; i < obj.length; i++){
  218 + if(obj[i].companyCode == jyszGsdm){
  219 + var children = obj[i].children;
  220 + for(var j = 0; j < children.length; j++){
  221 + fgsqx1 +=children[j].code+",";
  222 + }
  223 + }
  224 + }
  225 + params['fgsdm_in']=fgsqx1;
  226 + }
  227 + }
163 228 $get('/cwjy' ,params, function(data){
164 229 $.each(data.content, function(i, obj) {
165 230 obj.createDate = moment(obj.createDate).format("YYYY-MM-DD");
... ... @@ -208,7 +273,19 @@ $(function(){
208 273 return;
209 274 }
210 275 page = num - 1;
211   - jsDoQuery(null, false);
  276 + var cells = $('tr.filter')[0].cells
  277 + ,params = {}
  278 + ,name;
  279 + $.each(cells, function(i, cell){
  280 + var items = $('input,select', cell);
  281 + for(var j = 0, item; item = items[j++];){
  282 + name = $(item).attr('name');
  283 + if(name){
  284 + params[name] = $(item).val();
  285 + }
  286 + }
  287 + });
  288 + jsDoQuery(params, false);
212 289 }
213 290 });
214 291 }
... ... @@ -230,19 +307,10 @@ $(function(){
230 307 $('#addJysz').on('click', function(){
231 308 $.get('jyszAdd.html', function(m){$(pjaxContainer).append(m);});
232 309 });
  310 +
  311 +
233 312 });
234 313  
235   -function refreshJsTree(){
236   - var pjaxContainer = '#monde-page';
237   - $.pjax({url: "/pages/oil/jyszList.html", container: pjaxContainer})
238   -}
239   -//改变状态
240   -function changeEnabled(id,enabled){
241   - debugger
242   - $get('/user/changeEnabled',{id:id,enabled:enabled},function(result){
243   - jsDoQuery(null, true);
244   - })
245   -}
246 314  
247 315  
248 316 </script>
249 317 \ No newline at end of file
... ...
src/main/resources/static/pages/report/timetable/timetable.html
  View file @b07324d
... ... @@ -27,6 +27,14 @@
27 27 <div class="portlet light porttlet-fit bordered">
28 28 <div class="portlet-title">
29 29 <form class="form-inline" action="">
  30 + <div style="display: inline-block; margin-left: 33px;" id="gsdmDiv_time">
  31 + <span class="item-label" style="width: 80px;">公司: </span>
  32 + <select class="form-control" name="company" id="gsdmTime" style="width: 140px;"></select>
  33 + </div>
  34 + <div style="display: inline-block; margin-left: 24px;" id="fgsdmDiv_time">
  35 + <span class="item-label" style="width: 80px;">分公司: </span>
  36 + <select class="form-control" name="subCompany" id="fgsdmTime" style="width: 140px;"></select>
  37 + </div>
30 38 <div style="display: inline-block;">
31 39 <span class="item-label" style="width: 80px;">线路: </span>
32 40 <select class="form-control" name="line" id="line" style="width: 180px;"></select>
... ... @@ -193,7 +201,40 @@
193 201 locale : 'zh-cn'
194 202 });
195 203  
  204 + var obj = [];
  205 + $.get('/user/companyData', function(result){
  206 + obj = result;
  207 + var options = '';
  208 + for(var i = 0; i < obj.length; i++){
  209 + options += '<option value="'+obj[i].companyCode+'">'+obj[i].companyName+'</option>';
  210 + }
  211 +
  212 + if(obj.length ==0){
  213 + $("#gsdmDiv_time").css('display','none');
  214 + $('#fgsdmDiv_time').css('display','none');
  215 + }else if(obj.length ==1){
  216 + $("#gsdmDiv_time").css('display','none');
  217 + if(obj[0].children.length == 1 || obj[0].children.length ==0)
  218 + $('#fgsdmDiv_time').css('display','none');
  219 + }
  220 + $('#gsdmTime').html(options);
  221 + updateCompany();
  222 + });
196 223  
  224 + $("#gsdmTime").on("change",updateCompany);
  225 + function updateCompany(){
  226 + var company = $('#gsdmTime').val();
  227 + var options = '';
  228 + for(var i = 0; i < obj.length; i++){
  229 + if(obj[i].companyCode == company){
  230 + var children = obj[i].children;
  231 + for(var j = 0; j < children.length; j++){
  232 + options += '<option value="'+children[j].code+'">'+children[j].name+'</option>';
  233 + }
  234 + }
  235 + }
  236 + $('#fgsdmTime').html(options);
  237 + }
197 238  
198 239 $.get('/basic/lineCode2Name',function(result){
199 240 var data=[];
... ... @@ -206,6 +247,8 @@
206 247 })
207 248 //查询
208 249 $("#query").on('click',function(){
  250 + console.log($("#gsdmTime").val());
  251 + console.log($("#fgsdmTime").val());
209 252 var line = $("#line").val();
210 253 var xlName = $("#select2-line-container").html();
211 254 var date = $("#date").val();
... ...