fe / yohobuy-shop-fe2 · Commits

Go to a project

Authored by 马力
Commit e5b628895d033596fe960a0cd12dff312482f94c 1 parent f0c276b1

商家端隐藏字段

Inline Side-by-side
Showing 16 changed files with 62 additions and 64 deletions
@@ -7,7 +7,7 @@ @@ -7,7 +7,7 @@
7 <div class="panel panel-default" style="margin-bottom:10px;"> 7 <div class="panel panel-default" style="margin-bottom:10px;">
8 <div class="panel-body"> 8 <div class="panel-body">
9 <table class="table table-bordered"> 9 <table class="table table-bordered">
10 - <tr> 10 + <!-- <tr>
11 <td rowspan="2">补货</td> 11 <td rowspan="2">补货</td>
12 <td>上传EXCEL:</td> 12 <td>上传EXCEL:</td>
13 <td style="position: relative;"><input id="supplyModify" name="file" data-type="searchSort" type="file" style="cursor: pointer; height: 37px; top: 8px;"></td> 13 <td style="position: relative;"><input id="supplyModify" name="file" data-type="searchSort" type="file" style="cursor: pointer; height: 37px; top: 8px;"></td>
@@ -33,7 +33,7 @@ @@ -33,7 +33,7 @@
33 2、第一行标题栏：<span style="color: #67D267;">SKN|奥莱</span><br> 33 2、第一行标题栏：<span style="color: #67D267;">SKN|奥莱</span><br>
34 3、<a href="/ajax/link/batchModifyOutlet">下载样例</a> 34 3、<a href="/ajax/link/batchModifyOutlet">下载样例</a>
35 </td> 35 </td>
36 - </tr> 36 + </tr> -->
37 <tr> 37 <tr>
38 <td rowspan="2">批量修改条码</td> 38 <td rowspan="2">批量修改条码</td>
39 <td>上传EXCEL:</td> 39 <td>上传EXCEL:</td>
@@ -99,13 +99,13 @@ @@ -99,13 +99,13 @@
99 </select> 99 </select>
100 </div> 100 </div>
101 101
102 - <label class="col-sm-2 control-label">JIT供应商</label> 102 + <!-- <label class="col-sm-2 control-label">JIT供应商</label>
103 <div class="col-sm-2"> 103 <div class="col-sm-2">
104 <select id="supplierId" class="form-control"> 104 <select id="supplierId" class="form-control">
105 <option value="[[supplierId||'-1']]">[[supplierName||'供应商']]</option> 105 <option value="[[supplierId||'-1']]">[[supplierName||'供应商']]</option>
106 </select> 106 </select>
107 <div class="col-sm-12 control-label red">JIT商品必须选择JIT供应商</div> 107 <div class="col-sm-12 control-label red">JIT商品必须选择JIT供应商</div>
108 - </div> 108 + </div> -->
109 109
110 </div> 110 </div>
111 <div class="form-group"> 111 <div class="form-group">
@@ -145,21 +145,21 @@ @@ -145,21 +145,21 @@
145 <option value="6">秋冬</option> 145 <option value="6">秋冬</option>
146 </select> 146 </select>
147 </div> 147 </div>
148 - <label class="col-sm-1 control-label">商品属性<span class="red">*</span></label> 148 + <!-- <label class="col-sm-1 control-label">商品属性<span class="red">*</span></label>
149 <div class="col-sm-2"> 149 <div class="col-sm-2">
150 <select id="attribute" class="form-control" value="[[attribute]]"> 150 <select id="attribute" class="form-control" value="[[attribute]]">
151 <option value="1">普通商品</option> 151 <option value="1">普通商品</option>
152 <option value="2">赠品</option> 152 <option value="2">赠品</option>
153 <option value="3">虚拟商品</option> 153 <option value="3">虚拟商品</option>
154 </select> 154 </select>
  155 + </div> -->
155 </div> 156 </div>
156 - </div>  
157 - <div class="form-group"> 157 + <!-- <div class="form-group">
158 <label class="col-sm-2 control-label">商品话题</label> 158 <label class="col-sm-2 control-label">商品话题</label>
159 <div class="col-sm-10"> 159 <div class="col-sm-10">
160 <input type="text" id="productTag" class="form-control" value="[[productTag]]" /> 160 <input type="text" id="productTag" class="form-control" value="[[productTag]]" />
161 </div> 161 </div>
162 - </div> 162 + </div> -->
163 <div class="form-group"> 163 <div class="form-group">
164 <label class="col-sm-2 control-label">年龄层<span class="red">*</span></label> 164 <label class="col-sm-2 control-label">年龄层<span class="red">*</span></label>
165 <div class="col-sm-2"> 165 <div class="col-sm-2">
@@ -236,7 +236,7 @@ @@ -236,7 +236,7 @@
236 236
237 </div> 237 </div>
238 238
239 - [[if isAuditing==200]] 239 + <!-- [[if isAuditing==200]]
240 <div class="form-group"> 240 <div class="form-group">
241 <label class="col-sm-2 control-label">是否奥莱</label> 241 <label class="col-sm-2 control-label">是否奥莱</label>
242 <div class="col-sm-2"> 242 <div class="col-sm-2">
@@ -249,9 +249,9 @@ @@ -249,9 +249,9 @@
249 249
250 250
251 </div> 251 </div>
252 - [[/if]] 252 + [[/if]] -->
253 253
254 - [[if isAuditing==200]] 254 + <!-- [[if isAuditing==200]]
255 <div class="form-group"> 255 <div class="form-group">
256 <label class="col-sm-2 control-label">是否VIP</label> 256 <label class="col-sm-2 control-label">是否VIP</label>
257 <div class="col-sm-2"> 257 <div class="col-sm-2">
@@ -265,7 +265,7 @@ @@ -265,7 +265,7 @@
265 </div> 265 </div>
266 </div> 266 </div>
267 [[/if]] 267 [[/if]]
268 - 268 + -->
269 269
270 <div class="form-group"> 270 <div class="form-group">
271 <label class="col-sm-2 control-label">吊牌价<span class="red">*</span></label> 271 <label class="col-sm-2 control-label">吊牌价<span class="red">*</span></label>
@@ -18,21 +18,21 @@ @@ -18,21 +18,21 @@
18 <div class="panel-col"> 18 <div class="panel-col">
19 <input type="text" id="productName" class="form-control" placeholder="商品名称"/> 19 <input type="text" id="productName" class="form-control" placeholder="商品名称"/>
20 </div> 20 </div>
21 - <div class="panel-col"> 21 + <!-- <div class="panel-col">
22 <input type="text" id="founderName" class="form-control" placeholder="创建人"/> 22 <input type="text" id="founderName" class="form-control" placeholder="创建人"/>
23 - </div> 23 + </div> -->
24 <div class="panel-col"> 24 <div class="panel-col">
25 <select id="brandId" class="form-control"> 25 <select id="brandId" class="form-control">
26 <option value="-1">请选择品牌</option> 26 <option value="-1">请选择品牌</option>
27 </select> 27 </select>
28 </div> 28 </div>
29 - <div class="panel-col"> 29 + <!-- <div class="panel-col">
30 <select id="isOutLets" class="form-control"> 30 <select id="isOutLets" class="form-control">
31 <option value="-1">是否奥莱</option> 31 <option value="-1">是否奥莱</option>
32 <option value="Y">是</option> 32 <option value="Y">是</option>
33 <option value="N">否</option> 33 <option value="N">否</option>
34 </select> 34 </select>
35 - </div> 35 + </div> -->
36 <div class="panel-col"> 36 <div class="panel-col">
37 <select id="isAdvance" class="form-control"> 37 <select id="isAdvance" class="form-control">
38 <option value="-1">是否预售</option> 38 <option value="-1">是否预售</option>
@@ -67,7 +67,7 @@ @@ -67,7 +67,7 @@
67 67
68 <div class="form-group"> 68 <div class="form-group">
69 <div class="col-sm-4">预售: [[isAdvance]]</div> 69 <div class="col-sm-4">预售: [[isAdvance]]</div>
70 - <div class="col-sm-4">预付定金: [[deposit]]</div> 70 + <!-- <div class="col-sm-4">预付定金: [[deposit]]</div> -->
71 </div> 71 </div>
72 72
73 <div class="form-group"> 73 <div class="form-group">
@@ -101,8 +101,8 @@ @@ -101,8 +101,8 @@
101 <th>款型编码</th> 101 <th>款型编码</th>
102 <th>条码</th> 102 <th>条码</th>
103 <th>厂家颜色</th> 103 <th>厂家颜色</th>
104 - <th>能否补货</th>  
105 - <th>支付尾款时间</th> 104 + <!-- <th>能否补货</th>
  105 + <th>支付尾款时间</th> -->
106 </tr> 106 </tr>
107 </thead> 107 </thead>
108 <tbody> 108 <tbody>
@@ -121,12 +121,12 @@ @@ -121,12 +121,12 @@
121 <th>[[item.factoryCode]]</th> 121 <th>[[item.factoryCode]]</th>
122 <th>[[_item.factoryCode]]</th> 122 <th>[[_item.factoryCode]]</th>
123 <th>[[item.factoryGoodsName]]</th> 123 <th>[[item.factoryGoodsName]]</th>
124 - [[if _item.isSuppled=="Y"]] 124 + <!-- [[if _item.isSuppled=="Y"]]
125 <th>是</th> 125 <th>是</th>
126 [[else]] 126 [[else]]
127 <th>否</th> 127 <th>否</th>
128 [[/if]] 128 [[/if]]
129 - <th>[[_item.balanceTime]]</th> 129 + <th>[[_item.balanceTime]]</th> -->
130 </tr> 130 </tr>
131 [[/each]] 131 [[/each]]
132 [[/each]] 132 [[/each]]
@@ -5,7 +5,7 @@ @@ -5,7 +5,7 @@
5 <div class="panel panel-default" style="margin-bottom:10px;"> 5 <div class="panel panel-default" style="margin-bottom:10px;">
6 <div class="panel-body"> 6 <div class="panel-body">
7 <table class="table table-bordered"> 7 <table class="table table-bordered">
8 - <tr> 8 + <!-- <tr>
9 <td rowspan="2">排序</td> 9 <td rowspan="2">排序</td>
10 <td>上传EXCEL:</td> 10 <td>上传EXCEL:</td>
11 <td style="position: relative;"><input id="sort-file" name="file" data-type="searchSort" type="file" style="cursor: pointer; height: 37px; top: 8px;"></td> 11 <td style="position: relative;"><input id="sort-file" name="file" data-type="searchSort" type="file" style="cursor: pointer; height: 37px; top: 8px;"></td>
@@ -34,7 +34,7 @@ @@ -34,7 +34,7 @@
34 4、每个文件控制在500行以内<br> 34 4、每个文件控制在500行以内<br>
35 5、<a href="/ajax/link/brandModelSeries">下载样例</a> 35 5、<a href="/ajax/link/brandModelSeries">下载样例</a>
36 </td> 36 </td>
37 - </tr> 37 + </tr> -->
38 <tr> 38 <tr>
39 <td rowspan="2">批量下架</td> 39 <td rowspan="2">批量下架</td>
40 <td>上传EXCEL:</td> 40 <td>上传EXCEL:</td>
@@ -38,7 +38,7 @@ @@ -38,7 +38,7 @@
38 38
39 <div class="panel-body" style="display: none;" > 39 <div class="panel-body" style="display: none;" >
40 <%include 'partials/add-info'%> 40 <%include 'partials/add-info'%>
41 - <%include 'partials/editor-recommend'%> 41 + <!-- <%include 'partials/editor-recommend'%> -->
42 <%include 'partials/model'%> 42 <%include 'partials/model'%>
43 <%include 'partials/close-match'%> 43 <%include 'partials/close-match'%>
44 </div> 44 </div>
@@ -65,15 +65,15 @@ @@ -65,15 +65,15 @@
65 <li name="position7"><a href="javascript:;"><i class="required-icon"></i>商品排序</a></li> --> 65 <li name="position7"><a href="javascript:;"><i class="required-icon"></i>商品排序</a></li> -->
66 </ul> 66 </ul>
67 </li> 67 </li>
68 - <li name="position8" data-pos="搜索/标签"> 68 + <!-- <li name="position8" data-pos="搜索/标签">
69 <a href="javascript:;">搜索关键词</a> 69 <a href="javascript:;">搜索关键词</a>
70 - </li> 70 + </li> -->
71 <li name="position9"> 71 <li name="position9">
72 <a href="javascript:;">上架后补全</a> 72 <a href="javascript:;">上架后补全</a>
73 <ul class="sub-floatnav"> 73 <ul class="sub-floatnav">
74 <li name="position10"><a href="javascript:;">模特</a></li> 74 <li name="position10"><a href="javascript:;">模特</a></li>
75 <!-- <li name="position11"><a href="javascript:;">品牌关联</a></li> --> 75 <!-- <li name="position11"><a href="javascript:;">品牌关联</a></li> -->
76 - <li name="position12"><a href="javascript:;">小编推荐</a></li> 76 + <!-- <li name="position12"><a href="javascript:;">小编推荐</a></li> -->
77 <li name="position13"><a href="javascript:;">搭配</a></li> 77 <li name="position13"><a href="javascript:;">搭配</a></li>
78 </ul> 78 </ul>
79 </li> 79 </li>
@@ -71,14 +71,14 @@ @@ -71,14 +71,14 @@
71 <div class="panel-col2"> 71 <div class="panel-col2">
72 <div id="sortTree" class="form-control height40" style="border: 0px; padding: 0px;"></div> 72 <div id="sortTree" class="form-control height40" style="border: 0px; padding: 0px;"></div>
73 </div> 73 </div>
74 - <div class="panel-col"> 74 + <!-- <div class="panel-col">
75 <select name="isOutLets" id="isOutLets" tabindex="-1" title="" class="form-control height40"> 75 <select name="isOutLets" id="isOutLets" tabindex="-1" title="" class="form-control height40">
76 <option value="-1">是否奥莱</option> 76 <option value="-1">是否奥莱</option>
77 <option value="Y">奥莱</option> 77 <option value="Y">奥莱</option>
78 <option value="N">非奥莱</option> 78 <option value="N">非奥莱</option>
79 <option value="B">品牌设置</option> 79 <option value="B">品牌设置</option>
80 </select> 80 </select>
81 - </div> 81 + </div> -->
82 <div class="panel-col"> 82 <div class="panel-col">
83 <select name="productStatus" id="productStatus" tabindex="-1" title="" class="form-control height40"> 83 <select name="productStatus" id="productStatus" tabindex="-1" title="" class="form-control height40">
84 <option value="">上下架状态</option> 84 <option value="">上下架状态</option>
@@ -109,13 +109,13 @@ @@ -109,13 +109,13 @@
109 <div class="panel-col"> 109 <div class="panel-col">
110 <input type="text" id="skuFactoryCode" class="form-control" placeholder="条码" style="height: 39px;"/> 110 <input type="text" id="skuFactoryCode" class="form-control" placeholder="条码" style="height: 39px;"/>
111 </div> 111 </div>
112 - <div class="panel-col"> 112 + <!-- <div class="panel-col">
113 <select id="isScreen" class="form-control height40"> 113 <select id="isScreen" class="form-control height40">
114 <option value="-1">是否已摄影传图</option> 114 <option value="-1">是否已摄影传图</option>
115 <option value="Y">是</option> 115 <option value="Y">是</option>
116 <option value="N">否</option> 116 <option value="N">否</option>
117 </select> 117 </select>
118 - </div> 118 + </div> -->
119 <div class="panel-col"> 119 <div class="panel-col">
120 <a id="filter-btn" href="javascript:;" class="btn btn-info">筛选</a> 120 <a id="filter-btn" href="javascript:;" class="btn btn-info">筛选</a>
121 <a id="all-btn" href="" class="btn btn-info">全部</a> 121 <a id="all-btn" href="" class="btn btn-info">全部</a>
@@ -26,7 +26,7 @@ @@ -26,7 +26,7 @@
26 <div class="form-group"> 26 <div class="form-group">
27 <div class="col-sm-3">店铺：[[shopName]]</div> 27 <div class="col-sm-3">店铺：[[shopName]]</div>
28 <div class="col-sm-3">品牌：[[brandName]]</div> 28 <div class="col-sm-3">品牌：[[brandName]]</div>
29 - <div class="col-sm-3">供应商：[[supplierName]]</div> 29 + <!-- <div class="col-sm-3">供应商：[[supplierName]]</div> -->
30 [[if renderType=='edit']] 30 [[if renderType=='edit']]
31 <div class="col-sm-3">厂家编号：[[factoryCode]]</div> 31 <div class="col-sm-3">厂家编号：[[factoryCode]]</div>
32 [[else]] 32 [[else]]
@@ -60,9 +60,9 @@ @@ -60,9 +60,9 @@
60 [[/if]] 60 [[/if]]
61 61
62 </div> 62 </div>
63 - <div class="form-group"> 63 + <!-- <div class="form-group">
64 <div class="col-sm-12">商品话题：[[productTag]]</div> 64 <div class="col-sm-12">商品话题：[[productTag]]</div>
65 - </div> 65 + </div> -->
66 66
67 <div class="form-group"> 67 <div class="form-group">
68 <div class="col-sm-3"> 68 <div class="col-sm-3">
@@ -107,14 +107,14 @@ @@ -107,14 +107,14 @@
107 </div> 107 </div>
108 <input id="isLimited" type="hidden" value="[[isLimited||'N']]" for="radio" /> 108 <input id="isLimited" type="hidden" value="[[isLimited||'N']]" for="radio" />
109 109
110 - <div class="col-sm-3"> 110 + <!-- <div class="col-sm-3">
111 <label>是否奥莱：</label> 111 <label>是否奥莱：</label>
112 <label > 112 <label >
113 <input type="radio" name="isOutLets" value="Y">是</label> 113 <input type="radio" name="isOutLets" value="Y">是</label>
114 <label > 114 <label >
115 <input type="radio" name="isOutLets" value="N">否</label> 115 <input type="radio" name="isOutLets" value="N">否</label>
116 <input type="hidden" id="isOutlets" value="[[isOutLets||'N']]" for="radio" /> 116 <input type="hidden" id="isOutlets" value="[[isOutLets||'N']]" for="radio" />
117 - </div> 117 + </div> -->
118 </div> 118 </div>
119 119
120 <div class="form-group"> 120 <div class="form-group">
@@ -128,9 +128,9 @@ @@ -128,9 +128,9 @@
128 <div class="col-sm-3">吊牌价：[[retailPrice]]</div> 128 <div class="col-sm-3">吊牌价：[[retailPrice]]</div>
129 <div class="col-sm-3">销售价：[[salesPrice]]</div> 129 <div class="col-sm-3">销售价：[[salesPrice]]</div>
130 </div> 130 </div>
131 - <div class="form-group"> 131 + <!-- <div class="form-group">
132 <div class="col-sm-3">是否VIP：[[isVip]]</div> 132 <div class="col-sm-3">是否VIP：[[isVip]]</div>
133 - </div> 133 + </div> -->
134 </script> 134 </script>
135 135
136 136
@@ -147,7 +147,7 @@ @@ -147,7 +147,7 @@
147 </div> 147 </div>
148 [[/if]] 148 [[/if]]
149 </div> 149 </div>
150 - <div class="form-group"> 150 + <!-- <div class="form-group">
151 <label class="col-sm-1 control-label">是否新品：</label> 151 <label class="col-sm-1 control-label">是否新品：</label>
152 <div class="col-sm-4"> 152 <div class="col-sm-4">
153 <label ><input type="radio" name="isNew" value="Y">是</label> 153 <label ><input type="radio" name="isNew" value="Y">是</label>
@@ -161,7 +161,7 @@ @@ -161,7 +161,7 @@
161 <label ><input type="checkbox" name="sellChannels" value="3">场地</label> 161 <label ><input type="checkbox" name="sellChannels" value="3">场地</label>
162 <input id="sellChannels" value="[[sellChannels||'1|2']]" type="hidden" for="checkbox"> 162 <input id="sellChannels" value="[[sellChannels||'1|2']]" type="hidden" for="checkbox">
163 </div> 163 </div>
164 - </div> 164 + </div> -->
165 <div class="form-group"> 165 <div class="form-group">
166 <label class="col-sm-1 control-label">展示时间：</label> 166 <label class="col-sm-1 control-label">展示时间：</label>
167 <label class="col-sm-1 control-label">售罄</label> 167 <label class="col-sm-1 control-label">售罄</label>
1 -<div class="panel panel-default"> 1 +<!-- <div class="panel panel-default">
2 2
3 <div class="panel-heading"> 3 <div class="panel-heading">
4 <a class="netsale-position" href="javascript:;" name="position12"></a> 4 <a class="netsale-position" href="javascript:;" name="position12"></a>
@@ -33,4 +33,4 @@ @@ -33,4 +33,4 @@
33 [[/each]] 33 [[/each]]
34 </div> 34 </div>
35 [[/each]] 35 [[/each]]
36 -</script>  
  36 +</script> -->
1 -<div class="panel panel-default"> 1 + <!--<div class="panel panel-default">
2 2
3 <div class="panel-heading"> 3 <div class="panel-heading">
4 <a class="netsale-position" href="javascript:;" name="position7"></a> 4 <a class="netsale-position" href="javascript:;" name="position7"></a>
@@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@
13 <div class="col-sm-2"> 13 <div class="col-sm-2">
14 <input type="text" class="form-control" id="sort0" value="0" required /> 14 <input type="text" class="form-control" id="sort0" value="0" required />
15 </div> 15 </div>
16 - <!-- 16 +
17 <label class="col-sm-1 control-label" for="sort1">奥莱</label> 17 <label class="col-sm-1 control-label" for="sort1">奥莱</label>
18 <div class="col-sm-2"> 18 <div class="col-sm-2">
19 <input type="text" class="form-control" id="sort1" value="0" required /> 19 <input type="text" class="form-control" id="sort1" value="0" required />
@@ -22,7 +22,7 @@ @@ -22,7 +22,7 @@
22 <div class="col-sm-2"> 22 <div class="col-sm-2">
23 <input type="text" class="form-control" id="sort2" value="0" required /> 23 <input type="text" class="form-control" id="sort2" value="0" required />
24 </div> 24 </div>
25 - --> 25 +
26 <label class="col-sm-1 control-label" for="sort3">店铺</label> 26 <label class="col-sm-1 control-label" for="sort3">店铺</label>
27 <div class="col-sm-2"> 27 <div class="col-sm-2">
28 <input type="text" class="form-control" id="sort3" value="0" required modelId="1" projectId="5"/> 28 <input type="text" class="form-control" id="sort3" value="0" required modelId="1" projectId="5"/>
@@ -33,4 +33,4 @@ @@ -33,4 +33,4 @@
33 <div class="panel-footer"> 33 <div class="panel-footer">
34 <button class="btn btn-primary" id="sort-save">保存</button> 34 <button class="btn btn-primary" id="sort-save">保存</button>
35 </div> 35 </div>
36 -</div>  
  36 +</div>-->
1 -<div class="panel panel-default"> 1 +<!-- <div class="panel panel-default">
2 <form action="" class="form-horizontal form-bordered"> 2 <form action="" class="form-horizontal form-bordered">
3 <div class="panel-heading"> 3 <div class="panel-heading">
4 <a class="netsale-position" href="javascript:;" name="position10"></a> 4 <a class="netsale-position" href="javascript:;" name="position10"></a>
@@ -27,4 +27,4 @@ @@ -27,4 +27,4 @@
27 <h4>尺码规范：</h4> 27 <h4>尺码规范：</h4>
28 </div> 28 </div>
29 </form> 29 </form>
30 -</div>  
  30 +</div> -->
1 -<div class="panel panel-primary"> 1 +<!-- <div class="panel panel-primary">
2 <div class="panel-heading"> 2 <div class="panel-heading">
3 <a class="netsale-position" href="javascript:;" name="position8"></a> 3 <a class="netsale-position" href="javascript:;" name="position8"></a>
4 <div class="panel-btns" style="display: none;"> 4 <div class="panel-btns" style="display: none;">
@@ -26,4 +26,4 @@ @@ -26,4 +26,4 @@
26 <div class="panel-footer" style="display: none;"> 26 <div class="panel-footer" style="display: none;">
27 <button class="btn btn-primary" id="save-searchKey">保存</button> 27 <button class="btn btn-primary" id="save-searchKey">保存</button>
28 </div> 28 </div>
29 -</div>  
  29 +</div> -->
@@ -170,7 +170,7 @@ var g=new common.grid({ @@ -170,7 +170,7 @@ var g=new common.grid({
170 } 170 }
171 var html=[]; 171 var html=[];
172 html.push("<div class='form-group'><div class='col-sm-11 red'><input type=text value='"+item.factoryCode+"' data-index="+item.__index+" class='modelCode form-control' placeholder='款型编码' required/></div></div>"); 172 html.push("<div class='form-group'><div class='col-sm-11 red'><input type=text value='"+item.factoryCode+"' data-index="+item.__index+" class='modelCode form-control' placeholder='款型编码' required/></div></div>");
173 - html.push("<dov class='rows'><div class='form-group'><div class='col-sm-2'>尺码</div><div class='col-sm-2'>销售价</div><div class='col-sm-2'>条码</div><div class='col-sm-2'>是否补货</div><div class='col-sm-2'>UPM条码</div></div></div>"); 173 + html.push("<dov class='rows'><div class='form-group'><div class='col-sm-2'>尺码</div><div class='col-sm-2'>销售价</div><div class='col-sm-2'>条码</div></div></div>");
174 html.push('<div class="rows" id="rows__'+item.__index+'">'); 174 html.push('<div class="rows" id="rows__'+item.__index+'">');
175 item.goodsSizeList=item.goodsSizeList||[$.extend({},ENUM.goodsSizeList)]; 175 item.goodsSizeList=item.goodsSizeList||[$.extend({},ENUM.goodsSizeList)];
176 html.push(common.util.__template2($("#template").html(),{index:item.__index,goodsSizeList:item.goodsSizeList})); 176 html.push(common.util.__template2($("#template").html(),{index:item.__index,goodsSizeList:item.goodsSizeList}));
@@ -113,7 +113,7 @@ var t = new common.tab2({ @@ -113,7 +113,7 @@ var t = new common.tab2({
113 113
114 var columnname=t.options.columns[t.options.active].name; 114 var columnname=t.options.columns[t.options.active].name;
115 115
116 - g.options.columns[6].hidden = true; 116 + g.options.columns[6].hidden = true; // 奥莱在商家端不展示
117 g.options.columns[9].hidden = true; //隐藏【创建时间】 117 g.options.columns[9].hidden = true; //隐藏【创建时间】
118 g.options.columns[10].hidden = true; //隐藏【创建人】 118 g.options.columns[10].hidden = true; //隐藏【创建人】
119 g.options.columns[11].hidden = true; //隐藏【驳回时间】 119 g.options.columns[11].hidden = true; //隐藏【驳回时间】
@@ -124,7 +124,7 @@ var t = new common.tab2({ @@ -124,7 +124,7 @@ var t = new common.tab2({
124 g.options.columns[16].hidden = true; //隐藏【操作信息】 124 g.options.columns[16].hidden = true; //隐藏【操作信息】
125 125
126 if (columnname == "all") { 126 if (columnname == "all") {
127 - g.options.columns[6].hidden = false; 127 + /*g.options.columns[6].hidden = false;*/
128 g.options.columns[15].hidden = false; //显示【状态】 128 g.options.columns[15].hidden = false; //显示【状态】
129 g.options.columns[16].hidden = false; //显示【操作信息】 129 g.options.columns[16].hidden = false; //显示【操作信息】
130 $("#daochu").hide(); 130 $("#daochu").hide();
@@ -149,7 +149,7 @@ var t = new common.tab2({ @@ -149,7 +149,7 @@ var t = new common.tab2({
149 149
150 case 'passAuditNum': 150 case 'passAuditNum':
151 { // 待审核 151 { // 待审核
152 - g.options.columns[6].hidden = false; 152 + /*g.options.columns[6].hidden = false;*/
153 g.options.columns[13].hidden = false; //显示【通过时间】 153 g.options.columns[13].hidden = false; //显示【通过时间】
154 g.options.columns[14].hidden = false; //显示【通过人】 154 g.options.columns[14].hidden = false; //显示【通过人】
155 } 155 }
@@ -257,14 +257,14 @@ var g = new common.grid({ @@ -257,14 +257,14 @@ var g = new common.grid({
257 html.push("<p>销售价：" + item.salesPrice + "</p>"); 257 html.push("<p>销售价：" + item.salesPrice + "</p>");
258 258
259 //待审核和驳回列表中只显示吊牌价和销售价，通过的列表中显示 259 //待审核和驳回列表中只显示吊牌价和销售价，通过的列表中显示
260 - if (item.isAuditing === 200) { 260 + /*if (item.isAuditing === 200) {
261 html.push("<p>是否VIP：" + YNEnum.enum[item.isVip] + "</p>"); 261 html.push("<p>是否VIP：" + YNEnum.enum[item.isVip] + "</p>");
262 if(item.productPrice&&item.productPrice.returnCoinMoney){ 262 if(item.productPrice&&item.productPrice.returnCoinMoney){
263 html.push("<p>返yoho币金额：" + item.productPrice.returnCoinMoney + "</p>"); 263 html.push("<p>返yoho币金额：" + item.productPrice.returnCoinMoney + "</p>");
264 }else{ 264 }else{
265 html.push("<p>返yoho币金额：0</p>"); 265 html.push("<p>返yoho币金额：0</p>");
266 } 266 }
267 - } 267 + }*/
268 return html.join(''); 268 return html.join('');
269 } 269 }
270 }, 270 },
@@ -211,14 +211,13 @@ var g = new common.grid({ @@ -211,14 +211,13 @@ var g = new common.grid({
211 salesPrice = item.salesPrice ? item.salesPrice : ''; 211 salesPrice = item.salesPrice ? item.salesPrice : '';
212 212
213 var html = '<p><strong>吊牌价：</strong>' + retailPrice + '</p>' + 213 var html = '<p><strong>吊牌价：</strong>' + retailPrice + '</p>' +
214 - '<p><strong>销售价：</strong>' + salesPrice + '</p>' +  
215 - '<p><strong>是否VIP：</strong>' + vip + '</p>'; 214 + '<p><strong>销售价：</strong>' + salesPrice + '</p>';
216 215
217 - if (item.returnCoinMoney) { 216 + /*if (item.returnCoinMoney) {
218 html += "<p><strong>返yoho币金额：</strong>" + item.returnCoinMoney + "</p>"; 217 html += "<p><strong>返yoho币金额：</strong>" + item.returnCoinMoney + "</p>";
219 } else { 218 } else {
220 html += "<p><strong>返yoho币金额：</strong>0</p>"; 219 html += "<p><strong>返yoho币金额：</strong>0</p>";
221 - } 220 + }*/
222 return html; 221 return html;
223 } 222 }
224 }, { 223 }, {
@@ -253,9 +252,9 @@ var g = new common.grid({ @@ -253,9 +252,9 @@ var g = new common.grid({
253 if (item.appType || item.appType == 0) { 252 if (item.appType || item.appType == 0) {
254 html.push("<p>"+ENUM.APPType[item.appType]+"</p>"); 253 html.push("<p>"+ENUM.APPType[item.appType]+"</p>");
255 } 254 }
256 - if (item.isOutlets) { 255 + /* if (item.isOutlets) {
257 html.push("<p>"+ENUM.isOutLets[item.isOutlets]+"</p>"); 256 html.push("<p>"+ENUM.isOutLets[item.isOutlets]+"</p>");
258 - } 257 + }*/
259 return html.join(''); 258 return html.join('');
260 } 259 }
261 }, { 260 }, {
@@ -109,8 +109,7 @@ var g = new common.grid({ @@ -109,8 +109,7 @@ var g = new common.grid({
109 return html; 109 return html;
110 }}, 110 }},
111 {display: '操作', render: function(item) { 111 {display: '操作', render: function(item) {
112 - return '<a href="javascript:;" class="btn btn-info btn-xs modify-btn" data-skn="' + item.product_skn + '">修改</a><br>' +  
113 - '<a href="javascript:;" class="btn btn-primary btn-xs history-btn" data-skn="' + item.product_skn + '" style="margin-top: 10px">变价记录</a>' 112 + return '<a href="javascript:;" class="btn btn-primary btn-xs history-btn" data-skn="' + item.product_skn + '" style="margin-top: 10px">变价记录</a>'
114 } 113 }
115 }] 114 }]
116 }); 115 });