Browse Source

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

rainco 7 years ago
parent
commit
506c810550

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

@@ -270,10 +270,11 @@ Ext.define('saas.view.core.query.QueryGridPanel', {
             if(e.target.parentElement.classList.contains('x-querygrid-code-column')) {
             if(e.target.parentElement.classList.contains('x-querygrid-code-column')) {
                 var grid = tableView.up('grid'),
                 var grid = tableView.up('grid'),
                 idValue = record.get(grid.idField),
                 idValue = record.get(grid.idField),
+                initId = typeof idValue.split == 'function' ? idValue.split('-')[0] : idValue;
                 codeValue = record.get(grid.codeField),
                 codeValue = record.get(grid.codeField),
                 id = grid.addXtype + '-' + idValue;
                 id = grid.addXtype + '-' + idValue;
                 saas.util.BaseUtil.openTab(grid.addXtype, grid.addTitle+"("+codeValue+")", id, {
                 saas.util.BaseUtil.openTab(grid.addXtype, grid.addTitle+"("+codeValue+")", id, {
-                    initId: idValue
+                    initId: initId
                 });
                 });
             }
             }
         },
         },

+ 1 - 1
frontend/saas-web/app/view/sale/saleOut/QueryPanel.js

@@ -126,7 +126,7 @@ Ext.define('saas.view.sale.saleout.QueryPanel', {
             xtype: 'numbercolumn'
             xtype: 'numbercolumn'
         }, {
         }, {
             text: '单据编号',
             text: '单据编号',
-            dataIndex: 'pd_inoutno',
+            dataIndex: 'pi_inoutno',
             width: 200
             width: 200
         }, {
         }, {
             text: '审核状态',
             text: '审核状态',