Browse Source

核销单界面标准化,收付款来源单号放大镜标准化

rainco 7 years ago
parent
commit
46fae0a596

+ 68 - 0
frontend/saas-web/app/view/core/dbfind/types/OriOrderMutiDbfindTrigger.js

@@ -0,0 +1,68 @@
+Ext.define('saas.view.core.dbfind.types.OriOrderMutiDbfindTrigger', {
+    extend: 'saas.view.core.dbfind.MultiDbfindTrigger',
+    xtype: 'oriOrderMutiDbfindTrigger',
+/**
+ * 用于资金首付款单明细
+ */
+    dataUrl: '/api/money/subledger/list',
+    addTitle: '源单资料',
+    dbtpls: [{
+        field: 'sl_code',
+        width: 150
+    }],
+    dbSearchFields: [{
+        emptyText: '查找资金账户',
+        xtype: "textfield",
+        name: "search",
+        getCondition: function (v) {
+            return "(upper(bk_bankcode) like '%" + v.toUpperCase() + "%' or upper(bk_bankname) like '%" + v.toUpperCase() + "%')";
+        },
+        allowBlank: true,
+        columnWidth: 0.25
+    }],
+    dbSearchFields:[{
+        emptyText:'输入源单编号',
+        xtype : "textfield",
+        name : "search",
+        getCondition: function(v) {
+            return "(upper(sl_code) like '%"+v.toUpperCase()+"%')";
+        },
+        allowBlank : true,
+        columnWidth : 0.25
+    }],
+    dbColumns:[{
+        "text": "源单id",
+        "hidden": true,
+        "dataIndex": "id",
+        "width": 100,
+        "xtype": "numbercolumn"
+    },{
+        "text": "源单编号",
+        "dataIndex": "sl_code",
+        "width": 150
+    },{
+        "text": "源单类型",
+        "dataIndex": "sl_kind",
+        "width": 110
+    }, {
+        "text": "单据金额",
+        "dataIndex": "sl_orderamount",
+        "width": 110,
+        xtype: 'numbercolumn'
+    }, {
+        "text": "已核销金额",
+        "dataIndex": "sl_yamount",
+        "width": 110,
+        xtype: 'numbercolumn'
+    }, {
+        "text": "未核销金额",
+        "dataIndex": "sl_namount",
+        "width": 110,
+        xtype: 'numbercolumn'
+    },{
+        "text": "单据日期",
+        "dataIndex": "sl_date",
+        "width": 110,
+        xtype: 'datecolumn'
+    }]
+});

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

@@ -210,7 +210,7 @@ Ext.define('saas.view.money.payBalance.FormPanel', {
                 queryMode : "local",
                 store : null,
                 valueField : "value",
-                xtype : "multidbfindtrigger",
+                xtype : "oriOrderMutiDbfindTrigger",
                 listeners:{
                     beforetriggerclick:'vendnamechange'
                 }

+ 2 - 65
frontend/saas-web/app/view/money/payBalance/FormPanelController.js

@@ -27,11 +27,9 @@ Ext.define('saas.view.money.payBalance.FormPanelController', {
 
                 }
             },
-            'multidbfindtrigger[name=pbd_slcode]': {
+            'oriOrderMutiDbfindTrigger[name=pbd_slcode]': {
                 beforerender: function (f) {
                     Ext.apply(f, {
-                        dataUrl: '/api/money/subledger/list',
-                        addTitle: '源单资料',
                         dbfinds: [{
                             from: 'id',
                             to: 'pbd_slid'
@@ -57,69 +55,8 @@ Ext.define('saas.view.money.payBalance.FormPanelController', {
                             from:'sl_namount',
                             to:'pbd_nowbalance'
                         }],
-                        dbtpls: [{
-                            field: 'sl_code',
-                            width: 100
-                        }],
-                        defaultCondition: "sl_vendid<>0 and sl_kind in ('期初余额','采购验收单','采购验退单') and sl_namount<>0" ,
-                        dbSearchFields:[{
-                            emptyText:'输入源单编号',
-                            xtype : "textfield",
-                            name : "search",
-                            getCondition: function(v) {
-                                return "(upper(sl_code) like '%"+v.toUpperCase()+"%')";
-                            },
-                            allowBlank : true,
-                            columnWidth : 0.25
-                        }],
-                        dbColumns:[{
-                            "text": "源单id",
-                            "hidden": true,
-                            "dataIndex": "id",
-                            "width": 100,
-                            "xtype": "numbercolumn"
-                        },{
-                            "text": "源单编号",
-                            "flex": 1,
-                            "dataIndex": "sl_code",
-                            "width": 100
-                        },{
-                            "text": "源单类型",
-                            "flex": 1,
-                            "dataIndex": "sl_kind",
-                            "width": 100
-                        }, {
-                            "text": "单据金额",
-                            "flex": 1,
-                            "dataIndex": "sl_orderamount",
-                            "width": 100,
-                            xtype: 'numbercolumn',
-                            align:'end'
-                        }, {
-                            "text": "已核销金额",
-                            "flex": 1,
-                            "dataIndex": "sl_yamount",
-                            "width": 150,
-                            xtype: 'numbercolumn',
-                            align:'end',
-                            "items": null
-                        }, {
-                            "text": "未核销金额",
-                            "flex": 1,
-                            "dataIndex": "sl_namount",
-                            "width": 100,
-                            xtype: 'numbercolumn',
-                            align:'end'
-                        },{
-                            "text": "单据日期",
-                            "flex": 1,
-                            "dataIndex": "sl_date",
-                            "width": 120,
-                            xtype: 'datecolumn',
-                            align:'end'
-                        }]
+                        defaultCondition: "sl_vendid<>0 and sl_kind in ('期初余额','采购验收单','采购验退单') and sl_namount<>0" 
                     });
-
                 }
             },
             'dbfindtrigger[name=pd_bankname]':{

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

@@ -214,7 +214,7 @@ Ext.define('saas.view.money.recBalance.FormPanel', {
                 queryMode : "local",
                 store : null,
                 valueField : "value",
-                xtype : "multidbfindtrigger",
+                xtype : "oriOrderMutiDbfindTrigger",
                 listeners:{
                     beforetriggerclick:'custnamechange'
                 }

+ 2 - 63
frontend/saas-web/app/view/money/recBalance/FormPanelController.js

@@ -37,11 +37,9 @@ Ext.define('saas.view.money.recBalance.FormPanelController', {
 
                 }
             },
-            'multidbfindtrigger[name=rbd_slcode]': {
+            'oriOrderMutiDbfindTrigger[name=rbd_slcode]': {
                 beforerender: function (f) {
                     Ext.apply(f, {
-                        dataUrl: '/api/money/subledger/list',
-                        addTitle: '源单单据',
                         dbfinds: [{
                             from: 'id',
                             to: 'rbd_slid',ignore:true
@@ -67,66 +65,7 @@ Ext.define('saas.view.money.recBalance.FormPanelController', {
                             from: 'sl_namount',
                             to: 'rbd_nowbalance'
                         }],
-                        dbtpls: [{
-                            field: 'sl_code',
-                            width: 100
-                        }],
-                        defaultCondition: "sl_custid<>0 and sl_kind in ('期初余额','出货单','销售退货单') and sl_namount<>0",
-                        dbSearchFields:[{
-                            emptyText:'输入源单编号',
-                            xtype : "textfield",
-                            name : "search",
-                            getCondition: function(v) {
-                                return "(upper(sl_code) like '%"+v.toUpperCase()+"%')";
-                            },
-                            allowBlank : true,
-                            columnWidth : 0.25
-                        }],
-                        dbColumns:[{
-                            "text": "源单id",
-                            "hidden": true,
-                            "dataIndex": "id",
-                            "width": 100,
-                            "xtype": "numbercolumn"
-                        },{
-                            "text": "源单编号",
-                            "dataIndex": "sl_code",
-                            "width": 180
-                        }, {
-                            "text": "源单类型",
-                            "flex": 1,
-                            "dataIndex": "sl_kind",
-                            "width": 100
-                        },{
-                            "text": "单据金额",
-                            "flex": 1,
-                            "dataIndex": "sl_orderamount",
-                            "width": 100,
-                            xtype: 'numbercolumn',
-                            align:'end'
-                        }, {
-                            "text": "已核销金额",
-                            "flex": 0,
-                            "dataIndex": "sl_yamount",
-                            "width": 200,
-                            "items": null,
-                            xtype: 'numbercolumn',
-                            align:'end'
-                        }, {
-                            "text": "未核销金额",
-                            "flex": 1,
-                            "dataIndex": "sl_namount",
-                            "width": 100,
-                            xtype: 'numbercolumn',
-                            align:'end'
-                        },{
-                            "text": "单据日期",
-                            "flex": 1,
-                            "dataIndex": "sl_date",
-                            "width": 120,
-                            xtype: 'datecolumn',
-                            align:'end'
-                        }]
+                        defaultCondition: "sl_custid<>0 and sl_kind in ('期初余额','出货单','销售退货单') and sl_namount<>0"
                     });
 
                 }

+ 18 - 6
frontend/saas-web/app/view/money/verification/FormPanel.js

@@ -66,6 +66,7 @@ Ext.define('saas.view.money.verification.FormPanel', {
             }, {
                 text: '来源单号',
                 dataIndex: 'vd_slcode',
+                width: 150,
                 editor:{
                     displayField : "display",
                     editable : true,
@@ -81,15 +82,18 @@ Ext.define('saas.view.money.verification.FormPanel', {
                 }
             }, {
                 text: '业务类型',
-                dataIndex: "vd_slkind"
+                dataIndex: "vd_slkind",
+                width: 110
             }, {
                 text: "单据日期",
                 dataIndex: "vd_sldate",
-                xtype: 'datecolumn'
+                xtype: 'datecolumn',
+                width: 110
             }, {
                 text: "单据金额",
                 xtype: 'numbercolumn',
                 dataIndex: "vd_amount",
+                width: 110,
                 renderer : function(v) {
                     var arr = (v + '.').split('.');
                     var xr = (new Array(arr[1].length > 2 ? 2 : arr[1].length)).fill('0');
@@ -107,6 +111,7 @@ Ext.define('saas.view.money.verification.FormPanel', {
                 text: "已核销金额",
                 xtype: 'numbercolumn',
                 dataIndex: "sl_yamount",
+                width: 110,
                 ignore:true,
                 renderer : function(v) {
                     var arr = (v + '.').split('.');
@@ -125,6 +130,7 @@ Ext.define('saas.view.money.verification.FormPanel', {
                 text: "未核销金额",
                 xtype: 'numbercolumn',
                 dataIndex: "sl_namount",
+                width: 110,
                 ignore:true,
                 renderer : function(v) {
                     var arr = (v + '.').split('.');
@@ -143,7 +149,7 @@ Ext.define('saas.view.money.verification.FormPanel', {
                 text: "本次核销金额",
                 xtype: 'numbercolumn',
                 dataIndex: "vd_nowbalance",
-                width:200,
+                width: 150,
                 editor : {
                     xtype : "numberfield",
                     decimalPrecision: 2
@@ -181,6 +187,7 @@ Ext.define('saas.view.money.verification.FormPanel', {
             }, {
                 text: '来源单号',
                 dataIndex: 'vd_slcode',
+                width: 150,
                 editor:{
                     displayField : "display",
                     editable : true,
@@ -196,15 +203,18 @@ Ext.define('saas.view.money.verification.FormPanel', {
                 }
             }, {
                 text: '业务类型',
-                dataIndex: "vd_slkind"
+                dataIndex: "vd_slkind",
+                width: 110
             }, {
                 text: "单据日期",
                 dataIndex: "vd_sldate",
-                xtype: 'datecolumn'
+                xtype: 'datecolumn',
+                width: 110
             }, {
                 text: "单据金额",
                 xtype: 'numbercolumn',
                 dataIndex: "vd_amount",
+                width: 110,
                 renderer : function(v) {
                     var arr = (v + '.').split('.');
                     var xr = (new Array(arr[1].length > 2 ? 2 : arr[1].length)).fill('0');
@@ -222,6 +232,7 @@ Ext.define('saas.view.money.verification.FormPanel', {
                 text: "已核销金额",
                 xtype: 'numbercolumn',
                 dataIndex: "sl_yamount",
+                width: 110,
                 ignore:true,
                 renderer : function(v) {
                     var arr = (v + '.').split('.');
@@ -240,6 +251,7 @@ Ext.define('saas.view.money.verification.FormPanel', {
                 text: "未核销金额",
                 xtype: 'numbercolumn',
                 dataIndex: "sl_namount",
+                width: 110,
                 ignore:true,
                 renderer : function(v) {
                     var arr = (v + '.').split('.');
@@ -258,7 +270,7 @@ Ext.define('saas.view.money.verification.FormPanel', {
                 text: "本次核销金额",
                 xtype: 'numbercolumn',
                 dataIndex: "vd_nowbalance",
-                width:200,
+                width:150,
                 editor : {
                     xtype : "numberfield",
                     decimalPrecision: 2

+ 6 - 10
frontend/saas-web/app/view/money/verification/QueryPanel.js

@@ -37,39 +37,35 @@ Ext.define('saas.view.money.verification.QueryPanel', {
         baseColumn: [{
             text: 'id',
             dataIndex: 'id',
-            width: 100,
             xtype: 'numbercolumn',
             hidden: true
         }, {
             text: '单据编号',
             dataIndex: 'rb_code',
-            width: 200
+            width: 150
         }, {
             text: '单据状态',
             dataIndex: 'rb_status',
-            width: 120
+            width: 90
         }, {
             text: '日期',
             dataIndex: 'rb_date',
             xtype: 'datecolumn',
-            width: 200
-        }, {
-            text: '客户编号',
-            dataIndex: 'rb_custcode',
-            hidden: true
+            width: 110
         }, {
             text: '客户名称',
             dataIndex: 'rb_custname',
+            width: 150
         }, {
             text: '收款人',
             dataIndex: 'rb_manname',
             xtype: 'numbercolumn',
-            width: 120,
+            width: 110
         }, {
             text: '收款金额',
             dataIndex: 'rb_rdamount',
             xtype: 'numbercolumn',
-            width: 120,
+            width: 110,
             flex: 1,
             hidden: true
         }]