物料资料顺序修改、金额修改

frontend/saas-web/app/view/core/dbfind/types/ProductDbfindTrigger.js

@@ -34,24 +34,24 @@ Ext.define('saas.view.core.dbfind.types.ProductDbfindTrigger', {
         dataIndex: "pr_code",
         width: 150
     },{
-        text: "类型",
-        dataIndex: "pr_kind",
-        width: 110
+        text: '品牌',
+        dataIndex: 'pr_brand',
+        width: 150
     },{
-        text: "物料名称",
-        width: 200,
-        dataIndex: "pr_detail"
-    }, {
-        text : "型号", 
-        dataIndex : "pr_orispeccode", 
-        width : 150.0
-    }, {
-        text : "规格", 
-        dataIndex : "pr_spec", 
-        width : 150.0
+        text: '名称',
+        dataIndex: 'pr_detail',
+        width: 200
     },{
-        text: "品牌",
-        dataIndex: "pr_brand",
+        text: '型号',
+        dataIndex: 'pr_orispeccode',
+        width: 200
+    },{
+        text: "单位",
+        dataIndex: "pr_unit",
+        width: 80
+    },{
+        text: "类型",
+        dataIndex: "pr_kind",
         width: 110
     },{
         text: "库存",

frontend/saas-web/app/view/core/dbfind/types/ProductMultiDbfindTrigger.js

@@ -48,17 +48,25 @@ Ext.define('saas.view.core.dbfind.types.ProductMultiDbfindTrigger', {
         text: "物料名称",
         width: 200,
         dataIndex: "pr_detail"
-    }, {
-        text : "型号", 
-        dataIndex : "pr_orispeccode", 
-        width : 150.0
-    }, {
-        text : "规格", 
-        dataIndex : "pr_spec", 
-        width : 150.0
     },{
-        text: "品牌",
-        dataIndex: "pr_brand",
+        text: '品牌',
+        dataIndex: 'pr_brand',
+        width: 150
+    },{
+        text: '名称',
+        dataIndex: 'pr_detail',
+        width: 200
+    },{
+        text: '型号',
+        dataIndex: 'pr_orispeccode',
+        width: 200
+    },{
+        text: "单位",
+        dataIndex: "pr_unit",
+        width: 80
+    },{
+        text: "类型",
+        dataIndex: "pr_kind",
         width: 110
     },{
         text: "库存",
@@ -71,10 +79,6 @@ Ext.define('saas.view.core.dbfind.types.ProductMultiDbfindTrigger', {
             var format = '0,000.' + xr.join('');
             return Ext.util.Format.number(v, format);
         },
-    },{
-        text: "单位",
-        dataIndex: "pr_unit",
-        width: 80
     }, {
         text: "采购提前期",
         dataIndex: "pr_leadtime",

frontend/saas-web/app/view/document/product/BasePanel.js

@@ -74,12 +74,12 @@ Ext.define('saas.view.document.product.BasePanel', {
             text : "物料编号", 
             dataIndex : "pr_code", 
             width : 150.0
+        },{
+            text : "品牌", 
+            dataIndex : "pr_brand", 
+            width : 150.0
         }, {
-            text : "类型", 
-            dataIndex : "pr_kind", 
-            width : 110.0
-        }, {
-            text : "物料名称", 
+            text : "名称", 
             dataIndex : "pr_detail", 
             width : 200.0
         }, {
@@ -90,21 +90,10 @@ Ext.define('saas.view.document.product.BasePanel', {
             text : "规格", 
             dataIndex : "pr_spec", 
             width : 150.0
-        },{
-            text : "品牌", 
-            dataIndex : "pr_brand", 
-            width : 110.0 
-        },  {
-            text : "库存", 
-            dataIndex : "po_onhand",
-            xtype: 'numbercolumn',
-            width : 120.0,
-            renderer : function(v) {
-                var arr = (v + '.').split('.');
-                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 : "pr_kind", 
+            width : 110.0
         },{
             text : "单位", 
             dataIndex : "pr_unit", 
@@ -120,6 +109,17 @@ Ext.define('saas.view.document.product.BasePanel', {
                 var format = '0,000.' + xr.join('');
                 return Ext.util.Format.number(v, format);
             }
+        },  {
+            text : "库存", 
+            dataIndex : "po_onhand",
+            xtype: 'numbercolumn',
+            width : 120.0,
+            renderer : function(v) {
+                var arr = (v + '.').split('.');
+                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 : "pr_purcprice",

frontend/saas-web/app/view/document/product/FormPanel.js

@@ -32,10 +32,31 @@ Ext.define('saas.view.document.product.FormPanel', {
         name: 'pr_code',
         fieldLabel: '物料编号',
         allowBlank: false
+    },{
+        editable:false,
+        xtype : "remotecombo", 
+        storeUrl:'/api/document/productbrand/getCombo',
+        name : "pr_brand", 
+        fieldLabel : "品牌", 
+        addHandler:function(b){
+            var form = this.ownerCmp.ownerCt;
+            this.dialog = form.add({
+                xtype: 'document-productbrand-window',
+                bind: {
+                    title: '新增物料品牌'
+                },
+                dataKind:'productbrand',
+                _parent:form,
+                _combo:this.ownerCmp,
+                record:null,
+                session: true
+            });
+            this.dialog.show();
+        }
     },{
         xtype: 'textfield',
         name: 'pr_detail',
-        fieldLabel: '物料名称',
+        fieldLabel: '名称',
         allowBlank: false
     },{
         xtype: 'hidden',
@@ -45,6 +66,10 @@ Ext.define('saas.view.document.product.FormPanel', {
         xtype: 'hidden',
         name: 'pr_statuscode',
         fieldLabel: '状态码'
+    },{
+        xtype: 'textfield',
+        name: 'pr_orispeccode',
+        fieldLabel: '型号'
     },{
         xtype: 'textfield',
         name: 'pr_spec',
@@ -74,31 +99,6 @@ Ext.define('saas.view.document.product.FormPanel', {
             });
             this.dialog.show();
         }
-    },{
-        xtype: 'textfield',
-        name: 'pr_orispeccode',
-        fieldLabel: '型号'
-    },{
-        editable:false,
-        xtype : "remotecombo", 
-        storeUrl:'/api/document/productbrand/getCombo',
-        name : "pr_brand", 
-        fieldLabel : "品牌", 
-        addHandler:function(b){
-            var form = this.ownerCmp.ownerCt;
-            this.dialog = form.add({
-                xtype: 'document-productbrand-window',
-                bind: {
-                    title: '新增物料品牌'
-                },
-                dataKind:'productbrand',
-                _parent:form,
-                _combo:this.ownerCmp,
-                record:null,
-                session: true
-            });
-            this.dialog.show();
-        }
     },{  
         editable:false,
         xtype : "remotecombo", 
@@ -122,6 +122,21 @@ Ext.define('saas.view.document.product.FormPanel', {
             });
             this.dialog.show();
         }
+    },{
+        xtype : "numberfield", 
+        name : "pr_standardprice", 
+        fieldLabel : "标准单价", 
+        allowBlank : true, 
+        columnWidth : 0.25,
+        decimalPrecision: 8,
+        minValue:0
+    },{
+        xtype : "numberfield", 
+        name : "pr_zxbzs", 
+        fieldLabel : "最小包装数", 
+        minValue:0,
+        decimalPrecision: 0,
+        allowBlank : true
     },{
         xtype : "hidden", 
         name : "pr_whid", 
@@ -149,14 +164,6 @@ Ext.define('saas.view.document.product.FormPanel', {
         xtype : "textfield", 
         name : "pr_vendname", 
         fieldLabel : "供应商名称"
-    },{
-        xtype : "numberfield", 
-        name : "pr_standardprice", 
-        fieldLabel : "标准单价", 
-        allowBlank : true, 
-        columnWidth : 0.25,
-        decimalPrecision: 8,
-        minValue:0
     },{
         ignore:true,
         readOnly:true,
@@ -175,13 +182,6 @@ Ext.define('saas.view.document.product.FormPanel', {
         fieldLabel : "最新出货单价", 
         decimalPrecision: 8,
         minValue:0
-    },{
-        xtype : "numberfield", 
-        name : "pr_zxbzs", 
-        fieldLabel : "最小包装数", 
-        minValue:0,
-        decimalPrecision: 0,
-        allowBlank : true
     },{  
         hidden:true,
         xtype : "datefield", 

frontend/saas-web/app/view/home/infoCardList/Payment.js

@@ -122,7 +122,7 @@ Ext.define('saas.view.home.infoCardList.Payment', {
         width: 150,
         hidden: true
     }, {
-        text: '单价',
+        text: '单价(元)',
         dataIndex: 'pd_orderprice',
         xtype: 'numbercolumn',
         hidden: true,
@@ -143,7 +143,7 @@ Ext.define('saas.view.home.infoCardList.Payment', {
             return Ext.util.Format.number(v, '0');
         },
     }, {
-        text: '金额',
+        text: '金额(元)',
         dataIndex: 'pd_total',
         xtype: 'numbercolumn',
         width: 110,

frontend/saas-web/app/view/home/infoCardList/PurchaseIn.js

@@ -80,7 +80,7 @@ Ext.define('saas.view.home.infoCardList.PurchaseIn', {
         xtype: 'datecolumn',
         width: 110
     }, {
-        text: '单价',
+        text: '单价(元)',
         dataIndex: 'pd_price',
         xtype: 'numbercolumn',
         width: 110,
@@ -99,7 +99,7 @@ Ext.define('saas.view.home.infoCardList.PurchaseIn', {
             return Ext.util.Format.number(v, '0');
         },
     }, {
-        text: '金额',
+        text: '金额(元)',
         dataIndex: 'pd_total',
         xtype: 'numbercolumn',
         width: 110,

frontend/saas-web/app/view/home/infoCardList/Recment.js

@@ -124,7 +124,7 @@ Ext.define('saas.view.home.infoCardList.Recment', {
             return Ext.util.Format.number(v, format);
         }
     }, {
-        text: '金额',
+        text: '金额(元)',
         dataIndex: 'pd_ordertotal',
         xtype:'numbercolumn',
         width: 110,

frontend/saas-web/app/view/home/infoCardList/SaleOut.js

@@ -71,7 +71,7 @@ Ext.define('saas.view.home.infoCardList.SaleOut', {
             return Ext.util.Format.number(v, format);
         },
     }, {
-        text: '单价',
+        text: '单价(元)',
         dataIndex: 'sd_price',
         xtype: 'numbercolumn',
         width: 110,

frontend/saas-web/app/view/home/infoCardList/UnauditCheckIn.js

@@ -122,7 +122,7 @@ Ext.define('saas.view.home.infoCardList.UnauditCheckIn', {
         hidden: true,
         width: 150
     }, {
-        text: '单价',
+        text: '单价(元)',
         dataIndex: 'pd_orderprice',
         hidden: true,
         xtype: 'numbercolumn',
@@ -143,7 +143,7 @@ Ext.define('saas.view.home.infoCardList.UnauditCheckIn', {
             return Ext.util.Format.number(v, '0');
         },
     }, {
-        text: '金额',
+        text: '金额(元)',
         dataIndex: 'pd_total',
         xtype: 'numbercolumn',
         hidden: true,

frontend/saas-web/app/view/home/infoCardList/UnauditSaleOut.js

@@ -121,7 +121,7 @@ Ext.define('saas.view.home.infoCardList.UnauditSaleOut', {
             return Ext.util.Format.number(v, format);
         }
     }, {
-        text: '金额',
+        text: '金额(元)',
         dataIndex: 'pd_ordertotal',
         xtype:'numbercolumn',
         width: 110,

frontend/saas-web/app/view/main/Main.js

@@ -131,10 +131,12 @@ Ext.define('saas.view.main.Main', {
                             var nowCompanyId = _localStorage.account.companyId;
                             if(_localStorage.account.rolesMap){
                                 var rolesMap = _localStorage.account.rolesMap[nowCompanyId];
-                                for(var i = 0; i < rolesMap.length; i++) {
-                                   if(rolesMap[i].type==0){
-                                        main.getController().loadInvitationMsg(1)
-                                   }
+                                if(rolesMap&&rolesMap.length>0){
+                                    for(var i = 0; i < rolesMap.length; i++) {
+                                        if(rolesMap[i].type==0){
+                                             main.getController().loadInvitationMsg(1)
+                                        }
+                                     }
                                 }
                             }
                         }

frontend/saas-web/app/view/money/fundtransfer/QueryPanel.js

@@ -99,7 +99,7 @@ Ext.define('saas.view.money.fundtransfer.QueryPanel', {
             dataIndex: 'ftd_inbankname',
             width: 150
         }, {
-            text: '金额',
+            text: '金额(元)',
             xtype: 'numbercolumn',
             dataIndex: 'ftd_nowbalance',
             width: 110,

frontend/saas-web/app/view/money/othreceipts/FormPanel.js

@@ -113,7 +113,7 @@ Ext.define('saas.view.money.othreceipts.FormPanel', {
                     }
                 }
             }, {
-                text : "金额", 
+                text : "金额(元)", 
                 xtype: 'numbercolumn',
                 dataIndex : "ord_nowbalance", 
                 width : 110.0,

frontend/saas-web/app/view/money/othspendings/FormPanel.js

@@ -113,7 +113,7 @@ Ext.define('saas.view.money.othspendings.FormPanel', {
                     }
                 }
             }, {
-                text : "金额", 
+                text : "金额(元)", 
                 xtype: 'numbercolumn',
                 dataIndex : "osd_nowbalance", 
                 width : 110.0,

frontend/saas-web/app/view/money/report/CustomerCheck.js

@@ -85,7 +85,7 @@ Ext.define('saas.view.money.report.CustomerCheckCheck', {
             return Ext.util.Format.number(v, format);
         }
     }, {
-        text: '单价',
+        text: '单价(元)',
         dataIndex: 'pd_orderprice',
         exportFormat: 'Price',
         xtype: 'numbercolumn',
@@ -106,7 +106,7 @@ Ext.define('saas.view.money.report.CustomerCheckCheck', {
             return Ext.util.Format.number(v, '0');
         }
     }, {
-        text: '金额',
+        text: '金额(元)',
         xtype: 'numbercolumn',
         exportFormat: 'Amount',
         width: 110,
@@ -125,8 +125,8 @@ Ext.define('saas.view.money.report.CustomerCheckCheck', {
         //     return Ext.util.Format.number(v, format);
         // }
     }, {
-        text: '不含税单价',
-        width: 110,
+        text: '不含税单价(元)',
+        width: 150,
         dataIndex: 'pd_netprice',
         exportFormat: 'Price',
         xtype: 'numbercolumn',
@@ -137,8 +137,8 @@ Ext.define('saas.view.money.report.CustomerCheckCheck', {
             return Ext.util.Format.number(v, format);
         }
     }, {
-        text: '不含税金额',
-        width: 110,
+        text: '不含税金额(元)',
+        width: 150,
         xtype: 'numbercolumn',
         exportFormat: 'Amount',
         dataIndex: 'pd_nettotal',

frontend/saas-web/app/view/money/report/ProfitDetail.js

@@ -70,11 +70,11 @@ Ext.define('saas.view.money.report.ProfitDetail', {
             return Ext.util.Format.number(v, format);
         }
     }, {
-        text: '不含税金额',
+        text: '不含税金额(元)',
         dataIndex: 'netamount',
         exportFormat: 'Amount',
         xtype: 'numbercolumn',
-        width: 110,
+        width: 150,
         renderer : function(v) {
             var arr = (v + '.').split('.');
             var xr = (new Array(arr[1].length > 2 ? 2 : arr[1].length)).fill('0');

frontend/saas-web/app/view/money/report/VendorCheck.js

@@ -95,7 +95,7 @@ Ext.define('saas.view.money.report.VendorCheck', {
             return Ext.util.Format.number(v, format);
         }
     }, {
-        text: '单价',
+        text: '单价(元)',
         dataIndex: 'pd_orderprice',
         exportFormat: 'Price',
         xtype: 'numbercolumn',
@@ -116,7 +116,7 @@ Ext.define('saas.view.money.report.VendorCheck', {
             return Ext.util.Format.number(v, '0');
         }
     }, {
-        text: '金额',
+        text: '金额(元)',
         xtype: 'numbercolumn',
         exportFormat: 'Amount',
         dataIndex: 'pd_total',
@@ -135,11 +135,11 @@ Ext.define('saas.view.money.report.VendorCheck', {
         //     return Ext.util.Format.number(v, format);
         // }
     }, {
-        text: '不含税单价',
+        text: '不含税单价(元)',
         dataIndex: 'pd_netprice',
         exportFormat: 'Price',
         xtype: 'numbercolumn',
-        width: 110,
+        width: 150,
         renderer: function(v) {
             var arr = (v + '.').split('.');
             var xr = (new Array(arr[1].length > 8 ? 8 : arr[1].length)).fill('0');
@@ -147,11 +147,11 @@ Ext.define('saas.view.money.report.VendorCheck', {
             return Ext.util.Format.number(v, format);
         }
     }, {
-        text: '不含税金额',
+        text: '不含税金额(元)',
         dataIndex: 'pd_nettotal',
         exportFormat: 'Amount',
         xtype: 'numbercolumn',
-        width: 110,
+        width: 150,
         renderer : function(v) {
             var arr = (v + '.').split('.');
             var xr = (new Array(arr[1].length > 2 ? 2 : arr[1].length)).fill('0');

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

@@ -103,6 +103,18 @@ Ext.define('saas.view.purchase.purchase.FormPanel', {
                             xtype : "productMultiDbfindTrigger"
                         }
                     },
+                    {
+                        text : "品牌", 
+                        width : 150.0, 
+                        dataIndex : "pr_brand",
+                        ignore:true,
+                        renderer: function (v, m, r) {
+                            if(!v){
+                                return r.data["productDTO"]?r.data["productDTO"][m.column.dataIndex]:null; 
+                            }                     
+                            return v;
+                        }
+                    },
                     {
                         text : "名称", 
                         width : 200.0, 
@@ -114,22 +126,23 @@ Ext.define('saas.view.purchase.purchase.FormPanel', {
                             }                     
                             return v;
                         }
-                    },{
-                        text: 'model映射需要',
-                        dataIndex: 'productDTO',
-                        hidden: true,
                     },
                     {
-                        text : "规格", 
-                        dataIndex : "pr_spec", 
-                        width : 150.0,
+                        text : "型号", 
+                        width : 200.0, 
+                        dataIndex : "pr_orispeccode",
                         ignore:true,
                         renderer: function (v, m, r) {
                             if(!v){
                                 return r.data["productDTO"]?r.data["productDTO"][m.column.dataIndex]:null; 
                             }                     
-                            return v;    
+                            return v;
                         }
+                    },
+                    {
+                        text: 'model映射需要',
+                        dataIndex: 'productDTO',
+                        hidden: true,
                     },            
                     {
                         text : "数量", 
@@ -157,7 +170,19 @@ Ext.define('saas.view.purchase.purchase.FormPanel', {
                         }
                     },
                     {
-                        text : "单价", 
+                        text : "单位", 
+                        width : 80.0, 
+                        dataIndex : "pr_unit",
+                        ignore:true,
+                        renderer: function (v, m, r) {
+                            if(!v){
+                                return r.data["productDTO"]?r.data["productDTO"][m.column.dataIndex]:null; 
+                            }                     
+                            return v;
+                        }
+                    },
+                    {
+                        text : "单价(元)", 
                         xtype: 'numbercolumn',
                         dataIndex : "pd_price", 
                         width : 110.0,

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

@@ -54,6 +54,12 @@ Ext.define('saas.view.purchase.purchase.FormPanelController', {
                         },{
                             from:'pr_spec',to:'pr_spec'
                         },{
+                            from: 'pr_brand', to: 'pr_brand'
+                        },{
+                            from: 'pr_orispeccode', to: 'pr_orispeccode'
+                        },{
+                            from: 'pr_unit', to: 'pr_unit'
+                        }, {
                             from:'pr_purcprice',to:'pd_price'
                         },{
                             from:'pr_zxbzs',to:'pr_zxbzs'

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

@@ -188,17 +188,17 @@ Ext.define('saas.view.purchase.purchase.QueryPanel', {
             dataIndex: 'pd_prodcode',
             width: 150
         },{
-            text: '物料名称',
+            text: '品牌',
+            dataIndex: 'pr_brand',
+            width: 150
+        },{
+            text: '名称',
             dataIndex: 'pr_detail',
             width: 200
-        }, {
-            text: '物料规格',
-            dataIndex: 'pr_spec',
-            width: 150
-        }, {
-            text: '单位',
-            dataIndex: 'pr_unit',
-            width: 80
+        },{
+            text: '型号',
+            dataIndex: 'pr_orispeccode',
+            width: 200
         },{
             text: '采购数量',
             dataIndex: 'pd_qty',
@@ -209,14 +209,13 @@ Ext.define('saas.view.purchase.purchase.QueryPanel', {
                 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_delivery',
-            xtype: 'datecolumn',
-            width: 110
-        },{
-            text: '单价',
+            text: '单位',
+            dataIndex: 'pr_unit',
+            width: 80
+        }, {
+            text: '单价(元)',
             dataIndex: 'pd_price',
             xtype: 'numbercolumn',
             width: 110,
@@ -226,6 +225,11 @@ Ext.define('saas.view.purchase.purchase.QueryPanel', {
                 var format = '0,000.' + xr.join('');
                 return Ext.util.Format.number(v, format);
             }
+        }, {
+            text: '需求日期',
+            dataIndex: 'pd_delivery',
+            xtype: 'datecolumn',
+            width: 110
         }, {
             text: '税率',
             dataIndex: 'pd_taxrate',
@@ -235,7 +239,7 @@ Ext.define('saas.view.purchase.purchase.QueryPanel', {
                 return Ext.util.Format.number(v, '0');
             },
         },{
-            text: '金额',
+            text: '金额(元)',
             dataIndex: 'pd_total',
             xtype: 'numbercolumn',
             width: 110,

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

@@ -126,10 +126,18 @@ Ext.define('saas.view.purchase.purchaseIn.FormPanel', {
                     valueField : "value", 
                     xtype : "productMultiDbfindTrigger"
                 }
-            },{
-                text: 'model映射需要',
-                dataIndex: 'productDTO',
-                hidden: true,
+            },
+            {
+                text : "品牌", 
+                width : 150.0, 
+                dataIndex : "pr_brand",
+                ignore:true,
+                renderer: function (v, m, r) {
+                    if(!v){
+                        return r.data["productDTO"]?r.data["productDTO"][m.column.dataIndex]:null; 
+                    }                     
+                    return v;
+                }
             },
             {
                 text : "名称", 
@@ -138,23 +146,28 @@ Ext.define('saas.view.purchase.purchaseIn.FormPanel', {
                 ignore:true,
                 renderer: function (v, m, r) {
                     if(!v){
-                        return r.data["productDTO"]?r.data["productDTO"][m.column.dataIndex]:null;
-                    }
+                        return r.data["productDTO"]?r.data["productDTO"][m.column.dataIndex]:null; 
+                    }                     
                     return v;
                 }
             },
             {
-                text : "规格", 
-                dataIndex : "pr_spec", 
-                width : 150.0,
+                text : "型号", 
+                width : 200.0, 
+                dataIndex : "pr_orispeccode",
                 ignore:true,
                 renderer: function (v, m, r) {
                     if(!v){
-                        return r.data["productDTO"]?r.data["productDTO"][m.column.dataIndex]:null;
-                    }
+                        return r.data["productDTO"]?r.data["productDTO"][m.column.dataIndex]:null; 
+                    }                     
                     return v;
                 }
             },
+            {
+                text: 'model映射需要',
+                dataIndex: 'productDTO',
+                hidden: true,
+            },
             {
                 text : "数量", 
                 dataIndex : "pd_inqty", 
@@ -179,6 +192,34 @@ Ext.define('saas.view.purchase.purchaseIn.FormPanel', {
                     var format = '0.' + xr.join('');
                     return Ext.util.Format.number(v, format);
                 }
+            },{
+                text : "单位", 
+                width : 80.0, 
+                dataIndex : "pr_unit",
+                ignore:true,
+                renderer: function (v, m, r) {
+                    if(!v){
+                        return r.data["productDTO"]?r.data["productDTO"][m.column.dataIndex]:null; 
+                    }                     
+                    return v;
+                }
+            },{
+                text : "单价(元)",
+                xtype: 'numbercolumn', 
+                width : 110.0,
+                editor : {
+                    xtype : "numberfield",
+                    decimalPrecision: 8,
+                    minValue:0
+                },
+                dataIndex : "pd_orderprice", 
+                width : 120.0,
+                renderer : function(v) {
+                    var arr = (v + '.').split('.');
+                    var xr = (new Array(arr[1].length > 8 ? 8 : arr[1].length)).fill('0');
+                    var format = '0,000.' + xr.join('');
+                    return Ext.util.Format.number(v, format);
+                },
             }, {
                 text : "已转数", 
                 dataIndex : "pd_yqty",
@@ -233,23 +274,6 @@ Ext.define('saas.view.purchase.purchaseIn.FormPanel', {
                 }
             },
             {
-                text : "单价",
-                xtype: 'numbercolumn', 
-                width : 110.0,
-                editor : {
-                    xtype : "numberfield",
-                    decimalPrecision: 8,
-                    minValue:0
-                },
-                dataIndex : "pd_orderprice", 
-                width : 120.0,
-                renderer : function(v) {
-                    var arr = (v + '.').split('.');
-                    var xr = (new Array(arr[1].length > 8 ? 8 : arr[1].length)).fill('0');
-                    var format = '0,000.' + xr.join('');
-                    return Ext.util.Format.number(v, format);
-                },
-            }, {
                 xtype: 'numbercolumn',
                 text : "税率", 
                 dataIndex : "pd_taxrate", 
@@ -264,7 +288,7 @@ Ext.define('saas.view.purchase.purchaseIn.FormPanel', {
                     return Ext.util.Format.number(v, '0');
                 },
             },{
-                text : "含税金额", 
+                text : "含税金额(元)", 
                 xtype: 'numbercolumn',
                 dataIndex : "pd_ordertotal", 
                 width : 110.0, 
@@ -288,7 +312,7 @@ Ext.define('saas.view.purchase.purchaseIn.FormPanel', {
                 }
             },
             {
-                text : "未税金额", 
+                text : "未税金额(元)", 
                 xtype: 'numbercolumn',
                 dataIndex : "pd_nettotal", 
                 width : 110.0, 

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

@@ -39,6 +39,12 @@ Ext.define('saas.view.purchase.purchaseIn.FormPanelController', {
                         },{
                             from:'pr_spec',to:'pr_spec'
                         },{
+                            from: 'pr_brand', to: 'pr_brand'
+                        },{
+                            from: 'pr_orispeccode', to: 'pr_orispeccode'
+                        },{
+                            from: 'pr_unit', to: 'pr_unit'
+                        }, {
                             from:'pr_whid',to:'pd_whid'
                         },{
                             from:'pr_whcode',to:'pd_whcode'

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

@@ -197,17 +197,17 @@ Ext.define('saas.view.purchase.purchaseIn.QueryPanel', {
             dataIndex: 'pd_prodcode',
             width: 150
         },{
-            text: '物料名称',
+            text: '品牌',
+            dataIndex: 'pr_brand',
+            width: 150
+        },{
+            text: '名称',
             dataIndex: 'pr_detail',
             width: 200
         },{
-            text: '物料规格',
-            dataIndex: 'pr_spec',
-            width: 150
-        },{
-            text: '单位',
-            dataIndex: 'pr_unit',
-            width: 80
+            text: '型号',
+            dataIndex: 'pr_orispeccode',
+            width: 200
         },{
             text: '数量',
             dataIndex: 'pd_inqty',
@@ -219,12 +219,12 @@ Ext.define('saas.view.purchase.purchaseIn.QueryPanel', {
                 var format = '0,000.' + xr.join('');
                 return Ext.util.Format.number(v, format);
             },
-        },{
-            text: '仓库',
-            dataIndex: 'pd_whname',
-            width: 150
-        },{
-            text: '单价',
+        }, {
+            text: '单位',
+            dataIndex: 'pr_unit',
+            width: 80
+        }, {
+            text: '单价(元)',
             dataIndex: 'pd_orderprice',
             xtype:'numbercolumn',
             renderer : function(v) {
@@ -234,6 +234,10 @@ Ext.define('saas.view.purchase.purchaseIn.QueryPanel', {
                 return Ext.util.Format.number(v, format);
             },            
             width: 110
+        },{
+            text: '仓库',
+            dataIndex: 'pd_whname',
+            width: 150
         },{
             text: '税率',
             dataIndex: 'pd_taxrate',
@@ -243,7 +247,7 @@ Ext.define('saas.view.purchase.purchaseIn.QueryPanel', {
                 return Ext.util.Format.number(v, '0');
             },
         },{
-            text: '金额',
+            text: '金额(元)',
             dataIndex: 'pd_ordertotal',
             xtype:'numbercolumn',
             width: 110,

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

@@ -126,27 +126,39 @@ Ext.define('saas.view.purchase.purchaseOut.FormPanel', {
                 dataIndex: 'productDTO',
                 hidden: true,
             },
+            {
+                text : "品牌", 
+                width : 150.0, 
+                dataIndex : "pr_brand",
+                ignore:true,
+                renderer: function (v, m, r) {
+                    if(!v){
+                        return r.data["productDTO"]?r.data["productDTO"][m.column.dataIndex]:null; 
+                    }                     
+                    return v;
+                }
+            },
             {
                 text : "名称", 
-                dataIndex : "pr_detail", 
-                width : 200.0,
+                width : 200.0, 
+                dataIndex : "pr_detail",
                 ignore:true,
                 renderer: function (v, m, r) {
                     if(!v){
-                        return r.data["productDTO"]?r.data["productDTO"][m.column.dataIndex]:null;
-                    }
+                        return r.data["productDTO"]?r.data["productDTO"][m.column.dataIndex]:null; 
+                    }                     
                     return v;
                 }
             },
             {
-                text : "规格", 
-                dataIndex : "pr_spec", 
-                width : 150.0,
+                text : "型号", 
+                width : 200.0, 
+                dataIndex : "pr_orispeccode",
                 ignore:true,
                 renderer: function (v, m, r) {
                     if(!v){
-                        return r.data["productDTO"]?r.data["productDTO"][m.column.dataIndex]:null;
-                    }
+                        return r.data["productDTO"]?r.data["productDTO"][m.column.dataIndex]:null; 
+                    }                     
                     return v;
                 }
             },
@@ -174,6 +186,34 @@ Ext.define('saas.view.purchase.purchaseOut.FormPanel', {
                     var format = '0.' + xr.join('');
                     return Ext.util.Format.number(v, format);
                 }
+            },{
+                text : "单位", 
+                width : 80.0, 
+                dataIndex : "pr_unit",
+                ignore:true,
+                renderer: function (v, m, r) {
+                    if(!v){
+                        return r.data["productDTO"]?r.data["productDTO"][m.column.dataIndex]:null; 
+                    }                     
+                    return v;
+                }
+            },{
+                text : "单价(元)",
+                xtype: 'numbercolumn', 
+                width : 110.0,
+                editor : {
+                    xtype : "numberfield",
+                    decimalPrecision: 8,
+                    minValue:0
+                },
+                dataIndex : "pd_orderprice", 
+                width : 120.0,
+                renderer : function(v) {
+                    var arr = (v + '.').split('.');
+                    var xr = (new Array(arr[1].length > 8 ? 8 : arr[1].length)).fill('0');
+                    var format = '0,000.' + xr.join('');
+                    return Ext.util.Format.number(v, format);
+                },
             }, {
                 text : "仓库id", 
                 dataIndex : "pd_whid", 
@@ -201,23 +241,6 @@ Ext.define('saas.view.purchase.purchaseOut.FormPanel', {
                     valueField : "value", 
                     xtype : "warehouseDbfindTrigger"
                 }
-            }, {
-                text : "单价",
-                xtype: 'numbercolumn', 
-                width : 110.0,
-                editor : {
-                    xtype : "numberfield",
-                    decimalPrecision: 8,
-                    minValue:0
-                },
-                dataIndex : "pd_orderprice", 
-                width : 120.0,
-                renderer : function(v) {
-                    var arr = (v + '.').split('.');
-                    var xr = (new Array(arr[1].length > 8 ? 8 : arr[1].length)).fill('0');
-                    var format = '0,000.' + xr.join('');
-                    return Ext.util.Format.number(v, format);
-                },
             }, {
                 text : "税率", 
                 xtype: 'numbercolumn',

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

@@ -41,6 +41,12 @@ Ext.define('saas.view.purchase.purchaseOut.FormPanelController', {
                         },{
                             from:'pr_spec',to:'pr_spec'
                         },{
+                            from: 'pr_brand', to: 'pr_brand'
+                        },{
+                            from: 'pr_orispeccode', to: 'pr_orispeccode'
+                        },{
+                            from: 'pr_unit', to: 'pr_unit'
+                        }, {
                             from:'pr_whid',to:'pd_whid'
                         },{
                             from:'pr_whcode',to:'pd_whcode'

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

@@ -220,17 +220,17 @@ Ext.define('saas.view.purchase.purchaseOut.QueryPanel', {
                     return Ext.util.Format.number(v, '0');
                 }
             },{
-                text: '物料名称',
+                text: '品牌',
+                dataIndex: 'pr_brand',
+                width: 150
+            },{
+                text: '名称',
                 dataIndex: 'pr_detail',
                 width: 200
             },{
-                text: '物料规格',
-                dataIndex: 'pr_spec',
-                width: 150
-            },{
-                text: '单位',
-                dataIndex: 'pr_unit',
-                width: 80
+                text: '型号',
+                dataIndex: 'pr_orispeccode',
+                width: 200
             },{
                 text: '数量',
                 dataIndex: 'pd_outqty',
@@ -242,12 +242,12 @@ Ext.define('saas.view.purchase.purchaseOut.QueryPanel', {
                     var format = '0,000.' + xr.join('');
                     return Ext.util.Format.number(v, format);
                 },
-            },{
-                text: '仓库',
-                dataIndex: 'pd_whname',
-                width: 150
-            },{
-                text: '单价',
+            }, {
+                text: '单位',
+                dataIndex: 'pr_unit',
+                width: 80
+            }, {
+                text: '单价(元)',
                 dataIndex: 'pd_orderprice',
                 xtype:'numbercolumn',
                 renderer : function(v) {
@@ -257,6 +257,10 @@ 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',
@@ -266,7 +270,7 @@ Ext.define('saas.view.purchase.purchaseOut.QueryPanel', {
                     return Ext.util.Format.number(v, '0');
                 },
             },{
-                text: '金额',
+                text: '金额(元)',
                 dataIndex: 'pd_ordertotal',
                 xtype:'numbercolumn',
                 width: 110,

frontend/saas-web/app/view/purchase/report/Purchase.js

@@ -115,7 +115,7 @@ Ext.define('saas.view.purchase.report.Purchase', {
             return Ext.util.Format.number(v, format);
         }
     }, {
-        text: '单价',
+        text: '单价(元)',
         dataIndex: 'pd_price',
         exportFormat: 'Price',
         width: 110,
@@ -136,7 +136,7 @@ Ext.define('saas.view.purchase.report.Purchase', {
             return Ext.util.Format.number(v, '0');
         }
     }, {
-        text: '金额',
+        text: '金额(元)',
         dataIndex: 'pd_total',
         exportFormat: 'Amount',
         width: 110,
@@ -155,10 +155,10 @@ Ext.define('saas.view.purchase.report.Purchase', {
             return Ext.util.Format.number(v, format);
         }
     }, {
-        text: '不含税单价',
+        text: '不含税单价(元)',
         dataIndex: 'pd_taxprice',
         exportFormat: 'Price',
-        width: 110,
+        width: 150,
         xtype: 'numbercolumn',
         renderer: function(v) {
             var arr = (v + '.').split('.');
@@ -167,9 +167,9 @@ Ext.define('saas.view.purchase.report.Purchase', {
             return Ext.util.Format.number(v, format);
         }
     }, {
-        text: '不含税金额',
+        text: '不含税金额(元)',
         exportFormat: 'Amount',
-        width: 110,
+        width: 150,
         dataIndex: 'pd_taxtotal',
         xtype: 'numbercolumn',
         renderer: function(v) {

frontend/saas-web/app/view/sale/report/Sale.js

@@ -124,7 +124,7 @@ Ext.define('saas.view.sale.report.Sale', {
             return Ext.util.Format.number(v, format);
         }
     }, {
-        text: '单价',
+        text: '单价(元)',
         dataIndex: 'sd_price',
         exportFormat: 'Price',
         xtype: 'numbercolumn',
@@ -135,7 +135,7 @@ Ext.define('saas.view.sale.report.Sale', {
             return Ext.util.Format.number(v, format);
         }
     }, {
-        text: '不含税单价',
+        text: '不含税单价(元)',
         dataIndex: 'sd_netprice',
         exportFormat: 'Price',
         xtype: 'numbercolumn',
@@ -173,7 +173,7 @@ Ext.define('saas.view.sale.report.Sale', {
             return Ext.util.Format.number(v, format);
         }
     }, {//∑不含税金额
-        text: '不含税金额',
+        text: '不含税金额(元)',
         xtype: 'numbercolumn',
         exportFormat: 'Amount',
         dataIndex: 'sd_nettotal',

frontend/saas-web/app/view/sale/report/SaleProfit.js

@@ -93,11 +93,11 @@ Ext.define('saas.view.sale.report.SaleProfit', {
             return Ext.util.Format.number(v, format);
         }
     }, {
-        text: '含税单价',
+        text: '含税单价(元)',
         dataIndex: 'pd_sendprice',
         exportFormat: 'Price',
         xtype: 'numbercolumn',
-        width: 110,
+        width: 150,
         renderer: function(v) {
             var arr = (v + '.').split('.');
             var xr = (new Array(arr[1].length > 2 ? 2 : arr[1].length)).fill('0');
@@ -114,7 +114,7 @@ Ext.define('saas.view.sale.report.SaleProfit', {
             return Ext.util.Format.number(v, '0');
         }
     }, {
-        text: '含税金额',
+        text: '含税金额(元)',
         dataIndex: 'pd_ordertotal',
         xtype: 'numbercolumn',
         renderer: function(v) {
@@ -124,7 +124,7 @@ Ext.define('saas.view.sale.report.SaleProfit', {
             return Ext.util.Format.number(v, format);
         }
     }, {
-        text: '不含税单价',
+        text: '不含税单价(元)',
         exportFormat: 'Price',
         dataIndex: 'pd_netprice',
         xtype: 'numbercolumn'

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

@@ -129,29 +129,44 @@ Ext.define('saas.view.sale.sale.FormPanel', {
                         text: 'model映射需要',
                         dataIndex: 'productDTO',
                         hidden: true,
-                    }, {
+                    },
+                    {
+                        text : "品牌", 
+                        width : 150.0, 
+                        dataIndex : "pr_brand",
+                        ignore:true,
+                        renderer: function (v, m, r) {
+                            if(!v){
+                                return r.data["productDTO"]?r.data["productDTO"][m.column.dataIndex]:null; 
+                            }                     
+                            return v;
+                        }
+                    },
+                    {
                         text : "名称", 
-                        dataIndex : "pr_detail", 
-                        width : 200.0,
+                        width : 200.0, 
+                        dataIndex : "pr_detail",
                         ignore:true,
                         renderer: function (v, m, r) {
                             if(!v){
-                                return r.data["productDTO"]?r.data["productDTO"][m.column.dataIndex]:null;
-                            }
+                                return r.data["productDTO"]?r.data["productDTO"][m.column.dataIndex]:null; 
+                            }                     
                             return v;
                         }
-                    }, {
-                        text : "规格", 
-                        dataIndex : "pr_spec",
+                    },
+                    {
+                        text : "型号", 
+                        width : 200.0, 
+                        dataIndex : "pr_orispeccode",
                         ignore:true,
-                        width : 150.0, 
                         renderer: function (v, m, r) {
                             if(!v){
-                                return r.data["productDTO"]?r.data["productDTO"][m.column.dataIndex]:null;
-                            }
+                                return r.data["productDTO"]?r.data["productDTO"][m.column.dataIndex]:null; 
+                            }                     
                             return v;
                         }
-                    }, {
+                    },
+                    {
                         text : "数量", 
                         dataIndex : "sd_qty", 
                         width : 110.0,
@@ -175,7 +190,34 @@ Ext.define('saas.view.sale.sale.FormPanel', {
                             var format = '0.' + xr.join('');
                             return Ext.util.Format.number(v, format);
                         }
-                    },  {
+                    },{
+                        text : "单位", 
+                        width : 80.0, 
+                        dataIndex : "pr_unit",
+                        ignore:true,
+                        renderer: function (v, m, r) {
+                            if(!v){
+                                return r.data["productDTO"]?r.data["productDTO"][m.column.dataIndex]:null; 
+                            }                     
+                            return v;
+                        }
+                    },{
+                        text : "单价(元)", 
+                        xtype: 'numbercolumn',
+                        dataIndex : "sd_price", 
+                        width : 110.0,
+                        editor : {
+                            xtype : "numberfield",
+                            decimalPrecision: 8,
+                            minValue:0
+                        },
+                        renderer : function(v) {
+                            var arr = (v + '.').split('.');
+                            var xr = (new Array(arr[1].length > 8 ? 8 :(arr[1].length < 2? 2 : arr[1].length))).fill('0');
+                            var format = '0,000.' + xr.join('');
+                            return Ext.util.Format.number(v, format);
+                       }
+                    },   {
                         text : "已转数", 
                         xtype: 'numbercolumn',
                         dataIndex : "sd_yqty", 
@@ -200,7 +242,7 @@ Ext.define('saas.view.sale.sale.FormPanel', {
                         }
                     },
                     {
-                        text : "单价", 
+                        text : "单价(元)", 
                         xtype: 'numbercolumn',
                         dataIndex : "sd_price", 
                         width : 110.0,
@@ -242,7 +284,7 @@ Ext.define('saas.view.sale.sale.FormPanel', {
                         }
                     },
                     {
-                        text : "含税金额", 
+                        text : "含税金额(元)", 
                         xtype: 'numbercolumn',
                         dataIndex : "sd_total", 
                         width : 110.0,

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

@@ -63,6 +63,12 @@ Ext.define('saas.view.sale.sale.FormPanelController', {
                             from: 'pr_detail', to: 'pr_detail'
                         }, {
                             from: 'pr_spec', to: 'pr_spec'
+                        },{
+                            from: 'pr_brand', to: 'pr_brand'
+                        },{
+                            from: 'pr_orispeccode', to: 'pr_orispeccode'
+                        },{
+                            from: 'pr_unit', to: 'pr_unit'
                         }, {
                             from: 'id', to: 'sd_prodid', ignore: true
                         }],

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

@@ -199,15 +199,19 @@ Ext.define('saas.view.sale.sale.QueryPanel', {
             text: '物料编号',
             dataIndex: 'sd_prodcode',
             width: 120
-        }, {
-            text: '物料名称',
+        },{
+            text: '品牌',
+            dataIndex: 'pr_brand',
+            width: 150
+        },{
+            text: '名称',
             dataIndex: 'pr_detail',
-            width: 120
-        }, {
-            text: '物料规格',
-            dataIndex: 'pr_spec',
-            width: 120
-        }, {
+            width: 200
+        },{
+            text: '型号',
+            dataIndex: 'pr_orispeccode',
+            width: 200
+        },{
             text: '数量',
             dataIndex: 'sd_qty',
             xtype: 'numbercolumn',
@@ -219,7 +223,11 @@ Ext.define('saas.view.sale.sale.QueryPanel', {
                 return Ext.util.Format.number(v, format);
             },
         }, {
-            text: '单价',
+            text: '单位',
+            dataIndex: 'pr_unit',
+            width: 80
+        }, {
+            text: '单价(元)',
             dataIndex: 'sd_price',
             xtype: 'numbercolumn',
             width: 120,

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

@@ -139,29 +139,44 @@ Ext.define('saas.view.sale.saleIn.FormPanel', {
                 text: 'model映射需要',
                 dataIndex: 'productDTO',
                 hidden: true,
-            }, {
+            },
+            {
+                text : "品牌", 
+                width : 150.0, 
+                dataIndex : "pr_brand",
+                ignore:true,
+                renderer: function (v, m, r) {
+                    if(!v){
+                        return r.data["productDTO"]?r.data["productDTO"][m.column.dataIndex]:null; 
+                    }                     
+                    return v;
+                }
+            },
+            {
                 text : "名称", 
+                width : 200.0, 
                 dataIndex : "pr_detail",
                 ignore:true,
-                width : 200.0, 
                 renderer: function (v, m, r) {
                     if(!v){
-                        return r.data["productDTO"]?r.data["productDTO"][m.column.dataIndex]:null;
-                    }
+                        return r.data["productDTO"]?r.data["productDTO"][m.column.dataIndex]:null; 
+                    }                     
                     return v;
                 }
-            }, {
-                text : "规格", 
-                dataIndex : "pr_spec",
+            },
+            {
+                text : "型号", 
+                width : 200.0, 
+                dataIndex : "pr_orispeccode",
                 ignore:true,
-                width : 150.0, 
                 renderer: function (v, m, r) {
                     if(!v){
-                        return r.data["productDTO"]?r.data["productDTO"][m.column.dataIndex]:null;
-                    }
+                        return r.data["productDTO"]?r.data["productDTO"][m.column.dataIndex]:null; 
+                    }                     
                     return v;
                 }
-            }, {
+            },
+            {
                 text : "数量", 
                 xtype: 'numbercolumn',
                 dataIndex : "pd_inqty", 
@@ -185,7 +200,34 @@ Ext.define('saas.view.sale.saleIn.FormPanel', {
                     var format = '0.' + xr.join('');
                     return Ext.util.Format.number(v, format);
                 }
-            }, {
+            },{
+                text : "单位", 
+                width : 80.0, 
+                dataIndex : "pr_unit",
+                ignore:true,
+                renderer: function (v, m, r) {
+                    if(!v){
+                        return r.data["productDTO"]?r.data["productDTO"][m.column.dataIndex]:null; 
+                    }                     
+                    return v;
+                }
+            },{
+                text : "单价(元)", 
+                xtype: 'numbercolumn',
+                dataIndex : "pd_sendprice", 
+                width : 110.0, 
+                editor : {
+                    xtype : "numberfield",
+                    decimalPrecision: 8,
+                    minValue:0
+                },
+                renderer : function(v) {
+                    var arr = (v + '.').split('.');
+                    var xr = (new Array(arr[1].length > 8 ? 8 : arr[1].length)).fill('0');
+                    var format = '0,000.' + xr.join('');
+                    return Ext.util.Format.number(v, format);
+                },
+            },  {
                 text : "仓库ID", 
                 dataIndex : "pd_whid", 
                 width : 0
@@ -213,22 +255,6 @@ Ext.define('saas.view.sale.saleIn.FormPanel', {
                 }
             },
             {
-                text : "单价", 
-                xtype: 'numbercolumn',
-                dataIndex : "pd_sendprice", 
-                width : 110.0, 
-                editor : {
-                    xtype : "numberfield",
-                    decimalPrecision: 8,
-                    minValue:0
-                },
-                renderer : function(v) {
-                    var arr = (v + '.').split('.');
-                    var xr = (new Array(arr[1].length > 8 ? 8 : arr[1].length)).fill('0');
-                    var format = '0,000.' + xr.join('');
-                    return Ext.util.Format.number(v, format);
-                },
-            }, {
                 text : "税率", 
                 xtype: 'numbercolumn',
                 dataIndex : "pd_taxrate", 

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

@@ -36,6 +36,12 @@ Ext.define('saas.view.sale.saleIn.FormPanelController', {
                                 from: 'pr_detail', to: 'pr_detail'
                             }, {
                                 from: 'pr_spec', to: 'pr_spec'
+                            },{
+                                from: 'pr_brand', to: 'pr_brand'
+                            },{
+                                from: 'pr_orispeccode', to: 'pr_orispeccode'
+                            },{
+                                from: 'pr_unit', to: 'pr_unit'
                             }, {
                                 from:'pr_whid',to:'pd_whid'
                             }, {

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

@@ -219,7 +219,19 @@ Ext.define('saas.view.sale.saleIn.QueryPanel', {
             text: '物料编号',
             dataIndex: 'pd_prodcode',
             width: 150
-        }, {
+        },{
+            text: '品牌',
+            dataIndex: 'pr_brand',
+            width: 150
+        },{
+            text: '名称',
+            dataIndex: 'pr_detail',
+            width: 200
+        },{
+            text: '型号',
+            dataIndex: 'pr_orispeccode',
+            width: 200
+        },{
             text: '退货数量',
             dataIndex: 'pd_inqty',
             xtype:'numbercolumn',
@@ -230,6 +242,10 @@ Ext.define('saas.view.sale.saleIn.QueryPanel', {
                 var format = '0.' + xr.join('');
                 return Ext.util.Format.number(v, format);
             }
+        }, {
+            text: '单位',
+            dataIndex: 'pr_unit',
+            width: 80
         }, {
             text: '销售单价',
             dataIndex: 'pd_sendprice',
@@ -242,7 +258,7 @@ Ext.define('saas.view.sale.saleIn.QueryPanel', {
                 return Ext.util.Format.number(v, format);
             }
         }, {
-            text: '金额',
+            text: '金额(元)',
             dataIndex: 'pd_total',
             xtype:'numbercolumn',
             width: 110,

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

@@ -150,29 +150,44 @@ Ext.define('saas.view.sale.saleout.FormPanel', {
                 text: 'model映射需要',
                 dataIndex: 'productDTO',
                 hidden: true,
-            }, {
+            },
+            {
+                text : "品牌", 
+                width : 150.0, 
+                dataIndex : "pr_brand",
+                ignore:true,
+                renderer: function (v, m, r) {
+                    if(!v){
+                        return r.data["productDTO"]?r.data["productDTO"][m.column.dataIndex]:null; 
+                    }                     
+                    return v;
+                }
+            },
+            {
                 text : "名称", 
+                width : 200.0, 
                 dataIndex : "pr_detail",
                 ignore:true,
-                width : 200.0, 
                 renderer: function (v, m, r) {
                     if(!v){
-                        return r.data["productDTO"]?r.data["productDTO"][m.column.dataIndex]:null;
-                    }
+                        return r.data["productDTO"]?r.data["productDTO"][m.column.dataIndex]:null; 
+                    }                     
                     return v;
                 }
-            }, {
-                text : "规格", 
-                dataIndex : "pr_spec",
+            },
+            {
+                text : "型号", 
+                width : 200.0, 
+                dataIndex : "pr_orispeccode",
                 ignore:true,
-                width : 150.0, 
                 renderer: function (v, m, r) {
                     if(!v){
-                        return r.data["productDTO"]?r.data["productDTO"][m.column.dataIndex]:null;
-                    }
+                        return r.data["productDTO"]?r.data["productDTO"][m.column.dataIndex]:null; 
+                    }                     
                     return v;
                 }
-            },  {
+            },
+            {
                 text : "出货数量", 
                 xtype: 'numbercolumn',
                 dataIndex : "pd_outqty", 
@@ -196,7 +211,34 @@ Ext.define('saas.view.sale.saleout.FormPanel', {
                     var format = '0.' + xr.join('');
                     return Ext.util.Format.number(v, format);
                 }
-            }, {
+            },{
+                text : "单位", 
+                width : 80.0, 
+                dataIndex : "pr_unit",
+                ignore:true,
+                renderer: function (v, m, r) {
+                    if(!v){
+                        return r.data["productDTO"]?r.data["productDTO"][m.column.dataIndex]:null; 
+                    }                     
+                    return v;
+                }
+            },{
+                text : "单价(元)", 
+                xtype: 'numbercolumn',
+                dataIndex : "pd_sendprice", 
+                width : 110.0,
+                editor : {
+                    xtype : "numberfield",
+                    decimalPrecision: 8,
+                    minValue:0
+                },
+                renderer : function(v) {
+                    var arr = (v + '.').split('.');
+                    var xr = (new Array(arr[1].length > 8 ? 8 : arr[1].length)).fill('0');
+                    var format = '0,000.' + xr.join('');
+                    return Ext.util.Format.number(v, format);
+                },
+            },{
                 text : "仓库ID", 
                 dataIndex : "pd_whid", 
                 hidden :true
@@ -225,22 +267,6 @@ Ext.define('saas.view.sale.saleout.FormPanel', {
                 }
             },
             {
-                text : "单价", 
-                xtype: 'numbercolumn',
-                dataIndex : "pd_sendprice", 
-                width : 110.0,
-                editor : {
-                    xtype : "numberfield",
-                    decimalPrecision: 8,
-                    minValue:0
-                },
-                renderer : function(v) {
-                    var arr = (v + '.').split('.');
-                    var xr = (new Array(arr[1].length > 8 ? 8 : arr[1].length)).fill('0');
-                    var format = '0,000.' + xr.join('');
-                    return Ext.util.Format.number(v, format);
-                },
-            }, {
                 text : "税率", 
                 xtype: 'numbercolumn',
                 dataIndex : "pd_taxrate", 
@@ -256,10 +282,10 @@ Ext.define('saas.view.sale.saleout.FormPanel', {
                 }
             }, 
            {
-                text : "含税金额", 
+                text : "含税金额(元)", 
                 xtype: 'numbercolumn',
                 dataIndex : "pd_ordertotal", 
-                width : 110.0, 
+                width : 150.0, 
                 renderer : function(v) {
                     var arr = (v + '.').split('.');
                     var xr = (new Array(arr[1].length > 2 ? 2 : arr[1].length)).fill('0');
@@ -275,10 +301,10 @@ Ext.define('saas.view.sale.saleout.FormPanel', {
                 }
             },
             {
-                text : "未税金额", 
+                text : "未税金额(元)", 
                 xtype: 'numbercolumn',
                 dataIndex : "pd_nettotal", 
-                width : 110.0, 
+                width : 150.0, 
                 renderer : function(v) {
                     var arr = (v + '.').split('.');
                     var xr = (new Array(arr[1].length)).fill('0');

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

@@ -33,6 +33,12 @@ Ext.define('saas.view.sale.saleout.FormPanelController', {
                             from:'pr_detail',to:'pr_detail'
                         }, {
                             from:'pr_spec',to:'pr_spec'
+                        },{
+                            from: 'pr_brand', to: 'pr_brand'
+                        },{
+                            from: 'pr_orispeccode', to: 'pr_orispeccode'
+                        },{
+                            from: 'pr_unit', to: 'pr_unit'
                         }, {
                             from:'pr_whid',to:'pd_whid'
                         }, {

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

@@ -153,7 +153,7 @@ Ext.define('saas.view.sale.saleout.QueryPanel', {
             dataIndex: 'pi_remark',
             width: 250
         },{
-            text: '未含税金额',
+            text: '未含税金额(元)',
             dataIndex: 'pi_nettotal',
             xtype:'numbercolumn',
             hidden :true
@@ -211,11 +211,19 @@ Ext.define('saas.view.sale.saleout.QueryPanel', {
             text: '物料编号',
             dataIndex: 'pd_prodcode',
             width: 150
-        }, {
-            text: '物料名称',
-            dataIndex: 'pr_detail',
+        },{
+            text: '品牌',
+            dataIndex: 'pr_brand',
             width: 150
-        }, {
+        },{
+            text: '名称',
+            dataIndex: 'pr_detail',
+            width: 200
+        },{
+            text: '型号',
+            dataIndex: 'pr_orispeccode',
+            width: 200
+        },{
             text: '出货数量',
             dataIndex: 'pd_outqty',
             xtype:'numbercolumn',
@@ -226,6 +234,10 @@ Ext.define('saas.view.sale.saleout.QueryPanel', {
                 var format = '0.' + xr.join('');
                 return Ext.util.Format.number(v, format);
             }
+        }, {
+            text: '单位',
+            dataIndex: 'pr_unit',
+            width: 80
         }, {
             text: '销售单价',
             dataIndex: 'pd_sendprice',
@@ -238,7 +250,7 @@ Ext.define('saas.view.sale.saleout.QueryPanel', {
                 return Ext.util.Format.number(v, format);
             }
         }, {
-            text: '金额',
+            text: '金额(元)',
             dataIndex: 'pd_ordertotal',
             xtype:'numbercolumn',
             width: 110,

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

@@ -115,27 +115,39 @@ Ext.define('saas.view.stock.appropriationInOut.FormPanel', {
                 dataIndex: 'productDTO',
                 hidden: true,
             },
+            {
+                text : "品牌", 
+                width : 150.0, 
+                dataIndex : "pr_brand",
+                ignore:true,
+                renderer: function (v, m, r) {
+                    if(!v){
+                        return r.data["productDTO"]?r.data["productDTO"][m.column.dataIndex]:null; 
+                    }                     
+                    return v;
+                }
+            },
             {
                 text : "名称", 
-                dataIndex : "pr_detail", 
-                width : 200.0,
+                width : 200.0, 
+                dataIndex : "pr_detail",
                 ignore:true,
                 renderer: function (v, m, r) {
                     if(!v){
-                        return r.data["productDTO"]?r.data["productDTO"][m.column.dataIndex]:null;
-                    }
+                        return r.data["productDTO"]?r.data["productDTO"][m.column.dataIndex]:null; 
+                    }                     
                     return v;
                 }
             },
             {
-                text : "规格", 
-                dataIndex : "pr_spec", 
-                width : 150.0,
+                text : "型号", 
+                width : 200.0, 
+                dataIndex : "pr_orispeccode",
                 ignore:true,
                 renderer: function (v, m, r) {
                     if(!v){
-                        return r.data["productDTO"]?r.data["productDTO"][m.column.dataIndex]:null;
-                    }
+                        return r.data["productDTO"]?r.data["productDTO"][m.column.dataIndex]:null; 
+                    }                     
                     return v;
                 }
             },
@@ -163,6 +175,17 @@ Ext.define('saas.view.stock.appropriationInOut.FormPanel', {
                     var format = '0.' + xr.join('');
                     return Ext.util.Format.number(v, format);
                 }
+            },{
+                text : "单位", 
+                width : 80.0, 
+                dataIndex : "pr_unit",
+                ignore:true,
+                renderer: function (v, m, r) {
+                    if(!v){
+                        return r.data["productDTO"]?r.data["productDTO"][m.column.dataIndex]:null; 
+                    }                     
+                    return v;
+                }
             },{
                 text : "拨出仓库id", 
                 dataIndex : "pd_whid", 

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

@@ -59,6 +59,12 @@ Ext.define('saas.view.stock.appropriationInOut.FormPanelController', {
                             from: 'pr_spec',
                             to: 'pr_spec'
                         },{
+                            from: 'pr_brand', to: 'pr_brand'
+                        },{
+                            from: 'pr_orispeccode', to: 'pr_orispeccode'
+                        },{
+                            from: 'pr_unit', to: 'pr_unit'
+                        }, {
                             from:'pr_whid',to:'pd_whid'
                         },{
                             from:'pr_whcode',to:'pd_whcode'

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

@@ -180,17 +180,17 @@ Ext.define('saas.view.stock.appropriationInOut.QueryPanel', {
                 dataIndex: 'pd_prodcode',
                 width: 150
             },{
-                text: '物料名称',
+                text: '品牌',
+                dataIndex: 'pr_brand',
+                width: 150
+            },{
+                text: '名称',
                 dataIndex: 'pr_detail',
                 width: 200
             },{
-                text: '规格',
-                dataIndex: 'pr_spec',
-                width: 150
-            },{
-                text: '单位',
-                dataIndex: 'pr_unit',
-                width: 80
+                text: '型号',
+                dataIndex: 'pr_orispeccode',
+                width: 200
             },{
                 text: '数量',
                 dataIndex: 'pd_outqty',
@@ -202,7 +202,11 @@ Ext.define('saas.view.stock.appropriationInOut.QueryPanel', {
                     var format = '0,000.' + xr.join('');
                     return Ext.util.Format.number(v, format);
                 }
-            },{
+            }, {
+                text: '单位',
+                dataIndex: 'pr_unit',
+                width: 80
+            }, {
                 text: '拨出仓',
                 dataIndex: 'pd_whname',
                 width: 150

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

@@ -110,7 +110,7 @@ Ext.define('saas.view.stock.make.FormPanel', {
     },{
         xtype : "numberfield", 
         name : "ma_price", 
-        fieldLabel : "单价",
+        fieldLabel : "单价(元)",
         readOnly:true,
         editable:false,
         decimalPrecision:8,
@@ -120,7 +120,7 @@ Ext.define('saas.view.stock.make.FormPanel', {
         name : "ma_total",
         readOnly:true,
         editable:false, 
-        fieldLabel : "金额",
+        fieldLabel : "金额(元)",
         decimalPrecision:2,
         columnWidth: 0.25
     },
@@ -169,38 +169,38 @@ Ext.define('saas.view.stock.make.FormPanel', {
                 hidden: true,
             },
             {
-                text : "名称", 
-                dataIndex : "pr_detail",
-                width : 200.0,
+                text : "品牌", 
+                width : 150.0, 
+                dataIndex : "pr_brand",
                 ignore:true,
                 renderer: function (v, m, r) {
                     if(!v){
-                        return r.data["productDTO"]?r.data["productDTO"][m.column.dataIndex]:null;
-                    }
+                        return r.data["productDTO"]?r.data["productDTO"][m.column.dataIndex]:null; 
+                    }                     
                     return v;
                 }
             },
             {
-                text : "规格", 
-                dataIndex : "pr_spec",
-                width : 150.0,
+                text : "名称", 
+                width : 200.0, 
+                dataIndex : "pr_detail",
                 ignore:true,
                 renderer: function (v, m, r) {
                     if(!v){
-                        return r.data["productDTO"]?r.data["productDTO"][m.column.dataIndex]:null;
-                    }
+                        return r.data["productDTO"]?r.data["productDTO"][m.column.dataIndex]:null; 
+                    }                     
                     return v;
                 }
             },
             {
-                text : "单位", 
-                dataIndex : "pr_unit",
-                width : 80.0,
+                text : "型号", 
+                width : 200.0, 
+                dataIndex : "pr_orispeccode",
                 ignore:true,
                 renderer: function (v, m, r) {
                     if(!v){
-                        return r.data["productDTO"]?r.data["productDTO"][m.column.dataIndex]:null;
-                    }
+                        return r.data["productDTO"]?r.data["productDTO"][m.column.dataIndex]:null; 
+                    }                     
                     return v;
                 }
             },            
@@ -228,6 +228,37 @@ Ext.define('saas.view.stock.make.FormPanel', {
                     return Ext.util.Format.number(v, format);
                 }
             },
+            {
+                text : "单位", 
+                dataIndex : "pr_unit",
+                width : 80.0,
+                ignore:true,
+                renderer: function (v, m, r) {
+                    if(!v){
+                        return r.data["productDTO"]?r.data["productDTO"][m.column.dataIndex]:null;
+                    }
+                    return v;
+                }
+            },{
+                text : "成本单价", 
+                dataIndex : "mm_price", 
+                xtype: 'numbercolumn',
+                width : 110.0,
+                editor : {
+                    xtype : "numberfield",
+                    decimalPrecision: 8,
+                    minValue:0
+                },
+                listeners:{
+                    edit:'price_change'
+                },
+                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 : "单位用量", 
                 xtype: 'numbercolumn',
@@ -285,25 +316,6 @@ Ext.define('saas.view.stock.make.FormPanel', {
                     xtype : "warehouseDbfindTrigger"
                 }
             },{
-                text : "成本单价", 
-                dataIndex : "mm_price", 
-                xtype: 'numbercolumn',
-                width : 110.0,
-                editor : {
-                    xtype : "numberfield",
-                    decimalPrecision: 8,
-                    minValue:0
-                },
-                listeners:{
-                    edit:'price_change'
-                },
-                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 : "成本金额", 
                 xtype: 'numbercolumn',
                 dataIndex : "mm_amount", 

frontend/saas-web/app/view/stock/make/FormPanelController.js

@@ -57,6 +57,12 @@ Ext.define('saas.view.stock.make.FormPanelController', {
                         }, {
                             from: 'pr_spec',
                             to: 'pr_spec'
+                        },{
+                            from: 'pr_brand', to: 'pr_brand'
+                        },{
+                            from: 'pr_orispeccode', to: 'pr_orispeccode'
+                        },{
+                            from: 'pr_unit', to: 'pr_unit'
                         }, {
                             from: 'pr_unit',
                             to: 'pr_unit'

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

@@ -126,27 +126,39 @@ Ext.define('saas.view.stock.otherIn.FormPanel', {
                 dataIndex: 'productDTO',
                 hidden: true,
             },
+            {
+                text : "品牌", 
+                width : 150.0, 
+                dataIndex : "pr_brand",
+                ignore:true,
+                renderer: function (v, m, r) {
+                    if(!v){
+                        return r.data["productDTO"]?r.data["productDTO"][m.column.dataIndex]:null; 
+                    }                     
+                    return v;
+                }
+            },
             {
                 text : "名称", 
-                dataIndex : "pr_detail", 
-                width : 200.0,
+                width : 200.0, 
+                dataIndex : "pr_detail",
                 ignore:true,
                 renderer: function (v, m, r) {
                     if(!v){
-                        return r.data["productDTO"]?r.data["productDTO"][m.column.dataIndex]:null;
-                    }
+                        return r.data["productDTO"]?r.data["productDTO"][m.column.dataIndex]:null; 
+                    }                     
                     return v;
                 }
             },
             {
-                text : "规格", 
-                dataIndex : "pr_spec", 
-                width : 150.0,
+                text : "型号", 
+                width : 200.0, 
+                dataIndex : "pr_orispeccode",
                 ignore:true,
                 renderer: function (v, m, r) {
                     if(!v){
-                        return r.data["productDTO"]?r.data["productDTO"][m.column.dataIndex]:null;
-                    }
+                        return r.data["productDTO"]?r.data["productDTO"][m.column.dataIndex]:null; 
+                    }                     
                     return v;
                 }
             },
@@ -174,6 +186,33 @@ Ext.define('saas.view.stock.otherIn.FormPanel', {
                     var format = '0.' + xr.join('');
                     return Ext.util.Format.number(v, format);
                 }
+            },{
+                text : "单位", 
+                width : 80.0, 
+                dataIndex : "pr_unit",
+                ignore:true,
+                renderer: function (v, m, r) {
+                    if(!v){
+                        return r.data["productDTO"]?r.data["productDTO"][m.column.dataIndex]:null; 
+                    }                     
+                    return v;
+                }
+            },{
+                text : "单价(元)", 
+                xtype: 'numbercolumn',
+                dataIndex : "pd_orderprice",
+                width : 110.0,
+                editor : {
+                    xtype : "numberfield",
+                    decimalPrecision: 8,
+                    minValue:0
+                },
+                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 : "仓库id", 
                 dataIndex : "pd_whid", 
@@ -203,23 +242,6 @@ Ext.define('saas.view.stock.otherIn.FormPanel', {
                     valueField : "value", 
                     xtype : "warehouseDbfindTrigger"
                 }
-            },
-            {
-                text : "单价", 
-                xtype: 'numbercolumn',
-                dataIndex : "pd_orderprice",
-                width : 110.0,
-                editor : {
-                    xtype : "numberfield",
-                    decimalPrecision: 8,
-                    minValue:0
-                },
-                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 : "税率", 
                 xtype: 'numbercolumn',
@@ -236,10 +258,10 @@ Ext.define('saas.view.stock.otherIn.FormPanel', {
                 }
             }, 
            {
-                text : "含税金额", 
+                text : "含税金额(元)", 
                 xtype: 'numbercolumn',
                 dataIndex : "pd_ordertotal", 
-                width : 110.0,
+                width : 150.0,
                 // editor : {
                 //     xtype : "numberfield",
                 //     decimalPrecision: 2,
@@ -260,10 +282,10 @@ Ext.define('saas.view.stock.otherIn.FormPanel', {
                 }
             },
             {
-                text : "未税金额", 
+                text : "未税金额(元)", 
                 xtype: 'numbercolumn',
                 dataIndex : "pd_nettotal", 
-                width : 110.0, 
+                width : 150.0, 
                 // editor : {
                 //     xtype : "numberfield",
                 //     decimalPrecision: 2,

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

@@ -52,6 +52,12 @@ Ext.define('saas.view.stock.otherIn.FormPanelController', {
                             from: 'pr_spec',
                             to: 'pr_spec'
                         },{
+                            from: 'pr_brand', to: 'pr_brand'
+                        },{
+                            from: 'pr_orispeccode', to: 'pr_orispeccode'
+                        },{
+                            from: 'pr_unit', to: 'pr_unit'
+                        }, {
                             from:'pr_whid',to:'pd_whid'
                         },{
                             from:'pr_whcode',to:'pd_whcode'

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

@@ -173,17 +173,17 @@ Ext.define('saas.view.stock.otherIn.QueryPanel', {
             dataIndex: 'pd_prodcode',
             width: 150
         },{
-            text: '物料名称',
+            text: '品牌',
+            dataIndex: 'pr_brand',
+            width: 150
+        },{
+            text: '名称',
             dataIndex: 'pr_detail',
             width: 200
         },{
-            text: '物料规格',
-            dataIndex: 'pr_spec',
-            width: 150
-        },{
-            text: '单位',
-            dataIndex: 'pr_unit',
-            width: 80
+            text: '型号',
+            dataIndex: 'pr_orispeccode',
+            width: 200
         },{
             text: '数量',
             dataIndex: 'pd_inqty',
@@ -196,11 +196,11 @@ Ext.define('saas.view.stock.otherIn.QueryPanel', {
                 return Ext.util.Format.number(v, format);
             },
         },{
-            text: '仓库',
-            dataIndex: 'pd_whname',
-            width: 150
+            text: '单位',
+            dataIndex: 'pr_unit',
+            width: 80
         },{
-            text: '单价',
+            text: '单价(元)',
             dataIndex: 'pd_orderprice',
             xtype:'numbercolumn',
             width: 110,
@@ -210,6 +210,10 @@ Ext.define('saas.view.stock.otherIn.QueryPanel', {
                 var format = '0,000.' + xr.join('');
                 return Ext.util.Format.number(v, format);
             }         
+        },{
+            text: '仓库',
+            dataIndex: 'pd_whname',
+            width: 150
         },{
             text: '税率',
             dataIndex: 'pd_taxrate',
@@ -219,7 +223,7 @@ Ext.define('saas.view.stock.otherIn.QueryPanel', {
                 return Ext.util.Format.number(v, '0');
             },
         },{
-            text: '金额',
+            text: '金额(元)',
             dataIndex: 'pd_ordertotal',
             xtype:'numbercolumn',            
             width: 110,

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

@@ -111,21 +111,39 @@ Ext.define('saas.view.stock.otherOut.FormPanel', {
                 hidden: true,
             },
             {
-                text: "名称",
-                dataIndex: "pr_detail", 
-                width : 200.0,
-                ignore: true,
+                text : "品牌", 
+                width : 150.0, 
+                dataIndex : "pr_brand",
+                ignore:true,
                 renderer: function (v, m, r) {
-                    return r.data["productDTO"] ? r.data["productDTO"][m.column.dataIndex] : v;
+                    if(!v){
+                        return r.data["productDTO"]?r.data["productDTO"][m.column.dataIndex]:null; 
+                    }                     
+                    return v;
                 }
             },
             {
-                text: "规格",
-                dataIndex: "pr_spec", 
-                width : 150.0,
-                ignore: true,
+                text : "名称", 
+                width : 200.0, 
+                dataIndex : "pr_detail",
+                ignore:true,
+                renderer: function (v, m, r) {
+                    if(!v){
+                        return r.data["productDTO"]?r.data["productDTO"][m.column.dataIndex]:null; 
+                    }                     
+                    return v;
+                }
+            },
+            {
+                text : "型号", 
+                width : 200.0, 
+                dataIndex : "pr_orispeccode",
+                ignore:true,
                 renderer: function (v, m, r) {
-                    return r.data["productDTO"] ? r.data["productDTO"][m.column.dataIndex] : v;
+                    if(!v){
+                        return r.data["productDTO"]?r.data["productDTO"][m.column.dataIndex]:null; 
+                    }                     
+                    return v;
                 }
             },
             {
@@ -152,6 +170,33 @@ Ext.define('saas.view.stock.otherOut.FormPanel', {
                     var format = '0.' + xr.join('');
                     return Ext.util.Format.number(v, format);
                 }
+            },{
+                text : "单位", 
+                width : 80.0, 
+                dataIndex : "pr_unit",
+                ignore:true,
+                renderer: function (v, m, r) {
+                    if(!v){
+                        return r.data["productDTO"]?r.data["productDTO"][m.column.dataIndex]:null; 
+                    }                     
+                    return v;
+                }
+            },{
+                text: "单价(元)",
+                xtype: 'numbercolumn',
+                dataIndex: "pd_orderprice", 
+                width : 110.0,
+                editor : {
+                    xtype : "numberfield",
+                    decimalPrecision: 8,
+                    minValue:0
+                },
+                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: "仓库id",
                 dataIndex: "pd_whid",
@@ -183,22 +228,6 @@ Ext.define('saas.view.stock.otherOut.FormPanel', {
                 }
             },
             {
-                text: "单价",
-                xtype: 'numbercolumn',
-                dataIndex: "pd_orderprice", 
-                width : 110.0,
-                editor : {
-                    xtype : "numberfield",
-                    decimalPrecision: 8,
-                    minValue:0
-                },
-                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: "税率",
                 xtype: 'numbercolumn',
                 dataIndex: "pd_taxrate", 
@@ -214,10 +243,10 @@ Ext.define('saas.view.stock.otherOut.FormPanel', {
                 }
             },
             {
-                text: "含税金额",
+                text: "含税金额(元)",
                 xtype: 'numbercolumn',
                 dataIndex: "pd_ordertotal",
-                width: 110.0,
+                width: 150.0,
                 renderer : function(v) {
                     var arr = (v + '.').split('.');
                     var xr = (new Array(arr[1].length > 2 ? 2 : arr[1].length)).fill('0');
@@ -233,10 +262,10 @@ Ext.define('saas.view.stock.otherOut.FormPanel', {
                 }
             },
             {
-                text: "未税金额",
+                text: "未税金额(元)",
                 xtype: 'numbercolumn',
                 dataIndex: "pd_nettotal", 
-                width : 110.0,
+                width : 150.0,
                 renderer : function(v) {
                     var arr = (v + '.').split('.');
                     var xr = (new Array(arr[1].length > 2 ? 2 : arr[1].length)).fill('0');

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

@@ -48,6 +48,12 @@ Ext.define('saas.view.stock.otherOut.FormPanelController', {
                         },{
                             from:'pr_spec',to:'pr_spec'
                         },{
+                            from: 'pr_brand', to: 'pr_brand'
+                        },{
+                            from: 'pr_orispeccode', to: 'pr_orispeccode'
+                        },{
+                            from: 'pr_unit', to: 'pr_unit'
+                        }, {
                             from:'pr_whid',to:'pd_whid'
                         },{
                             from:'pr_whcode',to:'pd_whcode'

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

@@ -173,17 +173,17 @@ Ext.define('saas.view.stock.otherOut.QueryPanel', {
             dataIndex: 'pd_prodcode',
             width: 150
         },{
-            text: '物料名称',
+            text: '品牌',
+            dataIndex: 'pr_brand',
+            width: 150
+        },{
+            text: '名称',
             dataIndex: 'pr_detail',
             width: 200
         },{
-            text: '物料规格',
-            dataIndex: 'pr_spec',
-            width: 150
-        },{
-            text: '单位',
-            dataIndex: 'pr_unit',
-            width: 80
+            text: '型号',
+            dataIndex: 'pr_orispeccode',
+            width: 200
         },{
             text: '数量',
             dataIndex: 'pd_inqty',
@@ -196,11 +196,11 @@ Ext.define('saas.view.stock.otherOut.QueryPanel', {
                 return Ext.util.Format.number(v, format);
             }
         },{
-            text: '仓库',
-            dataIndex: 'pd_whname',
-            width: 150
+            text: '单位',
+            dataIndex: 'pr_unit',
+            width: 80
         },{
-            text: '单价',
+            text: '单价(元)',
             dataIndex: 'pd_orderprice',
             xtype:'numbercolumn',
             width: 110,
@@ -210,6 +210,10 @@ Ext.define('saas.view.stock.otherOut.QueryPanel', {
                 var format = '0,000.' + xr.join('');
                 return Ext.util.Format.number(v, format);
             }         
+        },{
+            text: '仓库',
+            dataIndex: 'pd_whname',
+            width: 150
         },{
             text: '税率',
             dataIndex: 'pd_taxrate',
@@ -219,7 +223,7 @@ Ext.define('saas.view.stock.otherOut.QueryPanel', {
                 return Ext.util.Format.number(v, '0');
             },
         },{
-            text: '金额',
+            text: '金额(元)',
             dataIndex: 'pd_ordertotal',
             xtype:'numbercolumn',            
             width: 110,

frontend/saas-web/app/view/stock/report/DataList.js

@@ -87,7 +87,7 @@ Ext.define('saas.view.stock.report.DataList', {
         dataIndex: "rc_prodUnit",
         width: 80
     }, {
-        text: "单价",
+        text: "单价(元)",
         xtype: 'numbercolumn',
         exportFormat: 'Price',
         toggle: true,
@@ -101,7 +101,7 @@ Ext.define('saas.view.stock.report.DataList', {
             return Ext.util.Format.number(v, format);
         }
     }, {
-        text: "金额",
+        text: "金额(元)",
         xtype: 'numbercolumn',
         dataIndex: "rc_amount",
         exportFormat: 'Amount',