郭盛 / community · 提交

转到一个项目

作者 Cool
提交 b81151c74092cf466f3e4a3580a36672815d1580 1 个父辈 03f97626

商品管理优化

内嵌 并排对比
正在显示 3 个修改的文件 包含 77 行增加 和 77 行删除
@@ -41,21 +41,21 @@ @@ -41,21 +41,21 @@
41 <ul class="row list-inline plupload-preview" id="p-images"></ul> 41 <ul class="row list-inline plupload-preview" id="p-images"></ul>
42 </div> 42 </div>
43 </div> 43 </div>
44 - <div class="form-group">  
45 - <label class="control-label col-xs-12 col-sm-2">{:__('Spec_type')}:</label>  
46 - <div class="col-xs-12 col-sm-8">  
47 -  
48 - <select id="c-spec_type" data-rule="required" class="form-control selectpicker" name="row[spec_type]">  
49 - {foreach name="specTypeList" item="vo"}  
50 - <option value="{$key}" {in name="key" value="10"}selected{/in}>{$vo}</option>  
51 - {/foreach}  
52 - </select> 44 +<!-- <div class="form-group">-->
  45 +<!-- <label class="control-label col-xs-12 col-sm-2">{:__('Spec_type')}:</label>-->
  46 +<!-- <div class="col-xs-12 col-sm-8">-->
  47 +<!-- -->
  48 +<!-- <select id="c-spec_type" data-rule="required" class="form-control selectpicker" name="row[spec_type]">-->
  49 +<!-- {foreach name="specTypeList" item="vo"}-->
  50 +<!-- <option value="{$key}" {in name="key" value="10"}selected{/in}>{$vo}</option>-->
  51 +<!-- {/foreach}-->
  52 +<!-- </select>-->
53 53
54 - </div>  
55 - </div> 54 +<!-- </div>-->
  55 +<!-- </div>-->
56 56
57 <!-- 商品规格属性 start --> 57 <!-- 商品规格属性 start -->
58 -<div class="goods-spec-many form-group"> 58 +<div class="goods-spec-many form-group" style="display:block;">
59 <!-- <label class="control-label col-xs-12 col-sm-2"></label>--> 59 <!-- <label class="control-label col-xs-12 col-sm-2"></label>-->
60 <div class="goods-spec-box col-xs-12 col-sm-11" style="background-color: white;"> 60 <div class="goods-spec-box col-xs-12 col-sm-11" style="background-color: white;">
61 <!-- 规格属性 --> 61 <!-- 规格属性 -->
@@ -121,38 +121,38 @@ @@ -121,38 +121,38 @@
121 </div> 121 </div>
122 </div> 122 </div>
123 123
124 -<div class="goods-spec-single">  
125 - <div class="form-group">  
126 - <label class="control-label col-xs-12 col-sm-2">商品编码:</label>  
127 - <div class="col-xs-12 col-sm-8">  
128 - <input id="c-goods_no" class="form-control form-control" name="spec[goods_no]" type="text" value="">  
129 - </div>  
130 - </div>  
131 - <div class="form-group">  
132 - <label class="control-label col-xs-12 col-sm-2">商品价格:</label>  
133 - <div class="col-xs-12 col-sm-8">  
134 - <input id="c-goods_price" data-rule="required" class="form-control form-control" name="spec[goods_price]" type="number" value="0">  
135 - </div>  
136 - </div>  
137 - <div class="form-group">  
138 - <label class="control-label col-xs-12 col-sm-2">商品划线价:</label>  
139 - <div class="col-xs-12 col-sm-8">  
140 - <input id="c-line_price" class="form-control form-control" name="spec[line_price]" type="number" value="">  
141 - </div>  
142 - </div>  
143 - <div class="form-group">  
144 - <label class="control-label col-xs-12 col-sm-2">当前库存数量:</label>  
145 - <div class="col-xs-12 col-sm-8">  
146 - <input id="c-stock_num" class="form-control form-control" name="spec[stock_num]" type="number" value="100">  
147 - </div>  
148 - </div> 124 +<!--<div class="goods-spec-single">-->
  125 +<!-- <div class="form-group">-->
  126 +<!-- <label class="control-label col-xs-12 col-sm-2">商品编码:</label>-->
  127 +<!-- <div class="col-xs-12 col-sm-8">-->
  128 +<!-- <input id="c-goods_no" class="form-control form-control" name="spec[goods_no]" type="text" value="">-->
  129 +<!-- </div>-->
  130 +<!-- </div>-->
  131 +<!-- <div class="form-group">-->
  132 +<!-- <label class="control-label col-xs-12 col-sm-2">商品价格:</label>-->
  133 +<!-- <div class="col-xs-12 col-sm-8">-->
  134 +<!-- <input id="c-goods_price" data-rule="required" class="form-control form-control" name="spec[goods_price]" type="number" value="0">-->
  135 +<!-- </div>-->
  136 +<!-- </div>-->
  137 +<!-- <div class="form-group">-->
  138 +<!-- <label class="control-label col-xs-12 col-sm-2">商品划线价:</label>-->
  139 +<!-- <div class="col-xs-12 col-sm-8">-->
  140 +<!-- <input id="c-line_price" class="form-control form-control" name="spec[line_price]" type="number" value="">-->
  141 +<!-- </div>-->
  142 +<!-- </div>-->
  143 +<!-- <div class="form-group">-->
  144 +<!-- <label class="control-label col-xs-12 col-sm-2">当前库存数量:</label>-->
  145 +<!-- <div class="col-xs-12 col-sm-8">-->
  146 +<!-- <input id="c-stock_num" class="form-control form-control" name="spec[stock_num]" type="number" value="100">-->
  147 +<!-- </div>-->
  148 +<!-- </div>-->
149 <!-- <div class="form-group">--> 149 <!-- <div class="form-group">-->
150 <!-- <label class="control-label col-xs-12 col-sm-2">商品重量(Kg):</label>--> 150 <!-- <label class="control-label col-xs-12 col-sm-2">商品重量(Kg):</label>-->
151 <!-- <div class="col-xs-12 col-sm-8">--> 151 <!-- <div class="col-xs-12 col-sm-8">-->
152 <!-- <input id="c-goods_weight" class="form-control form-control" name="spec[goods_weight]" type="number" value="1">--> 152 <!-- <input id="c-goods_weight" class="form-control form-control" name="spec[goods_weight]" type="number" value="1">-->
153 <!-- </div>--> 153 <!-- </div>-->
154 <!-- </div>--> 154 <!-- </div>-->
155 -</div> 155 +<!--</div>-->
156 <!-- 商品规格属性 end --> 156 <!-- 商品规格属性 end -->
157 157
158 <!-- <div class="form-group">--> 158 <!-- <div class="form-group">-->
@@ -38,21 +38,21 @@ @@ -38,21 +38,21 @@
38 <ul class="row list-inline plupload-preview" id="p-images"></ul> 38 <ul class="row list-inline plupload-preview" id="p-images"></ul>
39 </div> 39 </div>
40 </div> 40 </div>
41 - <div class="form-group">  
42 - <label class="control-label col-xs-12 col-sm-2">{:__('Spec_type')}:</label>  
43 - <div class="col-xs-12 col-sm-8">  
44 -  
45 - <select id="c-spec_type" data-rule="required" class="form-control selectpicker" name="row[spec_type]">  
46 - {foreach name="specTypeList" item="vo"}  
47 - <option value="{$key}" {in name="key" value="$row.spec_type"}selected{/in}>{$vo}</option>  
48 - {/foreach}  
49 - </select> 41 +<!-- <div class="form-group">-->
  42 +<!-- <label class="control-label col-xs-12 col-sm-2">{:__('Spec_type')}:</label>-->
  43 +<!-- <div class="col-xs-12 col-sm-8">-->
  44 +<!-- -->
  45 +<!-- <select id="c-spec_type" data-rule="required" class="form-control selectpicker" name="row[spec_type]">-->
  46 +<!-- {foreach name="specTypeList" item="vo"}-->
  47 +<!-- <option value="{$key}" {in name="key" value="$row.spec_type"}selected{/in}>{$vo}</option>-->
  48 +<!-- {/foreach}-->
  49 +<!-- </select>-->
50 50
51 - </div>  
52 - </div> 51 +<!-- </div>-->
  52 +<!-- </div>-->
53 53
54 <!-- 商品规格属性 start --> 54 <!-- 商品规格属性 start -->
55 - <div class="goods-spec-many form-group" style="display: <?= $row['spec_type'] === '20' ? 'block' : 'none' ?>;" > 55 + <div class="goods-spec-many form-group" style="display: block;" >
56 <!-- <label class="control-label col-xs-12 col-sm-2"></label>--> 56 <!-- <label class="control-label col-xs-12 col-sm-2"></label>-->
57 <div class="goods-spec-box col-xs-12 col-sm-11" style="background-color: white;"> 57 <div class="goods-spec-box col-xs-12 col-sm-11" style="background-color: white;">
58 <!-- 规格属性 --> 58 <!-- 规格属性 -->
@@ -118,38 +118,38 @@ @@ -118,38 +118,38 @@
118 </div> 118 </div>
119 </div> 119 </div>
120 120
121 - <div class="goods-spec-single" style="display: <?= $row['spec_type'] === '10' ? 'block' : 'none' ?>;">  
122 - <div class="form-group">  
123 - <label class="control-label col-xs-12 col-sm-2">商品编码:</label>  
124 - <div class="col-xs-12 col-sm-8">  
125 - <input id="c-goods_no" class="form-control form-control" name="spec[goods_no]" type="text" value="{$row.spec.0.goods_no}">  
126 - </div>  
127 - </div>  
128 - <div class="form-group">  
129 - <label class="control-label col-xs-12 col-sm-2">商品价格:</label>  
130 - <div class="col-xs-12 col-sm-8">  
131 - <input id="c-goods_price" data-rule="required" class="form-control form-control" name="spec[goods_price]" type="number" value="{$row.spec.0.goods_price}">  
132 - </div>  
133 - </div>  
134 - <div class="form-group">  
135 - <label class="control-label col-xs-12 col-sm-2">商品划线价:</label>  
136 - <div class="col-xs-12 col-sm-8">  
137 - <input id="c-line_price" class="form-control form-control" name="spec[line_price]" type="number" value="{$row.spec.0.line_price}">  
138 - </div>  
139 - </div>  
140 - <div class="form-group">  
141 - <label class="control-label col-xs-12 col-sm-2">当前库存数量:</label>  
142 - <div class="col-xs-12 col-sm-8">  
143 - <input id="c-stock_num" class="form-control form-control" name="spec[stock_num]" type="number" value="{$row.spec.0.stock_num}">  
144 - </div>  
145 - </div> 121 +<!-- <div class="goods-spec-single" style="display: <?= $row['spec_type'] === '10' ? 'block' : 'none' ?>;"> -->
  122 +<!-- <div class="form-group">-->
  123 +<!-- <label class="control-label col-xs-12 col-sm-2">商品编码:</label>-->
  124 +<!-- <div class="col-xs-12 col-sm-8">-->
  125 +<!-- <input id="c-goods_no" class="form-control form-control" name="spec[goods_no]" type="text" value="{$row.spec.0.goods_no}">-->
  126 +<!-- </div>-->
  127 +<!-- </div>-->
  128 +<!-- <div class="form-group">-->
  129 +<!-- <label class="control-label col-xs-12 col-sm-2">商品价格:</label>-->
  130 +<!-- <div class="col-xs-12 col-sm-8">-->
  131 +<!-- <input id="c-goods_price" data-rule="required" class="form-control form-control" name="spec[goods_price]" type="number" value="{$row.spec.0.goods_price}">-->
  132 +<!-- </div>-->
  133 +<!-- </div>-->
  134 +<!-- <div class="form-group">-->
  135 +<!-- <label class="control-label col-xs-12 col-sm-2">商品划线价:</label>-->
  136 +<!-- <div class="col-xs-12 col-sm-8">-->
  137 +<!-- <input id="c-line_price" class="form-control form-control" name="spec[line_price]" type="number" value="{$row.spec.0.line_price}">-->
  138 +<!-- </div>-->
  139 +<!-- </div>-->
  140 +<!-- <div class="form-group">-->
  141 +<!-- <label class="control-label col-xs-12 col-sm-2">当前库存数量:</label>-->
  142 +<!-- <div class="col-xs-12 col-sm-8">-->
  143 +<!-- <input id="c-stock_num" class="form-control form-control" name="spec[stock_num]" type="number" value="{$row.spec.0.stock_num}">-->
  144 +<!-- </div>-->
  145 +<!-- </div>-->
146 <!-- <div class="form-group">--> 146 <!-- <div class="form-group">-->
147 <!-- <label class="control-label col-xs-12 col-sm-2">商品重量(Kg):</label>--> 147 <!-- <label class="control-label col-xs-12 col-sm-2">商品重量(Kg):</label>-->
148 <!-- <div class="col-xs-12 col-sm-8">--> 148 <!-- <div class="col-xs-12 col-sm-8">-->
149 <!-- <input id="c-goods_weight" class="form-control form-control" name="spec[goods_weight]" type="number" value="{$row.spec.0.goods_weight}">--> 149 <!-- <input id="c-goods_weight" class="form-control form-control" name="spec[goods_weight]" type="number" value="{$row.spec.0.goods_weight}">-->
150 <!-- </div>--> 150 <!-- </div>-->
151 <!-- </div>--> 151 <!-- </div>-->
152 - </div> 152 +<!-- </div>-->
153 <!-- 商品规格属性 end --> 153 <!-- 商品规格属性 end -->
154 154
155 <!-- <div class="form-group">--> 155 <!-- <div class="form-group">-->
@@ -30,7 +30,7 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form','template','litestoreg @@ -30,7 +30,7 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form','template','litestoreg
30 // {field: 'category.name', title: __('Category.name')}, 30 // {field: 'category.name', title: __('Category.name')},
31 // {field: 'category_id', visible:false,title: __('Category_id')}, 31 // {field: 'category_id', visible:false,title: __('Category_id')},
32 {field: 'images', title: __('Images'), formatter: Table.api.formatter.images}, 32 {field: 'images', title: __('Images'), formatter: Table.api.formatter.images},
33 - {field: 'spec_type', title: __('Spec_type'), searchList: {"10":__('Spec_type 10'),"20":__('Spec_type 20')}, formatter: Table.api.formatter.normal}, 33 + // {field: 'spec_type', title: __('Spec_type'), searchList: {"10":__('Spec_type 10'),"20":__('Spec_type 20')}, formatter: Table.api.formatter.normal},
34 // {field: 'deduct_stock_type', title: __('Deduct_stock_type'), searchList: {"10":__('Deduct_stock_type 10'),"20":__('Deduct_stock_type 20')}, formatter: Table.api.formatter.normal}, 34 // {field: 'deduct_stock_type', title: __('Deduct_stock_type'), searchList: {"10":__('Deduct_stock_type 10'),"20":__('Deduct_stock_type 20')}, formatter: Table.api.formatter.normal},
35 // {field: 'freight.name', title: __('Freight.name')}, 35 // {field: 'freight.name', title: __('Freight.name')},
36 {field: 'sales_initial', title: __('Sales_initial')}, 36 {field: 'sales_initial', title: __('Sales_initial')},