潘钊 / bsth_control · Commits

Commit 477bfe432b5dae61ff276438affe01893e35d580

Authored by 周勤
2 parents 63c594fc 3f04789a
build: skipped

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

Inline Side-by-side
Showing 2 changed files with 16 additions and 27 deletions
src/main/resources/static/pages/mforms/singledatas/singledata.html
  View file @477bfe4
@@ -214,7 +214,7 @@ @@ -214,7 +214,7 @@
214 var tjtype=$("#tjtype").val(); 214 var tjtype=$("#tjtype").val();
215 var params = {}; 215 var params = {};
216 var i = layer.load(2); 216 var i = layer.load(2);
217 -// if(tjtype=='jsy'){ 217 + if(tjtype=='jsy'){
218 $get("/mcy_forms/singledatatj",{sfyy:sfyy,gsdmSing:gsdmSing,fgsdmSing:fgsdmSing,line:line,startDate:startDate,lpName:lpName,tjtype:tjtype},function(result){ 218 $get("/mcy_forms/singledatatj",{sfyy:sfyy,gsdmSing:gsdmSing,fgsdmSing:fgsdmSing,line:line,startDate:startDate,lpName:lpName,tjtype:tjtype},function(result){
219 layer.close(i); 219 layer.close(i);
220 var singledata = template('singledata',{list:result}); 220 var singledata = template('singledata',{list:result});
@@ -222,21 +222,15 @@ @@ -222,21 +222,15 @@
222 $('#forms tbody').html(singledata); 222 $('#forms tbody').html(singledata);
223 223
224 }); 224 });
225 -// }else{  
226 -// $get("/mcy_forms/singledata",{ gsdmSing:gsdmSing,fgsdmSing:fgsdmSing, line:line,startDate:startDate,lpName:lpName,tjtype:tjtype},function(result){  
227 -// layer.close(i);  
228 -// var date=new Array(); //存放文本框数组  
229 -// $.each(result, function (i, obj) {  
230 -// if(obj.sgh !='' && obj.sgh!=null){  
231 -// date.push(obj);  
232 -// }  
233 -// });  
234 -// var singledata = template('singledata2',{result});  
235 -// // 把渲染好的模版html文本追加到表格中  
236 -// $('#forms tbody').html(singledata); 225 + }else{
  226 + $get("/mcy_forms/singledatatj2",{sfyy:sfyy,gsdmSing:gsdmSing,fgsdmSing:fgsdmSing,line:line,startDate:startDate,lpName:lpName,tjtype:tjtype},function(result){
  227 + layer.close(i);
  228 + var singledata = template('singledata',{list:result});
  229 + // 把渲染好的模版html文本追加到表格中
  230 + $('#forms tbody').html(singledata);
237 231
238 -// });  
239 -// } 232 + });
  233 + }
240 234
241 }); 235 });
242 236
src/main/resources/static/pages/mforms/singledatas/singledatas.html
  View file @477bfe4
@@ -204,7 +204,7 @@ @@ -204,7 +204,7 @@
204 204
205 }); 205 });
206 }else{ 206 }else{
207 - $get("/mcy_forms/singledata",{ gsdmSing:gsdmSing,fgsdmSing:fgsdmSing, line:line,startDate:startDate,lpName:lpName,tjtype:tjtype},function(result){ 207 + $get("/mcy_forms/singledata2",{ gsdmSing:gsdmSing,fgsdmSing:fgsdmSing, line:line,startDate:startDate,lpName:lpName,tjtype:tjtype},function(result){
208 208
209 layer.close(i); 209 layer.close(i);
210 210
@@ -225,20 +225,15 @@ @@ -225,20 +225,15 @@
225 var gsdmSing = $("#gsdmSing").val(); 225 var gsdmSing = $("#gsdmSing").val();
226 var fgsdmSing = $("#fgsdmSing").val(); 226 var fgsdmSing = $("#fgsdmSing").val();
227 var tjtype=$("#tjtype").val(); 227 var tjtype=$("#tjtype").val();
228 -// if(tjtype=='jsy'){ 228 + if(tjtype=='jsy'){
229 $get('/mcy_export/singledataExport',{gsdmSing:gsdmSing,fgsdmSing:fgsdmSing,line:line,startDate:startDate,endDate:endDate,tjtype:tjtype,type:'export'},function(result){ 229 $get('/mcy_export/singledataExport',{gsdmSing:gsdmSing,fgsdmSing:fgsdmSing,line:line,startDate:startDate,endDate:endDate,tjtype:tjtype,type:'export'},function(result){
230 window.open("/downloadFile/download?fileName=路单数据"+moment(startDate).format("YYYYMMDD")); 230 window.open("/downloadFile/download?fileName=路单数据"+moment(startDate).format("YYYYMMDD"));
231 }); 231 });
232 -// }else{  
233 -// $("#forms").table2excel({  
234 -// // 不被导出的表格行的CSS class类  
235 -// exclude: ".noExl",  
236 -// // 导出的Excel文档的名称，（没看到作用）  
237 -// name: "Excel Document Name.xlsx",  
238 -// // Excel文件的名称  
239 -// filename: "路单数据"+startDate  
240 -// });  
241 -// } 232 + }else{
  233 + $get('/mcy_export/singledataExport2',{gsdmSing:gsdmSing,fgsdmSing:fgsdmSing,line:line,startDate:startDate,endDate:endDate,tjtype:tjtype,type:'export'},function(result){
  234 + window.open("/downloadFile/download?fileName=路单数据"+moment(startDate).format("YYYYMMDD"));
  235 + });
  236 + }
242 237
243 }); 238 });
244 }); 239 });