Commit 88bbf2863cdf1457bcb7a54fa26efa52968ebdff

Authored by 王通
2 parents c80e2f24 d003db3f

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

src/main/resources/static/pages/forms/statement/lbStatuAnaly.html
... ... @@ -164,51 +164,7 @@
164 164 $("#times1").attr("disabled", true);
165 165 $("#times2").attr("disabled", true);
166 166  
167   -// $.get('/basic/lineCode2Name', function(result){
168   -// var data=[];
169   -
170   -// data.push({id: " ", text: "全部线路"});
171   -// for(var code in result){
172   -// data.push({id: code, text: result[code]});
173   -// }
174   -// console.log(data);
175   -// initPinYinSelect2('#line',data,'');
176   -
177   -// line = "";
178   -// updateModel();
179   -// })
180   -
181   -// var obj = [];
182   -// $.get('/user/companyData', function(result){
183   -// obj = result;
184   -// var options = '';
185   -// for(var i = 0; i < obj.length; i++){
186   -// options += '<option value="'+obj[i].companyCode+'">'+obj[i].companyName+'</option>';
187   -// }
188   -// if(obj.length == 1){
189   -// $('#company1').hide();
190   -// if(obj[0].children.length == 1)
191   -// $('#subCompany1').hide();
192   -// }
193   -// $('#company').html(options);
194   -// updateCompany();
195   -// });
196   -
197   -// $("#company").on("change",updateCompany);
198   -// function updateCompany(){
199   -// var company = $('#company').val();
200   -// var options = '';
201   -// for(var i = 0; i < obj.length; i++){
202   -// if(obj[i].companyCode == company){
203   -// var children = obj[i].children;
204   -// for(var j = 0; j < children.length; j++){
205   -// options += '<option value="'+children[j].code+'">'+children[j].name+'</option>';
206   -// }
207   -// }
208   -// }
209   -// $('#subCompany').html(options);
210   -// }
211   - var fage=false;
  167 + var fage=true;
212 168 var xlList;
213 169 var obj = [];
214 170  
... ... @@ -221,12 +177,14 @@
221 177 options += '<option value="'+obj[i].companyCode+'">'+obj[i].companyName+'</option>';
222 178 }
223 179  
224   - if(obj.length ==0){
  180 + if(obj.length == 0){
225 181 $("#company1").css('display','none');
226   - }else if(obj.length ==1){
  182 + }else if(obj.length == 1){
227 183 $("#company1").css('display','none');
228   - if(obj[0].children.length == 1 || obj[0].children.length ==0)
  184 + if(obj[0].children.length == 1 || obj[0].children.length == 0){
  185 + fage = false;
229 186 $('#subCompany1').css('display','none');
  187 + }
230 188 }
231 189 $('#company').html(options);
232 190 updateCompany();
... ... @@ -235,7 +193,10 @@
235 193 $("#company").on("change",updateCompany);
236 194 function updateCompany(){
237 195 var company = $('#company').val();
238   - var options = '<option value="">全部分公司</option>';
  196 + var options = '';
  197 + if(fage){
  198 + options = '<option value="">全部分公司</option>';
  199 + }
239 200 for(var i = 0; i < obj.length; i++){
240 201 if(obj[i].companyCode == company){
241 202 var children = obj[i].children;
... ... @@ -278,8 +239,8 @@
278 239 var temp = tempData[$("#line").val()].split(":");
279 240 $("#company").val(temp[0]);
280 241 updateCompany();
281   -// $("#subCompany").val(temp[1]);
282   - $("#subCompany").val("");
  242 + $("#subCompany").val(temp[1]);
  243 +// $("#subCompany").val("");
283 244 $("#company").attr("disabled", true);
284 245 // $("#subCompany").attr("disabled", true);
285 246 }
... ...