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

applications/purchase/purchase-server/src/main/java/com/usoftchina/saas/purchase/po/PurchaseList.java

@@ -122,6 +122,8 @@ public class PurchaseList extends CommonBaseEntity implements Serializable {
 
     private String pd_remark;
 
+    private String pd_ordercode;
+
     //private ProductDTO productDTO;
     private Long pr_id;
     private String pr_code;

applications/purchase/purchase-server/src/main/resources/mapper/PurchaseListMapper.xml

@@ -42,6 +42,7 @@
         <result column="PD_PRODID" property="pd_prodid" jdbcType="INTEGER" />
         <result column="PD_PRODCODE" property="pd_prodcode" jdbcType="VARCHAR" />
         <result column="PD_UNIT" property="pd_unit" jdbcType="VARCHAR" />
+        <result column="pd_ordercode" property="pd_ordercode" jdbcType="VARCHAR" />
         <result column="PD_QTY" property="pd_qty" jdbcType="DOUBLE" />
         <result column="PD_PRICE" property="pd_price" jdbcType="DOUBLE" />
         <result column="PD_TAXPRICE" property="pd_taxprice" jdbcType="DOUBLE" />

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

@@ -52,6 +52,12 @@ Ext.define('saas.view.core.query.QueryGridPanel', {
 
     initComponent: function () {
         var me = this;
+
+        console.log(me.idField);
+        if(me.idField == 'id') {
+            me.idField = '_id';
+        }
+
         Ext.apply(me, {
             columns: me.initColumns(),
             store: Ext.create('Ext.data.Store', {
@@ -115,12 +121,16 @@ Ext.define('saas.view.core.query.QueryGridPanel', {
                     },
                     load: function(store, records, successful, operation, eOpts) {
                         var queryPanel = me.up('core-query-querypanel'),
-                        mode = queryPanel.getQueryMode();
+                        mode = queryPanel.getQueryMode(),
+                        datas = [];
 
-                        store.each(function(d, i) {
-                            d.set('id', d.get('id') + '-' + i);
+                        Ext.Array.each(records, function(r, i) {
+                            var d = Object.assign({}, r.data, { _id: r.data.id, id: Ext.id() });
+                            datas.push(d);
                         });
-                        
+
+                        store.loadData(datas, false);
+
                         if(mode=="MAIN"){
                             me.reconfigure(store, me.initColumns(me.baseColumn));
                         }else{
@@ -270,11 +280,11 @@ Ext.define('saas.view.core.query.QueryGridPanel', {
             if(e.target.parentElement.classList.contains('x-querygrid-code-column')) {
                 var grid = tableView.up('grid'),
                 idValue = record.get(grid.idField),
-                initId = typeof idValue.split == 'function' ? idValue.split('-')[0] : idValue;
+                // initId = typeof idValue.split == 'function' ? idValue.split('-')[0] : idValue;
                 codeValue = record.get(grid.codeField),
                 id = grid.addXtype + '-' + idValue;
                 saas.util.BaseUtil.openTab(grid.addXtype, grid.addTitle+"("+codeValue+")", id, {
-                    initId: initId
+                    initId: idValue
                 });
             }
         },
@@ -326,7 +336,7 @@ Ext.define('saas.view.core.query.QueryGridPanel', {
         saas.util.BaseUtil.request({
             url: url,
             params: '',
-            method: 'POST',
+            method: 'GET',
         })
         .then(function(localJson) {
             if(localJson.success){