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

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')) {
                 var grid = tableView.up('grid'),
                 idValue = record.get(grid.idField),
+                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: idValue
+                    initId: initId
                 });
             }
         },

frontend/saas-web/app/view/purchase/purchase/FormPanel.js

@@ -139,19 +139,6 @@ Ext.define('saas.view.purchase.purchase.FormPanel', {
                     }                     
                     return v;    
                 }
-            },
-            {
-                text : "最小包装数", 
-                xtype: 'numbercolumn',
-                dataIndex : "pr_zxbzs",
-                align: 'end',
-                ignore:true,
-                renderer: function (v, m, r) {
-                    if(!v){
-                        return r.data["productDTO"]?r.data["productDTO"][m.column.dataIndex]:null; 
-                    }                     
-                    return v; 
-                }
             },            
             {
                 text : "数量", 
@@ -293,6 +280,19 @@ Ext.define('saas.view.purchase.purchase.FormPanel', {
                     return Ext.util.Format.number(v, format);
                 }
             },
+            {
+                text : "最小包装数", 
+                xtype: 'numbercolumn',
+                dataIndex : "pr_zxbzs",
+                align: 'end',
+                ignore:true,
+                renderer: function (v, m, r) {
+                    if(!v){
+                        return r.data["productDTO"]?r.data["productDTO"][m.column.dataIndex]:null; 
+                    }                     
+                    return v; 
+                }
+            },
             {
                 text : "关联销售单号", 
                 dataIndex : "pd_salecode", 

frontend/saas-web/app/view/purchase/purchase/QueryPanel.js

@@ -89,7 +89,8 @@ Ext.define('saas.view.purchase.purchase.QueryPanel', {
         addXtype: 'purchase-purchase-formpanel',
         defaultCondition:'',
         baseVastUrl: '/api/purchase/purchase/',
-        baseColumn: [{
+        baseColumn: [
+        {
             text: 'id',
             dataIndex: 'pu_id',
             width: 100,
@@ -164,7 +165,8 @@ Ext.define('saas.view.purchase.purchase.QueryPanel', {
             xtype: 'datecolumn',
             width: 0
         }],
-        relativeColumn: [{
+        relativeColumn: [
+        {
             text: 'id',
             dataIndex: 'pu_id',
             width: 100,
@@ -198,28 +200,31 @@ Ext.define('saas.view.purchase.purchase.QueryPanel', {
             text: '序号',
             dataIndex: 'pd_detno',
             xtype: 'numbercolumn',
-            width: 120
+            width: 120, 
+            renderer : function(v) {
+            return Ext.util.Format.number(v, '0');
+            }
         }, {
             text: '物料编号',
             dataIndex: 'pd_prodcode',
-            width: 120
+            width: 150
         },{
             text: '物料名称',
             dataIndex: 'pr_detail',
-            width: 120
+            width: 180
         }, {
             text: '物料规格',
             dataIndex: 'pr_spec',
-            width: 120
+            width: 180
         }, {
             text: '单位',
             dataIndex: 'pr_spec',
-            width: 120
+            width: 100
         },{
             text: '采购数量',
             dataIndex: 'pd_qty',
             xtype: 'numbercolumn',
-            width: 120,
+            width: 100,
             renderer : function(v) {
                 var arr = (v + '.').split('.');
                 var xr = (new Array(arr[1].length > 3 ? 3 : arr[1].length)).fill('0');
@@ -235,18 +240,18 @@ Ext.define('saas.view.purchase.purchase.QueryPanel', {
             text: '单价',
             dataIndex: 'pd_price',
             xtype: 'numbercolumn',
-            width: 120,
+            width: 100,
             renderer : function(v) {
                 var arr = (v + '.').split('.');
-                var xr = (new Array(arr[1].length > 8 ? 8 : arr[1].length)).fill('0');
+                var xr = (new Array(arr[1].length > 3 ? 3 : 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: 120,
+            width: 100,
             renderer : function(v) {
                 return Ext.util.Format.number(v, '0');
             },
@@ -254,18 +259,18 @@ Ext.define('saas.view.purchase.purchase.QueryPanel', {
             text: '金额',
             dataIndex: 'pd_total',
             xtype: 'numbercolumn',
-            width: 120,
+            width: 100,
             renderer : function(v) {
                 var arr = (v + '.').split('.');
                 var xr = (new Array(arr[1].length > 2 ? 2 : arr[1].length)).fill('0');
                 var format = '0,000.' + xr.join();
                 return Ext.util.Format.number(v, format);
-            },
+            }
         },{
             text: '备注',
             dataIndex: 'pu_remark',
             xtype: 'numbercolumn',
-            width: 120
+            width: 250
         }]
     }
 });

frontend/saas-web/app/view/sale/sale/FormPanel.js

@@ -53,7 +53,7 @@ Ext.define('saas.view.sale.sale.FormPanel', {
         fieldLabel : "客户名称",
         allowBlank : false
     }, {
-        name : "pu_shipaddresscode", 
+        name : "sa_toplace", 
         editable:false,
         xtype : "remotecombo", 
         storeUrl:'/api/document/address/getCombo',
@@ -218,6 +218,15 @@ Ext.define('saas.view.sale.sale.FormPanel', {
                 renderer : function(v) {
                     return Ext.util.Format.number(v, '0');
                 }
+            },{
+                text : "交货日期", 
+                dataIndex : "sd_delivery", 
+                xtype:'datecolumn',
+                editor : {
+                    xtype : "datefield",
+                    editable : true, 
+                    hideTrigger : false
+                }
             },
             {
                 text : "含税金额", 
@@ -255,15 +264,6 @@ Ext.define('saas.view.sale.sale.FormPanel', {
                     var format = '0,000.' + xr.join();
                     return Ext.util.Format.number(v, format);
                 }
-            },{
-                text : "交货日期", 
-                dataIndex : "sd_delivery", 
-                xtype:'datecolumn',
-                editor : {
-                    xtype : "datefield",
-                    editable : true, 
-                    hideTrigger : false
-                }
             },{
                 text : "关联采购订单", 
                 dataIndex : "sd_pucode",

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

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