Преглед изворни кода

【界面标准化】【供应商对账】【界面标准化】【前端处理】

rainco пре 7 година
родитељ
комит
ff2391fa46

+ 13 - 2
frontend/saas-web/app/view/money/report/VendorCheck.js

@@ -56,6 +56,7 @@ Ext.define('saas.view.money.report.VendorCheck', {
         text: '序号',
         xtype: 'numbercolumn',
         dataIndex: 'pd_pdno',
+        align: 'center',
         exportFormat: 'Integer',
         width: 65
     }, {
@@ -133,18 +134,28 @@ Ext.define('saas.view.money.report.VendorCheck', {
         exportFormat: 'Amount',
         dataIndex: 'pd_ordertotal-pd_nettotal',
         width: 120,
-        renderer : function(v) {
+        summaryType: 'sum',
+        summaryLabel: '税额',
+        renderer: function(v) {
             return saas.util.BaseUtil.numberFormat(v, 2, true);
         },
+        summaryRenderer: function(v) {
+            return saas.util.BaseUtil.numberFormat(v, 2, true);
+        }
     }, {
         text: '价税合计(元)',
         xtype: 'numbercolumn',
         exportFormat: 'Amount',
         dataIndex: 'pd_ordertotal',
         width: 120,
-        renderer : function(v) {
+        summaryType: 'sum',
+        summaryLabel: '价税合计',
+        renderer: function(v) {
             return saas.util.BaseUtil.numberFormat(v, 2, true);
         },
+        summaryRenderer: function(v) {
+            return saas.util.BaseUtil.numberFormat(v, 2, true);
+        }
     }],
 
     listeners: {

+ 2 - 2
frontend/saas-web/app/view/purchase/report/Purchase.js

@@ -13,13 +13,13 @@ Ext.define('saas.view.purchase.report.Purchase', {
     reportTitle: '采购明细报表',
     QueryWidth: 0.2,
     searchItems: [{
-        xtype: 'vendorDbfindTrigger',
+        xtype: 'textfield',
         name: 'pu_vendname',
         columnWidth: 0.2,
         emptyText:'请输入供应商名称',
         getCondition: function (v) {
             return "(upper(pu_vendname) like '%" + v.toUpperCase() + "%' )";
-        },
+        }
     }, {
         xtype: 'condatefield',
         name: 'pu_date',

+ 0 - 11
frontend/saas-web/app/view/purchase/report/PurchaseController.js

@@ -3,17 +3,6 @@ Ext.define('saas.view.purchase.report.PurchaseController', {
     alias: 'controller.purchase-report-purchase',
     init: function (form) {
         this.control({
-            // 供应商编号
-            'dbfindtrigger[name=pu_vendname]':{
-                beforerender:function(f){
-                    Ext.apply(f,{
-                        dbfinds:[{
-                            from:'ve_name',to:'pu_vendname'
-                        }],
-                    }) ;   
-
-                }
-            }
         });
     }
 });

+ 8 - 4
frontend/saas-web/app/view/purchase/report/PurchasePay.js

@@ -14,14 +14,18 @@ Ext.define('saas.view.purchase.report.PurchasePay', {
     QueryWidth:0.25,
     searchItems: [
     {
-        xtype: 'vendorDbfindTrigger',
+        xtype: 'textfield',
         name: 'pu_vendname',
         fieldLabel: '供应商名称',
-        columnWidth: 0.25
+        columnWidth: 0.25,
+        emptyText:'请输入供应商名称',
+        getCondition: function (v) {
+            return "(upper(pu_vendname) like '%" + v.toUpperCase() + "%' )";
+        }
     }, {
         xtype: 'condatefield',
         name: 'createTime',
-        fieldLabel: '单据日期',
+        fieldLabel: '日期',
         columnWidth: 0.5
     }],
 
@@ -90,7 +94,7 @@ Ext.define('saas.view.purchase.report.PurchasePay', {
             return saas.util.BaseUtil.numberFormat(v, 2, true);
         }
     }, {
-        text: '付款比例%',
+        text: '付款比例(%)',
         //本次付款/采购金额*100%
         dataIndex: 'pb_payrate',
         xtype: 'numbercolumn',

+ 0 - 13
frontend/saas-web/app/view/purchase/report/PurchasePayController.js

@@ -3,19 +3,6 @@ Ext.define('saas.view.purchase.report.PurchasePayController', {
     alias: 'controller.purchase-report-purchasepay',
     init: function (form) {
         this.control({
-            // 供应商编号
-            'dbfindtrigger[name=pu_vendname]':{
-                beforerender:function(f){
-                    Ext.apply(f,{
-                        dbfinds:[{
-                            from:'ve_code',to:'pu_vendcode'
-                        },{
-                            from:'ve_name',to:'pu_vendname'
-                        }],
-                    }) ;   
-
-                }
-            }
         });
     }
 });