代码提交

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

@@ -318,7 +318,7 @@ Ext.define('KitchenSink.view.binding.ChildForm', {
                 fieldLabel: '单据前缀',
                 name: 'mn_leadcode',
                 beforeLabelTextTpl: '',
-                allowBlank:false,
+                allowBlank:true,
                 maxLength: 20
             },{
                 xtype:'combo',

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

@@ -140,15 +140,12 @@ Ext.define('saas.view.sys.config.FormPanel', {
             xtype:'textfield'
         },{
             allowBlank : true, 
-            width:500,
+            width:150,
+            buttonOnly:true,
             fieldLabel:'打印章上传',
             xtype: 'filefield',
             name:'signetFilefield',
-            emptyText: '请选择图片',
-            buttonText: '',
-            buttonConfig: {
-                iconCls: 'x-fa fa-picture-o',
-            },
+            buttonText: '选择图片',
             createFileInput : function() {
                     var me = this;
                     me.fileInputEl = me.button.el.createChild({
@@ -212,11 +209,15 @@ Ext.define('saas.view.sys.config.FormPanel', {
                     });
                 }
             }
+        },{
+            xtype:'displayfield',
+            margin:'0 0 0 150',
+            value:'支持 JPG、JPEG、PNG、BMP 格式 , 图片小于10M ',  
         },{
             xtype: 'image',
             width: 100,
             height: 100,
-            margin:'5 0 5 150',
+            margin:'0 0 5 150',
             src:'resources/images/default/basePhoto.png',
             name:'SignetPhoto',
         },{
@@ -264,15 +265,12 @@ Ext.define('saas.view.sys.config.FormPanel', {
             xtype:'textfield'
         },{
             allowBlank : true, 
-            width:500,
+            width:150,
+            buttonOnly:true,
             fieldLabel:'Logo上传',
             name:'logoFilefield',
             xtype: 'filefield',
-            emptyText: '请选择图片',
-            buttonText: '',
-            buttonConfig: {
-                iconCls: 'x-fa fa-picture-o',
-            },
+            buttonText: '选择图片',
             createFileInput : function() {
                     var me = this;
                     me.fileInputEl = me.button.el.createChild({
@@ -316,7 +314,6 @@ Ext.define('saas.view.sys.config.FormPanel', {
                                 var data = res.data;
                                 var name = data.name + "  (" + Ext.util.Format.fileSize(data.size) + ")";
                                 myForm.down('[name=logoUrl]').setValue(data.fullPath);
-                                field.setRawValue(name);
                                 //读取图片
                                 if(data.id){
                                     var img = myForm.down('[name=LogoPhoto]');
@@ -336,12 +333,16 @@ Ext.define('saas.view.sys.config.FormPanel', {
                     });
                 }
             }
+        },{
+            xtype:'displayfield',
+            margin:'0 0 0 150',
+            value:'支持 JPG、JPEG、PNG、BMP 格式 , 图片小于10M ',  
         },{
             xtype: 'image',
             style:'border:1px solid #f7f7f7;',
             width: 100,
             height: 100,
-            margin:'5 0 5 150',
+            margin:'0 0 5 150',
             src:'resources/images/default/basePhoto.png',
             name:'LogoPhoto',
         },{
@@ -420,15 +421,13 @@ Ext.define('saas.view.sys.config.FormPanel', {
             showLogoPhoto.show();
         }
         //文件名称
-        var viewModel = form.getViewModel();
-        if(viewModel.data.fileInfoList&&viewModel.data.fileInfoList.length!=0){
-            var logo = viewModel.data.fileInfoList[0].logo;
-            var logoName = logo.name + "  (" + Ext.util.Format.fileSize(logo.size) + ")";
-            form.down('[name=logoFilefield]').setRawValue(logoName);
-            var signet = viewModel.data.fileInfoList[0].signet;
-            var signetName = signet.name + "  (" + Ext.util.Format.fileSize(signet.size) + ")";
-            form.down('[name=signetFilefield]').setRawValue(signetName);
-        }
+        // var viewModel = form.getViewModel();
+        // if(viewModel.data.fileInfoList&&viewModel.data.fileInfoList.length!=0){
+        //     var logo = viewModel.data.fileInfoList[0].logo;
+        //     var logoName = logo.name + "  (" + Ext.util.Format.fileSize(logo.size) + ")";
+        //     var signet = viewModel.data.fileInfoList[0].signet;
+        //     var signetName = signet.name + "  (" + Ext.util.Format.fileSize(signet.size) + ")";
+        // }
     },
 
     lookPic:function(img){