【界面标准化】【物料出入库明细表、物料收发汇总表界面标准化】【前端处理】

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

@@ -12,15 +12,14 @@ Ext.define('saas.view.stock.report.ProdinoutCount', {
     reportTitle: '物料收发汇总表',
     QueryWidth:0.4,
     searchItems: [{		
-        xtype: 'warehouseDbfindTrigger',
+        xtype: 'textfield',
         name: 'wh_description',
-        fieldLabel: '仓库',
-        columnWidth: 0.2
-    }, {		
-        xtype: 'productDbfindTrigger',
-        name: 'pr_code',
-        fieldLabel: '物料编号',
-        columnWidth: 0.2
+        columnWidth: 0.2,
+        emptyText:'输入仓库名称或物料名称',
+        columnWidth: 0.2,
+        getCondition:function(v){
+            return "(upper(pr_detail) like '%" + v.toUpperCase() + "%' or upper(wh_description) like '%" + v.toUpperCase() + "%')";
+        }
     }, {
         xtype: 'monthdatefield',
         name: 'pwm_yearmonth',
@@ -78,10 +77,15 @@ Ext.define('saas.view.stock.report.ProdinoutCount', {
             width:110,
             renderer: function(v) {
                 return saas.util.BaseUtil.numberFormat(v, 2, true);
+            },
+            summaryType: 'sum',
+            summaryLabel: '期初成本',
+            summaryRenderer: function(v) {
+                return saas.util.BaseUtil.numberFormat(v, 3, false);
             }
         }]
     }, {
-        text: '入库合计',
+        text: '入库',
         columns: [{
             text: '数量',
             dataIndex:'pwm_nowinqty',
@@ -99,10 +103,15 @@ Ext.define('saas.view.stock.report.ProdinoutCount', {
             width:110,
             renderer: function(v) {
                 return saas.util.BaseUtil.numberFormat(v, 2, true);
+            },
+            summaryType: 'sum',
+            summaryLabel: '入库成本',
+            summaryRenderer: function(v) {
+                return saas.util.BaseUtil.numberFormat(v, 3, false);
             }
         }]
     }, {
-        text: '出库合计',
+        text: '出库',
         columns: [{
             text: '数量',
             dataIndex:'pwm_nowoutqty',
@@ -120,6 +129,11 @@ Ext.define('saas.view.stock.report.ProdinoutCount', {
             width: 110,
             renderer: function(v) {
                 return saas.util.BaseUtil.numberFormat(v, 2, true);
+            },
+            summaryType: 'sum',
+            summaryLabel: '出库成本',
+            summaryRenderer: function(v) {
+                return saas.util.BaseUtil.numberFormat(v, 3, false);
             }
         }]
     }, {
@@ -141,6 +155,11 @@ Ext.define('saas.view.stock.report.ProdinoutCount', {
             width: 110,
             renderer: function(v) {
                 return saas.util.BaseUtil.numberFormat(v, 2, true);
+            },
+            summaryType: 'sum',
+            summaryLabel: '结存成本',
+            summaryRenderer: function(v) {
+                return saas.util.BaseUtil.numberFormat(v, 3, false);
             }
         }]
     }]

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

@@ -17,8 +17,7 @@ Ext.define('saas.view.stock.report.Prodiodetail', {
     searchItems: [ {		
         xtype: 'textfield',
         name: 'pd_prodcode',
-        fieldLabel: '',
-        emptyText:'输入单号，订单号或物料编号',
+        emptyText:'输入单号、关联订单号或物料编号',
         columnWidth: 0.2,
         getCondition:function(v){
             return "(upper(pd_prodcode) like '%" + v.toUpperCase() + "%' or upper(pi_inoutno) like '%" + v.toUpperCase() + "%' or upper(pd_ordercode) like '%" + v.toUpperCase() + "%')";
@@ -46,7 +45,7 @@ Ext.define('saas.view.stock.report.Prodiodetail', {
     }, {
         xtype: 'condatefield',
         name: 'pi_date',
-        fieldLabel: '单据日期',
+        fieldLabel: '日期',
         columnWidth: 0.4
     }],
     reportColumns: [{
@@ -70,6 +69,7 @@ Ext.define('saas.view.stock.report.Prodiodetail', {
         text: '序号',
         dataIndex: 'pd_pdno',
         exportFormat: 'Integer',
+        align: 'center',
         xtype: 'numbercolumn',
         width: 65
     }, {
@@ -128,7 +128,7 @@ Ext.define('saas.view.stock.report.Prodiodetail', {
     },  {
         text: '仓库',
         dataIndex: 'pd_whname',
-        width: 150
+        width: 110
     }, {
         text: '往来单位',
         dataIndex: 'bizname',