fe / yohobuy-portal-fe2 · Commits

Go to a project

Authored by shuaiguo
Commit 465cef47089fa247f969fd0f4c9eed39df82f76e 1 parent df5ba3fe

feat(一件代发)： 基础商品、上下架审核、变价管理

Inline Side-by-side
Showing 6 changed files with 15 additions and 2 deletions
... ... @@ -56,6 +56,14 @@
</select>
</div>
<div class="panel-col">
<select id="isOneSend" class="form-control">
<option value="-1">是否一件代发</option>
<option value="Y">是</option>
<option value="N">否</option>
</select>
</div>
<div class="panel-col" style="width:300px">
<div id="sort"></div>
... ...
... ... @@ -131,7 +131,7 @@
<select id="supplierId" class="form-control">
<option value="[[supplierId||'-1']]">[[supplierName||'供应商']]</option>
</select>
<div class="col-sm-12 control-label red">JIT/代销商品必须选择供应商</div>
<div class="col-sm-12 control-label red">代销和一件代发需选择供应商</div>
</div>
<label class="col-sm-2 control-label">经营模式 <span class="red">*</span></label>
<div class="col-sm-2">
... ... @@ -143,6 +143,7 @@
<option value="4">专营店代销入库</option>
<option value="5">专营店代销不入库</option>
<option value="10">经销保税</option>
<option value="30">一件代发</option>
</select>
</div>
</div>
... ...
... ... @@ -64,6 +64,7 @@
<option value="4">专营店代销入库</option>
<option value="5">专营店代销不入库</option>
<option value="10">经销保税</option>
<option value="30">一件代发</option>
</select>
</div>
<div class="panel-col">
... ...
... ... @@ -71,6 +71,7 @@
<option value="1">经销</option>
<option value="2">代销</option>
<option value="3">JIT</option>
<option value="30">一件代发</option>
<option value="0">未设置</option>
</select>
</div>
... ... @@ -82,6 +83,7 @@
<option value="自主">自主</option>
<option value="羊头">羊头</option>
<option value="代销">代销</option>
<option value="30">一件代发</option>
</select>
</div>
... ...
... ... @@ -203,6 +203,7 @@ var g = new common.grid({
shopId: common.util.__input("shopId"),
brandId: common.util.__input("brandId"),
isJit: common.util.__input("isJit"),
isOneSend:common.util.__input("isOneSend"),
gender: common.util.__input("gender"),
applyType:common.util.__input("applyType"),
maxSortId: tabTree.selected.length > 0 ? tabTree.selected[0].id : "", // 一级类目
... ...
... ... @@ -747,7 +747,7 @@ e.on("validate",function(){
});
e.on("validate",function(){
if (($('#sellType').val() == 2 || $('#sellType').val() == 3) && ($('#supplierId').val() == '' || $('#supplierId').val() == -1 )) {// 当经销模式为代销/JIT 供应商字段必填
if (($('#sellType').val() == 2 || $('#sellType').val() == 30 || $('#sellType').val() == 3) && ($('#supplierId').val() == '' || $('#supplierId').val() == -1 )) {// 当经销模式为代销/JIT 供应商字段必填
return "当经销模式为代销/JIT 供应商字段必填!";
}
});
... ...