fe / yohobuy-shop-fe2 · Commits

Go to a project

Authored by xuhongyun
Commit aba8214a1929c829e32b8d83b0b7c71468b0c9a6 1 parent 1f70c41c

build

Inline Side-by-side
Showing 3 changed files with 44 additions and 4 deletions
@@ -10,13 +10,24 @@ webpackJsonp([16],[ @@ -10,13 +10,24 @@ webpackJsonp([16],[
10 selectedNum = 0, 10 selectedNum = 0,
11 curTab = 0; 11 curTab = 0;
12 12
  13 + var ENUM = {
  14 + status: {
  15 + '0': '未上架',
  16 + '1': '已上架'
  17 + }
  18 + }
  19 +
13 var g1 = new common.grid({ 20 var g1 = new common.grid({
14 el: '#productTable', 21 el: '#productTable',
15 parms: function() { 22 parms: function() {
16 return { 23 return {
17 categoryId:　curCategoryId, 24 categoryId:　curCategoryId,
18 productSKN: common.util.__input("productSKN"), 25 productSKN: common.util.__input("productSKN"),
19 - productName: common.util.__input("productName") 26 + productName: common.util.__input("productName"),
  27 + maxSortId: tabTree.selected[0] ? tabTree.selected[0].id : "",
  28 + middleSortId: tabTree.selected[1] ? tabTree.selected[1].id : "",
  29 + smallSortId: tabTree.selected[2] ? tabTree.selected[2].id : "",
  30 + status: common.util.__input("status-select")
20 }; 31 };
21 }, 32 },
22 columns: [ 33 columns: [
@@ -34,6 +45,10 @@ webpackJsonp([16],[ @@ -34,6 +45,10 @@ webpackJsonp([16],[
34 {display: "SKN", name: "productSKN"}, 45 {display: "SKN", name: "productSKN"},
35 {display: "商品名称", name: "productName"}, 46 {display: "商品名称", name: "productName"},
36 {display: "销售价(元)", name: "salePrice"}, 47 {display: "销售价(元)", name: "salePrice"},
  48 + {display: "可售库存", name: "storage"},
  49 + {display: "上下架状态", render: function(item) {
  50 + return ENUM.status[item.status];
  51 + }},
37 {display: "分类", name: "productSort"}, 52 {display: "分类", name: "productSort"},
38 {display: "商品分类", render: function (item) { 53 {display: "商品分类", render: function (item) {
39 var name = item.categoryName ? item.categoryName : '未分类'; 54 var name = item.categoryName ? item.categoryName : '未分类';
@@ -68,7 +83,11 @@ webpackJsonp([16],[ @@ -68,7 +83,11 @@ webpackJsonp([16],[
68 return { 83 return {
69 categoryId:　curCategoryId, 84 categoryId:　curCategoryId,
70 productSKN: common.util.__input("productSKN"), 85 productSKN: common.util.__input("productSKN"),
71 - productName: common.util.__input("productName") 86 + productName: common.util.__input("productName"),
  87 + maxSortId: tabTree.selected[0] ? tabTree.selected[0].id : "",
  88 + middleSortId: tabTree.selected[1] ? tabTree.selected[1].id : "",
  89 + smallSortId: tabTree.selected[2] ? tabTree.selected[2].id : "",
  90 + status: common.util.__input("status-select")
72 }; 91 };
73 }, 92 },
74 columns: [ 93 columns: [
@@ -87,6 +106,10 @@ webpackJsonp([16],[ @@ -87,6 +106,10 @@ webpackJsonp([16],[
87 {display: "SKN", name: "productSKN"}, 106 {display: "SKN", name: "productSKN"},
88 {display: "商品名称", name: "productName"}, 107 {display: "商品名称", name: "productName"},
89 {display: "销售价(元)", name: "salePrice"}, 108 {display: "销售价(元)", name: "salePrice"},
  109 + {display: "可售库存", name: "storage"},
  110 + {display: "上下架状态", render: function(item) {
  111 + return ENUM.status[item.status];
  112 + }},
90 {display: "分类", name: "productSort"}, 113 {display: "分类", name: "productSort"},
91 {display: "商品分类", render: function (item) { 114 {display: "商品分类", render: function (item) {
92 var name = item.categoryName ? item.categoryName : '未分类'; 115 var name = item.categoryName ? item.categoryName : '未分类';
@@ -111,6 +134,9 @@ webpackJsonp([16],[ @@ -111,6 +134,9 @@ webpackJsonp([16],[
111 } 134 }
112 }); 135 });
113 136
  137 + var tabTree = new common.tabTree("#sortTree");
  138 + tabTree.init();
  139 +
114 var Bll = { 140 var Bll = {
115 init: function () { 141 init: function () {
116 this.getParamsInUrl(); 142 this.getParamsInUrl();
@@ -47,7 +47,11 @@ module.exports={ @@ -47,7 +47,11 @@ module.exports={
47 {name:"categoryId",type:"Number"}, 47 {name:"categoryId",type:"Number"},
48 {name:"productSKN",type:"Number"}, 48 {name:"productSKN",type:"Number"},
49 {name:"productName",type:"String"}, 49 {name:"productName",type:"String"},
50 - {name:"page",type:"Number"} 50 + {name:"page",type:"Number"},
  51 + {name:"maxSortId",type:"Number"},
  52 + {name:"middleSortId",type:"Number"},
  53 + {name:"smallSortId",type:"Number"},
  54 + {name:"status",type:"Number"}
51 ] 55 ]
52 }, 56 },
53 57
@@ -58,7 +62,11 @@ module.exports={ @@ -58,7 +62,11 @@ module.exports={
58 {name:"categoryId",type:"Number"}, 62 {name:"categoryId",type:"Number"},
59 {name:"productSKN",type:"Number"}, 63 {name:"productSKN",type:"Number"},
60 {name:"productName",type:"String"}, 64 {name:"productName",type:"String"},
61 - {name:"page",type:"Number"} 65 + {name:"page",type:"Number"},
  66 + {name:"maxSortId",type:"Number"},
  67 + {name:"middleSortId",type:"Number"},
  68 + {name:"smallSortId",type:"Number"},
  69 + {name:"status",type:"Number"}
62 ] 70 ]
63 }, 71 },
64 72
@@ -20,6 +20,12 @@ @@ -20,6 +20,12 @@
20 <div class="filter form-inline" style="margin-bottom: 20px"> 20 <div class="filter form-inline" style="margin-bottom: 20px">
21 <input id="productSKN" type="text" class="form-control" placeholder="SKN" />&nbsp;&nbsp; 21 <input id="productSKN" type="text" class="form-control" placeholder="SKN" />&nbsp;&nbsp;
22 <input id="productName" type="text" class="form-control" placeholder="商品名称" />&nbsp;&nbsp; 22 <input id="productName" type="text" class="form-control" placeholder="商品名称" />&nbsp;&nbsp;
  23 + <select id="status-select" class="form-control" name="status-select">
  24 + <option value="-1">请选择上下架状态</option>
  25 + <option value="0">下架</option>
  26 + <option value="1">上架</option>
  27 + </select>&nbsp;&nbsp;
  28 + <div id="sortTree" class="form-control height40" style="border: 0px; padding: 0px;"></div>
23 <a href="javascript:" class="btn btn-info filter-btn">查询</a> 29 <a href="javascript:" class="btn btn-info filter-btn">查询</a>
24 <a href="javascript:" class="btn btn-danger cancelAll" style="float: right;display: none">全部取消</a> 30 <a href="javascript:" class="btn btn-danger cancelAll" style="float: right;display: none">全部取消</a>
25 </div> 31 </div>