Merge branch 'dev' of ssh://10.10.100.21/source/saas-platform into dev

frontend/saas-web/app/view/stock/report/Prodiodetail.js

@@ -13,7 +13,16 @@ Ext.define('saas.view.stock.report.Prodiodetail', {
     reportTitle: '物料出入库明细表',
     QueryWidth:0.2,
     //筛选：单据类型、物料、日期
-    searchItems: [{
+    searchItems: [ {		
+        xtype: 'textfield',
+        name: 'pd_prodcode',
+        fieldLabel: '',
+        emptyText:'输入单号，订单号或物料编号',
+        columnWidth: 0.2,
+        getCondition:function(v){
+            return "pd_prodcode='"+v+"' or pi_inoutno='"+v+"' or pd_ordercode='"+v+"'";
+        }
+    },{
         xtype: 'multicombo',
         name: 'pi_class',
         fieldLabel: '单据类型',
@@ -33,15 +42,6 @@ Ext.define('saas.view.stock.report.Prodiodetail', {
             ["拨入单", "拨入单"],
             ["库存初始化","库存初始化"]
         ]
-    }, {		
-        xtype: 'textfield',
-        name: 'pd_prodcode',
-        fieldLabel: '',
-        emptyText:'输入单号，订单号或物料编号',
-        columnWidth: 0.2,
-        getCondition:function(v){
-            return "pd_prodcode='"+v+"' or pi_inoutno='"+v+"' or pd_ordercode='"+v+"'";
-        }
     }, {
         xtype: 'condatefield',
         name: 'pi_date',