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

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

@@ -116,7 +116,7 @@ Ext.define('saas.view.core.form.FormPanel', {
             text:'操作日志',
             hidden: true,
             bind: {
-                hidden: '{!id}'
+                hidden: '{!showLogBtn || !id}'
             },
             handler:"showMessageLog"
         }, {

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

@@ -17,6 +17,7 @@ Ext.define('saas.view.core.form.FormPanelModel', {
         showCopyBtn: true, // 显示复制按钮
         showAuditBtn: true, // 显示审核、反审核按钮
         showPrintBtn: false, // 显示打印按钮
+        showLogBtn: true, // 显示操作日志按钮
         configurable: true, // 显示界面设置按钮
 
         detailBindeFields: [], // 从表绑定列

frontend/saas-web/app/view/purchase/b2b/reconciliation/FormPanelModel.js

@@ -17,6 +17,7 @@ Ext.define('saas.view.purchase.b2b.reconciliation.FormPanelModel', {
         showCopyBtn: false, // 显示复制按钮
         showAuditBtn: false, // 显示审核、反审核按钮
         showPrintBtn: false, // 显示打印按钮
+        showLogBtn: false, // 显示操作日志按钮
         configurable: false, // 显示界面设置按钮
 
         detailBindeFields: [], // 从表绑定列

frontend/saas-web/app/view/sale/b2b/recformpanel/FormPanelController.js

@@ -78,7 +78,6 @@ Ext.define('saas.view.sale.b2b.recformpanel.FormPanelController', {
     check:function(url){
         var me = this;
         var view = me.getView();
-        view.setLoading(true);
 
         //判断数据是否合格
         var selected = view.down('[xtype=grid]').selModel.selected.items;
@@ -141,6 +140,7 @@ Ext.define('saas.view.sale.b2b.recformpanel.FormPanelController', {
             items:items
         }
         
+        view.setLoading(true);
         saas.util.BaseUtil.request({
             url: '/api/sale/b2b/apCheck/operation/save',
             params: JSON.stringify(params),

frontend/saas-web/app/view/sale/b2b/recformpanel/FormPanelModel.js

@@ -17,6 +17,7 @@ Ext.define('saas.view.sale.b2b.recformpanel.FormPanelModel', {
         showCopyBtn: false, // 显示复制按钮
         showAuditBtn: false, // 显示审核、反审核按钮
         showPrintBtn: false, // 显示打印按钮
+        showLogBtn: false, // 显示操作日志按钮
         configurable: false, // 显示界面设置按钮
 
         detailBindeFields: [], // 从表绑定列