diff --git a/application/admin/view/default/goods/save_info.html b/application/admin/view/default/goods/save_info.html
index 11bc405c58f5c12a1bf67b4d39670a66eb6aa9eb..a471641bdf2c168213de29b28aa131cda2277f14 100755
--- a/application/admin/view/default/goods/save_info.html
+++ b/application/admin/view/default/goods/save_info.html
@@ -54,7 +54,7 @@
-
@@ -263,8 +263,8 @@
- 取消
- 确认
+ 取消
+ 确认
@@ -280,7 +280,7 @@
- 确认
+ 确认
diff --git a/application/admin/view/default/warehouse/save_info.html b/application/admin/view/default/warehouse/save_info.html
index 5785a7a1ff3ff6bdf3c9c80f458d93f8d50e6d86..395c45305de959c17c74d7184f70df2fbf3b1341 100644
--- a/application/admin/view/default/warehouse/save_info.html
+++ b/application/admin/view/default/warehouse/save_info.html
@@ -40,7 +40,7 @@
- 定位
+ 定位
diff --git a/application/admin/view/default/warehousegoods/inventory_info.html b/application/admin/view/default/warehousegoods/inventory_info.html
index ba6f5c0a0ad87f0f536191344ee7dd233ee0d4e3..9bf9e32be53314fc48b7483911790e2a4142a789 100644
--- a/application/admin/view/default/warehousegoods/inventory_info.html
+++ b/application/admin/view/default/warehousegoods/inventory_info.html
@@ -10,7 +10,21 @@
规格 |
- 库存 |
+
+ 库存
+
+
+ |
diff --git a/application/index/view/default/useraddress/save_info.html b/application/index/view/default/useraddress/save_info.html
index 6c943ababb33a987d2bad20d0c52274c1e61a80c..bd184f0e9f4d225f721419969fb108bb6908faa1 100755
--- a/application/index/view/default/useraddress/save_info.html
+++ b/application/index/view/default/useraddress/save_info.html
@@ -21,7 +21,7 @@
- 定位
+ 定位
diff --git a/public/static/admin/default/css/warehousegoods.inventoryinfo.css b/public/static/admin/default/css/warehousegoods.inventoryinfo.css
index df5246a41ebb2ca4b46e95908dbbf1a68005edf5..6f19ae55c62cd06b240685c28be86b931442d248 100644
--- a/public/static/admin/default/css/warehousegoods.inventoryinfo.css
+++ b/public/static/admin/default/css/warehousegoods.inventoryinfo.css
@@ -1,3 +1,6 @@
+/**
+ * 布局基础样式
+ */
.form-inventory-container {
margin-bottom: 80px;
}
@@ -10,4 +13,11 @@
height: 70px;
padding: 20px 10px;
border-top: 1px solid #eee;
+}
+
+/**
+ * 批量设置库存
+ */
+#inventory-dropdown .am-dropdown-content {
+ width: 200px;
}
\ No newline at end of file
diff --git a/public/static/admin/default/js/warehousegoods.inventoryinfo.js b/public/static/admin/default/js/warehousegoods.inventoryinfo.js
new file mode 100644
index 0000000000000000000000000000000000000000..f21070dc4cbba298a0a0ae9a4bcbc89738e86e68
--- /dev/null
+++ b/public/static/admin/default/js/warehousegoods.inventoryinfo.js
@@ -0,0 +1,10 @@
+$(function()
+{
+ // 库存批量设置
+ $('.inventory-all-submit').on('click', function()
+ {
+ var value = $('table.am-table thead tr th input').val() || '';
+ $('table.am-table tbody tr td input[type="number"]').val(value);
+ $('#inventory-dropdown').dropdown('close');
+ });
+});
\ No newline at end of file