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

applications/document/document-server/src/main/resources/mapper/CustomerMapper.xml

@@ -156,7 +156,7 @@
         #{cu_code,jdbcType=VARCHAR},
       </if>
       <if test="cu_shortname !=null">
-        #{cu_shortname,jdbcType=VARCHAR}
+        #{cu_shortname,jdbcType=VARCHAR},
       </if>
       <if test="cu_name != null">
         #{cu_name,jdbcType=VARCHAR},

frontend/saas-web/app/view/core/form/FormPanelController.js

@@ -403,6 +403,7 @@ Ext.define('saas.view.core.form.FormPanelController', {
                 closable: true,
                 layout: 'fit',
                 items: [{
+                    padding:'5 10 5 10',
                     xtype: 'core-form-mseeageLog',
                     mlKeyvalue:mlKeyvalue,
                     mlCaller:mlCaller

frontend/saas-web/app/view/core/form/MseeageLog.js

@@ -121,6 +121,7 @@ Ext.define('saas.view.core.form.MseeageLog', {
 
             Ext.apply(me, {
                 dockedItems:[{
+                    style:'padding: 3px 0 3px 0px;height: 36px;',
                     xtype: 'pagingtoolbar',
                     dock: 'bottom',
                     displayInfo: true,

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

@@ -222,7 +222,7 @@ Ext.define('saas.view.sys.guide.FormPanel', {
         if(type=='warehouse'){
             message = '<span>因为新增物料时需要告知该物料所属仓库是哪里，所以需要首先进行仓库管理。</br>'+
             '录入完成后切换到“新手导航”页签继续下一步。</span>';
-            xtype = 'other-warehouse';
+            xtype = 'document-warehouse-datalist';
             title = '仓库资料'
         }
         if(type=='product'){

frontend/saas-web/resources/json/navigation.json

@@ -74,10 +74,6 @@
             "text": "客户对账单",
             "id": "monry-report-customercheck",
             "viewType":"monry-report-customercheck"
-        },{
-            "text":"其他收支明细表",
-            "id":"money-report-otheriodetail",
-            "viewType":"monry-report-otheriodetail"
         }]
     }]
 }, {
@@ -185,6 +181,10 @@
             "id": "monry-report-accountdetails",
             "viewType":"monry-report-accountdetails"
         }, {
+            "text":"其他收支明细表",
+            "id":"money-report-otheriodetail",
+            "viewType":"monry-report-otheriodetail"
+        },{
             "text": "账户收支明细表",
             "id": "monry-report-accountbalance",
             "viewType":"monry-report-accountbalance"