|
@@ -276,7 +276,7 @@ $(document).ready(function() {
|
|
|
$('#remove').prop('disabled', ! $('#erpTable').bootstrapTable('getSelections').length);
|
|
|
$('#view,#edit').prop('disabled', $('#erpTable').bootstrapTable('getSelections').length!=1);
|
|
|
});
|
|
|
-
|
|
|
+ var str = "";
|
|
|
$("#btnImport").click(function(){
|
|
|
jp.open({
|
|
|
type: 2,
|
|
@@ -293,22 +293,30 @@ $(document).ready(function() {
|
|
|
iframeWin.contentWindow.importExcel('${ctx}/sg/financial/erpCredit/import', function (data) {
|
|
|
if(data.success){
|
|
|
jp.success(data.msg);
|
|
|
+ // jp.success(data.strings);
|
|
|
+ str = data.list;
|
|
|
+ jp.downloadFile('${ctx}/sg/financial/erpCredit/export?ids='+ data.list);
|
|
|
refresh();
|
|
|
- }else{
|
|
|
- jp.error(data.msg);
|
|
|
+ }else if (data.flag) {
|
|
|
+ jp.success("导入失败");
|
|
|
+ var str1 =encodeURI(encodeURI(data.list));
|
|
|
+ jp.openSaveDialog('不符合导出条件项目', "${ctx}/sg/financial/erpCredit/tips?str="+str1,'800px', '500px');
|
|
|
+ }else {
|
|
|
+ jp.error(data.msg);
|
|
|
}
|
|
|
jp.close(index);
|
|
|
});//调用保存事件
|
|
|
return false;
|
|
|
},
|
|
|
-
|
|
|
+
|
|
|
btn2: function(index){
|
|
|
jp.close(index);
|
|
|
}
|
|
|
- });
|
|
|
+ });
|
|
|
+ getExport(flag,str)
|
|
|
});
|
|
|
$("#export").click(function(){//导出Excel文件
|
|
|
- jp.downloadFile('${ctx}/sg/financial/erpCredit/export?ids='+ getIdSelections());
|
|
|
+ jp.downloadFile('${ctx}/sg/financial/erpCredit/export?ids='+ str);
|
|
|
});
|
|
|
$("#search").click("click", function() {// 绑定查询按扭
|
|
|
$('#erpTable').bootstrapTable('refresh');
|
|
@@ -348,7 +356,6 @@ $(document).ready(function() {
|
|
|
jp.error(data.msg);
|
|
|
}
|
|
|
})
|
|
|
-
|
|
|
})
|
|
|
}
|
|
|
|
|
@@ -358,6 +365,7 @@ $(document).ready(function() {
|
|
|
}
|
|
|
function add(){
|
|
|
jp.openSaveDialog('新增记录', "${ctx}/sg/financial/erpCredit/form",'800px', '500px');
|
|
|
+ // jp.openSaveDialog('新增记录', "${ctx}/sg/financial/erpCredit/tips",'800px', '500px');
|
|
|
}
|
|
|
|
|
|
function edit(id){//没有权限时,不显示确定按钮
|