代码提交

frontend/saas-web/app/view/document/customer/FormPanel.js

@@ -41,7 +41,6 @@ Ext.define('saas.view.document.customer.FormPanel', {
         allowBlank: true,
         columnWidth: 0.25
     },{
-        editable:false,
         xtype : "remotecombo", 
         storeUrl:'/api/document/customerkind/getCombo',
         name : "cu_type", 
@@ -159,6 +158,8 @@ Ext.define('saas.view.document.customer.FormPanel', {
         name : "cu_uu", 
         fieldLabel : "客户UU", 
         allowBlank : true, 
+        readOnly:true,
+        editable:false,
         columnWidth : 0.25
     },{
         xtype:'textfield',
@@ -224,7 +225,7 @@ Ext.define('saas.view.document.customer.FormPanel', {
                 items : null
             },
             {
-                allowBlank:false,
+                allowBlank:true,
                 text : "微信/QQ", 
                 editor : {
                     xtype : "textfield"
@@ -320,7 +321,7 @@ Ext.define('saas.view.document.customer.FormPanel', {
                 items : null
             },  
             {
-                allowBlank:false,
+                allowBlank:true,
                 text : "联系人", 
                 editor : {
                     xtype : "textfield"
@@ -330,7 +331,7 @@ Ext.define('saas.view.document.customer.FormPanel', {
                 items : null   
             },
             {
-                allowBlank:false,
+                allowBlank:true,
                 text : "联系电话", 
                 editor : {
                     xtype : "textfield",
@@ -341,8 +342,8 @@ Ext.define('saas.view.document.customer.FormPanel', {
                 items : null   
             },
             {
+                allowBlank:false,
                 editor : {
-                    editable:false,
                     displayField : "display", 
                     format : "", 
                     hideTrigger : false, 

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

@@ -139,8 +139,29 @@ Ext.define('KitchenSink.view.binding.ChildForm', {
                 xtype:'textfield',
                 name:'ft_name',
                 allowBlank:false,
-                fieldLabel:'类型',
+                fieldLabel:'收支名称',
                 maxLength: 20
+            },{
+                xtype:'combo',
+                name:'ft_kind',
+                allowBlank:false,
+                fieldLabel:'收支类型',
+                hideTrigger : false, 
+                maxLength : 100.0, 
+                minValue : null, 
+                positiveNum : false, 
+                queryMode : "local", 
+                valueField : "value", 
+                xtype : "combo",
+                editable:false,
+                displayField : "display", 
+                store:{
+                    fields: ['display', 'value'],
+                    data : [
+                        {"display":"收入", "value":'收入'},
+                        {"display":"支出", "value":'支出'}
+                    ]
+                }
             }]
         },
         address:{

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

@@ -155,9 +155,13 @@ Ext.define('saas.view.document.kind.Kind', {
         },
         inoutkind:{
             columns: [{
-                text: '收支类别',
+                text: '收支名称',
                 dataIndex: 'ft_name',
                 flex: 1
+            },{
+                text: '收支类别',
+                dataIndex: 'ft_kind',
+                flex: 1
             }],
             keyField:'id',
             reqUrl: '/api/document/fundinouttype/save',

frontend/saas-web/app/view/document/kind/KindModel.js

@@ -152,7 +152,7 @@ Ext.define('saas.view.document.kind.KindModel', {
         inoutkind:{ 
             fields:[
                 {name: 'id', type: 'int'},
-                {name: 'ft_type',  type: 'string'},
+                {name: 'ft_kind',  type: 'string'},
                 {name: 'ft_name',  type: 'string'}
             ],
             proxy: {  

frontend/saas-web/app/view/document/product/FormPanel.js

@@ -170,9 +170,8 @@ Ext.define('saas.view.document.product.FormPanel', {
         allowBlank : true, 
         columnWidth : 0.25
     },{
-        ignore:true,
-        readOnly:true,
         xtype : "numberfield", 
+        bind : "{pr_standardprice}",
         name : "pr_standardprice", 
         fieldLabel : "标准单价", 
         allowBlank : true, 
@@ -181,6 +180,7 @@ Ext.define('saas.view.document.product.FormPanel', {
         ignore:true,
         readOnly:true,
         xtype : "numberfield", 
+        bind : "{pr_purcprice}",
         name : "pr_purcprice", 
         fieldLabel : "最新采购单价", 
         allowBlank : true, 

frontend/saas-web/app/view/document/vendor/FormPanel.js

@@ -95,14 +95,14 @@ Ext.define('saas.view.document.vendor.FormPanel', {
         xtype : "numberfield", 
         hideTrigger:true,
         name : "ve_beginapamount", 
-        fieldLabel : "期初应收", 
+        fieldLabel : "期初应付", 
         allowBlank : true, 
         columnWidth : 0.25
     },{ 
         xtype : "numberfield", 
         hideTrigger:true, 
         name : "ve_beginprepayamount", 
-        fieldLabel : "期初预收", 
+        fieldLabel : "期初预付", 
         allowBlank : true, 
         columnWidth : 0.25    
     },{
@@ -121,29 +121,20 @@ Ext.define('saas.view.document.vendor.FormPanel', {
         columnWidth : 0.25      
     },{
         xtype : "textfield", 
-        name : "ve_1", 
+        name : "ve_nsrzh", 
         fieldLabel : "纳税人识别号", 
-        ignore:true,
-        editable:false,
-        readOnly:true,
         allowBlank : true, 
         columnWidth : 0.25
     },{
         xtype : "textfield", 
-        name : "ve_2", 
+        name : "ve_bankcode", 
         fieldLabel : "开户银行", 
-        ignore:true,
-        editable:false,
-        readOnly:true,
         allowBlank : true, 
         columnWidth : 0.25
     },{
         xtype : "textfield", 
-        name : "ve_3", 
+        name : "ve_bankaccount", 
         fieldLabel : "银行账户", 
-        ignore:true,
-        editable:false,
-        readOnly:true,
         allowBlank : true, 
         columnWidth : 0.25
     },{
@@ -151,6 +142,8 @@ Ext.define('saas.view.document.vendor.FormPanel', {
         name : "ve_uu", 
         fieldLabel : "供应商UU", 
         allowBlank : true, 
+        editable:false,
+        readOnly:true,
         columnWidth : 0.25
     },{  
         xtype : "datefield", 
@@ -206,7 +199,7 @@ Ext.define('saas.view.document.vendor.FormPanel', {
                 xtype : "", 
             },
             {
-                allowBlank:false,
+                allowBlank:true,
                 text : "微信/QQ", 
                 editor : {
                     xtype : "textfield"
@@ -225,7 +218,7 @@ Ext.define('saas.view.document.vendor.FormPanel', {
             {
                 editor : {
                     displayField : "display", 
-                    editable:false,
+                    editable:true,
                     format : "", 
                     hideTrigger : false, 
                     maxLength : 100.0,