条码查询新增

lijian
Commit cf908500edd02df3a5590c5796c74bf83b92a6e1 1 parent ef4de6e0
Showing 6 changed files with 25 additions and 9 deletions
code/apps/goods/interfaces/basegoods.js
code/apps/goods/interfaces/netsale.js
code/apps/goods/views/basegoods/Index.html
code/apps/goods/views/netsale/Index.html
code/static/js.jquery/module/goods/basegoods.Index.js
code/static/js.jquery/module/goods/netsale.Index.js
--- a/code/apps/goods/interfaces/basegoods.js
View file @cf90850
+++ b/code/apps/goods/interfaces/basegoods.js
View file @cf90850
@@ -24,7 +24,9 @@ module.exports={
 				{name: 'supplierId',type: 'Number'},
 				{name: 'isAuditing',type: 'Number'},
 				{name: 'founderName',type: 'String'},
-                {name:'factoryCode',type:'String'}
+                {name:'factoryCode',type:'String'},
+				{name:'skuFactoryCode',type:'String'}
+
 			]
         },
         getBaseProductList:{
@@ -50,7 +52,8 @@ module.exports={
 				{name: 'supplierId',type: 'Number'},
 				{name: 'isAuditing',type: 'Number'},
 				{name: 'founderName',type: 'String'},
-                {name:'factoryCode',type:'String'}
+                {name:'factoryCode',type:'String'},
+				{name:'skuFactoryCode',type:'String'}
 			]
         },
         queryProductColors:{
--- a/code/apps/goods/interfaces/netsale.js
View file @cf90850
+++ b/code/apps/goods/interfaces/netsale.js
View file @cf90850
@@ -32,7 +32,8 @@ module.exports={
                 {name: 'descFlag',type: 'string'},
                 {name:'isAdvance',type:'string'},
                 {name:'skcOnsaleStatus',type:'string'},
-                {name:'factoryCode',type:'String'}
+                {name:'factoryCode',type:'String'},
+                {name:'skuFactoryCode',type:'String'}
             ]
         },
         queryTabProductNum: {
@@ -61,7 +62,9 @@ module.exports={
                 {name: 'descFlag',type: 'string'},
                 {name:'isAdvance',type:'string'},
                 {name:'skcOnsaleStatus',type:'string'},
-                {name:'factoryCode',type:'String'}
+                {name:'factoryCode',type:'String'},
+                {name:'skuFactoryCode',type:'String'}
+
             ]
         },
         updateProductSknTimingInfo:{
--- a/code/apps/goods/views/basegoods/Index.html
View file @cf90850
+++ b/code/apps/goods/views/basegoods/Index.html
View file @cf90850
@@ -55,6 +55,9 @@
                  <div class="panel-col">
                     <input type="text" id="factoryCode" class="form-control" placeholder="厂家编号" style="height: 39px;"/>
                 </div>
+                <div class="panel-col">
+                    <input type="text" id="skuFactoryCode" class="form-control" placeholder="条码" style="height: 39px;"/>
+                </div>
                 <div class="panel-col2">
                     <div id="sort"></div>
                 </div>
--- a/code/apps/goods/views/netsale/Index.html
View file @cf90850
+++ b/code/apps/goods/views/netsale/Index.html
View file @cf90850
@@ -107,6 +107,9 @@
                     <input type="text" id="factoryCode" class="form-control" placeholder="厂家编号" style="height: 39px;"/>
                 </div>
                 <div class="panel-col">
+                    <input type="text" id="skuFactoryCode" class="form-control" placeholder="条码" style="height: 39px;"/>
+                </div>
+                <div class="panel-col">
                     <select id="isScreen" class="form-control">
                         <option value="-1">是否已摄影传图</option>
                         <option value="Y">是</option>
@@ -117,17 +120,19 @@
                     <a id="filter-btn" href="javascript:;" class="btn btn-info">筛选</a>
                     <a id="all-btn" href="" class="btn btn-info">全部</a>
                 </div>
-            </div>
-
-            <div class="row" style="margin: 0 0 0 -5px;">
+                <div class="panel-col">
                     <a id="onshelve" href="javascript:;" class="btn btn-info" >上架</a>
                     <a id="offshelve" href="javascript:;" class="btn btn-info">下架</a>
+                </div>
+                <div class="panel-col2">
                     <a id="export-btn" href="javascript:;" class="btn btn-info">导出</a>
                     <a id="import-btn" href="/goods/netsale/batch" class="btn btn-info">批量（排序、款型系列、下架）</a>
                 </div>
             </div>
         </div>
+        
+    </div>
     <div class="panel">
         <div class="panel-body nopadding">
             <div class="dataTab_wrapper" id="basicTab"></div>
--- a/code/static/js.jquery/module/goods/basegoods.Index.js
View file @cf90850
+++ b/code/static/js.jquery/module/goods/basegoods.Index.js
View file @cf90850
@@ -206,7 +206,8 @@ var g = new common.grid({
             smallSortId: select[2] ? select[2].id : "",
             sortId: select[3] ? select[3].id : "",
             founderName: common.util.__input("founderName"),
-            factoryCode: common.util.__input("factoryCode")
+            factoryCode: common.util.__input("factoryCode"),
+            skuFactoryCode: common.util.__input("skuFactoryCode")
         };
     },
     columns: [{
--- a/code/static/js.jquery/module/goods/netsale.Index.js
View file @cf90850
+++ b/code/static/js.jquery/module/goods/netsale.Index.js
View file @cf90850
@@ -137,7 +137,8 @@ var g = new common.grid({
             sortFlag: sortFlag,
             skcOnsaleStatus: common.util.__input("skcOnsaleStatus"),
             isAdvance: common.util.__input("isAdvance"),
-            factoryCode: common.util.__input("factoryCode")
+            factoryCode: common.util.__input("factoryCode"),
+			skuFactoryCode: common.util.__input("skuFactoryCode")
 	};
     },
     columns: [{