潘钊 / bsth_control · Commits

Commit 6cafe1acab4252c1fd171e0669654f317bf0fd4a

Authored by 娄高锋
1 parent b49f9724
build: skipped

月存油报表线调内缺少公司编码查询条件造成后台报错问题

Inline Side-by-side
Showing 1 changed file with 21 additions and 36 deletions
src/main/resources/static/pages/report/oil/oilListMonth.html
  View file @6cafe1a
... ... @@ -104,27 +104,6 @@
104 104 $("#date").val(year + "-0" + month + "-" + day);
105 105 }
106 106  
107   - /* var tempData = {};
108   - $.get('/report/lineList',function(xlList){
109   - var data = [];
110   - $.get('/user/companyData', function(result){
111   - for(var i = 0; i < result.length; i++){
112   - var companyCode = result[i].companyCode;
113   - var children = result[i].children;
114   - for(var j = 0; j < children.length; j++){
115   - var code = children[j].code;
116   - for(var k=0;k < xlList.length;k++ ){
117   - if(xlList[k]["fgsbm"]==code && xlList[k]["gsbm"]==companyCode){
118   - data.push({id: xlList[k]["xlbm"], text: xlList[k]["xlname"]});
119   - tempData[xlList[k]["xlbm"]] = companyCode+":"+code;
120   - }
121   - }
122   - }
123   - }
124   - initPinYinSelect2('#line',data,'');
125   -
126   - });
127   - }); */
128 107 var fage=false;
129 108 var obj = [];
130 109 var xlList;
... ... @@ -150,6 +129,7 @@
150 129 });
151 130 });
152 131  
  132 + var tempData = {};
153 133 $("#gsdm").on("change",updateCompany);
154 134 function updateCompany(){
155 135 var company = $('#gsdm').val();
... ... @@ -164,11 +144,11 @@
164 144 }
165 145 $('#fgsdm').html(options);
166 146  
167   - var tempData = {};
168 147 $.get('/report/lineList',function(xlList){
169 148 var data = [];
170 149 data.push({id: " ", text: "全部线路"});
171 150 $.get('/user/companyData', function(result){
  151 + tempData = {};
172 152 for(var i = 0; i < result.length; i++){
173 153 var companyCode = result[i].companyCode;
174 154 var children = result[i].children;
... ... @@ -186,22 +166,22 @@
186 166  
187 167 });
188 168 });
189   -
190   - $("#line").on("change", function(){
191   - if($("#line").val() == " "){
192   - $("#gsdm").attr("disabled", false);
193   - $("#fgsdm").attr("disabled", false);
194   - } else {
195   - var temp = tempData[$("#line").val()].split(":");
196   - $("#gsdm").val(temp[0]);
197   - updateCompany();
198   - $("#fgsdm").val(temp[1]);
199   - $("#gsdm").attr("disabled", true);
200   - $("#fgsdm").attr("disabled", true);
201   - }
202   - });
203 169 }
204 170  
  171 + $("#line").on("change", function(){
  172 + if($("#line").val() == " "){
  173 + $("#gsdm").attr("disabled", false);
  174 + $("#fgsdm").attr("disabled", false);
  175 + } else {
  176 + var temp = tempData[$("#line").val()].split(":");
  177 + $("#gsdm").val(temp[0]);
  178 +// updateCompany();
  179 + $("#fgsdm").val(temp[1]);
  180 + $("#gsdm").attr("disabled", true);
  181 + $("#fgsdm").attr("disabled", true);
  182 + }
  183 + });
  184 +
205 185  
206 186  
207 187 //查询
... ... @@ -214,6 +194,11 @@
214 194 var date = $("#date").val();
215 195 var gsdm = $("#gsdm").val();
216 196 var fgsdm = $("#fgsdm").val();
  197 + if(!gsdm || !fgsdm){
  198 + var temp = tempData[line].split(":");
  199 + gsdm = temp[0];
  200 + fgsdm = temp[1];
  201 + }
217 202 var i = layer.load(2);
218 203 $get('/ylb/oilListMonth',{line:line,date:date,gsdm:gsdm,fgsdm,fgsdm,type:'query'},function(result){
219 204 var oilListMonth = template('oilListMonth',{list:result});
... ...