diff --git a/application/admin/view/default/goods/save_info.html b/application/admin/view/default/goods/save_info.html
index 11bc405c5..a471641bd 100755
--- a/application/admin/view/default/goods/save_info.html
+++ b/application/admin/view/default/goods/save_info.html
@@ -54,7 +54,7 @@
 						<input type="hidden" name="title_color" value="{{if !empty($data['title_color'])}}{{$data.title_color}}{{/if}}" />
 						<input type="text" name="title" placeholder="标题名称" minlength="2" maxlength="60" data-validation-message="标题名称格式 2~60 个字符" class="am-form-field am-radius" {{if !empty($data)}} value="{{$data.title}}" {{/if}} {{if !empty($data['title_color'])}} style="color:{{$data.title_color}};" {{/if}} required />
 						<span class="am-input-group-btn">
-							<button class="am-btn am-btn-default am-btn-xs colorpicker-submit" type="button" data-input-tag="input[name='title']" data-color-tag="input[name='title_color']">
+							<button type="button" class="am-btn am-btn-default am-btn-xs colorpicker-submit" data-input-tag="input[name='title']" data-color-tag="input[name='title_color']">
 								<img src="{{$attachment_host}}/static/common/images/colorpicker.png" />
 							</button>
 						</span>
@@ -263,8 +263,8 @@
 									<input type="text" placeholder="原价" class="am-radius popup_all_original_price" pattern="^([0-9]{1}\d{0,6})(\.\d{1,2})?$" data-validation-message="请填写有效的原价" />
 								</div>
 								<div class="am-form-group am-form-group-refreshing am-text-center">
-									<button class="am-btn am-btn-warning am-radius am-btn-sm am-margin-right-lg" type="button" data-am-modal-close>取消</button>
-									<button class="am-btn am-btn-secondary am-radius am-btn-sm am-margin-left-lg" type="button">确认</button>
+									<button type="button" class="am-btn am-btn-warning am-radius am-btn-sm am-margin-right-lg" data-am-modal-close>取消</button>
+									<button type="button" class="am-btn am-btn-secondary am-radius am-btn-sm am-margin-left-lg">确认</button>
 								</div>
 							</div>
 						</div>
@@ -280,7 +280,7 @@
 								<div class="am-input-group am-input-group-sm">
 									<input type="text" class="am-form-field" placeholder="批量设置的值" />
 									<span class="am-input-group-btn">
-										<button class="am-btn am-btn-default" type="button">确认</button>
+										<button type="button" class="am-btn am-btn-default">确认</button>
 									</span>
 								</div>
 							</div>
diff --git a/application/admin/view/default/warehouse/save_info.html b/application/admin/view/default/warehouse/save_info.html
index 5785a7a1f..395c45305 100644
--- a/application/admin/view/default/warehouse/save_info.html
+++ b/application/admin/view/default/warehouse/save_info.html
@@ -40,7 +40,7 @@
                     <input type="hidden" name="lat" id="form-lat" {{if !empty($data)}} value="{{$data.lat}}"{{/if}} />
                     <input type="text" name="address" id="form-address" placeholder="详细地址" minlength="2" maxlength="80" data-validation-message="详细地址格式 1~80 个字符之间" class="am-radius" {{if !empty($data)}} value="{{$data.address}}"{{/if}} required />
                     <span class="am-input-group-btn">
-                        <button type="button" class="am-btn am-btn-default am-radius" type="button" id="map-location-submit"><span class="am-icon-map-marker"></span> 定位</button>
+                        <button type="button" class="am-btn am-btn-default am-radius" id="map-location-submit"><span class="am-icon-map-marker"></span> 定位</button>
                     </span>
                 </div>
                 <div id="map" data-level="17" class="am-margin-top-xs"></div>
diff --git a/application/admin/view/default/warehousegoods/inventory_info.html b/application/admin/view/default/warehousegoods/inventory_info.html
index ba6f5c0a0..9bf9e32be 100644
--- a/application/admin/view/default/warehousegoods/inventory_info.html
+++ b/application/admin/view/default/warehousegoods/inventory_info.html
@@ -10,7 +10,21 @@
                     <thead>
                         <tr>
                             <th>规格</th>
-                            <th>库存</th>
+                            <th>
+                                <span>库存</span>
+                                <!-- 批量设置 -->
+                                <div class="am-dropdown" id="inventory-dropdown" data-am-dropdown>
+                                    <a href="javascript:;" class="am-icon-edit am-dropdown-toggle"></a>
+                                    <div class="am-dropdown-content">
+                                        <div class="am-input-group am-input-group-sm">
+                                            <input type="text" class="am-form-field" placeholder="批量设置的值" />
+                                            <span class="am-input-group-btn">
+                                                <button type="button" class="am-btn am-btn-default inventory-all-submit">确认</button>
+                                            </span>
+                                        </div>
+                                    </div>
+                                </div>
+                            </th>
                         </tr>
                     </thead>
                     <tbody>
diff --git a/application/index/view/default/useraddress/save_info.html b/application/index/view/default/useraddress/save_info.html
index 6c943abab..bd184f0e9 100755
--- a/application/index/view/default/useraddress/save_info.html
+++ b/application/index/view/default/useraddress/save_info.html
@@ -21,7 +21,7 @@
                 <input type="hidden" name="lat" id="form-lat" {{if !empty($data)}} value="{{$data.lat}}"{{/if}} />
                 <input type="text" name="address" id="form-address" placeholder="详细地址" minlength="2" maxlength="80" data-validation-message="详细地址格式 1~80 个字符之间" class="am-radius" {{if !empty($data)}} value="{{$data.address}}"{{/if}} required />
                 <span class="am-input-group-btn">
-                    <button type="button" class="am-btn am-btn-default am-radius" type="button" id="map-location-submit"><span class="am-icon-map-marker"></span> 定位</button>
+                    <button type="button" class="am-btn am-btn-default am-radius" id="map-location-submit"><span class="am-icon-map-marker"></span> 定位</button>
                 </span>
             </div>
             <div id="map" data-level="17" class="am-margin-top-xs"></div>
diff --git a/public/static/admin/default/css/warehousegoods.inventoryinfo.css b/public/static/admin/default/css/warehousegoods.inventoryinfo.css
index df5246a41..6f19ae55c 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 000000000..f21070dc4
--- /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