Merge branch 'dev_2.2' into gray

@@ -105,6 +105,13 @@
                     <input type="text" id="factoryCode" class="form-control" placeholder="厂家编号" style="height: 39px;"/>
                 </div>
                 <div class="panel-col">
+                    <select id="isScreen" class="form-control">
+                        <option value="-1">是否已摄影传图</option>
+                        <option value="Y">是</option>
+                        <option value="N">否</option>
+                    </select>
+                </div>
+                <div class="panel-col">
                     <a id="filter-btn" href="javascript:;" class="btn btn-info">筛选</a>
                     <a id="all-btn" href="" class="btn btn-info">全部</a>
                 </div>

@@ -19,15 +19,17 @@
 [[each goodsList as item index]]
     <div class="form-group">
         <div class="fm-side col-sm-2">
-             <div class="goods-img">
+             <div class="goods-img-left">
                 <p>SKC: [[item.productSkc]]</p>
                 <p>[[item.goodsName]]：</p>
                 <p>[[item.factoryGoodsName || '']]</p>
-                <table><tr>
-                <td valign='top'>SKU:</td>
-                  <td>
-                  [[each item.goodsSizeList as item2 index2]]
-                 [[item2.productSku || '']]
+                <table ><tr>
+                <td valign='top'>SKU:</td><td></td></tr>
+                <tr><td>
+                 [[each item.goodsSizeList as item2 index2]]
+                 [[item2.productSku || '']]&nbsp;
+                 [[if index2%2==0]] </td><td>[[/if]]
+                 [[if index2%2==1]] </td></tr><tr><td>[[/if]]
                  [[/each]]</td>
                 </tr></table>
             </div>

@@ -316,7 +316,7 @@ var g = new common.grid({
             HtmArr.push('<a href="/goods/netsale/info/' + item.productSkn + editPostion + '" class="btn btn-info btn-xs info-btn">查看</a>');
             HtmArr.push('<a href="javascript:;" class="btn btn-success btn-xs chima-btn" data-index="' + item.__index + '">尺码</a>');
             if(typeof(item.productSearch) == "undefined"){
-                intValue = "";
+                intValue = 0;
             }else{
                 intValue=item.productSearch.intValue;
             }

@@ -118,6 +118,38 @@ input[type=date], input[type=time], input[type=datetime-local], input[type=month
         }
     }
 }
+
+.goods-img-left {
+    position: relative;
+    width: 110px;
+    height: 180px;
+    
+
+    .fileinput-button-icon {
+        width: 100%;
+        height: 100%;
+        line-height: 150px;
+        overflow: hidden;
+
+        img {
+            max-width: 100%;
+            max-height: 100%;
+        }
+    }
+
+    .remove-item-btn {
+        position: absolute;
+        font-size: 20px;
+        top: -10px;
+        right: -10px;
+        cursor: pointer;
+        color: #ccc;
+
+        &:hover {
+            color: #000;
+        }
+    }
+}
 .poseditimg{
     position: relative;
     width: auto;