代码提交

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

@@ -115,14 +115,14 @@ Ext.define('saas.view.document.product.FormController', {
                             "width": 100,
                             "xtype": "",
                         },{
-                            "text": "仓库类型",
+                            "text": "仓库名称",
                             "flex": 1,
-                            "dataIndex": "wh_type",
+                            "dataIndex": "wh_description",
                             "xtype": "",
                         },{
-                            "text": "仓库名称",
+                            "text": "仓库类型",
                             "flex": 1,
-                            "dataIndex": "wh_description",
+                            "dataIndex": "wh_type",
                             "xtype": "",
                         }]
                     }) ;   

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

@@ -122,7 +122,7 @@ Ext.define('saas.view.document.product.FormPanel', {
         storeUrl:'/api/document/productbrand/getCombo',
         name : "pr_brand", 
         fieldLabel : "物料品牌", 
-        allowBlank : false, 
+        allowBlank : true, 
         columnWidth : 0.25,
         addHandler:function(b){
             var document = Ext.create('saas.view.document.kind.Kind',{});

frontend/saas-web/app/view/sys/config/FormPanel.js

@@ -25,13 +25,19 @@ Ext.define('saas.view.sys.config.FormPanel', {
         columnWidth: 0.25,
         blankText: '该字段不能为空'
     },
-    
-    tbar:[{
-        text:'保存',
-        handler:function(){
 
-        }
-    }],
+    tbar:{
+        style: {
+            'border-bottom': '1px solid #35baf6 !important'
+        },
+        frame:true,
+        items:['->',{
+            text:'保存',
+            handler:function(){
+
+            }
+        }]
+    },
 
     items: [{
         xtype: 'hidden',

frontend/saas-web/app/view/sys/messagelog/DataList.js

@@ -11,7 +11,7 @@ Ext.define('saas.view.sys.messagelog.DataList', {
         width: 150,
         name: 'ml_name',
         xtype: 'textfield',
-        emptyText : '单据类别'
+        emptyText : '单据类型'
     },{
         width: 150,
         name: 'ml_code',
@@ -52,7 +52,7 @@ Ext.define('saas.view.sys.messagelog.DataList', {
         dataIndex : "id", 
         xtype : "numbercolumn",   
     },{
-        text:'单据类别',
+        text:'单据类型',
         dataIndex : "ml_name",
         width : 120.0, 
     },{