Browse Source

some bug fix...

zhuth 7 years ago
parent
commit
94756aba2e

+ 10 - 2
frontend/saas-web/app/view/document/kind/ChildForm.js

@@ -96,14 +96,17 @@ Ext.define('KitchenSink.view.binding.ChildForm', {
                 mouseWheelEnabled: false,
                 mouseWheelEnabled: false,
                 minValue: 0
                 minValue: 0
             },{
             },{
-                xtype:'textfield',
+                xtype:'combo',
                 name:'bk_type',
                 name:'bk_type',
                 allowBlank:false,
                 allowBlank:false,
                 fieldLabel:'账户类别',
                 fieldLabel:'账户类别',
+                store: [
+                    '现金',
+                    '银行'
+                ]
             },{
             },{
                 xtype:'datefield',
                 xtype:'datefield',
                 name:'bk_date',
                 name:'bk_date',
-                readOnly:true,
                 fieldLabel:'建账日期',
                 fieldLabel:'建账日期',
                 format:'Y-m-d H:i:s',
                 format:'Y-m-d H:i:s',
                 listeners:{
                 listeners:{
@@ -111,6 +114,11 @@ Ext.define('KitchenSink.view.binding.ChildForm', {
                         d.setValue(new Date())
                         d.setValue(new Date())
                     }
                     }
                 }
                 }
+            }, {
+                xtype:'textfield',
+                name:'bk_remark',
+                allowBlank:true,
+                fieldLabel:'备注',
             }]
             }]
         },
         },
         productbrand:{
         productbrand:{

+ 5 - 1
frontend/saas-web/app/view/document/kind/Kind.js

@@ -143,7 +143,7 @@ Ext.define('saas.view.document.kind.Kind', {
             },{
             },{
                 text: '账户类别',
                 text: '账户类别',
                 dataIndex: 'bk_type',
                 dataIndex: 'bk_type',
-                flex: 1
+                flex: 1,
             },{
             },{
                 text: '账户期初金额',
                 text: '账户期初金额',
                 dataIndex: 'bk_beginamount',
                 dataIndex: 'bk_beginamount',
@@ -152,6 +152,10 @@ Ext.define('saas.view.document.kind.Kind', {
                 text: '账户期末余额',
                 text: '账户期末余额',
                 dataIndex: 'bk_thisamount',
                 dataIndex: 'bk_thisamount',
                 flex: 1
                 flex: 1
+            }, {
+                text: '备注',
+                dataIndex: 'bk_remark',
+                flex: 1
             }],
             }],
             keyField:'id',
             keyField:'id',
             reqUrl: '/api/document/bankinformation/save',
             reqUrl: '/api/document/bankinformation/save',

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

@@ -70,7 +70,7 @@ Ext.define('saas.view.purchase.purchase.FormPanel', {
         name : "pu_shipaddresscode", 
         name : "pu_shipaddresscode", 
         fieldLabel : "交货地址", 
         fieldLabel : "交货地址", 
         allowBlank : false, 
         allowBlank : false, 
-        columnWidth : 0.25,
+        columnWidth : 0.5,
         hiddenBtn:false,//true 则会关闭新增按钮功能
         hiddenBtn:false,//true 则会关闭新增按钮功能
         addHandler:function(b){
         addHandler:function(b){
             var document = Ext.create('saas.view.document.kind.Kind',{});
             var document = Ext.create('saas.view.document.kind.Kind',{});

+ 5 - 0
frontend/saas-web/app/view/purchase/purchaseIn/FormPanel.js

@@ -329,6 +329,11 @@ Ext.define('saas.view.purchase.purchaseIn.FormPanel', {
                 }
                 }
             }
             }
         ]
         ]
+    },{
+        xtype : "textfield", 
+        name : "pi_remark", 
+        fieldLabel : "备注", 
+        columnWidth : 1
     },{
     },{
         xtype : "textfield", 
         xtype : "textfield", 
         name : "pi_recordman", 
         name : "pi_recordman", 

+ 5 - 0
frontend/saas-web/app/view/purchase/purchaseOut/FormPanel.js

@@ -308,6 +308,11 @@ Ext.define('saas.view.purchase.purchaseOut.FormPanel', {
                 }
                 }
             }
             }
         ]
         ]
+    },{
+        xtype : "textfield", 
+        name : "pi_remark", 
+        fieldLabel : "备注", 
+        columnWidth : 1
     }, {
     }, {
         xtype : "textfield", 
         xtype : "textfield", 
         name : "pi_recordman", 
         name : "pi_recordman",