diff --git a/src/main/resources/static/upload/inventoryImport.xlsx b/src/main/resources/static/upload/inventoryImport.xlsx
index 474d9641..476929e1 100644
Binary files a/src/main/resources/static/upload/inventoryImport.xlsx and b/src/main/resources/static/upload/inventoryImport.xlsx differ
diff --git a/src/main/resources/templates/pages/depository/table-stock.html b/src/main/resources/templates/pages/depository/table-stock.html
index 862987e2..348a422a 100644
--- a/src/main/resources/templates/pages/depository/table-stock.html
+++ b/src/main/resources/templates/pages/depository/table-stock.html
@@ -63,6 +63,7 @@
+
@@ -331,6 +332,8 @@
layer.full(index);
});
return false;
+ }else if (obj.event === 'downloadFile') {
+ window.open("/download/inventoryImportDownload","_self");
}
});
diff --git a/src/main/resources/templates/pages/material/material-out.html b/src/main/resources/templates/pages/material/material-out.html
index 0f0051a2..80b542d8 100644
--- a/src/main/resources/templates/pages/material/material-out.html
+++ b/src/main/resources/templates/pages/material/material-out.html
@@ -87,6 +87,7 @@
+
@@ -234,7 +235,8 @@
$(window).on("resize", function () {
layer.full(index);
});
- } else if (obj.event === 'delete') { // 监听删除操作
+ }
+ else if (obj.event === 'delete') { // 监听删除操作
var checkStatus = table.checkStatus('currentTableId')
, data = checkStatus.data;
var req = {};
@@ -279,7 +281,8 @@
layer.msg("未选中记录,请确认!");
return false;
}
- } else if (obj.event === 'applicationIn') {
+ }
+ else if (obj.event === 'applicationIn') {
// 入库申请
var checkStatus = table.checkStatus('currentTableId')
, data = checkStatus.data;
@@ -321,6 +324,9 @@
})
}
+ else if (obj.event === 'downloadFile') {
+ window.open("/download/materialImportDownload","_self");
+ }
});
//用于导入数据
diff --git a/src/main/resources/templates/pages/materialtype/materialType_view.html b/src/main/resources/templates/pages/materialtype/materialType_view.html
index e80c5d51..dcba61b7 100644
--- a/src/main/resources/templates/pages/materialtype/materialType_view.html
+++ b/src/main/resources/templates/pages/materialtype/materialType_view.html
@@ -64,6 +64,8 @@
+
+
@@ -173,7 +175,8 @@
$(window).on("resize", function () {
layer.full(index);
});
- } else if (obj.event === 'delete') { // 监听删除操作
+ }
+ else if (obj.event === 'delete') { // 监听删除操作
var checkStatus = table.checkStatus('currentTableId')
, data = checkStatus.data;
var req = {};
@@ -219,6 +222,9 @@
return false;
}
}
+ else if (obj.event === 'downloadFile') {
+ window.open("/download/materialTypeImportDownload","_self");
+ }
});
diff --git a/target/classes/static/upload/inventoryImport.xlsx b/target/classes/static/upload/inventoryImport.xlsx
index 474d9641..476929e1 100644
Binary files a/target/classes/static/upload/inventoryImport.xlsx and b/target/classes/static/upload/inventoryImport.xlsx differ
diff --git a/target/classes/templates/pages/depository/table-stock.html b/target/classes/templates/pages/depository/table-stock.html
index 862987e2..348a422a 100644
--- a/target/classes/templates/pages/depository/table-stock.html
+++ b/target/classes/templates/pages/depository/table-stock.html
@@ -63,6 +63,7 @@
+
@@ -331,6 +332,8 @@
layer.full(index);
});
return false;
+ }else if (obj.event === 'downloadFile') {
+ window.open("/download/inventoryImportDownload","_self");
}
});
diff --git a/target/classes/templates/pages/material/material-out.html b/target/classes/templates/pages/material/material-out.html
index 0f0051a2..80b542d8 100644
--- a/target/classes/templates/pages/material/material-out.html
+++ b/target/classes/templates/pages/material/material-out.html
@@ -87,6 +87,7 @@
+
@@ -234,7 +235,8 @@
$(window).on("resize", function () {
layer.full(index);
});
- } else if (obj.event === 'delete') { // 监听删除操作
+ }
+ else if (obj.event === 'delete') { // 监听删除操作
var checkStatus = table.checkStatus('currentTableId')
, data = checkStatus.data;
var req = {};
@@ -279,7 +281,8 @@
layer.msg("未选中记录,请确认!");
return false;
}
- } else if (obj.event === 'applicationIn') {
+ }
+ else if (obj.event === 'applicationIn') {
// 入库申请
var checkStatus = table.checkStatus('currentTableId')
, data = checkStatus.data;
@@ -321,6 +324,9 @@
})
}
+ else if (obj.event === 'downloadFile') {
+ window.open("/download/materialImportDownload","_self");
+ }
});
//用于导入数据
diff --git a/target/classes/templates/pages/materialtype/materialType_view.html b/target/classes/templates/pages/materialtype/materialType_view.html
index e80c5d51..dcba61b7 100644
--- a/target/classes/templates/pages/materialtype/materialType_view.html
+++ b/target/classes/templates/pages/materialtype/materialType_view.html
@@ -64,6 +64,8 @@
+
+
@@ -173,7 +175,8 @@
$(window).on("resize", function () {
layer.full(index);
});
- } else if (obj.event === 'delete') { // 监听删除操作
+ }
+ else if (obj.event === 'delete') { // 监听删除操作
var checkStatus = table.checkStatus('currentTableId')
, data = checkStatus.data;
var req = {};
@@ -219,6 +222,9 @@
return false;
}
}
+ else if (obj.event === 'downloadFile') {
+ window.open("/download/materialTypeImportDownload","_self");
+ }
});