Commit 477bfe432b5dae61ff276438affe01893e35d580
Merge remote-tracking branch 'origin/pudong' into pudong
Showing
2 changed files
with
16 additions
and
27 deletions
src/main/resources/static/pages/mforms/singledatas/singledata.html
| ... | ... | @@ -214,7 +214,7 @@ |
| 214 | 214 | var tjtype=$("#tjtype").val(); |
| 215 | 215 | var params = {}; |
| 216 | 216 | var i = layer.load(2); |
| 217 | -// if(tjtype=='jsy'){ | |
| 217 | + if(tjtype=='jsy'){ | |
| 218 | 218 | $get("/mcy_forms/singledatatj",{sfyy:sfyy,gsdmSing:gsdmSing,fgsdmSing:fgsdmSing,line:line,startDate:startDate,lpName:lpName,tjtype:tjtype},function(result){ |
| 219 | 219 | layer.close(i); |
| 220 | 220 | var singledata = template('singledata',{list:result}); |
| ... | ... | @@ -222,21 +222,15 @@ |
| 222 | 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
| ... | ... | @@ -204,7 +204,7 @@ |
| 204 | 204 | |
| 205 | 205 | }); |
| 206 | 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 | 209 | layer.close(i); |
| 210 | 210 | |
| ... | ... | @@ -225,20 +225,15 @@ |
| 225 | 225 | var gsdmSing = $("#gsdmSing").val(); |
| 226 | 226 | var fgsdmSing = $("#fgsdmSing").val(); |
| 227 | 227 | var tjtype=$("#tjtype").val(); |
| 228 | -// if(tjtype=='jsy'){ | |
| 228 | + if(tjtype=='jsy'){ | |
| 229 | 229 | $get('/mcy_export/singledataExport',{gsdmSing:gsdmSing,fgsdmSing:fgsdmSing,line:line,startDate:startDate,endDate:endDate,tjtype:tjtype,type:'export'},function(result){ |
| 230 | 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 | }); | ... | ... |