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

frontend/saas-web/app/view/core/base/BasePanel.scss

@@ -19,6 +19,15 @@
         border-bottom-color: #fff !important;
         border-bottom-width: 1px !important;
     }
+    .x-btn-menu-active{
+        .x-btn-wrap{
+            .x-btn-button{
+                .x-btn-inner{
+                    color:#fff;
+                }
+            }
+        }
+    }
 }
 .core-base-gridpanel{
     .x-grid-body{

frontend/saas-web/app/view/core/base/GridPanel.js

@@ -53,7 +53,7 @@ Ext.define('saas.view.core.base.GridPanel', {
                                 }
                             }else {
                                 console.error('exception: ', response.responseJson);
-                                saas.util.BaseUtil.showErrorToast('查询失败：' + response.responseJson.message);
+                                saas.util.BaseUtil.showErrorToast('查询失败：' + response.responseJson?response.responseJson.message:'请求超时');
                             }
                         }
                     }

frontend/saas-web/app/view/core/query/QueryGridPanel.js

@@ -93,7 +93,7 @@ Ext.define('saas.view.core.query.QueryGridPanel', {
                                 if(response.timedout) {
                                     saas.util.BaseUtil.showErrorToast('请求超时');
                                 }else{
-                                    saas.util.BaseUtil.showErrorToast('查询失败：' + response.responseJson.message);
+                                    saas.util.BaseUtil.showErrorToast('查询失败：' + response.responseJson?response.responseJson.message:'请求超时');
                                 }
                             }
                         }

frontend/saas-web/app/view/core/query/QueryGridPanel.scss

@@ -9,6 +9,16 @@
         }
     }
 
+    .x-btn-menu-active{
+        .x-btn-wrap{
+            .x-btn-button{
+                .x-btn-inner{
+                    color:#fff;
+                }
+            }
+        }
+    }
+
     .x-panel-default-outer-border-trl {
         border-top-color: #fff !important;
         border-top-width: 1px !important;

frontend/saas-web/app/view/stock/appropriationInOut/QueryPanel.js

@@ -180,10 +180,6 @@ Ext.define('saas.view.stock.appropriationInOut.QueryPanel', {
                 text: '序号',
                 dataIndex: 'pd_pdno',
                 width: 80
-            },{
-                text: '相关单号',
-                dataIndex: 'pd_ordercode',
-                width: 150
             },{
                 text: '物料编号',
                 dataIndex: 'pd_prodcode',
@@ -193,7 +189,11 @@ Ext.define('saas.view.stock.appropriationInOut.QueryPanel', {
                 dataIndex: 'pr_detail',
                 width: 200
             },{
-                text: '物料规格',
+                text: '型号',
+                dataIndex: 'pr_orispeccode',
+                width: 150
+            },{
+                text: '规格',
                 dataIndex: 'pr_spec',
                 width: 150
             },{
@@ -206,39 +206,13 @@ Ext.define('saas.view.stock.appropriationInOut.QueryPanel', {
                 xtype:'numbercolumn',
                 width: 110
             },{
-                text: '仓库',
+                text: '拨出仓',
                 dataIndex: 'pd_whname',
                 width: 150
             },{
-                text: '单价',
-                dataIndex: 'pd_orderprice',
-                xtype:'numbercolumn',
-                width: 110,
-                renderer : function(v) {
-                    var arr = (v + '.').split('.');
-                    var xr = (new Array(arr[1].length)).fill('0');
-                    var format = '0,000.' + xr.join();
-                    return Ext.util.Format.number(v, format);
-                }         
-            },{
-                text: '税率',
-                dataIndex: 'pd_taxrate',
-                xtype:'numbercolumn',
-                width: 80,            
-                renderer : function(v) {
-                    return Ext.util.Format.number(v, '0');
-                },
-            },{
-                text: '金额',
-                dataIndex: 'pd_total',
-                xtype:'numbercolumn',            
-                width: 110,
-                renderer : function(v) {
-                    var arr = (v + '.').split('.');
-                    var xr = (new Array(arr[1].length)).fill('0');
-                    var format = '0,000.' + xr.join();
-                    return Ext.util.Format.number(v, format);
-                }
+                text: '拨入仓',
+                dataIndex: 'pd_inwhname',
+                width: 150
             },{
                 text: '备注',
                 dataIndex: 'pd_remark',