界面标准化

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

@@ -39,11 +39,11 @@ Ext.define('saas.view.core.dbfind.types.ProductAddMultiDbfindTrigger', {
         dataIndex: "pr_code",
         width: 150
     },{
-        text: "类型",
-        dataIndex: "pr_kind",
+        text: "品牌",
+        dataIndex: "pr_brand",
         width: 110
     },{
-        text: "物料名称",
+        text: "名称",
         width: 200,
         dataIndex: "pr_detail"
     }, {
@@ -55,8 +55,12 @@ Ext.define('saas.view.core.dbfind.types.ProductAddMultiDbfindTrigger', {
         dataIndex : "pr_spec", 
         width : 150.0
     },{
-        text: "品牌",
-        dataIndex: "pr_brand",
+        text: "单位",
+        dataIndex: "pr_unit",
+        width: 80
+    },{
+        text: "类型",
+        dataIndex: "pr_kind",
         width: 110
     },{
         text: "库存",
@@ -69,10 +73,6 @@ Ext.define('saas.view.core.dbfind.types.ProductAddMultiDbfindTrigger', {
             var format = '0,000.' + xr.join();
             return Ext.util.Format.number(v, format);
         },
-    },{
-        text: "单位",
-        dataIndex: "pr_unit",
-        width: 80
     }, {
         text: "采购提前期",
         dataIndex: "pr_leadtime",
@@ -91,12 +91,12 @@ Ext.define('saas.view.core.dbfind.types.ProductAddMultiDbfindTrigger', {
         width: 200,
         hidden: true
     }, {
-        text: "最新采购单价",
+        text: "最新采购单价(元)",
         dataIndex: "pr_purcprice",
         xtype: 'numbercolumn',
         hidden:true
     }, {
-        text: "最新出货单价",
+        text: "最新出货单价(元)",
         dataIndex: "pr_saleprice",
         xtype: 'numbercolumn',
         hidden:true

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

@@ -34,17 +34,21 @@ Ext.define('saas.view.core.dbfind.types.ProductDbfindTrigger', {
         dataIndex: "pr_code",
         width: 150
     },{
-        text: '品牌',
-        dataIndex: 'pr_brand',
-        width: 150
-    },{
-        text: '名称',
-        dataIndex: 'pr_detail',
-        width: 200
+        text: "品牌",
+        dataIndex: "pr_brand",
+        width: 110
     },{
-        text: '型号',
-        dataIndex: 'pr_orispeccode',
-        width: 200
+        text: "名称",
+        width: 200,
+        dataIndex: "pr_detail"
+    }, {
+        text : "型号", 
+        dataIndex : "pr_orispeccode", 
+        width : 150.0
+    }, {
+        text : "规格", 
+        dataIndex : "pr_spec", 
+        width : 150.0
     },{
         text: "单位",
         dataIndex: "pr_unit",
@@ -65,10 +69,6 @@ Ext.define('saas.view.core.dbfind.types.ProductDbfindTrigger', {
             return Ext.util.Format.number(v, format);
         }
     },{
-        text: "单位",
-        dataIndex: "pr_unit",
-        width: 80
-    }, {
         text: "采购提前期",
         dataIndex: "pr_leadtime",
         hidden: true
@@ -86,17 +86,17 @@ Ext.define('saas.view.core.dbfind.types.ProductDbfindTrigger', {
         width: 200,
         hidden: true
     }, {
-        text: "最新采购单价",
+        text: "最新采购单价(元)",
         dataIndex: "pr_purcprice",
         xtype: 'numbercolumn',
         hidden:true
     }, {
-        text: "最新出货单价",
+        text: "最新出货单价(元)",
         dataIndex: "pr_saleprice",
         xtype: 'numbercolumn',
         hidden:true
     }, {
-        text: "成本单价",
+        text: "成本单价(元)",
         dataIndex: "po_avprice",
         xtype: 'numbercolumn',
         hidden:true

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

@@ -41,25 +41,21 @@ Ext.define('saas.view.core.dbfind.types.ProductMultiDbfindTrigger', {
         dataIndex: "pr_code",
         width: 150
     },{
-        text: "类型",
-        dataIndex: "pr_kind",
+        text: "品牌",
+        dataIndex: "pr_brand",
         width: 110
     },{
-        text: "物料名称",
+        text: "名称",
         width: 200,
         dataIndex: "pr_detail"
-    },{
-        text: '品牌',
-        dataIndex: 'pr_brand',
-        width: 150
-    },{
-        text: '名称',
-        dataIndex: 'pr_detail',
-        width: 200
-    },{
-        text: '型号',
-        dataIndex: 'pr_orispeccode',
-        width: 200
+    }, {
+        text : "型号", 
+        dataIndex : "pr_orispeccode", 
+        width : 150.0
+    }, {
+        text : "规格", 
+        dataIndex : "pr_spec", 
+        width : 150.0
     },{
         text: "单位",
         dataIndex: "pr_unit",
@@ -97,17 +93,17 @@ Ext.define('saas.view.core.dbfind.types.ProductMultiDbfindTrigger', {
         width: 200,
         hidden: true
     }, {
-        text: "最新采购单价",
+        text: "最新采购单价(元)",
         dataIndex: "pr_purcprice",
         xtype: 'numbercolumn',
         hidden:true
     }, {
-        text: "最新出货单价",
+        text: "最新出货单价(元)",
         dataIndex: "pr_saleprice",
         xtype: 'numbercolumn',
         hidden:true
     }, {
-        text: "成本单价",
+        text: "成本单价(元)",
         dataIndex: "po_avprice",
         xtype: 'numbercolumn',
         hidden:true

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

@@ -90,6 +90,10 @@ Ext.define('saas.view.document.product.BasePanel', {
             text : "规格", 
             dataIndex : "pr_spec", 
             width : 150.0
+        },{
+            text : "单位", 
+            dataIndex : "pr_unit", 
+            width : 80.0 
         }, {
             text : "类型", 
             dataIndex : "pr_kind", 
@@ -105,10 +109,6 @@ Ext.define('saas.view.document.product.BasePanel', {
                 var format = '0.' + xr.join('');
                 return Ext.util.Format.number(v, format);
             }
-        },{
-            text : "单位", 
-            dataIndex : "pr_unit", 
-            width : 80.0 
         }, {
             text : "标准定价(元)", 
             dataIndex : "pr_standardprice",

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

@@ -125,7 +125,7 @@ Ext.define('saas.view.document.product.FormPanel', {
     },{
         xtype : "numberfield", 
         name : "pr_standardprice", 
-        fieldLabel : "标准单价", 
+        fieldLabel : "标准单价(元)", 
         allowBlank : true, 
         columnWidth : 0.25,
         decimalPrecision: 8,
@@ -169,7 +169,7 @@ Ext.define('saas.view.document.product.FormPanel', {
         readOnly:true,
         xtype : "numberfield", 
         name : "pr_purcprice", 
-        fieldLabel : "最新采购单价", 
+        fieldLabel : "最新采购单价(元)", 
         allowBlank : true, 
         columnWidth : 0.25,
         decimalPrecision: 8,
@@ -179,7 +179,7 @@ Ext.define('saas.view.document.product.FormPanel', {
         readOnly:true,
         xtype : "numberfield", 
         name : "pr_saleprice", 
-        fieldLabel : "最新出货单价", 
+        fieldLabel : "最新出货单价(元)", 
         decimalPrecision: 8,
         minValue:0
     },{  

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

@@ -61,14 +61,6 @@ Ext.define('saas.view.home.infoCardList.Payment', {
         align: 'center',
         dataIndex: 'pi_prstatus',
         width: 90
-    },{
-        text: '录入人',
-        dataIndex: 'creatorName',
-        width: 110
-    },{
-        text: '审核人',
-        dataIndex: 'pi_auditman',
-        width: 110
     },{
         text: '备注',
         dataIndex: 'pi_remark',
@@ -143,7 +135,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

@@ -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

@@ -48,14 +48,6 @@ Ext.define('saas.view.home.infoCardList.Recment', {
         align: 'center',
         dataIndex: 'pi_prstatus',
         width: 90
-    },{
-        text: '录入人',
-        dataIndex: 'creatorName',
-        width :110
-    },{
-        text: '审核人',
-        dataIndex: 'pi_auditman',
-        width: 110
     }, {
         text: '备注',
         dataIndex: 'pi_remark',
@@ -112,7 +104,7 @@ Ext.define('saas.view.home.infoCardList.Recment', {
             return Ext.util.Format.number(v, format);
         }
     }, {
-        text: '销售单价',
+        text: '销售单价(元)',
         dataIndex: 'pd_sendprice',
         xtype:'numbercolumn',
         hidden:true,
@@ -124,7 +116,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

@@ -81,17 +81,6 @@ Ext.define('saas.view.home.infoCardList.SaleOut', {
             var format = '0,000.' + xr.join('');
             return Ext.util.Format.number(v, format);
         },
-    }, {
-        text: '已转数',
-        dataIndex: 'sd_yqty',
-        xtype: 'numbercolumn',
-        width: 110,
-        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: 'sd_sendqty',

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

@@ -61,14 +61,6 @@ Ext.define('saas.view.home.infoCardList.UnauditCheckIn', {
         align: 'center',
         dataIndex: 'pi_prstatus',
         width: 90
-    },{
-        text: '录入人',
-        dataIndex: 'creatorName',
-        width: 110
-    },{
-        text: '审核人',
-        dataIndex: 'pi_auditman',
-        width: 110
     },{
         text: '备注',
         dataIndex: 'pi_remark',
@@ -143,7 +135,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

@@ -48,14 +48,6 @@ Ext.define('saas.view.home.infoCardList.UnauditSaleOut', {
         align: 'center',
         dataIndex: 'pi_prstatus',
         width: 90
-    },{
-        text: '录入人',
-        dataIndex: 'creatorName',
-        width :110
-    },{
-        text: '审核人',
-        dataIndex: 'pi_auditman',
-        width: 110
     }, {
         text: '备注',
         dataIndex: 'pi_remark',
@@ -121,7 +113,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/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,
@@ -122,14 +122,6 @@ Ext.define('saas.view.money.fundtransfer.QueryPanel', {
             dataIndex: 'ft_status',
             align: 'center',
             width: 90
-        }, {
-            text: '录入人',
-            dataIndex: 'creatorName',
-            width: 110
-        }, {
-            text: '审核人',
-            dataIndex: 'ft_auditman',
-            width: 110
         }, {
             text: '备注',
             dataIndex: 'ftd_remark',

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/othreceipts/QueryPanel.js

@@ -132,14 +132,6 @@ Ext.define('saas.view.money.othreceipts.QueryPanel', {
             align: 'center',
             dataIndex: 'or_status',
             width: 90
-        }, {
-            text: '录入人',
-            dataIndex: 'creatorName',
-            width: 110
-        },{
-            text: '审核人',
-            dataIndex: 'or_auditman',
-            width: 110
         },  {
             text: '备注',
             dataIndex: 'or_remark',
@@ -182,14 +174,6 @@ Ext.define('saas.view.money.othreceipts.QueryPanel', {
             align: 'center',
             dataIndex: 'or_status',
             width: 90
-        }, {
-            text: '录入人',
-            dataIndex: 'creatorName',
-            width: 110
-        },{
-            text: '审核人',
-            dataIndex: 'or_auditman',
-            width: 110
         },{
             text: '收入类别',
             dataIndex: 'ord_type',

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/othspendings/QueryPanel.js

@@ -129,14 +129,6 @@ Ext.define('saas.view.money.othspendings.QueryPanel', {
             align: 'center',
             dataIndex: 'os_status',
             width: 90
-        },{
-            text: '录入人',
-            dataIndex: 'creatorName',
-            width: 110
-        }, {
-            text: '审核人',
-            dataIndex: 'os_auditman',
-            width: 110
         }, {
             text: '备注',
             dataIndex: 'os_remark',
@@ -179,14 +171,6 @@ Ext.define('saas.view.money.othspendings.QueryPanel', {
             align: 'center',
             dataIndex: 'os_status',
             width: 90
-        },{
-            text: '录入人',
-            dataIndex: 'creatorName',
-            width: 110
-        }, {
-            text: '审核人',
-            dataIndex: 'os_auditman',
-            width: 110
         }, {
             text: '支出类别',
             dataIndex: 'osd_type',

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

@@ -96,14 +96,6 @@ Ext.define('saas.view.money.paybalance.QueryPanel', {
                 text: '付款人',
                 dataIndex: 'pb_manname',
                 width: 110
-            }, {
-                text: '录入人',
-                dataIndex: 'creatorName',
-                width: 110
-            }, {
-                text: '审核人',
-                dataIndex: 'pb_auditman',
-                width: 110
             }, {
                 text: '备注',
                 dataIndex: 'pb_remark',
@@ -137,14 +129,6 @@ Ext.define('saas.view.money.paybalance.QueryPanel', {
             text: '付款人',
             dataIndex: 'pb_manname',
             width: 110
-        }, {
-            text: '录入人',
-            dataIndex: 'creatorName',
-            width: 110
-        }, {
-            text: '审核人',
-            dataIndex: 'pb_auditman',
-            width: 110
         },{
             text: '资金账户',
             dataIndex: 'pd_bankname',

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

@@ -87,14 +87,6 @@ Ext.define('saas.view.money.recBalance.QueryPanel', {
             text: '收款人',
             dataIndex: 'rb_manname',
             width: 110
-        }, {
-            text: '录入人',
-            dataIndex: 'creatorName',
-            width: 110
-        }, {
-            text: '审核人',
-            dataIndex: 'rb_auditman',
-            width: 110
         }, {
             text: '备注',
             dataIndex: 'rb_remark',
@@ -128,14 +120,6 @@ Ext.define('saas.view.money.recBalance.QueryPanel', {
             text: '收款人',
             dataIndex: 'rb_manname',
             width: 100
-        }, {
-            text: '录入人',
-            dataIndex: 'creatorName',
-            width: 110
-        }, {
-            text: '审核人',
-            dataIndex: 'rb_auditman',
-            width: 110
         },{
             text: '资金账户',
             dataIndex: 'rd_bankname',

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

@@ -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,
@@ -137,7 +137,7 @@ Ext.define('saas.view.money.report.CustomerCheckCheck', {
             return Ext.util.Format.number(v, format);
         }
     }, {
-        text: '不含税金额(元)',
+        text: '不含税金额',
         width: 150,
         xtype: 'numbercolumn',
         exportFormat: 'Amount',

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

@@ -70,7 +70,7 @@ Ext.define('saas.view.money.report.ProfitDetail', {
             return Ext.util.Format.number(v, format);
         }
     }, {
-        text: '不含税金额(元)',
+        text: '不含税金额',
         dataIndex: 'netamount',
         exportFormat: 'Amount',
         xtype: 'numbercolumn',

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

@@ -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',
@@ -147,7 +147,7 @@ Ext.define('saas.view.money.report.VendorCheck', {
             return Ext.util.Format.number(v, format);
         }
     }, {
-        text: '不含税金额(元)',
+        text: '不含税金额',
         dataIndex: 'pd_nettotal',
         exportFormat: 'Amount',
         xtype: 'numbercolumn',

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

@@ -143,8 +143,18 @@ Ext.define('saas.view.purchase.purchase.FormPanel', {
                         text: 'model映射需要',
                         dataIndex: 'productDTO',
                         hidden: true,
-                    },            
-                    {
+                    },{
+                        text : "规格", 
+                        width : 150, 
+                        dataIndex : "pr_spec",
+                        ignore:true,
+                        renderer: function (v, m, r) {
+                            if(!v){
+                                return r.data["productDTO"]?r.data["productDTO"][m.column.dataIndex]:null; 
+                            }                     
+                            return v;
+                        }
+                    },{
                         text : "数量", 
                         dataIndex : "pd_qty", 
                         xtype: 'numbercolumn',

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

@@ -129,14 +129,6 @@ Ext.define('saas.view.purchase.purchase.QueryPanel', {
             align: 'center',
             dataIndex: 'pu_acceptstatus',
             width: 90
-        },{
-            text: '录入人',
-            dataIndex: 'creatorName',
-            width: 110
-        },{
-            text: '审核人',
-            dataIndex: 'pu_auditman',
-            width: 110
         },{
             text: '关联销售单',
             dataIndex: 'pu_sacode',
@@ -199,6 +191,10 @@ Ext.define('saas.view.purchase.purchase.QueryPanel', {
             text: '型号',
             dataIndex: 'pr_orispeccode',
             width: 200
+        },{
+            text: '规格',
+            dataIndex: 'pr_spce',
+            width: 150
         },{
             text: '采购数量',
             dataIndex: 'pd_qty',
@@ -239,7 +235,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

@@ -162,8 +162,18 @@ Ext.define('saas.view.purchase.purchaseIn.FormPanel', {
                     }                     
                     return v;
                 }
-            },
-            {
+            },{
+                text : "规格", 
+                width : 150, 
+                dataIndex : "pr_spec",
+                ignore:true,
+                renderer: function (v, m, r) {
+                    if(!v){
+                        return r.data["productDTO"]?r.data["productDTO"][m.column.dataIndex]:null; 
+                    }                     
+                    return v;
+                }
+            },{
                 text: 'model映射需要',
                 dataIndex: 'productDTO',
                 hidden: true,
@@ -288,7 +298,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, 
@@ -312,7 +322,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/QueryPanel.js

@@ -139,14 +139,6 @@ Ext.define('saas.view.purchase.purchaseIn.QueryPanel', {
             align: 'center',
             dataIndex: 'pi_prstatus',
             width: 90
-        },{
-            text: '录入人',
-            dataIndex: 'creatorName',
-            width: 110
-        },{
-            text: '审核人',
-            dataIndex: 'pi_auditman',
-            width: 110
         },{
             text: '备注',
             dataIndex: 'pi_remark',
@@ -208,6 +200,10 @@ Ext.define('saas.view.purchase.purchaseIn.QueryPanel', {
             text: '型号',
             dataIndex: 'pr_orispeccode',
             width: 200
+        },{
+            text: '规格',
+            dataIndex: 'pr_spce',
+            width: 150
         },{
             text: '数量',
             dataIndex: 'pd_inqty',
@@ -247,7 +243,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

@@ -161,8 +161,18 @@ Ext.define('saas.view.purchase.purchaseOut.FormPanel', {
                     }                     
                     return v;
                 }
-            },
-            {
+            },{
+                text : "规格", 
+                width : 150, 
+                dataIndex : "pr_spec",
+                ignore:true,
+                renderer: function (v, m, r) {
+                    if(!v){
+                        return r.data["productDTO"]?r.data["productDTO"][m.column.dataIndex]:null; 
+                    }                     
+                    return v;
+                }
+            },{
                 text : "数量", 
                 dataIndex : "pd_outqty", 
                 width : 110.0,

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

@@ -152,14 +152,6 @@ Ext.define('saas.view.purchase.purchaseOut.QueryPanel', {
             align: 'center',
             dataIndex: 'pi_prstatus',
             width: 90
-        },{
-            text: '录入人',
-            dataIndex: 'creatorName',
-            width: 110
-        },{
-            text: '审核人',
-            dataIndex: 'pi_auditman',
-            width: 110
         },{
             text: '备注',
             dataIndex: 'pi_remark',
@@ -231,6 +223,10 @@ Ext.define('saas.view.purchase.purchaseOut.QueryPanel', {
                 text: '型号',
                 dataIndex: 'pr_orispeccode',
                 width: 200
+            },{
+                text: '规格',
+                dataIndex: 'pr_spce',
+                width: 150
             },{
                 text: '数量',
                 dataIndex: 'pd_outqty',
@@ -270,7 +266,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

@@ -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,
@@ -167,7 +167,7 @@ Ext.define('saas.view.purchase.report.Purchase', {
             return Ext.util.Format.number(v, format);
         }
     }, {
-        text: '不含税金额(元)',
+        text: '不含税金额',
         exportFormat: 'Amount',
         width: 150,
         dataIndex: 'pd_taxtotal',

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

@@ -44,10 +44,6 @@ Ext.define('saas.view.purchase.report.PurchasePay', {
         text: '供应商名称',
         dataIndex: 'pu_vendname',
         width: 250
-    }, {
-        text: '录入人',
-        dataIndex: 'creatorName',
-        width: 110
     }, {
         text : "日期", 
         dataIndex : "createTime", 

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

@@ -167,7 +167,7 @@ Ext.define('saas.view.sale.report.Sale', {
             return Ext.util.Format.number(v, format);
         }
     }, {
-        text: '不含税金额(元)',
+        text: '不含税金额',
         xtype: 'numbercolumn',
         exportFormat: 'Amount',
         width: 150,

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

@@ -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) {

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

@@ -165,8 +165,18 @@ Ext.define('saas.view.sale.sale.FormPanel', {
                             }                     
                             return v;
                         }
-                    },
-                    {
+                    },{
+                        text : "规格", 
+                        width : 150, 
+                        dataIndex : "pr_spec",
+                        ignore:true,
+                        renderer: function (v, m, r) {
+                            if(!v){
+                                return r.data["productDTO"]?r.data["productDTO"][m.column.dataIndex]:null; 
+                            }                     
+                            return v;
+                        }
+                    },{
                         text : "数量", 
                         dataIndex : "sd_qty", 
                         width : 110.0,
@@ -266,7 +276,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/QueryPanel.js

@@ -141,14 +141,6 @@ Ext.define('saas.view.sale.sale.QueryPanel', {
             text: '业务员',
             dataIndex: 'sa_seller',
             width: 110
-        }, {
-            text: '录入人',
-            dataIndex: 'creatorName',
-            width :110
-        }, {
-            text: '审核人',
-            dataIndex: 'sa_auditman',
-            width: 110
         }, {
             text: '收货地址',
             dataIndex: 'sa_toplace',
@@ -211,6 +203,10 @@ Ext.define('saas.view.sale.sale.QueryPanel', {
             text: '型号',
             dataIndex: 'pr_orispeccode',
             width: 200
+        },{
+            text: '规格',
+            dataIndex: 'pr_spce',
+            width: 150
         },{
             text: '数量',
             dataIndex: 'sd_qty',
@@ -237,17 +233,6 @@ Ext.define('saas.view.sale.sale.QueryPanel', {
                 var format = '0,000.' + xr.join('');
                 return Ext.util.Format.number(v, format);
             },
-        }, {
-            text: '已转数',
-            dataIndex: 'sd_yqty',
-            xtype: 'numbercolumn',
-            width: 120,
-            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: 'sd_sendqty',

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

@@ -175,8 +175,18 @@ Ext.define('saas.view.sale.saleIn.FormPanel', {
                     }                     
                     return v;
                 }
-            },
-            {
+            },{
+                text : "规格", 
+                width : 150, 
+                dataIndex : "pr_spec",
+                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_inqty", 

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

@@ -146,14 +146,6 @@ Ext.define('saas.view.sale.saleIn.QueryPanel', {
             dataIndex: 'sa_seller',
             width: 90,
             hidden :true
-        }, {
-            text: '录入人',
-            dataIndex: 'creatorName',
-            width :110
-        },{
-            text: '审核人',
-            dataIndex: 'pi_auditman',
-            width: 110
         }, {
             text: '备注',
             dataIndex: 'pi_remark',
@@ -231,6 +223,10 @@ Ext.define('saas.view.sale.saleIn.QueryPanel', {
             text: '型号',
             dataIndex: 'pr_orispeccode',
             width: 200
+        },{
+            text: '规格',
+            dataIndex: 'pr_spce',
+            width: 150
         },{
             text: '退货数量',
             dataIndex: 'pd_inqty',
@@ -258,7 +254,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

@@ -186,8 +186,18 @@ Ext.define('saas.view.sale.saleout.FormPanel', {
                     }                     
                     return v;
                 }
-            },
-            {
+            },{
+                text : "规格", 
+                width : 150, 
+                dataIndex : "pr_spec",
+                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_outqty", 
@@ -282,7 +292,7 @@ Ext.define('saas.view.sale.saleout.FormPanel', {
                 }
             }, 
            {
-                text : "含税金额(元)", 
+                text : "含税金额", 
                 xtype: 'numbercolumn',
                 dataIndex : "pd_ordertotal", 
                 width : 150.0, 
@@ -301,7 +311,7 @@ Ext.define('saas.view.sale.saleout.FormPanel', {
                 }
             },
             {
-                text : "未税金额(元)", 
+                text : "未税金额", 
                 xtype: 'numbercolumn',
                 dataIndex : "pd_nettotal", 
                 width : 150.0, 

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

@@ -140,20 +140,12 @@ Ext.define('saas.view.sale.saleout.QueryPanel', {
             dataIndex: 'sa_seller',
             width: 90,
             hidden :true
-        }, {
-            text: '录入人',
-            dataIndex: 'creatorName',
-            width :110
-        },{
-            text: '审核人',
-            dataIndex: 'pi_auditman',
-            width: 110
         }, {
             text: '备注',
             dataIndex: 'pi_remark',
             width: 250
         },{
-            text: '未含税金额(元)',
+            text: '未含税金额',
             dataIndex: 'pi_nettotal',
             xtype:'numbercolumn',
             hidden :true
@@ -223,6 +215,10 @@ Ext.define('saas.view.sale.saleout.QueryPanel', {
             text: '型号',
             dataIndex: 'pr_orispeccode',
             width: 200
+        },{
+            text: '规格',
+            dataIndex: 'pr_spce',
+            width: 150
         },{
             text: '出货数量',
             dataIndex: 'pd_outqty',
@@ -250,7 +246,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

@@ -150,8 +150,18 @@ Ext.define('saas.view.stock.appropriationInOut.FormPanel', {
                     }                     
                     return v;
                 }
-            },
-            {
+            },{
+                text : "规格", 
+                width : 150, 
+                dataIndex : "pr_spec",
+                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_outqty", 

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

@@ -134,14 +134,6 @@ Ext.define('saas.view.stock.appropriationInOut.QueryPanel', {
             align: 'center',
             dataIndex: 'pi_status',
             width: 90
-        },{
-            text: '录入人',
-            dataIndex: 'creatorName',
-            width: 110
-        },{
-            text: '审核人',
-            dataIndex: 'pi_auditman',
-            width: 110
         },{
             text: '备注',
             dataIndex: 'pi_remark',
@@ -191,6 +183,10 @@ Ext.define('saas.view.stock.appropriationInOut.QueryPanel', {
                 text: '型号',
                 dataIndex: 'pr_orispeccode',
                 width: 200
+            },{
+                text: '规格',
+                dataIndex: 'pr_spce',
+                width: 150
             },{
                 text: '数量',
                 dataIndex: 'pd_outqty',

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

@@ -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
     },
@@ -203,8 +203,18 @@ Ext.define('saas.view.stock.make.FormPanel', {
                     }                     
                     return v;
                 }
-            },            
-            {
+            },{
+                text : "规格", 
+                width : 150, 
+                dataIndex : "pr_spec",
+                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 : "mm_qty", 

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

@@ -161,8 +161,18 @@ Ext.define('saas.view.stock.otherIn.FormPanel', {
                     }                     
                     return v;
                 }
-            },
-            {
+            },{
+                text : "规格", 
+                width : 150, 
+                dataIndex : "pr_spec",
+                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_inqty", 
@@ -258,7 +268,7 @@ Ext.define('saas.view.stock.otherIn.FormPanel', {
                 }
             }, 
            {
-                text : "含税金额(元)", 
+                text : "含税金额", 
                 xtype: 'numbercolumn',
                 dataIndex : "pd_ordertotal", 
                 width : 150.0,
@@ -282,7 +292,7 @@ Ext.define('saas.view.stock.otherIn.FormPanel', {
                 }
             },
             {
-                text : "未税金额(元)", 
+                text : "未税金额", 
                 xtype: 'numbercolumn',
                 dataIndex : "pd_nettotal", 
                 width : 150.0, 

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

@@ -119,14 +119,6 @@ Ext.define('saas.view.stock.otherIn.QueryPanel', {
             align: 'center',
             dataIndex: 'pi_status',
             width: 90
-        },{
-            text: '录入人',
-            dataIndex: 'creatorName',
-            width: 110
-        },{
-            text: '审核人',
-            dataIndex: 'pi_auditman',
-            width: 110
         },{
             text: '备注',
             dataIndex: 'pi_remark',
@@ -184,6 +176,10 @@ Ext.define('saas.view.stock.otherIn.QueryPanel', {
             text: '型号',
             dataIndex: 'pr_orispeccode',
             width: 200
+        },{
+            text: '规格',
+            dataIndex: 'pr_spce',
+            width: 150
         },{
             text: '数量',
             dataIndex: 'pd_inqty',
@@ -223,7 +219,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

@@ -145,8 +145,18 @@ Ext.define('saas.view.stock.otherOut.FormPanel', {
                     }                     
                     return v;
                 }
-            },
-            {
+            },{
+                text : "规格", 
+                width : 150, 
+                dataIndex : "pr_spec",
+                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_outqty",
@@ -243,7 +253,7 @@ Ext.define('saas.view.stock.otherOut.FormPanel', {
                 }
             },
             {
-                text: "含税金额(元)",
+                text: "含税金额",
                 xtype: 'numbercolumn',
                 dataIndex: "pd_ordertotal",
                 width: 150.0,
@@ -262,7 +272,7 @@ Ext.define('saas.view.stock.otherOut.FormPanel', {
                 }
             },
             {
-                text: "未税金额(元)",
+                text: "未税金额",
                 xtype: 'numbercolumn',
                 dataIndex: "pd_nettotal", 
                 width : 150.0,

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

@@ -119,14 +119,6 @@ Ext.define('saas.view.stock.otherOut.QueryPanel', {
             align: 'center',
             dataIndex: 'pi_status',
             width: 90
-        },{
-            text: '录入人',
-            dataIndex: 'creatorName',
-            width: 110
-        },{
-            text: '审核人',
-            dataIndex: 'pi_auditman',
-            width: 110
         },{
             text: '备注',
             dataIndex: 'pi_remark',
@@ -184,6 +176,10 @@ Ext.define('saas.view.stock.otherOut.QueryPanel', {
             text: '型号',
             dataIndex: 'pr_orispeccode',
             width: 200
+        },{
+            text: '规格',
+            dataIndex: 'pr_spce',
+            width: 150
         },{
             text: '数量',
             dataIndex: 'pd_inqty',
@@ -223,7 +219,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

@@ -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',