Merge branch 'dev6.5' into test6.5
Showing
4 changed files
with
20 additions
and
16 deletions
| @@ -52,7 +52,7 @@ | @@ -52,7 +52,7 @@ | ||
| 52 | [[each goodsSizeList as item __index]] | 52 | [[each goodsSizeList as item __index]] |
| 53 | <div class="form-group"> | 53 | <div class="form-group"> |
| 54 | <!-- <label class="col-sm-1 red">*</label> --> | 54 | <!-- <label class="col-sm-1 red">*</label> --> |
| 55 | - <div class="col-sm-1"> | 55 | + <div class="col-sm-2" style='width: 14%'> |
| 56 | <select id="sizeName" class="form-control btn-sort-chima" data-index=[[index]] data-eq=[[__index]] value='[[item.sizeId]]' required placeholder="尺码"> | 56 | <select id="sizeName" class="form-control btn-sort-chima" data-index=[[index]] data-eq=[[__index]] value='[[item.sizeId]]' required placeholder="尺码"> |
| 57 | <option value="[[item.sizeId||'-1']]">[[item.sizeName||'选择尺码']]</option> | 57 | <option value="[[item.sizeId||'-1']]">[[item.sizeName||'选择尺码']]</option> |
| 58 | </select> | 58 | </select> |
| @@ -60,10 +60,10 @@ | @@ -60,10 +60,10 @@ | ||
| 60 | <div class="col-sm-1"> | 60 | <div class="col-sm-1"> |
| 61 | <input class="form-control btn-sort-xiaoshou" value="[[item.salePrice]]" placeholder="默认销售价" data-index=[[index]] data-eq=[[__index]] required match="numbers" type="text"></input> | 61 | <input class="form-control btn-sort-xiaoshou" value="[[item.salePrice]]" placeholder="默认销售价" data-index=[[index]] data-eq=[[__index]] required match="numbers" type="text"></input> |
| 62 | </div> | 62 | </div> |
| 63 | - <div class="col-sm-2"> | 63 | + <div class="col-sm-2" style='width: 13%'> |
| 64 | <input class="form-control btn-sort-tiaoma" value="[[item.factoryCode]]" placeholder="条码" data-index=[[index]] data-eq=[[__index]]></input> | 64 | <input class="form-control btn-sort-tiaoma" value="[[item.factoryCode]]" placeholder="条码" data-index=[[index]] data-eq=[[__index]]></input> |
| 65 | </div> | 65 | </div> |
| 66 | - <div class="col-sm-2"> | 66 | + <div class="col-sm-2" style='width: 13%'> |
| 67 | <input class="form-control btn-sort-nationalCode" value="[[item.nationalCode]]" placeholder="品牌条码" data-index=[[index]] data-eq=[[__index]]></input> | 67 | <input class="form-control btn-sort-nationalCode" value="[[item.nationalCode]]" placeholder="品牌条码" data-index=[[index]] data-eq=[[__index]]></input> |
| 68 | </div> | 68 | </div> |
| 69 | <div class="col-sm-1"> | 69 | <div class="col-sm-1"> |
| @@ -72,10 +72,10 @@ | @@ -72,10 +72,10 @@ | ||
| 72 | <option value="Y">可补货</option> | 72 | <option value="Y">可补货</option> |
| 73 | </select> | 73 | </select> |
| 74 | </div> | 74 | </div> |
| 75 | - <div class="col-sm-2"> | 75 | + <div class="col-sm-2" style='width: 13%'> |
| 76 | <input class="form-control btn-sort-upmCode" value="[[item.upmCode]]" placeholder="UPC条码" data-index=[[index]] data-eq=[[__index]]></input> | 76 | <input class="form-control btn-sort-upmCode" value="[[item.upmCode]]" placeholder="UPC条码" data-index=[[index]] data-eq=[[__index]]></input> |
| 77 | </div> | 77 | </div> |
| 78 | - <div class="col-sm-2"> | 78 | + <div class="col-sm-2" style="width: 10%"> |
| 79 | <input class="form-control" type="text" value="[[item.balanceTimeStr]]" readonly="readonly" data-index=[[index]] data-eq=[[__index]]> | 79 | <input class="form-control" type="text" value="[[item.balanceTimeStr]]" readonly="readonly" data-index=[[index]] data-eq=[[__index]]> |
| 80 | </div> | 80 | </div> |
| 81 | <div class="col-sm-1"> | 81 | <div class="col-sm-1"> |
| @@ -215,13 +215,15 @@ var g=new common.grid({ | @@ -215,13 +215,15 @@ var g=new common.grid({ | ||
| 215 | html.push("<p>色系: "+item.goodsName+"</p>"); | 215 | html.push("<p>色系: "+item.goodsName+"</p>"); |
| 216 | } | 216 | } |
| 217 | html.push('<p><button type="button" data-index='+item.__index+' class="sortdelete btn btn-danger btn-xs">删除</button></p>'); | 217 | html.push('<p><button type="button" data-index='+item.__index+' class="sortdelete btn btn-danger btn-xs">删除</button></p>'); |
| 218 | + | ||
| 219 | + html.push("<input type=file name='goodsColorImage' id='file__"+item.__index+"' value='"+item.goodsColorImage+"' />"); | ||
| 218 | return html.join(""); | 220 | return html.join(""); |
| 219 | - }}, | 221 | + }}/*, |
| 220 | { | 222 | { |
| 221 | display:"图片",render:function(item){ | 223 | display:"图片",render:function(item){ |
| 222 | return "<input type=file name='goodsColorImage' id='file__"+item.__index+"' value='"+item.goodsColorImage+"' />"; | 224 | return "<input type=file name='goodsColorImage' id='file__"+item.__index+"' value='"+item.goodsColorImage+"' />"; |
| 223 | } | 225 | } |
| 224 | - }, | 226 | + }*/, |
| 225 | { | 227 | { |
| 226 | display:"<label class='red'>厂家颜色、尺码、款型编码、条码、销售价 必填，可补货将开启到货通知，不可补货将关闭到货通知</label>",render:function(item){ | 228 | display:"<label class='red'>厂家颜色、尺码、款型编码、条码、销售价 必填，可补货将开启到货通知，不可补货将关闭到货通知</label>",render:function(item){ |
| 227 | if(!item.isAdd&&!g.__gsm.hasOwnProperty(item.__index)){ | 229 | if(!item.isAdd&&!g.__gsm.hasOwnProperty(item.__index)){ |
| @@ -229,7 +231,7 @@ var g=new common.grid({ | @@ -229,7 +231,7 @@ var g=new common.grid({ | ||
| 229 | } | 231 | } |
| 230 | var html=[]; | 232 | var html=[]; |
| 231 | html.push("<div class='form-group' style='padding-bottom: 0'><div class='col-sm-11 red'><input type=text value='"+item.factoryCode+"' data-index="+item.__index+" class='modelCode form-control' placeholder='款型编码' required/></div></div>"); | 233 | html.push("<div class='form-group' style='padding-bottom: 0'><div class='col-sm-11 red'><input type=text value='"+item.factoryCode+"' data-index="+item.__index+" class='modelCode form-control' placeholder='款型编码' required/></div></div>"); |
| 232 | - html.push("<div class='rows'><div class='form-group' style='padding-bottom: 0'><div class='col-sm-1'>尺码</div><div class='col-sm-1'>销售价</div><div class='col-sm-2'>条码</div><div class='col-sm-2'>品牌条码</div><div class='col-sm-1'>是否补货</div><div class='col-sm-2'>UPC条码</div><div class='col-sm-2'>支付尾款时间</div></div></div>"); | 234 | + html.push("<div class='rows'><div class='form-group' style='padding-bottom: 0'><div class='col-sm-1' style='width: 14%'>尺码</div><div class='col-sm-1'>销售价</div><div class='col-sm-2' style='width: 13%'>条码</div><div class='col-sm-2' style='width: 13%'>品牌条码</div><div class='col-sm-1'>是否补货</div><div class='col-sm-2' style='width: 13%'>UPC条码</div><div class='col-sm-2' style='width: 10%'>支付尾款时间</div></div></div>"); |
| 233 | html.push('<div class="rows" id="rows__'+item.__index+'">'); | 235 | html.push('<div class="rows" id="rows__'+item.__index+'">'); |
| 234 | item.goodsSizeList=item.goodsSizeList||[$.extend({},ENUM.goodsSizeList)]; | 236 | item.goodsSizeList=item.goodsSizeList||[$.extend({},ENUM.goodsSizeList)]; |
| 235 | html.push(common.util.__template2($("#template").html(),{index:item.__index,goodsSizeList:item.goodsSizeList})); | 237 | html.push(common.util.__template2($("#template").html(),{index:item.__index,goodsSizeList:item.goodsSizeList})); |
| @@ -219,13 +219,15 @@ webpackJsonp([33],[ | @@ -219,13 +219,15 @@ webpackJsonp([33],[ | ||
| 219 | html.push("<p>色系: "+item.goodsName+"</p>"); | 219 | html.push("<p>色系: "+item.goodsName+"</p>"); |
| 220 | } | 220 | } |
| 221 | html.push('<p><button type="button" data-index='+item.__index+' class="sortdelete btn btn-danger btn-xs">删除</button></p>'); | 221 | html.push('<p><button type="button" data-index='+item.__index+' class="sortdelete btn btn-danger btn-xs">删除</button></p>'); |
| 222 | + | ||
| 223 | + html.push("<input type=file name='goodsColorImage' id='file__"+item.__index+"' value='"+item.goodsColorImage+"' />"); | ||
| 222 | return html.join(""); | 224 | return html.join(""); |
| 223 | - }}, | 225 | + }}/*, |
| 224 | { | 226 | { |
| 225 | display:"图片",render:function(item){ | 227 | display:"图片",render:function(item){ |
| 226 | return "<input type=file name='goodsColorImage' id='file__"+item.__index+"' value='"+item.goodsColorImage+"' />"; | 228 | return "<input type=file name='goodsColorImage' id='file__"+item.__index+"' value='"+item.goodsColorImage+"' />"; |
| 227 | } | 229 | } |
| 228 | - }, | 230 | + }*/, |
| 229 | { | 231 | { |
| 230 | display:"<label class='red'>厂家颜色、尺码、款型编码、条码、销售价 必填，可补货将开启到货通知，不可补货将关闭到货通知</label>",render:function(item){ | 232 | display:"<label class='red'>厂家颜色、尺码、款型编码、条码、销售价 必填，可补货将开启到货通知，不可补货将关闭到货通知</label>",render:function(item){ |
| 231 | if(!item.isAdd&&!g.__gsm.hasOwnProperty(item.__index)){ | 233 | if(!item.isAdd&&!g.__gsm.hasOwnProperty(item.__index)){ |
| @@ -233,7 +235,7 @@ webpackJsonp([33],[ | @@ -233,7 +235,7 @@ webpackJsonp([33],[ | ||
| 233 | } | 235 | } |
| 234 | var html=[]; | 236 | var html=[]; |
| 235 | html.push("<div class='form-group' style='padding-bottom: 0'><div class='col-sm-11 red'><input type=text value='"+item.factoryCode+"' data-index="+item.__index+" class='modelCode form-control' placeholder='款型编码' required/></div></div>"); | 237 | html.push("<div class='form-group' style='padding-bottom: 0'><div class='col-sm-11 red'><input type=text value='"+item.factoryCode+"' data-index="+item.__index+" class='modelCode form-control' placeholder='款型编码' required/></div></div>"); |
| 236 | - html.push("<div class='rows'><div class='form-group' style='padding-bottom: 0'><div class='col-sm-1'>尺码</div><div class='col-sm-1'>销售价</div><div class='col-sm-2'>条码</div><div class='col-sm-2'>品牌条码</div><div class='col-sm-1'>是否补货</div><div class='col-sm-2'>UPC条码</div><div class='col-sm-2'>支付尾款时间</div></div></div>"); | 238 | + html.push("<div class='rows'><div class='form-group' style='padding-bottom: 0'><div class='col-sm-1' style='width: 14%'>尺码</div><div class='col-sm-1'>销售价</div><div class='col-sm-2' style='width: 13%'>条码</div><div class='col-sm-2' style='width: 13%'>品牌条码</div><div class='col-sm-1'>是否补货</div><div class='col-sm-2' style='width: 13%'>UPC条码</div><div class='col-sm-2' style='width: 10%'>支付尾款时间</div></div></div>"); |
| 237 | html.push('<div class="rows" id="rows__'+item.__index+'">'); | 239 | html.push('<div class="rows" id="rows__'+item.__index+'">'); |
| 238 | item.goodsSizeList=item.goodsSizeList||[$.extend({},ENUM.goodsSizeList)]; | 240 | item.goodsSizeList=item.goodsSizeList||[$.extend({},ENUM.goodsSizeList)]; |
| 239 | html.push(common.util.__template2($("#template").html(),{index:item.__index,goodsSizeList:item.goodsSizeList})); | 241 | html.push(common.util.__template2($("#template").html(),{index:item.__index,goodsSizeList:item.goodsSizeList})); |
| @@ -52,7 +52,7 @@ | @@ -52,7 +52,7 @@ | ||
| 52 | [[each goodsSizeList as item __index]] | 52 | [[each goodsSizeList as item __index]] |
| 53 | <div class="form-group"> | 53 | <div class="form-group"> |
| 54 | <!-- <label class="col-sm-1 red">*</label> --> | 54 | <!-- <label class="col-sm-1 red">*</label> --> |
| 55 | - <div class="col-sm-1"> | 55 | + <div class="col-sm-2" style='width: 14%'> |
| 56 | <select id="sizeName" class="form-control btn-sort-chima" data-index=[[index]] data-eq=[[__index]] value='[[item.sizeId]]' required placeholder="尺码"> | 56 | <select id="sizeName" class="form-control btn-sort-chima" data-index=[[index]] data-eq=[[__index]] value='[[item.sizeId]]' required placeholder="尺码"> |
| 57 | <option value="[[item.sizeId||'-1']]">[[item.sizeName||'选择尺码']]</option> | 57 | <option value="[[item.sizeId||'-1']]">[[item.sizeName||'选择尺码']]</option> |
| 58 | </select> | 58 | </select> |
| @@ -60,10 +60,10 @@ | @@ -60,10 +60,10 @@ | ||
| 60 | <div class="col-sm-1"> | 60 | <div class="col-sm-1"> |
| 61 | <input class="form-control btn-sort-xiaoshou" value="[[item.salePrice]]" placeholder="默认销售价" data-index=[[index]] data-eq=[[__index]] required match="numbers" type="text"></input> | 61 | <input class="form-control btn-sort-xiaoshou" value="[[item.salePrice]]" placeholder="默认销售价" data-index=[[index]] data-eq=[[__index]] required match="numbers" type="text"></input> |
| 62 | </div> | 62 | </div> |
| 63 | - <div class="col-sm-2"> | 63 | + <div class="col-sm-2" style='width: 13%'> |
| 64 | <input class="form-control btn-sort-tiaoma" value="[[item.factoryCode]]" placeholder="条码" data-index=[[index]] data-eq=[[__index]]></input> | 64 | <input class="form-control btn-sort-tiaoma" value="[[item.factoryCode]]" placeholder="条码" data-index=[[index]] data-eq=[[__index]]></input> |
| 65 | </div> | 65 | </div> |
| 66 | - <div class="col-sm-2"> | 66 | + <div class="col-sm-2" style='width: 13%'> |
| 67 | <input class="form-control btn-sort-nationalCode" value="[[item.nationalCode]]" placeholder="品牌条码" data-index=[[index]] data-eq=[[__index]]></input> | 67 | <input class="form-control btn-sort-nationalCode" value="[[item.nationalCode]]" placeholder="品牌条码" data-index=[[index]] data-eq=[[__index]]></input> |
| 68 | </div> | 68 | </div> |
| 69 | <div class="col-sm-1"> | 69 | <div class="col-sm-1"> |
| @@ -72,10 +72,10 @@ | @@ -72,10 +72,10 @@ | ||
| 72 | <option value="Y">可补货</option> | 72 | <option value="Y">可补货</option> |
| 73 | </select> | 73 | </select> |
| 74 | </div> | 74 | </div> |
| 75 | - <div class="col-sm-2"> | 75 | + <div class="col-sm-2" style='width: 13%'> |
| 76 | <input class="form-control btn-sort-upmCode" value="[[item.upmCode]]" placeholder="UPC条码" data-index=[[index]] data-eq=[[__index]]></input> | 76 | <input class="form-control btn-sort-upmCode" value="[[item.upmCode]]" placeholder="UPC条码" data-index=[[index]] data-eq=[[__index]]></input> |
| 77 | </div> | 77 | </div> |
| 78 | - <div class="col-sm-2"> | 78 | + <div class="col-sm-2" style="width: 10%"> |
| 79 | <input class="form-control" type="text" value="[[item.balanceTimeStr]]" readonly="readonly" data-index=[[index]] data-eq=[[__index]]> | 79 | <input class="form-control" type="text" value="[[item.balanceTimeStr]]" readonly="readonly" data-index=[[index]] data-eq=[[__index]]> |
| 80 | </div> | 80 | </div> |
| 81 | <div class="col-sm-1"> | 81 | <div class="col-sm-1"> |
-
Please register or login to post a comment