浏览代码

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

# Conflicts:
#	08.src/Xingxi/xingxi-admin/src/main/resources/templates/business/prodInventory/mercProdInventory.html
baolei 2 月之前
父节点
当前提交
c00a989de0

+ 7 - 1
08.src/Xingxi/xingxi-admin/src/main/resources/templates/business/prodInventory/mercProdInventory.html

@@ -113,7 +113,7 @@
                 maxmin: false,
                 shade: 0.3,
                 area: ['800px', '480px'],
-                title: '增加库存',
+                title: '添加标签',
                 // 弹层外区域关闭
                 shadeClose: true,
                 success: function(layero, index) {
@@ -124,6 +124,12 @@
                 btn: ['<i class="fa fa-check"></i> 确定', '<i class="fa fa-remove"></i> 关闭'],
                 btn1: function() {
                     var addInvQty = $("#addInvQty").val();
+                    if (addInvQty === "") {
+                        $.modal.alertWarning("需要添加的库存数量未输入,请输入库存后重试!");
+                    }
+                    if (!$.isNumeric(addInvQty)) {
+                        $.modal.alertWarning("库存数量未输入数字,请重新输入库存!");
+                    }
                     if (addInvQty > 0) {
                         var url = prefix + "/mercInventory/add";
                         var data = {