Merge branch 'dev' of ssh://10.10.100.21/source/saas-platform into dev

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

@@ -36,15 +36,14 @@ Ext.define('saas.view.document.customer.FormPanel', {
         columnWidth: 0.25
     },{
         xtype: 'textfield',
-        name: 'cu_shortname',
-        fieldLabel: '客户简称',
+        name: 'cu_name',
+        fieldLabel: '客户名称',
         allowBlank: false,
         columnWidth: 0.25
     },{
         xtype: 'textfield',
-        name: 'cu_name',
-        fieldLabel: '客户名称',
-        allowBlank: false,
+        name: 'cu_shortname',
+        fieldLabel: '客户简称',
         columnWidth: 0.25
     },{
         editable:false,

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

@@ -36,15 +36,14 @@ Ext.define('saas.view.document.vendor.FormPanel', {
         columnWidth: 0.25
     },{
         xtype: 'textfield',
-        name: 've_shortname',
-        fieldLabel: '供应商简称',
+        name: 've_name',
+        fieldLabel: '供应商名称',
         allowBlank: false,
         columnWidth: 0.25
     },{
         xtype: 'textfield',
-        name: 've_name',
-        fieldLabel: '供应商名称',
-        allowBlank: false,
+        name: 've_shortname',
+        fieldLabel: '供应商简称',
         columnWidth: 0.25
     },{
         xtype: 'hidden',