采购、销售、其它出入库列表、关联列表、明细表表标准化

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

@@ -314,7 +314,7 @@ Ext.define('saas.view.purchase.purchase.FormPanel', {
             }, {
                 xtype: "textfield",
                 name: "pu_total",
-                fieldLabel: "采购金额",
+                fieldLabel: "价税合计(元)",
                 readOnly: true,
                 columnWidth: 0.25,
             }, {

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

@@ -126,7 +126,7 @@ Ext.define('saas.view.purchase.purchaseIn.FormPanel', {
             }
         }, {
             text: "品牌",
-            width: 150.0,
+            width: 100.0,
             dataIndex: "pr_brand",
             ignore: true,
             renderer: function (v, m, r) {
@@ -136,8 +136,8 @@ Ext.define('saas.view.purchase.purchaseIn.FormPanel', {
                 return v;
             }
         }, {
-            text: "名称",
-            width: 200.0,
+            text: "物料名称",
+            width: 150.0,
             dataIndex: "pr_detail",
             ignore: true,
             renderer: function (v, m, r) {
@@ -159,7 +159,7 @@ Ext.define('saas.view.purchase.purchaseIn.FormPanel', {
             }
         }, {
             text: "规格",
-            width: 150,
+            width: 200,
             dataIndex: "pr_spec",
             ignore: true,
             renderer: function (v, m, r) {
@@ -172,6 +172,33 @@ Ext.define('saas.view.purchase.purchaseIn.FormPanel', {
             text: 'model映射需要',
             dataIndex: 'productDTO',
             hidden: true,
+        }, {
+            text: "仓库id",
+            dataIndex: "pd_whid",
+            xtype: "numbercolumn",
+            hidden: true
+        }, {
+            text: "仓库编号",
+            dataIndex: "pd_whcode",
+            hidden: true
+        }, {
+            text: "仓库",
+            dataIndex: "pd_whname",
+            width: 80.0,
+            allowBlank: false,
+            editor: {
+                displayField: "display",
+                editable: true,
+                format: "",
+                hideTrigger: false,
+                maxLength: 100.0,
+                minValue: null,
+                positiveNum: false,
+                queryMode: "local",
+                store: null,
+                valueField: "value",
+                xtype: "warehouseDbfindTrigger"
+            }
         }, {
             text: "数量",
             dataIndex: "pd_inqty",
@@ -192,7 +219,7 @@ Ext.define('saas.view.purchase.purchaseIn.FormPanel', {
             }
         }, {
             text: "单位",
-            width: 80.0,
+            width: 65.0,
             dataIndex: "pr_unit",
             ignore: true,
             renderer: function (v, m, r) {
@@ -251,7 +278,7 @@ Ext.define('saas.view.purchase.purchaseIn.FormPanel', {
             }
         }, {
             xtype: 'numbercolumn',
-            text: "税率",
+            text: "税率(%)",
             dataIndex: "pd_taxrate",
             width: 80,
             editor: {
@@ -288,56 +315,10 @@ Ext.define('saas.view.purchase.purchaseIn.FormPanel', {
                 return saas.util.BaseUtil.numberFormat(v, 2, true);
             }
         }, {
-            text: "仓库id",
-            dataIndex: "pd_whid",
-            xtype: "numbercolumn",
-            hidden: true
-        }, {
-            text: "仓库编号",
-            dataIndex: "pd_whcode",
-            hidden: true
-        }, {
-            text: "仓库",
-            dataIndex: "pd_whname",
-            width: 150.0,
-            allowBlank: false,
-            editor: {
-                displayField: "display",
-                editable: true,
-                format: "",
-                hideTrigger: false,
-                maxLength: 100.0,
-                minValue: null,
-                positiveNum: false,
-                queryMode: "local",
-                store: null,
-                valueField: "value",
-                xtype: "warehouseDbfindTrigger"
-            }
-        }, {
-            text: "采购单明细id",
-            dataIndex: "pd_orderid",
-            ignore: true,
-            hidden: true
-        }, {
-            text: "采购单号",
+            text: "关联采购单号",
             dataIndex: "pd_ordercode",
             width: 150.0,
             ignore: true,
-        }, {
-            text: "采购序号",
-            dataIndex: "pd_orderdetno",
-            xtype: "numbercolumn",
-            width: 110.0,
-            format: '0',
-            ignore: true,
-            renderer: function (v) {
-                if (v) {
-                    return Ext.util.Format.number(v, '0');
-                } else {
-                    return null;
-                }
-            }
         }, {
             text: "备注",
             dataIndex: "pd_remark",
@@ -345,7 +326,7 @@ Ext.define('saas.view.purchase.purchaseIn.FormPanel', {
             items: null,
             editor: {
                 xtype: "textfield"
-            },
+            }
         }]
     }, {
         xtype: "textfield",

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

@@ -122,23 +122,27 @@ Ext.define('saas.view.purchase.purchaseIn.QueryPanel', {
             dataIndex: 'pi_vendname',
             width: 150
         },{
-            text: '关联采购单号',
-            dataIndex: 'pi_pucode',
-            width: 150
+            text: '金额(元)',
+            dataIndex: 'pi_nettotal',
+            width: 110
         },{
-            text: '总金额',
+            text: '价税合计(元)',
             dataIndex: 'pi_total',
             width: 110
         },{
-            text: '单据状态',
+            text: '审核状态',
             align: 'center',
             dataIndex: 'pi_status',
-            width: 90
+            width: 80
         },{
             text: '付款状态',
             align: 'center',
             dataIndex: 'pi_prstatus',
-            width: 90
+            width: 80
+        }, {
+            text: '关联采购单号',
+            dataIndex: 'pi_pucode',
+            width: 150
         },{
             text: '备注',
             dataIndex: 'pi_remark',
@@ -151,39 +155,23 @@ Ext.define('saas.view.purchase.purchaseIn.QueryPanel', {
             xtype: 'numbercolumn',
             hidden:true
         }, {
-            text: '单据编号',
+            text: '验收单号',
             dataIndex: 'pi_inoutno',
             width: 150
-        }, {
-            text: '单据类型',
-            dataIndex: 'pd_piclass',
-            width: 0
         },{
             text: '单据日期',
             dataIndex: 'pi_date',
             xtype:'datecolumn',
             width: 110
-        },{
-            text: '供应商编号',
-            dataIndex: 'pi_vendcode',
-            width: 0
         },{
             text: '供应商名称',
             dataIndex: 'pi_vendname',
-            width: 150
+            width: 200
         },{
             text: '审核状态',
             align: 'center',
             dataIndex: 'pi_status',
-            width: 90
-        },{
-            text: '序号',
-            dataIndex: 'pd_pdno',
             width: 80
-        },{
-            text: '相关单号',
-            dataIndex: 'pd_ordercode',
-            width: 150
         },{
             text: '物料编号',
             dataIndex: 'pd_prodcode',
@@ -191,11 +179,11 @@ Ext.define('saas.view.purchase.purchaseIn.QueryPanel', {
         },{
             text: '品牌',
             dataIndex: 'pr_brand',
-            width: 150
+            width: 100
         },{
             text: '名称',
             dataIndex: 'pr_detail',
-            width: 200
+            width: 150
         },{
             text: '型号',
             dataIndex: 'pr_orispeccode',
@@ -203,9 +191,9 @@ Ext.define('saas.view.purchase.purchaseIn.QueryPanel', {
         },{
             text: '规格',
             dataIndex: 'pr_spec',
-            width: 150
+            width: 200
         },{
-            text: '数量',
+            text: '验收数量',
             dataIndex: 'pd_inqty',
             xtype:'numbercolumn',
             width: 110,
@@ -218,9 +206,20 @@ Ext.define('saas.view.purchase.purchaseIn.QueryPanel', {
         }, {
             text: '单位',
             dataIndex: 'pr_unit',
-            width: 80
+            width: 65
         }, {
             text: '单价(元)',
+            dataIndex: 'pd_netprice',
+            xtype:'numbercolumn',
+            renderer : function(v) {
+                var arr = (v + '.').split('.');
+                var xr = (new Array(arr[1].length > 4 ? 4 : arr[1].length)).fill('0');
+                var format = '0,000.' + xr.join('');
+                return Ext.util.Format.number(v, format);
+            },            
+            width: 110
+        }, {
+            text: '含税单价(元)',
             dataIndex: 'pd_orderprice',
             xtype:'numbercolumn',
             renderer : function(v) {
@@ -231,19 +230,30 @@ Ext.define('saas.view.purchase.purchaseIn.QueryPanel', {
             },            
             width: 110
         },{
-            text: '仓库',
-            dataIndex: 'pd_whname',
-            width: 150
-        },{
-            text: '税率',
-            dataIndex: 'pd_taxrate',
+            text: '金额(元)',
+            dataIndex: 'pd_nettotal',
             xtype:'numbercolumn',
-            width: 80,
+            width: 110,
             renderer : function(v) {
-                return Ext.util.Format.number(v, '0');
+                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: '金额',
+            text: '税额(元)',
+            dataIndex: 'pd_taxamount',
+            xtype:'numbercolumn',
+            width: 110,
+            renderer : function(v,g,r) {
+                v = (r.data["pd_ordertotal"]||0.0) - (r.data["pd_nettotal"]||0.0);
+                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: 'pd_ordertotal',
             xtype:'numbercolumn',
             width: 110,
@@ -253,6 +263,10 @@ Ext.define('saas.view.purchase.purchaseIn.QueryPanel', {
                 var format = '0,000.' + xr.join('');
                 return Ext.util.Format.number(v, format);
             },
+        }, {
+            text: '备注',
+            dataIndex: 'pd_remark',
+            width: 250
         }]
     }
 });

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

@@ -125,7 +125,7 @@ Ext.define('saas.view.purchase.purchaseOut.FormPanel', {
             hidden: true,
         }, {
             text: "品牌",
-            width: 150.0,
+            width: 100.0,
             dataIndex: "pr_brand",
             ignore: true,
             renderer: function (v, m, r) {
@@ -135,8 +135,8 @@ Ext.define('saas.view.purchase.purchaseOut.FormPanel', {
                 return v;
             }
         }, {
-            text: "名称",
-            width: 200.0,
+            text: "物料名称",
+            width: 150.0,
             dataIndex: "pr_detail",
             ignore: true,
             renderer: function (v, m, r) {
@@ -158,7 +158,7 @@ Ext.define('saas.view.purchase.purchaseOut.FormPanel', {
             }
         }, {
             text: "规格",
-            width: 150,
+            width: 200,
             dataIndex: "pr_spec",
             ignore: true,
             renderer: function (v, m, r) {
@@ -167,6 +167,33 @@ Ext.define('saas.view.purchase.purchaseOut.FormPanel', {
                 }
                 return v;
             }
+        }, {
+            text: "仓库id",
+            dataIndex: "pd_whid",
+            xtype: "numbercolumn",
+            hidden: true
+        }, {
+            text: "仓库编号",
+            dataIndex: "pd_whcode",
+            hidden: true
+        }, {
+            text: "仓库",
+            dataIndex: "pd_whname",
+            width: 80.0,
+            allowBlank: false,
+            editor: {
+                displayField: "display",
+                editable: true,
+                format: "",
+                hideTrigger: false,
+                maxLength: 100.0,
+                minValue: null,
+                positiveNum: false,
+                queryMode: "local",
+                store: null,
+                valueField: "value",
+                xtype: "warehouseDbfindTrigger"
+            }
         }, {
             text: "数量",
             dataIndex: "pd_outqty",
@@ -187,7 +214,7 @@ Ext.define('saas.view.purchase.purchaseOut.FormPanel', {
             }
         }, {
             text: "单位",
-            width: 80.0,
+            width: 65.0,
             dataIndex: "pr_unit",
             ignore: true,
             renderer: function (v, m, r) {
@@ -243,7 +270,7 @@ Ext.define('saas.view.purchase.purchaseOut.FormPanel', {
                 return saas.util.BaseUtil.numberFormat(v, 2, true);
             }
         }, {
-            text: "税率",
+            text: "税率(%)",
             xtype: 'numbercolumn',
             dataIndex: "pd_taxrate",
             width: 80,
@@ -280,33 +307,6 @@ Ext.define('saas.view.purchase.purchaseOut.FormPanel', {
             summaryRenderer: function (v) {
                 return saas.util.BaseUtil.numberFormat(v, 2, true);
             }
-        }, {
-            text: "仓库id",
-            dataIndex: "pd_whid",
-            xtype: "numbercolumn",
-            hidden: true
-        }, {
-            text: "仓库编号",
-            dataIndex: "pd_whcode",
-            hidden: true
-        }, {
-            text: "仓库",
-            dataIndex: "pd_whname",
-            width: 150.0,
-            allowBlank: false,
-            editor: {
-                displayField: "display",
-                editable: true,
-                format: "",
-                hideTrigger: false,
-                maxLength: 100.0,
-                minValue: null,
-                positiveNum: false,
-                queryMode: "local",
-                store: null,
-                valueField: "value",
-                xtype: "warehouseDbfindTrigger"
-            }
         }, {
             text: "验收明细id",
             dataIndex: "pd_ioid",
@@ -316,19 +316,6 @@ Ext.define('saas.view.purchase.purchaseOut.FormPanel', {
             dataIndex: "iocode",
             width: 150.0,
             ignore: true
-        }, {
-            text: "验收序号",
-            dataIndex: "iodetno",
-            xtype: "numbercolumn",
-            width: 110.0,
-            ignore: true,
-            renderer: function (v) {
-                if (v) {
-                    return Ext.util.Format.number(v, '0');
-                } else {
-                    return null;
-                }
-            }
         }, {
             text: "备注",
             dataIndex: "pd_remark",

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

@@ -134,25 +134,29 @@ Ext.define('saas.view.purchase.purchaseOut.QueryPanel', {
             text: '供应商名称',
             dataIndex: 'pi_vendname',
             width: 150
-        },{
-            text: '关联验收单号',
-            dataIndex: 'pi_iocode',
-            width: 150
-        },{
-            text: '总金额',
+        }, {
+            text: '金额(元)',
+            dataIndex: 'pi_nettotal',
+            width: 110
+        }, {
+            text: '价税合计(元)',
             dataIndex: 'pi_total',
             width: 110
         },{
-            text: '单据状态',
+            text: '审核状态',
             align: 'center',
             dataIndex: 'pi_status',
-            width: 90
+            width: 80
         },{
             text: '付款状态',
             align: 'center',
             dataIndex: 'pi_prstatus',
-            width: 90
-        },{
+            width: 80
+        }, {
+            text: '关联验收单号',
+            dataIndex: 'pi_iocode',
+            width: 150
+        }, {
             text: '备注',
             dataIndex: 'pi_remark',
             width: 250
@@ -164,61 +168,38 @@ Ext.define('saas.view.purchase.purchaseOut.QueryPanel', {
                 xtype: 'numbercolumn',
                 hidden:true
             }, {
-                text: '单据编号',
+                text: '验退单号',
                 dataIndex: 'pi_inoutno',
                 width: 150
             }, {
-                text: '单据类型',
-                dataIndex: 'pd_piclass',
-                width: 0
-            },{
                 text: '单据日期',
                 dataIndex: 'pi_date',
                 xtype:'datecolumn',
                 width: 110
-            },{
-                text: '供应商编号',
-                dataIndex: 'pi_vendcode',
-                width: 0
             },{
                 text: '供应商名称',
                 dataIndex: 'pi_vendname',
-                width: 250
+                width: 200
             },{
                 text: '审核状态',
                 align: 'center',
                 dataIndex: 'pi_status',
-                width: 90
-            },{
-                text: '序号',
-                dataIndex: 'pd_pdno',
-                width: 80, 
-                renderer : function(v) {
-                    return Ext.util.Format.number(v, '0');
-                }
-            },{
-                text: '关联验收单号',
-                dataIndex: 'pi_iocode',
-                width: 150
-            },{
-                text: '关联验收序号',
-                dataIndex: 'iodetno',
-                width: 150
-            },{
+                width: 80
+            }, {
                 text: '物料编号',
                 dataIndex: 'pd_prodcode',
                 width: 150, 
                 renderer : function(v) {
                     return Ext.util.Format.number(v, '0');
                 }
-            },{
+            }, {
                 text: '品牌',
                 dataIndex: 'pr_brand',
-                width: 150
+                width: 100
             },{
-                text: '名称',
+                text: '物料名称',
                 dataIndex: 'pr_detail',
-                width: 200
+                width: 150
             },{
                 text: '型号',
                 dataIndex: 'pr_orispeccode',
@@ -226,9 +207,13 @@ Ext.define('saas.view.purchase.purchaseOut.QueryPanel', {
             },{
                 text: '规格',
                 dataIndex: 'pr_spec',
-                width: 150
+                width: 200
+            },{
+                text: '仓库',
+                dataIndex: 'pd_whname',
+                width: 80
             },{
-                text: '数量',
+                text: '验退数量',
                 dataIndex: 'pd_outqty',
                 xtype:'numbercolumn',
                 width: 110,
@@ -241,10 +226,10 @@ Ext.define('saas.view.purchase.purchaseOut.QueryPanel', {
             }, {
                 text: '单位',
                 dataIndex: 'pr_unit',
-                width: 80
+                width: 65
             }, {
                 text: '单价(元)',
-                dataIndex: 'pd_orderprice',
+                dataIndex: 'pd_netprice',
                 xtype:'numbercolumn',
                 renderer : function(v) {
                     var arr = (v + '.').split('.');
@@ -253,20 +238,42 @@ Ext.define('saas.view.purchase.purchaseOut.QueryPanel', {
                     return Ext.util.Format.number(v, format);
                 },            
                 width: 110
-            },{
-                text: '仓库',
-                dataIndex: 'pd_whname',
-                width: 150
-            },{
-                text: '税率',
-                dataIndex: 'pd_taxrate',
+            }, {
+                text: '含税单价(元)',
+                dataIndex: 'pd_netprice',
                 xtype:'numbercolumn',
-                width: 80,
                 renderer : function(v) {
-                    return Ext.util.Format.number(v, '0');
+                    var arr = (v + '.').split('.');
+                    var xr = (new Array(arr[1].length > 4 ? 4 : arr[1].length)).fill('0');
+                    var format = '0,000.' + xr.join('');
+                    return Ext.util.Format.number(v, format);
+                },            
+                width: 110
+            }, {
+                text: '金额(元)',
+                dataIndex: 'pd_nettotal',
+                xtype:'numbercolumn',
+                width: 110,
+                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: '金额',
+            }, {
+                text: '税额(元)',
+                dataIndex: 'pd_taxamount',
+                xtype:'numbercolumn',
+                width: 110,
+                renderer : function(v,g,r) {
+                    v = (r.data["pd_ordertotal"]||0.0) - (r.data["pd_nettotal"]||0.0);
+                    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: 'pd_ordertotal',
                 xtype:'numbercolumn',
                 width: 110,
@@ -276,6 +283,14 @@ Ext.define('saas.view.purchase.purchaseOut.QueryPanel', {
                     var format = '0,000.' + xr.join('');
                     return Ext.util.Format.number(v, format);
                 },
+            }, {
+                text: '关联验收单号',
+                dataIndex: 'pi_iocode',
+                width: 150
+            }, {
+                text: '备注',
+                dataIndex: 'iodetno',
+                width: 250
             }]
     }
 });

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

@@ -322,7 +322,7 @@ Ext.define('saas.view.sale.sale.FormPanel', {
             }, {
                 xtype: "textfield",
                 name: "sa_total",
-                fieldLabel: "销售金额",
+                fieldLabel: "价税合计(元)",
                 readOnly: true
             }, {
                 xtype: "employeeDbfindTrigger",

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

@@ -142,7 +142,7 @@ Ext.define('saas.view.sale.saleIn.FormPanel', {
             },
             {
                 text : "品牌", 
-                width : 150.0, 
+                width : 100.0, 
                 dataIndex : "pr_brand",
                 ignore:true,
                 renderer: function (v, m, r) {
@@ -153,8 +153,8 @@ Ext.define('saas.view.sale.saleIn.FormPanel', {
                 }
             },
             {
-                text : "名称", 
-                width : 200.0, 
+                text : "物料名称", 
+                width : 150.0, 
                 dataIndex : "pr_detail",
                 ignore:true,
                 renderer: function (v, m, r) {
@@ -177,7 +177,7 @@ Ext.define('saas.view.sale.saleIn.FormPanel', {
                 }
             },{
                 text : "规格", 
-                width : 150, 
+                width : 200, 
                 dataIndex : "pr_spec",
                 ignore:true,
                 renderer: function (v, m, r) {
@@ -186,7 +186,33 @@ Ext.define('saas.view.sale.saleIn.FormPanel', {
                     }                     
                     return v;
                 }
-            },{
+            }, {
+                text : "仓库ID", 
+                dataIndex : "pd_whid", 
+                width : 0
+            }, {
+                text : "仓库", 
+                dataIndex : "pd_whcode", 
+                hidden :true
+            }, {
+                text : "仓库", 
+                dataIndex : "pd_whname", 
+                allowBlank:false,
+                width : 80.0, 
+                editor : {
+                    displayField : "display", 
+                    editable : true, 
+                    format : "", 
+                    hideTrigger : false, 
+                    maxLength : 100.0, 
+                    minValue : null, 
+                    positiveNum : false, 
+                    queryMode : "local", 
+                    store : null, 
+                    valueField : "value", 
+                    xtype : "warehouseDbfindTrigger"
+                }
+            }, {
                 text : "数量", 
                 xtype: 'numbercolumn',
                 dataIndex : "pd_inqty", 
@@ -206,7 +232,7 @@ Ext.define('saas.view.sale.saleIn.FormPanel', {
                 }
             },{
                 text : "单位", 
-                width : 80.0, 
+                width : 65.0, 
                 dataIndex : "pr_unit",
                 ignore:true,
                 renderer: function (v, m, r) {
@@ -262,7 +288,7 @@ Ext.define('saas.view.sale.saleIn.FormPanel', {
                     return saas.util.BaseUtil.numberFormat(v, 2, true);
                 }
             }, {
-                text : "税率", 
+                text : "税率(%)", 
                 xtype: 'numbercolumn',
                 dataIndex : "pd_taxrate", 
                 width : 80, 
@@ -300,42 +326,7 @@ Ext.define('saas.view.sale.saleIn.FormPanel', {
                     return saas.util.BaseUtil.numberFormat(v, 2, true);
                 }
             }, {
-                text : "仓库ID", 
-                dataIndex : "pd_whid", 
-                width : 0
-            }, {
-                text : "仓库", 
-                dataIndex : "pd_whcode", 
-                hidden :true
-            }, {
-                text : "仓库", 
-                dataIndex : "pd_whname", 
-                allowBlank:false,
-                width : 150.0, 
-                editor : {
-                    displayField : "display", 
-                    editable : true, 
-                    format : "", 
-                    hideTrigger : false, 
-                    maxLength : 100.0, 
-                    minValue : null, 
-                    positiveNum : false, 
-                    queryMode : "local", 
-                    store : null, 
-                    valueField : "value", 
-                    xtype : "warehouseDbfindTrigger"
-                }
-            }, {
-                text : "销售订单明细id", 
-                dataIndex : "pd_sdid", 
-                hidden:true
-            }, {
-                text : "销售单号", 
-                dataIndex : "pd_ordercode", 
-                width : 150.0,
-                ignore:true
-            },{
-                text : "销售序号", 
+                text : "出货单号", 
                 dataIndex : "pd_orderdetno", 
                 xtype : "numbercolumn",
                 width: 110.0,
@@ -357,7 +348,7 @@ Ext.define('saas.view.sale.saleIn.FormPanel', {
     }, {
         xtype : "textfield", 
         name : "pi_total", 
-        fieldLabel : "单据金额", 
+        fieldLabel : "价税合计(元)", 
         readOnly: true
     }, {
         xtype : "textfield", 

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

@@ -112,16 +112,23 @@ Ext.define('saas.view.sale.saleIn.QueryPanel', {
             dataIndex: 'pi_date',
             xtype:'datecolumn',
             width: 110
-        },{
+        }, {
             text: '客户名称',
             dataIndex: 'pi_custname',
-            width: 250
-        },{
-            text: '关联出货单号',
-            dataIndex: 'pi_iocode',
-            width: 150
-        },{
-            text: '总金额',
+            width: 200
+        }, {
+            text: '金额(元)',
+            dataIndex: 'pi_nettotal',
+            xtype:'numbercolumn',
+            width: 110,
+            renderer : function(v) {
+                var arr = (v + '.').split('.');
+                var xr = (new Array(arr[1].length > 2 ? 2 : arr[1].length)).fill('0');
+                var format = '0.' + xr.join('');
+                return Ext.util.Format.number(v, format);
+            }
+        }, {
+            text: '价税合计(元)',
             dataIndex: 'pi_total',
             xtype:'numbercolumn',
             width: 110,
@@ -132,39 +139,23 @@ Ext.define('saas.view.sale.saleIn.QueryPanel', {
                 return Ext.util.Format.number(v, format);
             }
         }, {
-            text: '单据状态',
+            text: '审核状态',
             align: 'center',
             dataIndex: 'pi_status',
-            width: 90
-        },{
+            width: 80
+        }, {
             text: '收款状态',
             align: 'center',
             dataIndex: 'pi_prstatus',
-            width: 90
-        },{
-            text: '业务员',
-            dataIndex: 'sa_seller',
-            width: 90,
-            hidden :true
+            width: 80
+        }, {
+            text: '关联出货单',
+            dataIndex: 'pi_iocode',
+            width: 150
         }, {
             text: '备注',
             dataIndex: 'pi_remark',
             width: 250
-        },{
-            text: '未含税金额',
-            dataIndex: 'pi_nettotal',
-            xtype:'numbercolumn',
-            width: 0,
-            renderer : function(v) {
-                var arr = (v + '.').split('.');
-                var xr = (new Array(arr[1].length > 2 ? 2 : arr[1].length)).fill('0');
-                var format = '0.' + xr.join('');
-                return Ext.util.Format.number(v, format);
-            }
-        },{
-            text: '单据类型',
-            dataIndex: 'pi_class',
-            hidden :true
         }],
         relativeColumn: [{
             text: 'id',
@@ -172,7 +163,7 @@ Ext.define('saas.view.sale.saleIn.QueryPanel', {
             hidden:true,
             xtype: 'numbercolumn'
         }, {
-            text: '出货单号',
+            text: '退货单号',
             dataIndex: 'pi_inoutno',
             width: 150
         }, {
@@ -183,30 +174,12 @@ Ext.define('saas.view.sale.saleIn.QueryPanel', {
         },{
             text: '客户名称',
             dataIndex: 'pi_custname',
-            width: 250
+            width: 200
         }, {
-            text: '单据状态',
+            text: '审核状态',
             align: 'center',
             dataIndex: 'pi_status',
-            width: 90
-        }, {
-            text: '明细序号',
-            dataIndex: 'pd_detno',
-            xtype: 'numbercolumn',
-            width: 100
-        }, {
-            text: '关联销售单号',
-            dataIndex: 'pd_ordercode',
-            width: 150
-        }, {
-            text: '订单序号',
-            dataIndex: 'pd_orderdetno',
-            xtype:'numbercolumn',
-            width: 100,
-            renderer : function(v) {
-                var format = '0'
-                return Ext.util.Format.number(v, format);
-            }
+            width: 80
         }, {
             text: '物料编号',
             dataIndex: 'pd_prodcode',
@@ -214,11 +187,11 @@ Ext.define('saas.view.sale.saleIn.QueryPanel', {
         },{
             text: '品牌',
             dataIndex: 'pr_brand',
-            width: 150
+            width: 100
         },{
-            text: '名称',
+            text: '物料名称',
             dataIndex: 'pr_detail',
-            width: 200
+            width: 150
         },{
             text: '型号',
             dataIndex: 'pr_orispeccode',
@@ -226,7 +199,7 @@ Ext.define('saas.view.sale.saleIn.QueryPanel', {
         },{
             text: '规格',
             dataIndex: 'pr_spec',
-            width: 150
+            width: 200
         },{
             text: '退货数量',
             dataIndex: 'pd_inqty',
@@ -241,12 +214,23 @@ Ext.define('saas.view.sale.saleIn.QueryPanel', {
         }, {
             text: '单位',
             dataIndex: 'pr_unit',
-            width: 80
+            width: 65
         }, {
-            text: '出货单价(元)',
+            text: '单价(元)',
+            dataIndex: 'pd_netprice',
+            xtype:'numbercolumn',
+            width: 110,
+            renderer : function(v) {
+                var arr = (v + '.').split('.');
+                var xr = (new Array(arr[1].length > 4 ? 4 : arr[1].length)).fill('0');
+                var format = '0.' + xr.join('');
+                return Ext.util.Format.number(v, format);
+            }
+        }, {
+            text: '含税单价(元)',
             dataIndex: 'pd_sendprice',
             xtype:'numbercolumn',
-            width: 140,
+            width: 110,
             renderer : function(v) {
                 var arr = (v + '.').split('.');
                 var xr = (new Array(arr[1].length > 4 ? 4 : arr[1].length)).fill('0');
@@ -254,8 +238,8 @@ Ext.define('saas.view.sale.saleIn.QueryPanel', {
                 return Ext.util.Format.number(v, format);
             }
         }, {
-            text: '金额',
-            dataIndex: 'pd_total',
+            text: '金额(元)',
+            dataIndex: 'pd_nettotal',
             xtype:'numbercolumn',
             width: 110,
             renderer : function(v) {
@@ -265,24 +249,32 @@ Ext.define('saas.view.sale.saleIn.QueryPanel', {
                 return Ext.util.Format.number(v, format);
             }
         }, {
-            text: '税率',
-            dataIndex: 'pd_taxrate',
+            text: '税额(元)',
+            dataIndex: 'pd_taxamount',
             xtype:'numbercolumn',
-            width: 80,
-            renderer : function(v) {
-                return Ext.util.Format.number(v, '0');
+            width: 110,
+            renderer : function(v,g,r) {
+                v = (r.data["pd_ordertotal"]||0.0) - (r.data["pd_nettotal"]||0.0);
+                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: 'pd_price',
+            text: '价税合计(元)',
+            dataIndex: 'pd_ordertotal',
             xtype:'numbercolumn',
-            width: 140,
+            width: 110,
             renderer : function(v) {
                 var arr = (v + '.').split('.');
-                var xr = (new Array(arr[1].length > 4 ? 4 : arr[1].length)).fill('0');
+                var xr = (new Array(arr[1].length > 3 ? 3 : arr[1].length)).fill('0');
                 var format = '0.' + xr.join('');
                 return Ext.util.Format.number(v, format);
             }
+        }, {
+            text: '关联出货单号',
+            dataIndex: 'pd_iocode',
+            width: 150
         }, {
             text: '备注',
             dataIndex: 'pd_remark',

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

@@ -151,7 +151,7 @@ Ext.define('saas.view.sale.saleout.FormPanel', {
             hidden: true,
         }, {
             text: "品牌",
-            width: 150.0,
+            width: 100.0,
             dataIndex: "pr_brand",
             ignore: true,
             renderer: function (v, m, r) {
@@ -161,8 +161,8 @@ Ext.define('saas.view.sale.saleout.FormPanel', {
                 return v;
             }
         }, {
-            text: "名称",
-            width: 200.0,
+            text: "物料名称",
+            width: 150.0,
             dataIndex: "pr_detail",
             ignore: true,
             renderer: function (v, m, r) {
@@ -184,7 +184,7 @@ Ext.define('saas.view.sale.saleout.FormPanel', {
             }
         }, {
             text: "规格",
-            width: 150,
+            width: 200,
             dataIndex: "pr_spec",
             ignore: true,
             renderer: function (v, m, r) {
@@ -194,7 +194,34 @@ Ext.define('saas.view.sale.saleout.FormPanel', {
                 return v;
             }
         }, {
-            text: "出货数量",
+            text: "仓库ID",
+            dataIndex: "pd_whid",
+            hidden: true
+        }, {
+            text: "仓库编号",
+            dataIndex: "pd_whcode",
+            hidden: true
+        }, {
+            text: "仓库",
+            dataIndex: "pd_whname",
+            width: 80.0,
+            items: null,
+            allowBlank: false,
+            editor: {
+                displayField: "display",
+                editable: true,
+                format: "",
+                hideTrigger: false,
+                maxLength: 100.0,
+                minValue: null,
+                positiveNum: false,
+                queryMode: "local",
+                store: null,
+                valueField: "value",
+                xtype: "warehouseDbfindTrigger"
+            }
+        }, {
+            text: "数量",
             xtype: 'numbercolumn',
             dataIndex: "pd_outqty",
             width: 110.0,
@@ -213,7 +240,7 @@ Ext.define('saas.view.sale.saleout.FormPanel', {
             }
         }, {
             text: "单位",
-            width: 80.0,
+            width: 65.0,
             dataIndex: "pr_unit",
             ignore: true,
             renderer: function (v, m, r) {
@@ -269,7 +296,7 @@ Ext.define('saas.view.sale.saleout.FormPanel', {
                 return saas.util.BaseUtil.numberFormat(v, 2, true);
             }
         }, {
-            text: "税率",
+            text: "税率(%)",
             xtype: 'numbercolumn',
             dataIndex: "pd_taxrate",
             width: 80,
@@ -306,48 +333,11 @@ Ext.define('saas.view.sale.saleout.FormPanel', {
             summaryRenderer: function (v) {
                 return saas.util.BaseUtil.numberFormat(v, 2, true);
             }
-        }, {
-            text: "仓库ID",
-            dataIndex: "pd_whid",
-            hidden: true
-        }, {
-            text: "仓库编号",
-            dataIndex: "pd_whcode",
-            hidden: true
-        }, {
-            text: "仓库",
-            dataIndex: "pd_whname",
-            width: 150.0,
-            items: null,
-            allowBlank: false,
-            editor: {
-                displayField: "display",
-                editable: true,
-                format: "",
-                hideTrigger: false,
-                maxLength: 100.0,
-                minValue: null,
-                positiveNum: false,
-                queryMode: "local",
-                store: null,
-                valueField: "value",
-                xtype: "warehouseDbfindTrigger"
-            }
         }, {
             text: "销售单号",
             dataIndex: "pd_ordercode",
             width: 150.0,
             ignore: true
-        }, {
-            text: "销售序号",
-            dataIndex: "pd_orderdetno",
-            xtype: "numbercolumn",
-            width: 110.0,
-            format: '0',
-            ignore: true,
-            renderer: function (v) {
-                return v ? v : null;
-            }
         }, {
             text: "备注",
             dataIndex: "pd_remark",
@@ -360,7 +350,7 @@ Ext.define('saas.view.sale.saleout.FormPanel', {
     }, {
         xtype: "textfield",
         name: "pi_total",
-        fieldLabel: "单据金额",
+        fieldLabel: "价税合计(元)",
         readOnly: true
     }, {
         xtype: "textfield",

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

@@ -115,44 +115,35 @@ Ext.define('saas.view.sale.saleout.QueryPanel', {
         },{
             text: '客户名称',
             dataIndex: 'pi_custname',
-            width: 250
-        },{
-            text: '关联销售单号',
-            dataIndex: 'pi_sacode',
-            width: 150
-        },{
-            text: '总金额',
+            width: 200
+        }, {
+            text: '金额(元)',
+            dataIndex: 'pi_nettotal',
+            xtype:'numbercolumn',
+            width: 110
+        }, {
+            text: '价税合计(元)',
             dataIndex: 'pi_total',
             xtype:'numbercolumn',
             width: 110
         }, {
-            text: '单据状态',
+            text: '审核状态',
             align: 'center',
             dataIndex: 'pi_status',
-            width: 90
+            width: 80
         },{
             text: '收款状态',
             align: 'center',
             dataIndex: 'pi_prstatus',
-            width: 90
-        },{
-            text: '业务员',
-            dataIndex: 'sa_seller',
-            width: 90,
-            hidden :true
+            width: 80
+        }, {
+            text: '关联销售单',
+            dataIndex: 'pi_sacode',
+            width: 150
         }, {
             text: '备注',
             dataIndex: 'pi_remark',
             width: 250
-        },{
-            text: '未含税金额',
-            dataIndex: 'pi_nettotal',
-            xtype:'numbercolumn',
-            hidden :true
-        },{
-            text: '单据类型',
-            dataIndex: 'pi_class',
-            hidden :true
         }],
         relativeColumn: [{
             text: 'id',
@@ -171,34 +162,12 @@ Ext.define('saas.view.sale.saleout.QueryPanel', {
         },{
             text: '客户名称',
             dataIndex: 'pi_custname',
-            width: 250
+            width: 200
         }, {
-            text: '单据状态',
+            text: '审核状态',
             align: 'center',
             dataIndex: 'pi_status',
-            width: 90
-        }, {
-            text: '明细序号',
-            dataIndex: 'pd_pdno',
-            xtype: 'numbercolumn',
-            width: 100,
-            renderer : function(v) {
-                var format = '0'
-                return Ext.util.Format.number(v, format);
-            }
-        }, {
-            text: '关联销售单号',
-            dataIndex: 'pd_ordercode',
-            width: 150
-        }, {
-            text: '订单序号',
-            dataIndex: 'pd_orderdetno',
-            xtype:'numbercolumn',
-            width: 100,
-            renderer : function(v) {
-                var format = '0'
-                return Ext.util.Format.number(v, format);
-            }
+            width: 80
         }, {
             text: '物料编号',
             dataIndex: 'pd_prodcode',
@@ -206,20 +175,24 @@ Ext.define('saas.view.sale.saleout.QueryPanel', {
         },{
             text: '品牌',
             dataIndex: 'pr_brand',
-            width: 150
+            width: 100
         },{
-            text: '名称',
+            text: '物料名称',
             dataIndex: 'pr_detail',
-            width: 200
+            width: 150
         },{
             text: '型号',
             dataIndex: 'pr_orispeccode',
             width: 200
-        },{
+        }, {
             text: '规格',
             dataIndex: 'pr_spec',
             width: 150
         },{
+            text: '仓库',
+            dataIndex: 'pd_whname',
+            width: 80
+        }, {
             text: '出货数量',
             dataIndex: 'pd_outqty',
             xtype:'numbercolumn',
@@ -233,12 +206,23 @@ Ext.define('saas.view.sale.saleout.QueryPanel', {
         }, {
             text: '单位',
             dataIndex: 'pr_unit',
-            width: 80
+            width: 65
+        }, {
+            text: '单价(元)',
+            dataIndex: 'pd_netprice',
+            xtype:'numbercolumn',
+            width: 110,
+            renderer : function(v) {
+                var arr = (v + '.').split('.');
+                var xr = (new Array(arr[1].length > 4 ? 4 : arr[1].length)).fill('0');
+                var format = '0.' + xr.join('');
+                return Ext.util.Format.number(v, format);
+            }
         }, {
-            text: '出货单价(元)',
+            text: '含税单价(元)',
             dataIndex: 'pd_sendprice',
             xtype:'numbercolumn',
-            width: 140,
+            width: 110,
             renderer : function(v) {
                 var arr = (v + '.').split('.');
                 var xr = (new Array(arr[1].length > 4 ? 4 : arr[1].length)).fill('0');
@@ -246,8 +230,8 @@ Ext.define('saas.view.sale.saleout.QueryPanel', {
                 return Ext.util.Format.number(v, format);
             }
         }, {
-            text: '金额',
-            dataIndex: 'pd_ordertotal',
+            text: '金额(元)',
+            dataIndex: 'pd_nettotal',
             xtype:'numbercolumn',
             width: 110,
             renderer : function(v) {
@@ -257,24 +241,32 @@ Ext.define('saas.view.sale.saleout.QueryPanel', {
                 return Ext.util.Format.number(v, format);
             }
         }, {
-            text: '税率',
-            dataIndex: 'pd_taxrate',
+            text: '税额(元)',
+            dataIndex: 'pd_taxamount',
             xtype:'numbercolumn',
-            width: 80,
-            renderer : function(v) {
-                return Ext.util.Format.number(v, '0');
+            width: 110,
+            renderer : function(v,g,r) {
+                v = (r.data["pd_ordertotal"]||0.0) - (r.data["pd_nettotal"]||0.0);
+                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: 'pd_price',
+            text: '价税合计(元)',
+            dataIndex: 'pd_ordertotal',
             xtype:'numbercolumn',
-            width: 140,
+            width: 110,
             renderer : function(v) {
                 var arr = (v + '.').split('.');
-                var xr = (new Array(arr[1].length > 4 ? 4 : arr[1].length)).fill('0');
+                var xr = (new Array(arr[1].length > 3 ? 3 : arr[1].length)).fill('0');
                 var format = '0.' + xr.join('');
                 return Ext.util.Format.number(v, format);
             }
+        }, {
+            text: '关联销售单号',
+            dataIndex: 'pd_ordercode',
+            width: 150
         }, {
             text: '备注',
             dataIndex: 'pd_remark',

frontend/saas-web/app/view/stock/otherIn/FormPanel.js

@@ -121,14 +121,13 @@ Ext.define('saas.view.stock.otherIn.FormPanel', {
                     valueField : "value", 
                     xtype : "productMultiDbfindTrigger"
                 }
-            },{
+            }, {
                 text: 'model映射需要',
                 dataIndex: 'productDTO',
                 hidden: true,
-            },
-            {
+            }, {
                 text : "品牌", 
-                width : 150.0, 
+                width : 100.0, 
                 dataIndex : "pr_brand",
                 ignore:true,
                 renderer: function (v, m, r) {
@@ -137,10 +136,9 @@ Ext.define('saas.view.stock.otherIn.FormPanel', {
                     }                     
                     return v;
                 }
-            },
-            {
-                text : "名称", 
-                width : 200.0, 
+            }, {
+                text : "物料名称", 
+                width : 150.0, 
                 dataIndex : "pr_detail",
                 ignore:true,
                 renderer: function (v, m, r) {
@@ -149,8 +147,7 @@ Ext.define('saas.view.stock.otherIn.FormPanel', {
                     }                     
                     return v;
                 }
-            },
-            {
+            }, {
                 text : "型号", 
                 width : 200.0, 
                 dataIndex : "pr_orispeccode",
@@ -161,9 +158,9 @@ Ext.define('saas.view.stock.otherIn.FormPanel', {
                     }                     
                     return v;
                 }
-            },{
+            }, {
                 text : "规格", 
-                width : 150, 
+                width : 200, 
                 dataIndex : "pr_spec",
                 ignore:true,
                 renderer: function (v, m, r) {
@@ -172,7 +169,34 @@ Ext.define('saas.view.stock.otherIn.FormPanel', {
                     }                     
                     return v;
                 }
-            },{
+            }, {
+                text : "仓库id", 
+                dataIndex : "pd_whid", 
+                xtype : "numbercolumn",
+                hidden:true
+            }, {
+                text : "仓库编号", 
+                dataIndex : "pd_whcode",
+                hidden:true
+            }, {
+                text : "仓库", 
+                dataIndex : "pd_whname", 
+                width : 80.0, 
+                allowBlank : false,
+                editor : {
+                    displayField : "display", 
+                    editable : true, 
+                    format : "", 
+                    hideTrigger : false, 
+                    maxLength : 100.0, 
+                    minValue : null, 
+                    positiveNum : false, 
+                    queryMode : "local", 
+                    store : null, 
+                    valueField : "value", 
+                    xtype : "warehouseDbfindTrigger"
+                }
+            }, {
                 text : "数量", 
                 xtype: 'numbercolumn',
                 dataIndex : "pd_inqty", 
@@ -210,8 +234,8 @@ Ext.define('saas.view.stock.otherIn.FormPanel', {
             },{
                 text : "单价(元)", 
                 xtype: 'numbercolumn',
-                dataIndex : "pd_orderprice",
-                width : 110.0,
+                dataIndex : "pd_price",
+                width : 120.0,
                 editor : {
                     xtype : "numberfield",
                     decimalPrecision: 4,
@@ -223,60 +247,11 @@ Ext.define('saas.view.stock.otherIn.FormPanel', {
                     var format = '0.' + xr.join('');
                     return Ext.util.Format.number(v, format);
                 }
-            },{
-                text : "仓库id", 
-                dataIndex : "pd_whid", 
-                xtype : "numbercolumn",
-                hidden:true
-            },
-            {
-                text : "仓库编号", 
-                dataIndex : "pd_whcode",
-                hidden:true
-            },
-            {
-                text : "仓库", 
-                dataIndex : "pd_whname", 
-                width : 150.0, 
-                allowBlank : false,
-                editor : {
-                    displayField : "display", 
-                    editable : true, 
-                    format : "", 
-                    hideTrigger : false, 
-                    maxLength : 100.0, 
-                    minValue : null, 
-                    positiveNum : false, 
-                    queryMode : "local", 
-                    store : null, 
-                    valueField : "value", 
-                    xtype : "warehouseDbfindTrigger"
-                }
             }, {
-                text : "税率", 
+                text : "金额(元)", 
                 xtype: 'numbercolumn',
-                dataIndex : "pd_taxrate", 
-                width : 80.0,
-                editor : {
-                    xtype : "numberfield",
-                    decimalPrecision: 0,
-                    minValue: 0,
-                    maxValue: 100
-                },
-                renderer : function(v) {
-                    return Ext.util.Format.number(v, '0');
-                }
-            }, 
-           {
-                text : "含税金额", 
-                xtype: 'numbercolumn',
-                dataIndex : "pd_ordertotal", 
-                width : 150.0,
-                // editor : {
-                //     xtype : "numberfield",
-                //     decimalPrecision: 2,
-                //     editable:false
-                // },
+                dataIndex : "pd_total", 
+                width : 120.0,
                 renderer : function(v) {
                     var arr = (v + '.').split('.');
                     var xr = (new Array(arr[1].length > 2 ? 2 : arr[1].length)).fill('0');
@@ -290,38 +265,14 @@ Ext.define('saas.view.stock.otherIn.FormPanel', {
                     var format = '0,000.' + xr.join('');
                     return Ext.util.Format.number(v, format);
                 }
-            },
-            {
-                text : "未税金额", 
-                xtype: 'numbercolumn',
-                dataIndex : "pd_nettotal", 
-                width : 150.0, 
-                // editor : {
-                //     xtype : "numberfield",
-                //     decimalPrecision: 2,
-                //     editable:false
-                // },
-                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);
-                },
-                summaryType: 'sum',
-                summaryRenderer: 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 : "pd_remark",
                 width : 250, 
                 items : null,
                 editor : {
                     xtype : "textfield"
-                },
+                }
             }
         ]
     },{

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

@@ -98,27 +98,27 @@ Ext.define('saas.view.stock.otherIn.QueryPanel', {
             hidden:true,
             xtype: 'numbercolumn'
         }, {
-            text: '其它入库单号',
+            text: '入库单号',
             dataIndex: 'pi_inoutno',
             width: 150
-        },{
-            text: '单据类型',
-            dataIndex: 'pi_class',
-            width: 0
-        },{
+        }, {
             text: '单据日期',
             dataIndex: 'pi_date',
             xtype:'datecolumn',
             width: 110
-        },{
-            text: '供应商',
+        }, {
+            text: '供应商名称',
             dataIndex: 'pi_vendname',
-            width: 250
-        },{
-            text: '状态',
+            width: 200
+        }, {
+            text: '金额(元)',
+            dataIndex: 'pi_nettotal',
+            width: 110
+        }, {
+            text: '审核状态',
             align: 'center',
             dataIndex: 'pi_status',
-            width: 90
+            width: 80
         },{
             text: '备注',
             dataIndex: 'pi_remark',
@@ -130,57 +130,49 @@ Ext.define('saas.view.stock.otherIn.QueryPanel', {
             dataIndex: 'pi_id',
             xtype: 'numbercolumn',
             hidden:true
-        },{
-            text: '其它入库单号',
+        }, {
+            text: '入库单号',
             dataIndex: 'pi_inoutno',
             width: 150
-        },{
-            text: '单据类型',
-            dataIndex: 'pi_class',
-            width: 0
-        },{
+        }, {
             text: '单据日期',
             dataIndex: 'pi_date',
             xtype:'datecolumn',
             width: 110
-        },{
-            text: '供应商',
+        }, {
+            text: '供应商名称',
             dataIndex: 'pi_vendname',
-            width: 250
-        },{
-            text: '状态',
+            width: 200
+        }, {
+            text: '审核状态',
             align: 'center',
             dataIndex: 'pi_status',
-            width: 90
-        },{
-            text: '序号',
-            dataIndex: 'pd_pdno',
             width: 80
-        },{
-            text: '相关单号',
-            dataIndex: 'pd_ordercode',
-            width: 150
-        },{
+        }, {
             text: '物料编号',
             dataIndex: 'pd_prodcode',
             width: 150
-        },{
+        }, {
             text: '品牌',
             dataIndex: 'pr_brand',
-            width: 150
-        },{
-            text: '名称',
+            width: 100
+        }, {
+            text: '物料名称',
             dataIndex: 'pr_detail',
-            width: 200
-        },{
+            width: 150
+        }, {
             text: '型号',
             dataIndex: 'pr_orispeccode',
             width: 200
-        },{
+        }, {
             text: '规格',
             dataIndex: 'pr_spec',
-            width: 150
-        },{
+            width: 200
+        }, {
+            text: '仓库',
+            dataIndex: 'pd_whname',
+            width: 80
+        }, {
             text: '数量',
             dataIndex: 'pd_inqty',
             xtype:'numbercolumn',
@@ -191,13 +183,13 @@ Ext.define('saas.view.stock.otherIn.QueryPanel', {
                 var format = '0,000.' + xr.join('');
                 return Ext.util.Format.number(v, format);
             },
-        },{
+        }, {
             text: '单位',
             dataIndex: 'pr_unit',
-            width: 80
+            width: 65
         },{
             text: '单价(元)',
-            dataIndex: 'pd_orderprice',
+            dataIndex: 'pd_price',
             xtype:'numbercolumn',
             width: 110,
             renderer : function(v) {
@@ -207,20 +199,8 @@ Ext.define('saas.view.stock.otherIn.QueryPanel', {
                 return Ext.util.Format.number(v, format);
             }        
         },{
-            text: '仓库',
-            dataIndex: 'pd_whname',
-            width: 150
-        },{
-            text: '税率',
-            dataIndex: 'pd_taxrate',
-            xtype:'numbercolumn',
-            width: 80,            
-            renderer : function(v) {
-                return Ext.util.Format.number(v, '0');
-            },
-        },{
-            text: '金额',
-            dataIndex: 'pd_ordertotal',
+            text: '金额(元)',
+            dataIndex: 'pd_total',
             xtype:'numbercolumn',            
             width: 110,
             renderer : function(v) {

frontend/saas-web/app/view/stock/otherOut/FormPanel.js

@@ -84,8 +84,7 @@ Ext.define('saas.view.stock.otherOut.FormPanel', {
                 dataIndex: "pd_prodid",
                 xtype: "numbercolumn",
                 hidden: true
-            },
-            {
+            }, {
                 text: "物料编号",
                 width: 150.0,
                 dataIndex: "pd_prodcode",
@@ -105,14 +104,13 @@ Ext.define('saas.view.stock.otherOut.FormPanel', {
                     valueField: "value",
                     xtype: "productMultiDbfindTrigger"
                 }
-            },{
+            }, {
                 text: 'model映射需要',
                 dataIndex: 'productDTO',
                 hidden: true,
-            },
-            {
+            }, {
                 text : "品牌", 
-                width : 150.0, 
+                width : 100.0, 
                 dataIndex : "pr_brand",
                 ignore:true,
                 renderer: function (v, m, r) {
@@ -121,10 +119,9 @@ Ext.define('saas.view.stock.otherOut.FormPanel', {
                     }                     
                     return v;
                 }
-            },
-            {
-                text : "名称", 
-                width : 200.0, 
+            }, {
+                text : "物料名称", 
+                width : 150.0, 
                 dataIndex : "pr_detail",
                 ignore:true,
                 renderer: function (v, m, r) {
@@ -133,8 +130,7 @@ Ext.define('saas.view.stock.otherOut.FormPanel', {
                     }                     
                     return v;
                 }
-            },
-            {
+            }, {
                 text : "型号", 
                 width : 200.0, 
                 dataIndex : "pr_orispeccode",
@@ -145,9 +141,9 @@ Ext.define('saas.view.stock.otherOut.FormPanel', {
                     }                     
                     return v;
                 }
-            },{
+            }, {
                 text : "规格", 
-                width : 150, 
+                width : 200, 
                 dataIndex : "pr_spec",
                 ignore:true,
                 renderer: function (v, m, r) {
@@ -156,7 +152,34 @@ Ext.define('saas.view.stock.otherOut.FormPanel', {
                     }                     
                     return v;
                 }
-            },{
+            }, {
+                text: "仓库id",
+                dataIndex: "pd_whid",
+                xtype: "numbercolumn",
+                hidden: true
+            }, {
+                text: "仓库编号",
+                dataIndex: "pd_whcode",
+                hidden: true
+            }, {
+                text: "仓库",
+                dataIndex: "pd_whname",
+                width: 80.0,
+                allowBlank : false,
+                editor: {
+                    displayField: "display",
+                    editable: true,
+                    format: "",
+                    hideTrigger: false,
+                    maxLength: 100.0,
+                    minValue: null,
+                    positiveNum: false,
+                    queryMode: "local",
+                    store: null,
+                    valueField: "value",
+                    xtype: "warehouseDbfindTrigger"
+                }
+            }, {
                 text: "数量",
                 xtype: 'numbercolumn',
                 dataIndex: "pd_outqty",
@@ -182,7 +205,7 @@ Ext.define('saas.view.stock.otherOut.FormPanel', {
                 }
             },{
                 text : "单位", 
-                width : 80.0, 
+                width : 65.0, 
                 dataIndex : "pr_unit",
                 ignore:true,
                 renderer: function (v, m, r) {
@@ -194,8 +217,8 @@ Ext.define('saas.view.stock.otherOut.FormPanel', {
             },{
                 text: "单价(元)",
                 xtype: 'numbercolumn',
-                dataIndex: "pd_orderprice", 
-                width : 110.0,
+                dataIndex: "pd_price", 
+                width : 120.0,
                 editor : {
                     xtype : "numberfield",
                     decimalPrecision: 4,
@@ -207,75 +230,11 @@ Ext.define('saas.view.stock.otherOut.FormPanel', {
                     var format = '0.' + xr.join('');
                     return Ext.util.Format.number(v, format);
                 }
-            },{
-                text: "仓库id",
-                dataIndex: "pd_whid",
-                xtype: "numbercolumn",
-                hidden: true
-            },
-            {
-                text: "仓库编号",
-                dataIndex: "pd_whcode",
-                hidden: true
-            },
-            {
-                text: "仓库",
-                dataIndex: "pd_whname",
-                width: 150.0,
-                allowBlank : false,
-                editor: {
-                    displayField: "display",
-                    editable: true,
-                    format: "",
-                    hideTrigger: false,
-                    maxLength: 100.0,
-                    minValue: null,
-                    positiveNum: false,
-                    queryMode: "local",
-                    store: null,
-                    valueField: "value",
-                    xtype: "warehouseDbfindTrigger"
-                }
-            },
-            {
-                text: "税率",
-                xtype: 'numbercolumn',
-                dataIndex: "pd_taxrate", 
-                width : 80.0,
-                editor : {
-                    xtype : "numberfield",
-                    decimalPrecision: 0,
-                    minValue: 0,
-                    maxValue: 100
-                },
-                renderer : function(v) {
-                    return Ext.util.Format.number(v, '0');
-                }
-            },
-            {
-                text: "含税金额",
-                xtype: 'numbercolumn',
-                dataIndex: "pd_ordertotal",
-                width: 150.0,
-                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);
-                },
-                summaryType: 'sum',
-                summaryRenderer: 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: "未税金额",
+            }, {
+                text: "金额(元)",
                 xtype: 'numbercolumn',
-                dataIndex: "pd_nettotal", 
-                width : 150.0,
+                dataIndex: "pd_total",
+                width: 120.0,
                 renderer : function(v) {
                     var arr = (v + '.').split('.');
                     var xr = (new Array(arr[1].length > 2 ? 2 : arr[1].length)).fill('0');
@@ -289,14 +248,14 @@ Ext.define('saas.view.stock.otherOut.FormPanel', {
                     var format = '0,000.' + xr.join('');
                     return Ext.util.Format.number(v, format);
                 }
-            },{
+            }, {
                 text : "备注", 
                 dataIndex : "pd_remark",
                 width : 250, 
                 items : null,
                 editor : {
                     xtype : "textfield"
-                },
+                }
             }
         ]
     },{

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

@@ -98,28 +98,28 @@ Ext.define('saas.view.stock.otherOut.QueryPanel', {
             hidden:true,
             xtype: 'numbercolumn'
         }, {
-            text: '其它出库单号',
+            text: '出库单号',
             dataIndex: 'pi_inoutno',
             width: 150
-        },{
-            text: '单据类型',
-            dataIndex: 'pi_class',
-            width: 0
-        },{
+        }, {
             text: '单据日期',
             dataIndex: 'pi_date',
             xtype:'datecolumn',
             width: 110
-        },{
-            text: '客户',
+        }, {
+            text: '客户名称',
             dataIndex: 'pi_custname',
-            width: 250
-        },{
-            text: '状态',
+            width: 200
+        }, {
+            text: '金额(元)',
+            dataIndex: 'pi_nettotal',
+            width: 110
+        }, {
+            text: '审核状态',
             align: 'center',
             dataIndex: 'pi_status',
-            width: 90
-        },{
+            width: 80
+        }, {
             text: '备注',
             dataIndex: 'pi_remark',
             width: 250
@@ -130,57 +130,49 @@ Ext.define('saas.view.stock.otherOut.QueryPanel', {
             dataIndex: 'pi_id',
             xtype: 'numbercolumn',
             hidden:true
-        },{
-            text: '其它入库单号',
+        }, {
+            text: '出库单号',
             dataIndex: 'pi_inoutno',
             width: 150
-        },{
-            text: '单据类型',
-            dataIndex: 'pi_class',
-            width: 0
-        },{
+        }, {
             text: '单据日期',
             dataIndex: 'pi_date',
             xtype:'datecolumn',
             width: 110
-        },{
-            text: '供应商',
+        }, {
+            text: '客户名称',
             dataIndex: 'pi_vendname',
-            width: 250
-        },{
-            text: '状态',
+            width: 200
+        }, {
+            text: '审核状态',
             align: 'center',
             dataIndex: 'pi_status',
             width: 90
-        },{
-            text: '序号',
-            dataIndex: 'pd_pdno',
-            width: 80
-        },{
-            text: '相关单号',
-            dataIndex: 'pd_ordercode',
-            width: 150
-        },{
+        }, {
             text: '物料编号',
             dataIndex: 'pd_prodcode',
             width: 150
-        },{
+        }, {
             text: '品牌',
             dataIndex: 'pr_brand',
-            width: 150
-        },{
-            text: '名称',
+            width: 100
+        }, {
+            text: '物料名称',
             dataIndex: 'pr_detail',
-            width: 200
-        },{
+            width: 150
+        }, {
             text: '型号',
             dataIndex: 'pr_orispeccode',
             width: 200
-        },{
+        }, {
             text: '规格',
             dataIndex: 'pr_spec',
-            width: 150
-        },{
+            width: 200
+        }, {
+            text: '仓库',
+            dataIndex: 'pd_whname',
+            width: 80
+        }, {
             text: '数量',
             dataIndex: 'pd_inqty',
             xtype:'numbercolumn',
@@ -191,13 +183,13 @@ Ext.define('saas.view.stock.otherOut.QueryPanel', {
                 var format = '0,000.' + xr.join('');
                 return Ext.util.Format.number(v, format);
             }
-        },{
+        }, {
             text: '单位',
             dataIndex: 'pr_unit',
-            width: 80
-        },{
+            width: 65
+        }, {
             text: '单价(元)',
-            dataIndex: 'pd_orderprice',
+            dataIndex: 'pd_price',
             xtype:'numbercolumn',
             width: 110,
             renderer : function(v) {
@@ -206,24 +198,13 @@ Ext.define('saas.view.stock.otherOut.QueryPanel', {
                 var format = '0.' + xr.join('');
                 return Ext.util.Format.number(v, format);
             }       
-        },{
-            text: '仓库',
-            dataIndex: 'pd_whname',
-            width: 150
-        },{
-            text: '税率',
-            dataIndex: 'pd_taxrate',
-            xtype:'numbercolumn',
-            width: 80,            
-            renderer : function(v) {
-                return Ext.util.Format.number(v, '0');
-            },
-        },{
-            text: '金额',
-            dataIndex: 'pd_ordertotal',
+        }, {
+            text: '金额(元)',
+            dataIndex: 'pd_total',
             xtype:'numbercolumn',            
             width: 110,
             renderer : function(v) {
+                v = (r.data["pd_ordertotal"]||0.0) * (r.data["pd_inqty"]||0.0);
                 var arr = (v + '.').split('.');
                 var xr = (new Array(arr[1].length)).fill('0');
                 var format = '0,000.' + xr.join('');