修改采购模块

frontend/saas-web/app/view/purchase/purchase/FormPanel.js

@@ -57,7 +57,8 @@ Ext.define('saas.view.purchase.purchase.FormPanel', {
     }, {
         xtype : "dbfindtrigger", 
         name : "pu_vendname", 
-        fieldLabel : "供应商名称"
+        fieldLabel : "供应商名称",
+        allowBlank : false,
     },{
         xtype : "hidden", 
         name : "pu_delivery", 
@@ -162,8 +163,7 @@ Ext.define('saas.view.purchase.purchase.FormPanel', {
                 format:'0,000.00', 
                 xtype : "numbercolumn", 
                 format:'0',
-                items : null,
-                summaryType: 'sum'
+                items : null
             },
             {
                 text : "单价", 
@@ -198,7 +198,8 @@ Ext.define('saas.view.purchase.purchase.FormPanel', {
                 dataIndex : "pd_taxtotal", 
                 width : 120.0,
                 format:'0,000.00', 
-                xtype : "numbercolumn"
+                xtype : "numbercolumn",
+                summaryType: 'sum'
             },{
                 text : "需求日期", 
                 dataIndex : "pd_delivery", 

frontend/saas-web/app/view/purchase/purchase/FormPanelController.js

@@ -59,6 +59,41 @@ Ext.define('saas.view.purchase.purchase.FormPanelController', {
                             "text": "供应商类型",
                             "flex": 0,
                             "dataIndex": "ve_type",
+                            "width": 50,
+                            "xtype": "",
+                            "items": null
+                        },{
+                            "text": "税率",
+                            "flex": 0,
+                            "dataIndex": "ve_taxrate",
+                            "width": 50,
+                            "xtype": "",
+                            "items": null
+                        },{
+                            "text": "承付天数",
+                            "flex": 0,
+                            "dataIndex": "ve_promisedays",
+                            "width": 50,
+                            "xtype": "",
+                            "items": null
+                        },{
+                            "text": "纳税人识别号",
+                            "flex": 0,
+                            "dataIndex": "ve_nsrzh",
+                            "width": 200,
+                            "xtype": "",
+                            "items": null
+                        },{
+                            "text": "开户银行",
+                            "flex": 0,
+                            "dataIndex": "ve_bankcode",
+                            "width": 200,
+                            "xtype": "",
+                            "items": null
+                        },{
+                            "text": "银行账户",
+                            "flex": 0,
+                            "dataIndex": "ve_bankaccount",
                             "width": 200,
                             "xtype": "",
                             "items": null

frontend/saas-web/app/view/purchase/purchaseIn/FormPanelController.js

@@ -149,6 +149,7 @@ Ext.define('saas.view.purchase.purchaseIn.FormPanelController', {
                         // dataUrl:'http://localhost:9480/warehouse/list',
                         addXtype: 'other-warehouse',
                         addTitle: '仓库资料',
+                        defaultCondition:"wh_statuscode='OPEN'",
                         dbfinds:[{
                             from:'id',to:'pd_whid'                          
                         },{
@@ -181,7 +182,13 @@ Ext.define('saas.view.purchase.purchaseIn.FormPanelController', {
                             "dataIndex": "wh_description",
                             "xtype": "",
                             "items": null
-                        }, ]
+                        }, {
+                            "text": "仓库类型",
+                            "flex": 1,
+                            "dataIndex": "wh_type",
+                            "xtype": "",
+                            "items": null
+                        }]
                     }) ;   
 
                 }

frontend/saas-web/app/view/purchase/purchaseOut/FormPanelController.js

@@ -148,6 +148,7 @@ Ext.define('saas.view.purchase.purchaseOut.FormPanelController', {
                         // dataUrl:'http://localhost:9480/warehouse/list',
                         addXtype: 'other-warehouse',
                         addTitle: '仓库资料',
+                        defaultCondition:"wh_statuscode='OPEN'",
                         dbfinds:[{
                             from:'id',to:'pd_whid'                          
                         },{
@@ -174,13 +175,19 @@ Ext.define('saas.view.purchase.purchaseOut.FormPanelController', {
                             "width": 100,
                             "xtype": "",
                             "items": null
-                        }, {
+                        },{
                             "text": "仓库名称",
                             "flex": 1,
                             "dataIndex": "wh_description",
                             "xtype": "",
                             "items": null
-                        }, ]
+                        },{
+                            "text": "仓库类型",
+                            "flex": 1,
+                            "dataIndex": "wh_type",
+                            "xtype": "",
+                            "items": null
+                        }]
                     }) ;   
 
                 }

frontend/saas-web/app/view/stock/appropriationInOut/FormPanelController.js

@@ -203,7 +203,8 @@ Ext.define('saas.view.stock.appropriationInOut.FormPanelController', {
                     dataUrl:'/api/document/warehouse/list',
                     // dataUrl:'http://localhost:9480/warehouse/list',
                     addXtype: 'other-warehouse',
-                        addTitle: '仓库资料',
+                    addTitle: '仓库资料',
+                    defaultCondition:"wh_statuscode='OPEN'",
                     dbfinds:[{
                         from:'id',to:'pd_whid'                          
                     },{
@@ -247,8 +248,9 @@ Ext.define('saas.view.stock.appropriationInOut.FormPanelController', {
              Ext.apply(f,{
                  dataUrl:'/api/document/warehouse/list',
                 //  dataUrl:'http://localhost:9480/warehouse/list',
-                addXtype: 'other-warehouse',
-                        addTitle: '仓库资料',
+                 addXtype: 'other-warehouse',
+                 addTitle: '仓库资料',
+                 defaultCondition:"wh_statuscode='OPEN'",
                  dbfinds:[{
                      from:'id',to:'pd_inwhid'                          
                  },{
@@ -281,7 +283,13 @@ Ext.define('saas.view.stock.appropriationInOut.FormPanelController', {
                      "dataIndex": "wh_description",
                      "xtype": "",
                      "items": null
-                 }, ]
+                 },{
+                    "text": "仓库类型",
+                    "flex": 1,
+                    "dataIndex": "wh_type",
+                    "xtype": "",
+                    "items": null
+                }]
              }) ;   
 
                 }

frontend/saas-web/app/view/stock/otherIn/FormPanel.js

@@ -208,7 +208,8 @@ Ext.define('saas.view.stock.otherIn.FormPanel', {
                 text : "含税金额", 
                 dataIndex : "pd_total", 
                 width : 120.0, 
-                xtype : "numbercolumn"
+                xtype : "numbercolumn",
+                summaryType: 'sum'
             }, {
                 text : "税率", 
                 dataIndex : "pd_taxrate",
@@ -222,7 +223,8 @@ Ext.define('saas.view.stock.otherIn.FormPanel', {
             {
                 text : "未税金额", 
                 dataIndex : "pd_nettotal", 
-                xtype : "numbercolumn"
+                xtype : "numbercolumn",
+                summaryType: 'sum'
             }
         ]
     }, {

frontend/saas-web/app/view/stock/otherIn/FormPanelController.js

@@ -210,6 +210,7 @@ Ext.define('saas.view.stock.otherIn.FormPanelController', {
                         // dataUrl:'http://localhost:9480/warehouse/list',
                         addXtype: 'other-warehouse',
                         addTitle: '仓库资料',
+                        defaultCondition:"wh_statuscode='OPEN'",
                         dbfinds: [{
                             from: 'id',
                             to: 'pd_whid'
@@ -247,7 +248,13 @@ Ext.define('saas.view.stock.otherIn.FormPanelController', {
                             "dataIndex": "wh_description",
                             "xtype": "",
                             "items": null
-                        }, ]
+                        },{
+                            "text": "仓库类型",
+                            "flex": 1,
+                            "dataIndex": "wh_type",
+                            "xtype": "",
+                            "items": null
+                        }]
                     });
                 },
             },

frontend/saas-web/app/view/stock/otherOut/FormPanel.js

@@ -205,7 +205,8 @@ Ext.define('saas.view.stock.otherOut.FormPanel', {
                 text: "含税金额",
                 dataIndex: "pd_total",
                 width: 120.0,
-                xtype: "numbercolumn"
+                xtype: "numbercolumn",
+                summaryType: 'sum'
             }, {
                 text: "税率",
                 dataIndex: "pd_taxrate",
@@ -219,7 +220,8 @@ Ext.define('saas.view.stock.otherOut.FormPanel', {
             {
                 text: "未税金额",
                 dataIndex: "pd_nettotal",
-                xtype: "numbercolumn"
+                xtype: "numbercolumn",
+                summaryType: 'sum'
             }
         ]
     }, {

frontend/saas-web/app/view/stock/otherOut/FormPanelController.js

@@ -197,6 +197,9 @@ Ext.define('saas.view.stock.otherOut.FormPanelController', {
                     Ext.apply(f,{
                         dataUrl:'/api/document/warehouse/list',
                         // dataUrl:'http://localhost:9480/warehouse/list',
+                        addXtype: 'other-warehouse',
+                        addTitle: '仓库资料',
+                        defaultCondition:"wh_statuscode='OPEN'",
                         dbfinds:[{
                             from:'id',to:'pd_whid'                          
                         },{
@@ -229,7 +232,13 @@ Ext.define('saas.view.stock.otherOut.FormPanelController', {
                             "dataIndex": "wh_description",
                             "xtype": "",
                             "items": null
-                        }, ]
+                        },{
+                            "text": "仓库类型",
+                            "flex": 1,
+                            "dataIndex": "wh_type",
+                            "xtype": "",
+                            "items": null
+                        }]
                     }) ;   
 
                 }