Merge branch 'lt_订单添加dgk'

public/js/goods.js

@@ -12,6 +12,7 @@
 			    		content: $('#addGoods'),
 			    		content: $('#addGoods'),
 			    		btn: ['新增', '取消'],
 			    		btn: ['新增', '取消'],
 			    		btn1: function() {
 			    		btn1: function() {
+                            var sku_id             = $('.search-sku').val();
                             var goods_min_num      = $('.sku-info').find('.moq').text(); // 最小起订量
                             var goods_min_num      = $('.sku-info').find('.moq').text(); // 最小起订量
                             var goods_id           = $('.sku-info').find('.goods_id').val(); 
                             var goods_id           = $('.sku-info').find('.goods_id').val(); 
                             var type               = $('.sku-info').find('.goods_type').val(); // 商品类型
                             var type               = $('.sku-info').find('.goods_type').val(); // 商品类型
@@ -20,6 +21,11 @@
                             var goods_min_price    = $('.sku-info').find('.goods-min-price').text(); // 人民币单价
                             var goods_min_price    = $('.sku-info').find('.goods-min-price').text(); // 人民币单价
                             var goods_min_price_us = $('.sku-info').find('.goods-min-price-us').text(); // 美元单价
                             var goods_min_price_us = $('.sku-info').find('.goods-min-price-us').text(); // 美元单价
 
 
+                            if (!sku_id) {
+                                layer.msg('请输入SKUID');
+                                return false;
+                            }
+
                             if (goods_type == 1) { // 联营需要选择交货地
                             if (goods_type == 1) { // 联营需要选择交货地
                                 if (type == 3 || type == 4) {
                                 if (type == 3 || type == 4) {
                                     layer.msg('自营商品不能添加到联营订单');
                                     layer.msg('自营商品不能添加到联营订单');
@@ -85,6 +91,10 @@
                     var val = $(this).val();
                     var val = $(this).val();
 
 
                     if (val.toLowerCase() == 'digikey') {
                     if (val.toLowerCase() == 'digikey') {
+                        layer.tips('暂不能添加digikey商品', $(this)); // 临时添加
+                        $(this).val('');
+                        return false;
+
                         $('.skuid-info').css('display', 'block');
                         $('.skuid-info').css('display', 'block');
                         $('.layui-layer-iframe .layui-layer-btn, .layui-layer-page .layui-layer-btn').css('padding-top', '50px');
                         $('.layui-layer-iframe .layui-layer-btn, .layui-layer-page .layui-layer-btn').css('padding-top', '50px');
                     } else {
                     } else {
@@ -234,11 +244,18 @@
                                 return false;
                                 return false;
                             }
                             }
 
 
-                            $('.sku-info').show();
-
                             var data = resp.data;
                             var data = resp.data;
                             var status_val = '';
                             var status_val = '';
 
 
+                            // 临时添加，限制新增digikey商品
+                            if (data.supplier_id == 7) {
+                                layer.msg('暂不能添加digikey商品');
+                                $('.search-sku').val('');
+                                return false;
+                            }
+
+                            $('.sku-info').show();
+
                             $('.goods_name').text(data.goods_name);
                             $('.goods_name').text(data.goods_name);
                             $('.brand_name').text(data.brand_name);
                             $('.brand_name').text(data.brand_name);
                             $('.supplier_name').text(data.supplier_name);
                             $('.supplier_name').text(data.supplier_name);