资金模块-调整资金模块单据界面

frontend/saas-web/app/view/money/fundtransfer/FormPanel.js

@@ -50,9 +50,9 @@ Ext.define('saas.view.money.fundtransfer.FormPanel', {
                 editor : {
                     xtype : "numberfield"
                 },
-                width : 120.0, 
-                xtype : "hidden",
-                items : null
+                width : 120.0,
+                items : null,
+                hidden: true
             }, {
                 text : "转出账户ID", 
                 dataIndex : "ftd_bankid", 

frontend/saas-web/app/view/money/fundtransfer/FormPanelController.js

@@ -9,6 +9,8 @@ Ext.define('saas.view.money.fundtransfer.FormPanelController', {
                 beforerender:function(f){
                     Ext.apply(f,{
                         dataUrl:'/api/document/bankinformation/list',
+                        addXtype: 'other-bankinformation',
+                        addTitle:'账户资料',
                         dbfinds:[
                         {
                             from:'bk_bankcode',to:'ftd_bankcode'
@@ -16,7 +18,7 @@ Ext.define('saas.view.money.fundtransfer.FormPanelController', {
                             from:'bk_bankname',to:'ftd_bankname'
                         },{
                             from:'id',to:'ftd_bankid'
-                    }],
+                        }],
                         dbtpls:[{
                             field:'bk_bankcode',width:100
                         },{
@@ -75,6 +77,8 @@ Ext.define('saas.view.money.fundtransfer.FormPanelController', {
                 beforerender:function(f){
                     Ext.apply(f,{
                         dataUrl:'/api/document/bankinformation/list',
+                        addXtype: 'other-bankinformation',
+                        addTitle:'账户资料',
                         dbfinds:[
                         {
                             from:'bk_bankcode',to:'ftd_inbankcode'
@@ -82,7 +86,7 @@ Ext.define('saas.view.money.fundtransfer.FormPanelController', {
                             from:'bk_bankname',to:'ftd_inbankname'
                         },{
                             from:'id',to:'ftd_inbankid'
-                    }],
+                        }],
                         dbtpls:[{
                             field:'bk_bankcode',width:100
                         },{

frontend/saas-web/app/view/money/othreceipts/FormPanel.js

@@ -37,9 +37,10 @@ Ext.define('saas.view.money.othreceipts.FormPanel', {
      }, {
          xtype : "dbfindtrigger", 
          name : "or_custname", 
-         fieldLabel : "客户名称"
+         fieldLabel : "客户名称",
+         allowBlank : false
      }, {
-        xtype : 'hidden',
+         xtype : 'hidden',
          name : 'or_bankid', 
          fieldLabel : '账户ID'
      }, {
@@ -49,7 +50,8 @@ Ext.define('saas.view.money.othreceipts.FormPanel', {
      }, {
          xtype : "dbfindtrigger", 
          name : "or_bankname", 
-         fieldLabel : "账户名称"
+         fieldLabel : "账户名称",
+         allowBlank : false
      }, {
         name : "detailGridField", 
         xtype : "detailGridField", 
@@ -64,13 +66,13 @@ Ext.define('saas.view.money.othreceipts.FormPanel', {
                 xtype : "numbercolumn",
                 width:0
             }, {
-                text : "期间", 
-                dataIndex : "ord_ym", 
+                text : "期间",
+                dataIndex : "ord_ym",
                 editor : {
                     xtype : "numberfield"
                 },
-                width : 120.0, 
-                xtype : "numbercolumn", 
+                width : 120.0,
+                hidden: true,
                 items : null
             }, {
                 text : "收入类别", 

frontend/saas-web/app/view/money/othreceipts/FormPanelController.js

@@ -110,6 +110,7 @@ Ext.define('saas.view.money.othreceipts.FormPanelController', {
                 beforerender: function (f) {
                     Ext.apply(f, {
                         dataUrl: '/api/document/bankinformation/list',
+                        addTitle: '账户资料',
                         dbfinds: [{
                             from: 'bk_bankcode',
                             to: 'or_bankcode'

frontend/saas-web/app/view/money/othspendings/FormPanel.js

@@ -37,7 +37,8 @@ Ext.define('saas.view.money.othspendings.FormPanel', {
      }, {
          xtype : "dbfindtrigger",
          name : "os_vendname", 
-         fieldLabel : "供应商名称"
+         fieldLabel : "供应商名称",
+         allowBlank : false
      }, {
         xtype : 'hidden',
          name : 'os_bankid', 
@@ -49,15 +50,12 @@ Ext.define('saas.view.money.othspendings.FormPanel', {
      }, {
          xtype : "dbfindtrigger",
          name : "os_bankname", 
-         fieldLabel : "结算账户名称"
+         fieldLabel : "账户名称",
+         allowBlank : false
      }, {
         xtype:'datefield',
         name : 'os_date',
         fieldLabel : '单据日期'
-    },{
-        xtype : 'numberfield',
-        name : 'os_amount',
-        fieldLabel : '付款金额'
     },{
         name : "detailGridField", 
         xtype : "detailGridField", 
@@ -78,7 +76,7 @@ Ext.define('saas.view.money.othspendings.FormPanel', {
                     xtype : "numberfield"
                 },
                 width : 120.0, 
-                xtype : "hidden",
+                hidden: true,
                 items : null
             }, {
                 text : "支出类别", 
@@ -136,11 +134,10 @@ Ext.define('saas.view.money.othspendings.FormPanel', {
                 },
             }
         ]
-    }, {
-        xtype : "numberfield", 
-        name : "os_amount", 
-        fieldLabel : "收款金额",
-        readOnly:true
+    },{
+        xtype : 'numberfield',
+        name : 'os_amount',
+        fieldLabel : '付款金额'
     },{
         xtype : "textfield", 
         name : "os_remark", 

frontend/saas-web/app/view/money/othspendings/FormPanelController.js

@@ -88,6 +88,7 @@ Ext.define('saas.view.money.othspendings.FormPanelController', {
                 beforerender: function (f) {
                     Ext.apply(f, {
                         dataUrl: '/api/document/bankinformation/list',
+                        addTitle: '账户资料',
                         dbfinds: [{
                             from: 'bk_bankcode',
                             to: 'os_bankcode'
@@ -95,9 +96,20 @@ Ext.define('saas.view.money.othspendings.FormPanelController', {
                             from: 'bk_bankname',
                             to: 'os_bankname'
                         }, {
-                            from: 'bk_id',
+                            from: 'id',
                             to: 'os_bankid'
                         }],
+                        defaultCondition: "1=1",
+                        dbSearchFields:[{
+                            emptyText:'输入账户编号或名称',
+                            xtype : "textfield",
+                            name : "search",
+                            getCondition: function(v) {
+                                return "(upper(bk_bankname) like '%"+v.toUpperCase()+"%' or upper(bk_bankcode) like '%"+v.toUpperCase()+"%')";
+                            },
+                            allowBlank : true,
+                            columnWidth : 0.25
+                        }],
                         dbtpls: [{
                             field: 'bk_bankcode',
                             width: 100

frontend/saas-web/app/view/money/payBalance/FormPanel.js

@@ -39,7 +39,8 @@ Ext.define('saas.view.money.payBalance.FormPanel', {
         xtype: 'textfield',
         name: 'pb_kind',
         fieldLabel: '单据类型',
-        defaultValue: '付款单'
+        defaultValue: '付款单',
+        readOnly: true
     },  {
         xtype: 'hidden',
         name: 'pb_vendid',

frontend/saas-web/app/view/money/recBalance/FormPanel.js

@@ -35,7 +35,8 @@ Ext.define('saas.view.money.recBalance.FormPanel', {
         xtype: 'textfield',
         name: 'rb_kind',
         fieldLabel: '单据类型',
-        defaultValue: '收款单'
+        defaultValue: '收款单',
+        readOnly: true
     }, {
         xtype: 'hidden',
         name: 'rb_custcode',