出入库数据接口

src/main/java/com/uas/platform/b2c/prod/commodity/service/impl/CommodityInOutboundServiceImpl.java

@@ -211,9 +211,6 @@ public class CommodityInOutboundServiceImpl implements CommodityInOutboundServic
             } else {
                 throw new IllegalOperatorException("没有需要操作的信息");
             }
-            if (CollectionUtils.isNotEmpty(set)) {
-                return new ResultMap(CodeType.NOT_PERMIT, "剩余库存为0，不能出库");
-            }
             inOutbound.setInOutboundDetails(set);
             inOutbound.setAffiliatedEnterprise(enName);
             CommodityInOutbound commodityInOutbound = commodityInOutboundDao.save(inOutbound);

src/main/java/com/uas/platform/b2c/prod/commodity/service/impl/ProductServiceImpl.java

@@ -1525,7 +1525,13 @@ public class ProductServiceImpl implements ProductService {
      */
     @Override
     public List<Product> findByProductId(Set<Long> ids) {
-        return findByProductId(ids);
+        List<Long> idList = new ArrayList<>();
+        if (CollectionUtils.isNotEmpty(ids)) {
+            idList.addAll(ids);
+            return findByProductId(idList);
+        } else {
+            return Collections.emptyList();
+        }
     }
 
     @Override

src/main/webapp/resources/js/common/query/goods.js

@@ -279,6 +279,18 @@ define([ 'ngResource' ], function() {
 			getRepeatByTagAndProductId : {
 				url : 'trade/goods/repeat/tag',
 				method : 'GET'
+			},
+
+		    // 库存管理其它出入库，根据联想词得到产品库数据
+            getKeywordToProductId : {
+                url : 'trade/products/code/keyword',
+                method : 'GET',
+                isArray : true
+            },
+			// 库存管理其它出入库，保存数据
+			saveOtherProductData : {
+				url: 'CommodityInOutbound/:storage_tab/other?enName=:enName',
+				method: 'POST'
 			}
 		});
 	}]).factory('GoodsModifyInfo', ['$resource', function ($resource) {

src/main/webapp/resources/js/vendor/controllers/forstore/vendor_storageCtrl.js

@@ -6,16 +6,17 @@ define([ 'app/app' ], function(app) {
         $scope.tab = 'storage';
         $scope.isInt = /^[0-9]*[1-9][0-9]*$/;
         document.title = '卖家出入库-优软商城';
-        $scope.storage_tab = 'inPut';
+        $scope.storage_tab = 'inBound';
+        $scope.countData = 10;
 
         // 更多操作数据和记录
         $scope.handleLink = [
-            {name: '查看入库记录', tab: 'inPut', id: 0},
-            {name: '其它入库', tab: 'inPut', id: 1},
-            {name: '采购入库', tab: 'inPut', id: 2},
-            {name: '查看出库记录', tab: 'outPut', id: 0},
-            {name: '其它出库', tab: 'outPut', id: 1},
-            {name: '销售出库', tab: 'outPut', id: 2}];
+            {name: '查看入库记录', tab: 'inBound', id: 0},
+            {name: '其它入库', tab: 'inBound', id: 1},
+            {name: '采购入库', tab: 'inBound', id: 2},
+            {name: '查看出库记录', tab: 'outBound', id: 0},
+            {name: '其它出库', tab: 'outBound', id: 1},
+            {name: '销售出库', tab: 'outBound', id: 2}];
         // $scope.handleItem = $scope.storage_tab === 'inPut'? $scope.handleLink[0].id : $scope.handleLink[3].id;
         $scope.handleItem = 1;
 
@@ -36,6 +37,38 @@ define([ 'app/app' ], function(app) {
         //只包含中文和英文的字符
         var pattern = /^[\u4e00-\u9fa5a-zA-Z]+$/;
 
+        // 时间格式化
+        var _formatDate = function (date, fmt) {
+            if(!date) {
+                return null;
+            }
+            if (typeof date === 'string') {
+                date = new Date(Date.parse(date.replace(/-/g, '/')));
+            }
+            var o = {
+                'M+': date.getMonth() + 1,
+                'd+': date.getDate(),
+                'h+': date.getHours(),
+                'm+': date.getMinutes(),
+                's+': date.getSeconds(),
+                'q+': Math.floor((date.getMonth() + 4) / 3),
+                's': date.getMilliseconds()
+            }
+            if (/(y+)/.test(fmt)) {
+                fmt = fmt.replace(RegExp.$1, (date.getFullYear() + '').substr(4 - RegExp.$1.length));
+            }
+            for (var k in o) {
+                if (new RegExp('(' + k + ')').test(fmt)) {
+                    fmt = fmt.replace(RegExp.$1, (RegExp.$1.length === 1) ? (o[k]) : (('00' + o[k]).substr(('' + o[k]).length)));
+                }
+            }
+            return fmt;
+        }
+
+        var _getClearDay = function (date) {
+            return new Date(_formatDate(date, 'yyyy-MM-dd')).getTime() - 8 * 60 * 60 * 1000
+        }
+
         $scope.param = {
             page : 1,
             count : 10,
@@ -45,6 +78,26 @@ define([ 'app/app' ], function(app) {
             status : "601-602"
         };
 
+        $scope.othenParam = {
+            enName: '',
+            detail: []
+        }
+
+        // 其它出入库默认数据
+        var initData = function () {
+            $scope.othenParam = {
+                enName: '',
+                detail: []
+            }
+            $scope.newDate = _formatDate(new Date(), 'yyyy-MM-dd hh-mm-ss')
+            $scope.otherData = [];
+            for (var i = 0; i< $scope.countData; i++) {
+                $scope.otherData.push({qty: '', id: i, price: '', key: '', show: false, productId: ''})
+            }
+        }
+        initData();
+
+
         /**
          * 最大
          * @type {number}
@@ -91,38 +144,6 @@ define([ 'app/app' ], function(app) {
             clearRecordParams()
         };
 
-        // 时间格式化
-        var _formatDate = function (date, fmt) {
-            if(!date) {
-                return null;
-            }
-            if (typeof date === 'string') {
-                date = new Date(Date.parse(date.replace(/-/g, '/')));
-            }
-            var o = {
-                'M+': date.getMonth() + 1,
-                'd+': date.getDate(),
-                'h+': date.getHours(),
-                'm+': date.getMinutes(),
-                's+': date.getSeconds(),
-                'q+': Math.floor((date.getMonth() + 4) / 3),
-                's': date.getMilliseconds()
-            }
-            if (/(y+)/.test(fmt)) {
-                fmt = fmt.replace(RegExp.$1, (date.getFullYear() + '').substr(4 - RegExp.$1.length));
-            }
-            for (var k in o) {
-                if (new RegExp('(' + k + ')').test(fmt)) {
-                    fmt = fmt.replace(RegExp.$1, (RegExp.$1.length === 1) ? (o[k]) : (('00' + o[k]).substr(('' + o[k]).length)));
-                }
-            }
-            return fmt;
-        }
-
-        var _getClearDay = function (date) {
-            return new Date(_formatDate(date, 'yyyy-MM-dd')).getTime() - 8 * 60 * 60 * 1000
-        }
-
         // 时间选择操作
         $scope.setFilters = function (type, val) {
             $scope[type] = val;
@@ -186,9 +207,54 @@ define([ 'app/app' ], function(app) {
           }
         };
 
-        $scope.onFocus = function (e) {
-            console.log(e.target)
-        }
+        $scope.onChange = function (type) {
+            type.show = true;
+            Goods.getKeywordToProductId({keyword: type.key}, function(data) {
+                $scope.listData = data
+            }, function (res) {
+                $scope.listData = [];
+                type.show = false;
+                toaster.pop('info', '提示', '该型号不存在你的产品库中！');
+            })
+        };
+        $scope.addProductId = function (key, type) {
+            type.show = false;
+            type.key = key.pcmpcode;
+            type.pbranden = key.pbranden;
+            type.kind = key.kind;
+            type.spec = key.spec;
+            type.productId = key.id;
+        };
+
+        $scope.addOneTable = function (type) {
+            if(type === 'clear') {
+                initData()
+            } else if(type === 'one') {
+                $scope.otherData.push({qty: '', id: i, price: '', key: '', show: false, productId: ''});
+            } else if(type === 'ten') {
+                for (var i = 0; i< 10; i++) {
+                    $scope.otherData.push({qty: '', id: i, price: '', key: '', show: false, productId: ''})
+                }
+            }
+        };
+
+        // 确认提交
+        $scope.otherAddClick = function () {
+            $scope.othenParam.detail = [];
+            console.log($scope.otherData)
+            if(!$scope.othenParam.enName) {
+                toaster.pop('error', '请填写' + ($scope.storage_tab === 'inBound' ? '卖家名称' : '买家名称'));
+                return false
+            }
+            angular.forEach($scope.otherData, function(val) {
+                if(val.productId) {
+                    $scope.othenParam.detail.push({productId: val.productId, qty: 323, price: 4234})
+                }
+            })
+            Goods.saveOtherProductData({storage_tab: $scope.storage_tab, enName: $scope.othenParam.enName}, $scope.othenParam.detail, function(data) {
+                console.log(data)
+            })
+        };
 
         //获取币别信息
         Enterprise.getCurrencyByRegisterAddress(null, function (data) {

src/main/webapp/resources/view/vendor/forstore/vendor_storage.html

@@ -963,9 +963,11 @@
     .down-form{
         position:relative;
     }
-    .down-form ul{
+    .down-form .down-key{
         position:absolute;
         top:100%;
+        left:5px;
+        z-index:100;
         width:700px;
         max-height:360px;
         overflow-y:hidden;
@@ -973,9 +975,11 @@
         border-radius:5px;
         background: #fff;
         box-shadow: 0 0 5px rgba(0,0,0,.8);
+    }
+    .down-form .down-key ul{
         margin-left:5px;
     }
-    .down-form ul li{
+    .down-form .down-key ul li{
         line-height: 34px;
         height:34px;
         font-size: 14px;
@@ -983,15 +987,20 @@
         text-align: left;
         vertical-align:middle;
     }
-    .down-form ul li span{
+    .down-form .down-key ul li:hover{
+        cursor:pointer;
+        background: #f5f5f5;
+    }
+    .down-form .down-key ul li span{
+        text-align: center;
         display:inline-block;
         padding: 0 10px;
         vertical-align:middle;
     }
-    .down-form ul li span:nth-child(1){width:20%;}
-    .down-form ul li span:nth-child(2){width:20%;}
-    .down-form ul li span:nth-child(3){width: 30%;}
-    .down-form ul li span:nth-child(4){
+    .down-form .down-key ul li span:nth-child(1){width:20%;}
+    .down-form .down-key ul li span:nth-child(2){width:20%;}
+    .down-form .down-key ul li span:nth-child(3){width: 30%;}
+    .down-form .down-key ul li span:nth-child(4){
         width:25%;
         overflow: hidden;
         text-overflow: ellipsis;
@@ -1015,9 +1024,46 @@
     .wanted_list .wanted-sub-tab tbody tr{}
     .wanted_list .wanted-sub-tab tbody tr td{}
 
-
+    .down-word{
+        height:400px;
+        overflow: hidden;
+    }
+    .down-word ul{
+        position:absolute;
+        top:100%;
+        width:700px;
+        max-height:360px;
+        overflow-y:hidden;
+        border:1px solid #5078cb;
+        border-radius:5px;
+        background: #fff;
+        box-shadow: 0 0 5px rgba(0,0,0,.8);
+        margin-left:5px;
+    }
+    .down-word ul li{
+        line-height: 34px;
+        height:34px;
+        font-size: 14px;
+        color:#333;
+        text-align: left;
+        vertical-align:middle;
+    }
+    .down-word ul li span{
+        display:inline-block;
+        padding: 0 10px;
+        vertical-align:middle;
+    }
+    .down-word ul li span:nth-child(1){width:20%;}
+    .down-word ul li span:nth-child(2){width:20%;}
+    .down-word ul li span:nth-child(3){width: 30%;}
+    .down-word ul li span:nth-child(4){
+        width:25%;
+        overflow: hidden;
+        text-overflow: ellipsis;
+        white-space: nowrap;
+    }
 </style>
-<div class="user_right fr">
+<div class="user_right fr" ng-click="">
     <!--货品管理-->
     <div class="pro_management device">
         <div class="com_tab">
@@ -1035,8 +1081,8 @@
         </div>
         <div class="com_tab com_tab2" style="margin-bottom: 10px">
             <ul class="fl distance" style="width: 100%">
-                <li ng-class="{active : storage_tab == 'inPut'}"  ng-click="toggleStorage('inPut')" title="入库"><a href="" class="standard">入库</a></li>
-                <li ng-class="{active : storage_tab =='outPut'}" ng-click="toggleStorage('outPut')" title="出库"><a href="" class="standard">出库</a></li>
+                <li ng-class="{active : storage_tab == 'inBound'}"  ng-click="toggleStorage('inBound')" title="入库"><a href="" class="standard">入库</a></li>
+                <li ng-class="{active : storage_tab =='outBound'}" ng-click="toggleStorage('outBound')" title="出库"><a href="" class="standard">出库</a></li>
             </ul>
         </div>
         <div class="search-check">
@@ -1126,18 +1172,19 @@
             <table class="wanted-tab table">
                 <thead>
                 <tr>
-                    <th width="120" ng-bind="storage_tab === 'inPut' ? '入库单号' : '出库单号'"></th>
-                    <th width="180" ng-bind="storage_tab === 'inPut' ? '*发货单' : '*订单号'" ng-if="handleItem === 2"></th>
-                    <th width="180" ng-bind="storage_tab === 'inPut' ? '卖家名称' : '买家名称'"></th>
-                    <th class="filter" width="110">
+                    <th width="120" ng-bind="storage_tab === 'inBound' ? '入库单号' : '出库单号'"></th>
+                    <th width="180" ng-bind="storage_tab === 'inBound' ? '*发货单' : '*订单号'" ng-if="handleItem === 2"></th>
+                    <th width="180" ng-bind="storage_tab === 'inBound' ? '卖家名称' : '买家名称'"></th>
+                    <th class="filter" width="110" ng-if="handleItem === 1">类型</th>
+                    <th class="filter" width="110" ng-if="handleItem !== 1">
                         <a ng-bind="selfSupport">全部类型</a> <i class="fa fa-angle-down fa-angle-up"></i>
                         <div class="hover-show">
                             <a ng-click="changeSupportType(selfSupportType.ALL)">全部类型</a>
-                            <a ng-click="changeSupportType(selfSupportType.SELF_SUPPORT)" ng-bind="storage_tab === 'inPut' ? '其它入库' : '其它出库'"></a>
-                            <a ng-click="changeSupportType(selfSupportType.CONSIGNMENT)" ng-bind="storage_tab === 'inPut' ? '销售入库' : '销售出库'"></a>
+                            <a ng-click="changeSupportType(selfSupportType.SELF_SUPPORT)" ng-bind="storage_tab === 'inBound' ? '其它入库' : '其它出库'"></a>
+                            <a ng-click="changeSupportType(selfSupportType.CONSIGNMENT)" ng-bind="storage_tab === 'inBound' ? '销售入库' : '销售出库'"></a>
                         </div>
                     </th>
-                   <th width="90">录入人</th>
+                    <th width="90">录入人</th>
                     <th width="170">录入日期</th>
                     <th width="170" class="padding0">操作</th>
                 </tr>
@@ -1195,11 +1242,11 @@
                 <tbody ng-if="handleItem === 1">
                 <tr>
                     <td>系统自动生成</td>
-                    <td><input type="text" class="form-control"></td>
-                    <td>腌肉入库</td>
+                    <td><input type="text" class="form-control" ng-model="othenParam.enName"></td>
+                    <td ng-bind="storage_tab === 'inBound' ? '其它入库' : '其它出库'">其它入库</td>
                     <td>张三</td>
-                    <td>2018-12-12 12：！@：</td>
-                    <td><span class="btn-click">确认</span><span class="btn-click">取消</span></td>
+                    <td ng-bind="newDate">2018-12-12</td>
+                    <td><span class="btn-click" ng-click="otherAddClick()">确认</span><span class="btn-click" ng-click="addOneTable('clear')">取消</span></td>
                 </tr>
                 <tr>
                     <td colspan="6">
@@ -1219,74 +1266,34 @@
                             </tr>
                             </thead>
                             <tbody>
-                            <tr>
-                                <td>1</td>
-                                <td>
-                                    <div class="down-form">
-                                        <input type="text" class="form-control" ng-change="onChange()" ng-focus="onFocus($event)" ng-blur="onBlur()">
-                                        <ul class="list-unstyled">
-                                            <li>
-                                                <span>464it655-01k</span>
-                                                <span>panasonic</span>
-                                                <span>panasonic</span>
-                                                <span>panasonic</span>
-                                            </li>
-                                        </ul>
-                                    </div>
-                                </td>
-                                <td><input type="text" class="form-control" readonly></td>
-                                <td><input type="text" class="form-control" readonly></td>
-                                <td><input type="text" class="form-control" readonly></td>
-                                <td><input type="text" class="form-control"></td>
-                                <td><input type="text" class="form-control"></td>
-                            </tr>
-                            <tr>
-                                <td>1</td>
-                                <td>
-                                    <div class="down-form">
-                                        <input type="text" class="form-control" ng-change="onChange()" ng-focus="onFocus($event)" ng-blur="onBlur()">
-                                        <ul class="list-unstyled">
-                                            <li>
-                                                <span>464it655-01k</span>
-                                                <span>panasonic</span>
-                                                <span>panasonic</span>
-                                                <span>panasonic</span>
-                                            </li>
-                                        </ul>
-                                    </div>
-                                </td>
-                                <td><input type="text" class="form-control" readonly></td>
-                                <td><input type="text" class="form-control" readonly></td>
-                                <td><input type="text" class="form-control" readonly></td>
-                                <td><input type="text" class="form-control"></td>
-                                <td><input type="text" class="form-control"></td>
-                            </tr>
-                            <tr>
-                                <td>1</td>
+                            <tr ng-repeat="(index, item) in otherData">
+                                <td ng-bind="index + 1"></td>
                                 <td>
                                     <div class="down-form">
-                                        <input type="text" class="form-control" ng-change="onChange()" ng-focus="onFocus($event)" ng-blur="onBlur()">
-                                        <ul class="list-unstyled">
-                                            <li>
-                                                <span>464it655-01k</span>
-                                                <span>panasonic</span>
-                                                <span>panasonic</span>
-                                                <span>panasonic</span>
-                                            </li>
-                                        </ul>
+                                        <input type="text" class="form-control" ng-model="item.key" ng-change="onChange(item)">
+                                        <div ng-show="item.show" class="down-key" ng-mouseenter="item.show = true">
+                                            <ul class="list-unstyled">
+                                                <li ng-repeat="list in listData" ng-click="addProductId(list, item)">
+                                                    <span ng-bind="list.pcmpcode">-01k</span>
+                                                    <span ng-bind="list.pbranden || '-'"></span>
+                                                    <span ng-bind="list.kind || '-'"></span>
+                                                    <span ng-bind="list.spec || '-'"></span>
+                                                </li>
+                                            </ul>
+                                        </div>
                                     </div>
                                 </td>
-                                <td><input type="text" class="form-control" readonly></td>
-                                <td><input type="text" class="form-control" readonly></td>
-                                <td><input type="text" class="form-control" readonly></td>
-                                <td><input type="text" class="form-control"></td>
-                                <td><input type="text" class="form-control"></td>
+                                <td><span ng-bind="item.pbranden || '-'"></span></td>
+                                <td><span ng-bind="item.kind || '-'"></span></td>
+                                <td><span ng-bind="item.spec || '-'"></span></td>
+                                <td><input type="text" class="form-control" ng-model="item.qty"></td>
+                                <td><input type="text" class="form-control" ng-model="item.price"></td>
                             </tr>
                             <tr>
                                 <td colspan="7">
-                                    <span class="btn-click">增加一</span>
-                                    <span class="btn-click">增加十条</span>
-                                    <span class="btn-click">清空</span>
+                                    <span class="btn-click" ng-click="addOneTable('one')">增加一</span>
+                                    <span class="btn-click" ng-click="addOneTable('ten')">增加十条</span>
+                                    <span class="btn-click" ng-click="addOneTable('clear')">清空</span>
                                 </td>
                             </tr>
                             </tbody>
@@ -1346,524 +1353,27 @@
                 </tbody>
             </table>
         </div>
-
-        <div class="wanted_list">
-            <!--在售产品-->
-            <div class="tab">
-                <table class="vendor-tab public-tab table">
-                    <thead>
-                    <tr>
-                        <th width="60" style="padding:8px 0;">
-                            <label class="check-active">
-                                <input ng-disabled="currenctGoods.length == 0" type="checkbox"  ng-click="chooseAllItem()" ng-checked="chooseAll || chooseAllPage" id="AllChoose"/>
-                                <label for="AllChoose"></label>
-                                <span>全选</span>
-                            </label>
-                        </th>
-                        <th width="220">产品信息</th>
-                        <th width="105">包装/生产日期</th>
-                        <th width="140">库存</th>
-                        <th width="105">梯度/pcs</th>
-                        <th ng-if="onsale.currency == 'USD'" width="116">单价<b style="font-size: 12px;font-weight: 600">($)</b></th>
-                        <th ng-if="onsale.currency == 'RMB'" width="116">单价<b style="font-size: 12px;font-weight: 600">(￥)</b></th>
-                        <th width="110">交期(天)</th>
-                        <th class="filter" width="100">
-                            <!--<a>{{selfSupport}}<i class="fa fa-angle-double-down angle-hover-up" aria-hidden="true"></i></a>-->
-                            <a ng-bind="selfSupport">销售方式</a> <i class="fa fa-angle-down fa-angle-up"></i>
-                            <div class="hover-show">
-                                <a ng-click="changeSupportType(selfSupportType.ALL)" title="销售方式">销售方式</a>
-                                <a ng-click="changeSupportType(selfSupportType.SELF_SUPPORT)" title="自营">自营</a>
-                                <a ng-click="changeSupportType(selfSupportType.CONSIGNMENT)" title="寄售">寄售</a>
-                            </div>
-                        </th>
-                        <th width="70" class="padding0">操作</th>
-                    </tr>
-                    </thead>
-                    <tbody class="bottom-no">
-                    <tr style="height: 14px;">
-                        <td colspan="10" class="hei16"></td>
-                    </tr>
-                    </tbody>
-                    <tbody ng-repeat="commodity in currenctGoods" ng-click="chooseOne(null, commodity)" class="edit-border">
-                    <!--非编辑状态自定义标签-->
-                    <tr class="define" ng-if="!commodity.edit">
-                        <td colspan="10">
-                            <div class="code">SKU编码 : <span ng-bind="commodity.batchCode">247823589235</span></div>
-                            <div class="labelling" ng-if="commodity.tag">
-                                <!--<em>*</em>-->
-                                自定义标签 : <span ng-bind="commodity.tag">散装出售散装出售</span>
-                            </div>
-                            <!--非标产品标志-->
-                            <img ng-if="!commodity.uuid" src="static/img/store/common/nonstandard.png" alt="" class="standard"/>
-                            <!--标准产品标志-->
-                            <img ng-if="commodity.uuid" src="static/img/store/common/standard.png" alt="" class="standard"/>
-                        </td>
-                    </tr>
-                    <tr class="edit-form" ng-if="!commodity.edit">
-                        <td class="middle padding0 check-input">
-                            <!-- <span><input type="checkbox" id="{{$index+1}}"/><label for="{{$index+1}}"></label><br/></span>-->
-                            <span name="check-one"><input type="checkbox" ng-checked="commodity.isChoosed" fid="{{$index+1}}"/><label for="{{$index+1}}"></label></span>
-                            <!--&lt;!&ndash;非标产品标志&ndash;&gt;-->
-                            <!--<img ng-if="!commodity.uuid" src="static/img/store/common/nonstandard.png" alt="" class="standard"/>-->
-                            <!--&lt;!&ndash;标产品标志&ndash;&gt;-->
-                            <!--<img ng-if="commodity.uuid" src="static/img/store/common/standard.png" alt="" class="standard"/>-->
-                        </td>
-                        <td class="middle"  style="vertical-align: top !important;">
-                            <div class="fl img marginL20">
-                                <a><img ng-src="{{commodity.img ? commodity.img : 'static/img/store/common/default.png'}}"/></a>
-                                <div class="hover-show" name="img-a">
-                                    <a ng-click="showImg(commodity.img || 'static/img/store/common/default.png')" title="查看大图"><i class="fa fa-search"></i>查看</a>
-                                </div>
-                            </div>
-                            <div class="fr wid135">
-                                <p ng-if="!commodity.uuid">品牌: <em ng-bind="commodity.brandNameEn" title="{{commodity.brandNameEn}}">NXP</em></a></p>
-                                <p ng-if="commodity.uuid" name="brand-a"><a href="product/brand/{{commodity.branduuid}}" style="margin: 0; color: #333;" target="_blank">品牌: <em ng-bind="commodity.brandNameEn" title="{{commodity.brandNameEn}}">NXP</em></a></p>
-                                <p ng-if="!commodity.uuid">物料名称: <em ng-bind="commodity.kindNameCn || '-'" title="{{commodity.kindNameCn}}"></em></a></p>
-                                <p ng-if="commodity.uuid" name="kind-a"><a href="product/kind/{{commodity.kindUuid}}" style="margin: 0; color: #333;" target="_blank">物料名称: <em ng-bind="commodity.kindNameCn || '-'" title="{{commodity.kindNameCn}}"></em></a></p>
-                                <p>型号: <em class="href" ng-bind="commodity.code" title="{{commodity.code}}"  ng-click="goToBatchDetail($event, commodity)">LPC1112</em></p>
-                                <p>规格: <em ng-bind="commodity.spec  || '-'" title="{{commodity.spec}}">LPC1112</em></p>
-                                <!--<div class="margin0">-->
-                                <!--<span class="marginL10">规格: </span>-->
-                                <!--<span ng-bind="commodity.spec  || '-'" title="{{commodity.spec}}" class="width45" style="overflow: hidden;text-overflow: ellipsis;white-space: nowrap;"></span>-->
-                                <!--</div>-->
-                            </div>
-                        </td>
-                        <td style="white-space: inherit;">
-                            <div>
-                                <span class="text-overflow marginL5" ng-bind="commodity.packaging || '无包装信息'" title="{{commodity.packaging}}"></span><br/>
-                            </div>
-                            <div class="margin0">
-                                <span ng-bind="commodity.produceDate || '-'" title="{{commodity.produceDate}}" class="marginL5"></span>
-                            </div>
-                            <div class="margin0">
-                                <span ng-if="commodity.breakUp" class="marginL5">可拆卖</span>
-                            </div>
-                        </td>
-                        <td>
-                            <div>
-                                <span class="marginL10">库存: </span>
-                                <span ng-bind="commodity.reserve" title="{{commodity.reserve}}"style="white-space: nowrap;overflow: hidden;text-overflow: ellipsis;width: 80px;" ></span>
-                            </div>
-                            <div class="margin0">
-                                <span class="marginL10">最小起订量: </span>
-                                <span ng-bind="commodity.minBuyQty" title="{{commodity.minBuyQty}}" class="width45" style="white-space: nowrap;overflow: hidden;text-overflow: ellipsis;"></span>
-                            </div>
-                            <div class="margin0">
-                                <span class="marginL10">最小包装数: </span>
-                                <span ng-bind="commodity.minPackQty" title="{{commodity.minPackQty}}" class="width45" style="white-space: nowrap;overflow: hidden;text-overflow: ellipsis;"></span>
-                            </div>
-                        </td>
-                        <td>
-                            <div ng-repeat="price in commodity.prices" >
-                                <span title="{{price.start + '+'}}" ng-bind="price.start + '+'" class="marginL40" style="overflow: hidden;text-overflow: ellipsis;white-space: nowrap;width:60px;"></span>
-                            </div>
-                        </td>
-                        <td ng-if="onsale.currency == 'USD'">
-                            <div  ng-repeat="price in commodity.prices" ng-if="price.uSDPrice" >
-                                <span title="{{price.uSDPrice | formateNumber : 6 | currencySysmbol : commodity.currencyName}}" ng-bind="price.uSDPrice | formateNumber : 6 | currencySysmbol : commodity.currencyName" class="marginL27"></span>
-                            </div>
-                        </td>
-                        <td ng-if="onsale.currency == 'RMB'">
-                            <div ng-repeat="price in commodity.prices" ng-if="price.rMBPrice">
-                                <span title="{{price.rMBPrice | formateNumber : 6 | currencySysmbol : commodity.currencyName}}" ng-bind="price.rMBPrice | formateNumber : 6 | currencySysmbol : commodity.currencyName" class="marginL27"></span>
-                            </div>
-                        </td>
-                        <td style="overflow: inherit;">
-                            <div ng-if="onsale.currency == 'RMB'" style="white-space: nowrap;overflow: hidden;text-overflow: ellipsis;">
-                                <span ng-if="commodity.b2cMaxDelivery && (commodity.b2cMaxDelivery != commodity.b2cMinDelivery)" ng-bind=" commodity.b2cMinDelivery + '-'+ commodity.b2cMaxDelivery" class="marginL40" style="overflow: hidden;text-overflow: ellipsis;white-space: nowrap;width:60px;"></span>
-                                <span ng-if="commodity.b2cMaxDelivery && (commodity.b2cMaxDelivery == commodity.b2cMinDelivery)" ng-bind=" commodity.b2cMinDelivery" class="marginL40" style="overflow: hidden;text-overflow: ellipsis;white-space: nowrap;width:60px;"></span>
-                            </div>
-                            <div ng-if="onsale.currency == 'USD'" style="white-space: nowrap;overflow: hidden;text-overflow: ellipsis;">
-                                <span ng-if="commodity.b2cMaxDelivery && (commodity.b2cMinDelivery != commodity.b2cMaxDelivery)" ng-bind=" commodity.b2cMinDelivery + '-'+ commodity.b2cMaxDelivery" class="marginL40"></span>
-                                <span ng-if="commodity.b2cMaxDelivery && (commodity.b2cMinDelivery == commodity.b2cMaxDelivery)" ng-bind=" commodity.b2cMinDelivery" class="marginL40"></span>
-                            </div>
-                            <div class="Regulpic">
-                                <span>规格书:</span>
-                                <!--<span ng-if="!commodity.Regulpic">-</span>-->
-                                <div ng-if="commodity.attach || commodity.productAttachSubmit" style="position: relative;display: inline-block;width: auto;margin-top: 0px" class="ToforAdminLook">
-                                    <a style="text-decoration: none;margin: 0px;border-bottom:0px" target="_blank" href="{{commodity.attach || commodity.productAttachSubmit.uploadAttach}}" class="Regulpica">
-                                        <div style="width:24px;height:26px;position: relative">
-                                            <img style="width:24px;height:26px" src="static/img/vendor/images/pdf.png"/>
-                                            <div class="zhezhaodang" ng-if="commodity.productAttachSubmit.uploadAttach"></div>
-                                        </div>
-                                    </a>
-                                    <img ng-if="commodity.productAttachSubmit.uploadAttach" src="static/img/vendor/images/fireinfo_icon.png" width="18" height="18" style="width:18px;height:18px;border: 0px;margin-left:5px;" class="nopass"/>
-                                    <div class="forAdminLook">待审核</div>
-                                </div>
-                                <div style="position: relative;display: inline-block;width: auto;margin-top: 0px" ng-if="!commodity.attach && !commodity.productAttachSubmit">-</div>
-                                <!--<div class="forAdminLook" style="margin-left: 35px;">待审核</div>-->
-                            </div>
-                        </td>
-                        <td>
-                            <div>
-                                <span ng-bind="(storeInfo.uuid != 'undefind' && commodity.storeid == storeInfo.uuid && storeInfo.storeName.indexOf('优软测试二') < 0 && storeInfo.storeName.indexOf('优软商城') < 0) ? '自营' : '寄售'"  style="text-align: center; width: 100%;"></span>
-                            </div>
-                        </td>
-                        <td class="padding0">
-                            <div ng-if="!commodity.sourceId" name="edit-a" class="edit-a"><span class="edit edits" ng-click="editCommodity(commodity, $event)">编辑</span></div><!--updateCommodityInfo(commodity, false)-->
-                            <div ng-if="commodity.sourceId"><a style="margin: 0;">来源UAS</a></div>
-                            <div ng-if="!commodity.sourceId" name="down-a" class="down-a"><span class='edits' ng-click="soldOut($event, commodity)">下架</span></div>
-                        </td>
-                    </tr>
-                    <!--编辑状态自定义标签-->
-                    <tr class="define defines" ng-if="commodity.edit">
-                        <td colspan="10">
-                            <div class="code">SKU编码 : <span ng-bind="commodity.batchCode">247823589235</span></div>
-                            <div class="labelling">
-                                <!--<em>*</em>-->
-                                自定义标签 : <input type="text" ng-blur="editTag(commodity)" ng-model="commodity.editTag" ng-change="changeTag(commodity)"
-                                               ng-class="{'error' : commodity.editTagInvalid}" maxlength="20"
-                                               placeholder="请设置产品标签"></div>
-                            <!--非标产品标志-->
-                            <img ng-if="!commodity.uuid" src="static/img/store/common/nonstandard.png" alt="" class="standard"/>
-                            <!--标准产品标志-->
-                            <img ng-if="commodity.uuid" src="static/img/store/common/standard.png" alt="" class="standard"/>
-                        </td>
-                    </tr>
-                    <tr class="edit-form edit-forms" ng-if="commodity.edit">
-                        <td colspan="9">
-                            <div class="bg-show">
-                                <div class="content-show width20">
-                                    <!--<div> {{$index + 1}}</div>-->
-                                </div>
-                                <div class="content-show width200">
-                                    <div class="fl img">
-                                        <a><img ng-src="{{commodity.editPic ? commodity.editPic : 'static/img/store/common/default.png'}}"/></a>
-                                        <div class="edit-img">
-                                            <a ng-click="commodity.editPic = null" class="delete-img" title="删除" ng-if="commodity.editPic"><i class="fa fa-trash"></i></a>
-                                            <a ng-click="editGoodsPicture(commodity.editPic || 'static/img/store/common/default.png', commodity)" title="修改图片"><img src="static/img/icon/update-img.png" /></a>
-                                        </div>
-                                    </div>
-                                    <div class="fr wid135" style="margin-top: 0px">
-                                        <p style="margin-top: 5px">
-                                            品牌:
-                                            <input style="border-radius: 3px;border: 1px solid #a9a9a9;height: 24px;line-height: 24px;width: 107px" type="text" ng-model="commodity.brandNameEn" style="width:106px" maxlength="25" ng-change="onBrandChange(commodity.brandNameEn)"/>
-                                        </p>
-                                        <p style="margin-top: 5px">
-                                            物料名称:
-                                            <input style="border-radius: 3px;border: 1px solid #a9a9a9;height: 24px;line-height: 24px;width: 79px" type="text" ng-model="commodity.kindNameCn" style="width:78px" maxlength="20" ng-change="onCodeChange(commodity.kindNameCn)"/>
-                                        </p>
-                                        <p style="margin-top: 5px">
-                                            型号:
-                                            <input style="border-radius: 3px;border: 1px solid #a9a9a9;height: 24px;line-height: 24px;width: 107px" type="text" ng-model="commodity.code" style="width:106px" maxlength="100" />
-                                        </p>
-                                        <p style="margin-top: 5px">
-                                            规格:
-                                            <input style="border-radius: 3px;border: 1px solid #a9a9a9;height: 24px;line-height: 24px;width: 107px" type="text" ng-model="commodity.spec" maxlength="50" style="width:106px"/>
-                                        </p>
-                                        <!--<p>品牌: <em ng-bind="commodity.brandNameEn" title="{{commodity.brandNameEn}}">NXP</em></p>-->
-                                        <!--<p>物料名称: <em ng-bind="commodity.kindNameCn || '-'" title="{{commodity.kindNameCn}}"></em></p>-->
-                                        <!--<p>型号: <em ng-bind="commodity.code" title="{{commodity.code}}">LPC1112</em></p>-->
-                                        <!--<p>规格: <em ng-bind="commodity.spec || '-'" title="{{commodity.spec}}">LPC1112</em></p>-->
-                                        <!--<p>-->
-                                        <!--<span style="width: 32px;">规格: </span>-->
-                                        <!--<span><input style="width:90px" type="text"-->
-                                        <!--placeholder="请输入规格" maxlength="50" ng-model="commodity.spec" class="wid48 form-control"/></span>-->
-                                        <!--</p>-->
-                                    </div>
-                                </div>
-                                <div class="content-show width120">
-                                    <div>
-                                        <span><!--<input type="text" ng-blur="editPackaging(commodity, true)" ng-change="changePackaging(commodity)" placeholder="包装方式" maxlength="10" ng-model="commodity.editPackaging" ng-class="{'error' : commodity.editPackagingInvalid}" class="wid88 form-control"/>-->
-                                            <select ng-model="commodity.editPackaging" class="select-adder select-item" title="包装">
-                                                <option ng-repeat="item in packageArray" ng-click="showText(goods, item)">{{item}}</option>
-                                            </select>
-                                        </span>
-                                    </div>
-                                    <div>
-                                        <span><input type="text" ng-change="editProduceDateFa(commodity)" placeholder="生产日期" maxlength="12" ng-model="commodity.editProduceDate" ng-class="{'error' : commodity.editProduceDateInvalid}" class="wid88 form-control"/></span>
-                                    </div>
-                                    <div>
-                                        <span>可拆卖:</span>
-                                        <span class="switch"><button ng-class="{'active' : commodity.editBreakUp}" ng-click="toggleIsBreadUp(commodity)"></button></span>
-                                    </div>
-                                </div>
-                                <div class="content-show width130">
-                                    <div>
-                                        <span>库存: </span>
-                                        <span><input type="text" ng-blur="changeReserve(commodity)" ng-class="{'error' : commodity.editReserveInvalid}"
-                                                     placeholder="数量" maxlength="9" ng-model="commodity.editReserve" class="wid48 form-control"/></span>
-                                    </div>
-                                    <div>
-                                        <span>最小起订量: </span>
-                                        <span><input type="text" ng-change="updateStartNumber(commodity)" ng-blur="changeMinBuyQty(commodity)" ng-class="{'error' : commodity.editMinBuyQtyInValid}" placeholder="数量" maxlength="6" ng-model="commodity.editMinBuyQty" class="wid48 form-control"/></span>
-                                    </div>
-                                    <div>
-                                        <span>最小包装数: </span>
-                                        <span><input type="text" ng-blur="changeMinPackQty(commodity)"
-                                                     ng-class="{'error' : commodity.editMinPackQtyInValid}" placeholder="数量" maxlength="6" ng-model="commodity.editMinPackQty" class="wid48 form-control"/></span>
-                                    </div>
-                                </div>
-                                <div class="content-show width135">
-                                    <div ng-repeat="price in commodity.editPrices">
-                                        <span style="margin-right: 0;overflow: hidden;"><input type="text" ng-disabled="$index == 0" ng-blur="editQty(commodity, $index, false, price.start)" ng-class="{'error' : price.startInValid}" placeholder="数量"  ng-model="price.start" class="wid40 form-control fl"/><em class="fl margin5" ng-if="$last">以上</em></span>
-                                        <span ng-if="!$last">-</span>
-                                        <span ng-if="!$last"><input type="text" ng-blur="editQty(commodity, $index, true, price.end)" ng-class="{'error' : price.endInValid}" placeholder="数量" ng-model="price.end" class="wid40 form-control"/></span>
-                                    </div>
-                                </div>
-                                <div class="content-show width135" ng-if="onsale.currency == 'USD'">
-                                    <div style="width: 99px;" ng-repeat="price in commodity.editPrices">
-                                    <span ng-if="commodity.currencyName.indexOf('USD') > -1">
-                                        <form name="usdForm">
-                                            <input type="text" name="usd" ng-class="{'error' : price.priceInvalid}" placeholder="单价($)" autocomplete="off" ng-blur="changePrices(commodity.editPrices, price.uSDPrice, $index)" ng-model="price.uSDPrice" class="wid85 form-control" validata-price/>
-                                        </form>
-                                    </span>
-                                        <a name="reduce-a" class="reduce" ng-disabled="commodity.editPrices.length < 2" ng-click="deleteFragment(commodity, $index)"><i class="fa fa-minus-circle"></i></a>
-                                        <a name="add-a" class="add" ng-disabled="commodity.editPrices.length >= 3" ng-click="addFragment(commodity)"><i class="fa fa-plus-circle"></i></a>
-                                    </div>
-                                </div>
-                                <div class="content-show width100"  ng-if="onsale.currency == 'RMB'">
-                                    <div style="width: 99px;" ng-repeat="price in commodity.editPrices">
-                                    <span ng-if="commodity.currencyName.indexOf('RMB') > -1">
-                                        <form name="rmbForm">
-                                            <input type="text" name="rmb" ng-class="{'error' : price.priceInvalid}" placeholder="单价(¥)" autocomplete="off" ng-blur="changePrices(commodity.editPrices, price.rMBPrice, $index)" ng-model="price.rMBPrice" class="wid85 form-control" validata-price/>
-                                        </form>
-                                    </span>
-                                        <a name="reduce-a" class="reduce" ng-disabled="commodity.editPrices.length < 2" ng-click="deleteFragment(commodity, $index)"><i class="fa fa-minus-circle"></i></a>
-                                        <a name="add-a" class="add" ng-disabled="commodity.editPrices.length >= 3" ng-click="addFragment(commodity)"><i class="fa fa-plus-circle"></i></a>
-                                    </div>
-                                </div>
-                                <div class="content-show width90">
-                                    <div ng-if="onsale.currency == 'RMB'">
-                                        <!--<span>大陆：</span>-->
-                                        <span><input type="text" ng-class="{'error' : commodity.editMinDeliveryinValid}" ng-blur="changeDelivery(commodity.editMinDelivery, commodity.editMaxDelivery, true, false, commodity)" placeholder="大陆最短交期" ng-model="commodity.editMinDelivery" class="wid25 form-control" oninput="if(value.length>3)value=value.slice(0,3)"/></span>
-                                        <span>-</span>
-                                        <span><input type="text" ng-class="{'error' : commodity.editMaxDeliveryinValid}" ng-blur="changeDelivery(commodity.editMinDelivery, commodity.editMaxDelivery, false, false, commodity)" placeholder="大陆最长交期" ng-model="commodity.editMaxDelivery" class="wid25 form-control" oninput="if(value.length>3)value=value.slice(0,3)"/></span>
-                                    </div>
-                                    <div ng-if="onsale.currency == 'USD'">
-                                        <!--<span>香港：</span>-->
-                                        <span><input type="text" placeholder="香港最短交期" ng-class="{'error' : commodity.editMinDeliveryinValid}" ng-blur="changeDelivery(commodity.editMinDelivery, commodity.editMaxDelivery, true, true, commodity)" ng-model="commodity.editMinDelivery" class="wid25 form-control" oninput="if(value.length>3)value=value.slice(0,3)"/></span>
-                                        <span>-</span>
-                                        <span><input type="text" placeholder="香港最长交期" ng-class="{'error' : commodity.editMaxDeliveryinValid}" ng-blur="changeDelivery(commodity.editMinDelivery, commodity.editMaxDelivery, false, true, commodity)" ng-model="commodity.editMaxDelivery" class="wid25 form-control" oninput="if(value.length>3)value=value.slice(0,3)"/></span>
-                                    </div>
-                                    <div class="Regulpic">
-                                        <span>规格书:</span>
-                                        <div style="position: relative;display: inline-block;width: auto;margin-top: 0px" class="ToforAdminLook">
-                                            <a style="text-decoration: none;margin: 0px;border-bottom:0px" target="_blank" href="{{commodity.attach}}" class="Regulpica" ng-if="commodity.attach">
-                                                <img style="width:24px;height:26px" src="static/img/vendor/images/pdf.png"/>
-                                            </a>
-                                            <a class="Regulpica" ng-click="editRegulPicture(commodity.productAttachSubmit.uploadAttach || 'static/img/vendor/images/upload_file_icon.png', commodity)" ng-if="!commodity.attach" style="margin: 0px">
-                                                <div style="width:24px;height:26px;position: relative">
-                                                    <img style="width:24px;height:26px" src="static/img/vendor/images/pdf.png"/>
-                                                    <div class="zhezhaodang"></div>
-                                                </div>
-                                            </a>
-                                            <img ng-if="commodity.productAttachSubmit.uploadAttach" src="static/img/vendor/images/fireinfo_icon.png" width="18" height="18" style="width:18px;height:18px;border: 0px;margin-left:5px;" class="nopass"/>
-                                            <div class="forAdminLook">待审核</div>
-                                        </div>
-                                    </div>
-                                    <!--<div class="Regulpic">-->
-                                    <!--<span>规格书:</span>-->
-                                    <!--<img style="width:24px;height:26px;cursor: pointer" src="static/img/vendor/images/pdf.png" ng-click="editRegulPicture(commodity.Regulpic || 'static/img/store/common/default.png', commodity)"/>-->
-                                    <!--<img src="static/img/vendor/images/fireinfo_icon.png" width="18" height="18" style="width:18px;height:18px;border: 0px;margin-left:5px;"/>-->
-                                    <!--<div class="forAdminLook">待审核</div>-->
-                                    <!--</div>-->
-                                </div>
-                                <div class="content-show width70">
-                                    <div>
-                                        <span>
-                                            <select ng-change="changeSaleMode(commodity)" class="wid68 select-adder form-control" ng-model="commodity.editSelfSale">
-                                                <option value="1">自营</option>
-                                                <option value="2">寄售</option>
-                                            </select>
-                                        </span>
-                                    </div>
-                                </div>
-                                <div class="content-show width60">
-                                    <div>
-                                        <span name="save-a"><button class="ok" ng-mouseleave="recoveryBlur()" ng-mouseenter="impedeBlur()" ng-click="updateGoods(commodity, $index)">保存</button></span>
-                                    </div>
-                                    <div>
-                                        <span name="cancle-a"><button class="off" ng-click="cancleEdit(commodity)">取消</button></span>
-                                    </div>
-                                </div>
-                            </div>
-                        </td>
-                        <!--<td class="middle padding0 check-input">-->
-                        <!--<div>{{$index + 1}}</div>-->
-                        <!--</td>-->
-                        <!--<td class="middle"  style="vertical-align: top !important;">-->
-                        <!--<div class="fl img">-->
-                        <!--<a><img ng-src="{{commodity.editPic ? commodity.editPic : 'static/img/store/common/default.png'}}"/></a>-->
-                        <!--<div class="edit-img">-->
-                        <!--<a ng-click="commodity.editPic = null" class="delete-img" title="删除" ng-if="commodity.editPic"><i class="fa fa-trash"></i></a>-->
-                        <!--<a ng-click="editGoodsPicture(commodity.editPic || 'static/img/store/common/default.png', commodity)" title="修改图片"><img src="static/img/icon/update-img.png" /></a>-->
-                        <!--</div>-->
-                        <!--</div>-->
-                        <!--<div class="fr wid135">-->
-                        <!--<p>类目: <em ng-bind="commodity.kindNameCn || '-'" title="{{commodity.kindNameCn}}"></em></p>-->
-                        <!--<p>型号: <em ng-bind="commodity.code" title="{{commodity.code}}">LPC1112</em></p>-->
-                        <!--<p>品牌: <em ng-bind="commodity.brandNameEn" title="{{commodity.brandNameEn}}">NXP</em></p>-->
-                        <!--</div>-->
-                        <!--</td>-->
-                        <!--<td>-->
-                        <!--<div>-->
-                        <!--<span><input type="text" ng-blur="editPackaging(commodity)" placeholder="包装方式" maxlength="10" ng-model="commodity.editPackaging" ng-class="{'error' : commodity.editPackagingInvalid}" class="wid88 form-control"/></span>-->
-                        <!--</div>-->
-                        <!--<div>-->
-                        <!--<span><input type="text" ng-blur="editProduceDateFa(commodity)" placeholder="生产日期" maxlength="11" ng-model="commodity.editProduceDate" ng-class="{'error' : commodity.editProduceDateInvalid}" class="wid88 form-control"/></span>-->
-                        <!--</div>-->
-                        <!--<div>-->
-                        <!--<span>可拆卖:</span>-->
-                        <!--<span class="switch"><button ng-class="{'active' : commodity.editBreakUp}" ng-click="toggleIsBreadUp(commodity)"></button></span>-->
-                        <!--</div>-->
-                        <!--</td>-->
-                        <!--<td>-->
-                        <!--<div>-->
-                        <!--<span>库存: </span>-->
-                        <!--<span><input type="text" ng-blur="changeReserve(commodity)" ng-class="{'error' : commodity.editReserveInvalid}" placeholder="库存" ng-model="commodity.editReserve" class="wid48 form-control"/></span>-->
-                        <!--</div>-->
-                        <!--<div>-->
-                        <!--<span>起订量: </span>-->
-                        <!--<span><input type="text" ng-blur="changeMinBuyQty(commodity)" ng-class="{'error' : commodity.editMinBuyQtyInValid}" placeholder="起拍" ng-model="commodity.editMinBuyQty" class="wid48 form-control"/></span>-->
-                        <!--</div>-->
-                        <!--<div>-->
-                        <!--<span>包装数量: </span>-->
-                        <!--<span><input type="text" ng-blur="changeMinPackQty(commodity)" ng-class="{'error' : commodity.editMinPackQtyInValid}" placeholder="倍数" ng-model="commodity.editMinPackQty" class="wid48 form-control"/></span>-->
-                        <!--</div>-->
-                        <!--&lt;!&ndash;<div>&ndash;&gt;-->
-                        <!--&lt;!&ndash;<span>&ndash;&gt;-->
-                        <!--&lt;!&ndash;<select class="wid85 select-adder form-control" style="width: 81px;">&ndash;&gt;-->
-                        <!--&lt;!&ndash;<option value="1">可拆卖</option>&ndash;&gt;-->
-                        <!--&lt;!&ndash;<option value="2">不可拆卖</option>&ndash;&gt;-->
-                        <!--&lt;!&ndash;</select>&ndash;&gt;-->
-                        <!--&lt;!&ndash;</span>&ndash;&gt;-->
-                        <!--&lt;!&ndash;</div>&ndash;&gt;-->
-                        <!--</td>-->
-                        <!--<td>-->
-                        <!--<div ng-repeat="price in commodity.editPrices">-->
-                        <!--<span style="margin-right: 0;overflow: hidden;"><input type="text" ng-blur="editQty(commodity, $index, false, price.start)" ng-class="{'error' : price.startInValid}" placeholder="数量"  ng-model="price.start" class="wid40 form-control fl"/><em class="fl margin5" ng-if="$index == (commodity.editPrices.length-1)">以上</em></span>-->
-                        <!--<span ng-if="$index != (commodity.editPrices.length-1)">-</span>-->
-                        <!--<span ng-if="$index != (commodity.editPrices.length-1)"><input type="text" ng-blur="editQty(commodity, $index, true, price.end)" ng-class="{'error' : price.endInValid}" placeholder="数量" ng-model="price.end" class="wid40 form-control"/></span>-->
-                        <!--</div>-->
-                        <!--</td>-->
-                        <!--<td ng-if="onsale.currency == 'USD'">-->
-                        <!--<div style="width: 99px;" ng-repeat="price in commodity.editPrices">-->
-                        <!--<span ng-if="commodity.currencyName.indexOf('USD') > -1">-->
-                        <!--<form name="usdForm">-->
-                        <!--<input type="text" name="usd" ng-blur="priceBlur(price, true)" ng-keyup="priceValid(price, true)" ng-class="{'error' : price.usdPriceInvalid}" placeholder="香港交货($)" autocomplete="off" ng-model="price.uSDPrice" ng-model-options="{debounce : 100}" class="wid85 form-control"/>-->
-                        <!--</form>-->
-                        <!--</span>-->
-                        <!--<a name="reduce-a" class="reduce" ng-disabled="commodity.editPrices.length < 2" ng-click="deleteFragment(commodity, $index)"><i class="fa fa-minus-circle"></i></a>-->
-                        <!--<a name="add-a" class="add" ng-disabled="commodity.editPrices.length >= 3" ng-click="addFragment(commodity)"><i class="fa fa-plus-circle"></i></a>-->
-                        <!--</div>-->
-                        <!--</td>-->
-                        <!--<td ng-if="onsale.currency == 'RMB'">-->
-                        <!--<div style="width: 99px;" ng-repeat="price in commodity.editPrices">-->
-                        <!--<span ng-if="commodity.currencyName.indexOf('RMB') > -1">-->
-                        <!--<form name="rmbForm">-->
-                        <!--<input type="text" name="rmb" ng-blur="priceBlur(price, false)" ng-keyup="priceValid(price, false)" ng-class="{'error' : price.rmbPriceInvalid}" placeholder="大陆交货(￥)" autocomplete="off" ng-model="price.rMBPrice" ng-model-options="{debounce : 100}" class="wid85 form-control"/>-->
-                        <!--</form>-->
-                        <!--</span>-->
-                        <!--<a name="reduce-a" class="reduce" ng-disabled="commodity.editPrices.length < 2" ng-click="deleteFragment(commodity, $index)"><i class="fa fa-minus-circle"></i></a>-->
-                        <!--<a name="add-a" class="add" ng-disabled="commodity.editPrices.length >= 3" ng-click="addFragment(commodity)"><i class="fa fa-plus-circle"></i></a>-->
-                        <!--</div>-->
-                        <!--</td>-->
-                        <!--<td>-->
-                        <!--<div ng-if="onsale.currency == 'RMB'">-->
-                        <!--&lt;!&ndash;<span>大陆：</span>&ndash;&gt;-->
-                        <!--<span><input type="text" ng-class="{'error' : commodity.editMinDeliveryinValid}" ng-blur="changeDelivery(commodity.editMinDelivery, commodity.editMaxDelivery, true, false, commodity)" placeholder="大陆最短交期" ng-model="commodity.editMinDelivery" class="wid25 form-control"/></span>-->
-                        <!--<span>-</span>-->
-                        <!--<span><input type="text" ng-class="{'error' : commodity.editMaxDeliveryinValid}" ng-blur="changeDelivery(commodity.editMinDelivery, commodity.editMaxDelivery, false, false, commodity)" placeholder="大陆最长交期" ng-model="commodity.editMaxDelivery" class="wid25 form-control"/></span>-->
-                        <!--</div>-->
-                        <!--<div ng-if="onsale.currency == 'USD'">-->
-                        <!--&lt;!&ndash;<span>香港：</span>&ndash;&gt;-->
-                        <!--<span><input type="text" placeholder="香港最短交期" ng-class="{'error' : commodity.editMinDeliveryinValid}" ng-blur="changeDelivery(commodity.editMinDelivery, commodity.editMaxDelivery, true, true, commodity)" ng-model="commodity.editMinDelivery" class="wid25 form-control"/></span>-->
-                        <!--<span>-</span>-->
-                        <!--<span><input type="text" placeholder="香港最长交期" ng-class="{'error' : commodity.editMaxDeliveryinValid}" ng-blur="changeDelivery(commodity.editMinDelivery, commodity.editMaxDelivery, false, true, commodity)" ng-model="commodity.editMaxDelivery" class="wid25 form-control"/></span>-->
-                        <!--</div>-->
-
-                        <!--</td>-->
-                        <!--<td>-->
-                        <!--<div>-->
-                        <!--<span>-->
-                        <!--<select ng-change="changeSaleMode(commodity)" class="wid68 select-adder form-control" ng-model="commodity.editSelfSale">-->
-                        <!--<option value="1">自营</option>-->
-                        <!--<option value="2">寄售</option>-->
-                        <!--</select>-->
-                        <!--</span>-->
-                        <!--</div>-->
-                        <!--</td>-->
-                        <!--<td class="padding0">-->
-                        <!--<div>-->
-                        <!--<span-->
-                        <!--name="cancle-a"><button class="off" ng-click="cancleEdit(commodity)">取消</button></span>-->
-                        <!--</div>-->
-                        <!--<div>-->
-                        <!--<span-->
-                        <!--name="save-a"><button class="ok" ng-click="updateGoods(commodity, $index)">保存</button></span>-->
-                        <!--</div>-->
-                        <!--</td>-->
-                    </tr>
-                    </tbody>
-                    <tbody ng-if="!currenctGoods || currenctGoods.length <= 0">
-                    <tr style="height: 252px;">
-                        <td colspan="12">
-                            <div class="empty">
-                                <p class="empty-img">
-                                    <img src="static/img/all/empty-cart.png">
-                                </p>
-                                <div class="empty-info">
-                                    <p class="grey"> 暂无产品信息，赶快上传让更多人看到你的产品吧 </p>
-                                    <a href="/vendor#/vendor_upload"><i></i>马上去上传</a>
-                                </div>
-                            </div>
-                        </td>
-                        <!--<td colspan="10" style="padding: 74px 0;">-->
-                        <!--<div style="line-height: 106px;">-->
-                        <!--<div class="col-xs-2" style="margin-left: 35%;">-->
-                        <!--<img src="static/img/all/empty-cart.png">-->
-                        <!--</div>-->
-                        <!--<div class="col-xs-4 text-right" style="line-height: 124px;">-->
-                        <!--<p class="grey f14">-->
-                        <!--暂无产品信息，赶快上传让更多人看到你的产品吧！-->
-                        <!--<a href="vendor#/vendor_upload" style="margin-left:20px;font-size: 14px;color:#5078cb"><i class="fa fa-mail-reply"></i>&nbsp;马上去上传</a>-->
-                        <!--</p>-->
-                        <!--</div>-->
-                        <!--</div>-->
-                        <!--</td>-->
-                    </tr>
-                    </tbody>
-                    <tbody>
-                    <tr class="no-hover batch-tr" ng-if="(chooseAll || chooseAllPage) && currenctGoods.length != 0">
-                        <td colspan="9">
-                            <div class="batch-line" ng-if="chooseAll && !chooseAllPage">
-                                已选中当前页
-                                <em class="red" ng-bind="goodsAll.numberOfElements"></em>个产品，
-                                <a ng-click="turnAllPage()" class="blue">点击此处</a>切换选中所有页面<em class="red" ng-bind="goodsAll.totalElements"></em>个产品
-                            </div>
-                            <div class="batch-line" ng-if="chooseAllPage">
-                                已选中所有页面
-                                <em class="red" ng-bind="goodsAll.totalElements"></em>个产品，
-                                <a ng-click="cancelAllPage()" class="blue">点击此处</a>全部取消选中
-                            </div>
-                        </td>
-                    </tr>
-                    <!--<tr class="no-hover batch-tr" ng-if="chooseAll && !chooseAllPage" ng-class="{'active': $data.length > 10}">-->
-                    </tbody>
-                </table>
-                <div class="record-line text-right" ng-if="currenctGoods.length != 0">显示 {{(param.page - 1) * 10 + 1}}-
-                    <span ng-bind="endNumber"></span>， 共： <span ng-bind="goodsAll.totalElements" style="color: #5078cb;"></span> 个</div>
-                <div class="ng-cloak ng-table-pager" style="text-align: right;margin-right: 60px;" ng-if="goodsAll.totalPages>1">
-                    <ul class="pagination ng-table-pagination">
-                        <li ng-class="{'disabled': !page.active && !page.current, 'active': page.current}" ng-repeat="page in pages" ng-switch="page.type">
-                            <a ng-switch-when="prev" ng-click="setPage(page.type, -1)" href="">&laquo;</a>
-                            <a ng-switch-when="first" ng-click="setPage(page.type, page.number)" href=""><span ng-bind="page.number"></span></a>
-                            <a ng-switch-when="page" ng-click="setPage(page.type, page.number)" href=""><span ng-bind="page.number"></span></a>
-                            <a ng-switch-when="more" ng-click="setPage(page.type, -1)" href="">&#8230;</a>
-                            <a ng-switch-when="last" ng-click="setPage(page.type, page.number)" href=""><span ng-bind="page.number"></span></a>
-                            <a ng-switch-when="next" ng-click="setPage(page.type, -1)" href="">&raquo;</a>
-                        </li>
-                    </ul>
-                    <div class="page-go-block">
-                        <input class="page-number" type="number" ng-model="param.currentPage" ng-keyup="listenEnter()"/>
-                        <a class="page-a" ng-click="setPage('page', param.currentPage)" href="">GO</a>
-                    </div>
-                </div>
-            </div>
-        </div>
     </div>
 </div>
+
+<!-- 搜索联想词定位和搜索 -->
+<!--<div class="down-word">-->
+    <!--<ul>-->
+        <!--<li>-->
+            <!--<span>464it655-01k</span>-->
+            <!--<span>panasonic</span>-->
+            <!--<span>panasonic</span>-->
+            <!--<span>panasonic</span>-->
+        <!--</li>-->
+        <!--<li>-->
+            <!--<span>464it655-01k</span>-->
+            <!--<span>panasonic</span>-->
+            <!--<span>panasonic</span>-->
+            <!--<span>panasonic</span>-->
+        <!--</li>-->
+    <!--</ul>-->
+<!--</div>-->
+
 <!--下架操作-->
 <div class="com-modal-wrap" ng-if="isSoldOut" ng-click="cancleSoldOut($event)" style="display:none">
     <div class="com-out-box">
@@ -1993,20 +1503,20 @@
     }
 </style>
 <script>
-    $(function(){
-        $(document).on('click', function () {
-            if ($(document).scrollTop() + $(window).height() < $('.record-line').offset().top + $('.record-line').height()) {
-                $('.wanted_list .tab table>tbody>tr.batch-tr').addClass('active')
-            } else {
-                $('.wanted_list .tab table>tbody>tr.batch-tr').removeClass('active')
-            }
-        })
-        $(window).bind("scroll",function() {
-            if ($(document).scrollTop() + $(window).height() < $('.record-line').offset().top + $('.record-line').height()) {
-                $('.wanted_list .tab table>tbody>tr.batch-tr').addClass('active')
-            } else {
-                $('.wanted_list .tab table>tbody>tr.batch-tr').removeClass('active')
-            }
-        });
-    })
+    // $(function(){
+    //     $(document).on('click', function () {
+    //         if ($(document).scrollTop() + $(window).height() < $('.record-line').offset().top + $('.record-line').height()) {
+    //             $('.wanted_list .tab table>tbody>tr.batch-tr').addClass('active')
+    //         } else {
+    //             $('.wanted_list .tab table>tbody>tr.batch-tr').removeClass('active')
+    //         }
+    //     })
+    //     $(window).bind("scroll",function() {
+    //         if ($(document).scrollTop() + $(window).height() < $('.record-line').offset().top + $('.record-line').height()) {
+    //             $('.wanted_list .tab table>tbody>tr.batch-tr').addClass('active')
+    //         } else {
+    //             $('.wanted_list .tab table>tbody>tr.batch-tr').removeClass('active')
+    //         }
+    //     });
+    // })
 </script>