Merge remote-tracking branch 'origin/dev' into dev

applications/sale/sale-server/src/main/java/com/usoftchina/saas/sale/po/SaleList.java

@@ -48,6 +48,8 @@ public class SaleList implements Serializable{
 
     private Date sa_recorddate;
 
+    private Date sa_date;
+
     private Integer companyid;
 
     private Integer updaterId;

applications/sale/sale-server/src/main/resources/mapper/SaleListMapper.xml

@@ -23,6 +23,7 @@
         <result column="companyid" property="companyid" jdbcType="INTEGER" />
         <result column="updaterId" property="updaterId" jdbcType="INTEGER" />
         <result column="updatetime" property="updatetime" jdbcType="TIMESTAMP" />
+        <result column="sa_date" property="sa_date" jdbcType="TIMESTAMP" />
         <result column="sa_text1" property="sa_text1" jdbcType="VARCHAR" />
         <result column="sa_text2" property="sa_text2" jdbcType="VARCHAR" />
         <result column="sa_text3" property="sa_text3" jdbcType="VARCHAR" />

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

@@ -274,7 +274,7 @@ Ext.define('saas.view.document.kind.Kind', {
         var grid = me.items.items[0];
         var button = grid.ownerCt.dockedItems.items[0].down('[name='+grid.ownerCt.ownerCt.viewConfig+']');
         
-        if(button){
+        if(button&&button.xtype!="tbfill"){
             button.click();
             me.ownerCt.setTitle(button.typeText + '查询');
         }

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

@@ -60,29 +60,44 @@ Ext.define('saas.view.document.vendor.BasePanel', {
             width : 120.0, 
             xtype : "", 
         }, 
-        {
-            text : "供应商状态", 
-            dataIndex : "ve_status", 
-            width : 120.0, 
-            xtype : ""
-        }, 
         {
             text : "供应商状态码", 
             dataIndex : "ve_statuscode", 
             width : 0, 
             xtype : ""
-        },
+        },               
         {
-            text : "供应商UU", 
-            dataIndex : "ve_uu", 
+            text : "税率", 
+            dataIndex : "ve_taxrate", 
             width : 120.0, 
             xtype : "",
-        }, 
-        {
-            text : "默认供应商联系人", 
-            dataIndex : "vc_name", 
-            flex : 1.0, 
+            align:'right'
+        }, {
+            text : "承付天数", 
+            dataIndex : "ve_promisedays", 
+            width : 120.0, 
             xtype : "",
+            align:'right'
+        }, {
+            text : "纳税人识别号", 
+            dataIndex : "ve_nsrzh", 
+            width : 120.0, 
+            xtype : ""
+        }, {
+            text : "开户银行", 
+            dataIndex : "ve_bankcode", 
+            width : 120.0, 
+            xtype : ""
+        }, {
+            text : "银行账户", 
+            dataIndex : "ve_bankaccount", 
+            width : 120.0, 
+            xtype : ""
+        }, {
+            text : "状态", 
+            dataIndex : "ve_status", 
+            width : 120.0, 
+            xtype : ""
         }]
     },