Commit cef14373 authored by dahai's avatar dahai

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

parents c1a7123b 7b191c96
...@@ -50,17 +50,30 @@ angular.module('AvatarCheck.excelAndSearch', ['ngRoute', 'AvatarCheck.http', 'tm ...@@ -50,17 +50,30 @@ angular.module('AvatarCheck.excelAndSearch', ['ngRoute', 'AvatarCheck.http', 'tm
$scope.uploadExcel = function () { $scope.uploadExcel = function () {
var fd = new FormData(); var fd = new FormData();
var files = document.querySelector('input#id_file_photo_for_check').files; var files = document.querySelector('input#id_file_photo_for_check').files;
if(angular.isUndefined(files)){ if(files.length==0){
MessageService.showAlert("请选择上传的文件...") MessageService.showAlert("请选择上传的文件...")
}else{ }else{
for(var i in files){ for(var i in files){
fd.append('file', files[i]); fd.append('file', files[i]);
} }
HttpService.uploadExcelFile($("#datepicker1").val(),$("#datepicker2").val(),fd,function (data) { var getData = $scope.getPostPackage;
if(data){ ngDialog.openConfirm({
MessageService.showAlert("上传成功") template: 'dialogs/alert.html' + urlTimeStamp(),
} width: 600,
}) cache: false,
closeByDocument:false,
controller: ['$scope', function ($scope) {
$scope.msgText = "解析中..."
HttpService.uploadExcelFile($("#datepicker1").val(),$("#datepicker2").val(),fd,function (data) {
if(data){
$scope.closeThisDialog();
getData();
MessageService.showAlert("上传成功")
}
})
}]
});
} }
} }
......
...@@ -92,9 +92,6 @@ ...@@ -92,9 +92,6 @@
</tbody> </tbody>
</table> </table>
</td> </td>
<td></td>
<td></td>
<td></td>
</tr> </tr>
</tbody> </tbody>
</table> </table>
...@@ -178,9 +175,6 @@ ...@@ -178,9 +175,6 @@
</tbody> </tbody>
</table> </table>
</td> </td>
<td></td>
<td></td>
<td></td>
</tr> </tr>
</tbody> </tbody>
</table> </table>
......
...@@ -89,9 +89,6 @@ ...@@ -89,9 +89,6 @@
</tbody> </tbody>
</table> </table>
</td> </td>
<td></td>
<td></td>
<td></td>
</tr> </tr>
</tbody> </tbody>
</table> </table>
...@@ -170,9 +167,6 @@ ...@@ -170,9 +167,6 @@
</tbody> </tbody>
</table> </table>
</td> </td>
<td></td>
<td></td>
<td></td>
</tr> </tr>
</tbody> </tbody>
</table> </table>
......
...@@ -90,9 +90,6 @@ ...@@ -90,9 +90,6 @@
</tbody> </tbody>
</table> </table>
</td> </td>
<td></td>
<td></td>
<td></td>
</tr> </tr>
</tbody> </tbody>
</table> </table>
...@@ -179,9 +176,6 @@ ...@@ -179,9 +176,6 @@
</tbody> </tbody>
</table> </table>
</td> </td>
<td></td>
<td></td>
<td></td>
</tr> </tr>
</tbody> </tbody>
</table> </table>
......
...@@ -89,9 +89,6 @@ ...@@ -89,9 +89,6 @@
</tbody> </tbody>
</table> </table>
</td> </td>
<td></td>
<td></td>
<td></td>
</tr> </tr>
</tbody> </tbody>
</table> </table>
......
...@@ -94,9 +94,6 @@ ...@@ -94,9 +94,6 @@
</tbody> </tbody>
</table> </table>
</td> </td>
<td></td>
<td></td>
<td></td>
</tr> </tr>
</tbody> </tbody>
</table> </table>
......
...@@ -60,18 +60,31 @@ angular.module('AvatarCheck.xmlAndSearch', ['ngRoute', 'AvatarCheck.http', 'tm.p ...@@ -60,18 +60,31 @@ angular.module('AvatarCheck.xmlAndSearch', ['ngRoute', 'AvatarCheck.http', 'tm.p
$scope.uploadXml = function () { $scope.uploadXml = function () {
var fd = new FormData(); var fd = new FormData();
var files = document.querySelector('input#id_file_photo_for_check').files; var files = document.querySelector('input#id_file_photo_for_check').files;
if(angular.isUndefined(files)){ if(files.length==0){
MessageService.showAlert("请选择上传的文件...") MessageService.showAlert("请选择上传的文件...")
}else{ }else{
for(var i in files){ for(var i in files){
fd.append('file', files[i]); fd.append('file', files[i]);
} }
HttpService.uploadPackage(fd,function (data) { var getData = $scope.getXmlPackage;
if(data){ ngDialog.openConfirm({
MessageService.showAlert("上传成功") template: 'dialogs/alert.html' + urlTimeStamp(),
$scope.getXmlPackage(); width: 600,
} cache: false,
}) closeByDocument:false,
controller: ['$scope', function ($scope) {
$scope.msgText = "解析中..."
HttpService.uploadPackage(fd,function (data) {
if(data){
$scope.closeThisDialog();
getData();
MessageService.showAlert("上传成功")
}
})
}]
});
} }
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment