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

applications/purchase/purchase-dto/src/main/java/com/usoftchina/saas/purchase/dto/ProdInOutDTO.java

@@ -97,5 +97,5 @@ public class ProdInOutDTO extends CommonBaseDTO implements Serializable {
 
     private Double pi_rate;
 
-    private Double b2bStatus;
+    private String b2bStatus;
 }

frontend/saas-web/app/util/FormUtil.js

@@ -216,12 +216,11 @@ Ext.define('saas.util.FormUtil', {
                             }
                         }
                     });
-                    
-                }
-                //附件名称的自定义字段 使用附件类型
-                if(item.fieldLabel == '附件' && item.name.indexOf('_text')>-1){
-                    item.xtype = 'mfilefield'
-                    form.renderMF = item.name
+                    //附件名称的自定义字段 使用附件类型
+                    if(item.fieldLabel == '附件' && item.name.indexOf('_text')>-1){
+                        item.xtype = 'mfilefield'
+                        form.renderMF = item.name
+                    }
                 }
             });
 

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

@@ -104,6 +104,11 @@ Ext.define('saas.view.document.customer.BasePanel', {
                     text : "类型", 
                     dataIndex : "cu_type", 
                     width : 100.0
+                }, {
+                    text: '币别',
+                    dataIndex: 'cu_currency',
+                    align: 'center',
+                    width: 65
                 }, {
                     text : "税率(%)", 
                     dataIndex : "cu_taxrate", 
@@ -119,11 +124,6 @@ Ext.define('saas.view.document.customer.BasePanel', {
                     renderer : function(v, m, r) {
                         return Ext.util.Format.number(v, '0');
                     }
-                }, {
-                    text: '币别',
-                    dataIndex: 'cu_currency',
-                    align: 'center',
-                    width: 65
                 }, {
                     text : "业务员", 
                     dataIndex : "cu_sellername",

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

@@ -94,6 +94,11 @@ Ext.define('saas.view.document.vendor.BasePanel', {
                     text: "类型",
                     dataIndex: "ve_type",
                     width: 100.0
+                }, {
+                    text: '币别',
+                    dataIndex: 've_currency',
+                    align: 'center',
+                    width: 65
                 }, {
                     text: "税率(%)",
                     xtype: 'numbercolumn',
@@ -110,11 +115,6 @@ Ext.define('saas.view.document.vendor.BasePanel', {
                     renderer: function(v, m, r) {
                         return Ext.util.Format.number(v, '0');
                     }
-                }, {
-                    text: '币别',
-                    dataIndex: 've_currency',
-                    align: 'center',
-                    width: 65
                 }, {
                     text: "备注",
                     dataIndex: "ve_remark",