BUG修复及物料放大镜字段规范

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

@@ -33,22 +33,22 @@ Ext.define('saas.view.core.dbfind.types.ProductDbfindTrigger', {
         text: "物料编号",       
         dataIndex: "pr_code",
         width: 150
-    }, {
+    },{
+        text: "类型",
+        dataIndex: "pr_kind",
+        width: 110
+    },{
         text: "物料名称",
         width: 200,
         dataIndex: "pr_detail"
     }, {
-        text: "型号规格",
-        dataIndex: "pr_spec",
-        width: 150
-    }, {
-        text: "类型",
-        dataIndex: "pr_kind",
-        width: 110
+        text : "型号", 
+        dataIndex : "pr_orispeccode", 
+        width : 150.0
     }, {
-        text: "单位",
-        dataIndex: "pr_unit",
-        width: 80
+        text : "规格", 
+        dataIndex : "pr_spec", 
+        width : 150.0
     },{
         text: "品牌",
         dataIndex: "pr_brand",
@@ -64,6 +64,10 @@ Ext.define('saas.view.core.dbfind.types.ProductDbfindTrigger', {
             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/core/dbfind/types/ProductMultiDbfindTrigger.js

@@ -40,22 +40,22 @@ Ext.define('saas.view.core.dbfind.types.ProductMultiDbfindTrigger', {
         text: "物料编号",       
         dataIndex: "pr_code",
         width: 150
-    }, {
+    },{
+        text: "类型",
+        dataIndex: "pr_kind",
+        width: 110
+    },{
         text: "物料名称",
         width: 200,
         dataIndex: "pr_detail"
     }, {
-        text: "型号规格",
-        dataIndex: "pr_spec",
-        width: 150
-    }, {
-        text: "类型",
-        dataIndex: "pr_kind",
-        width: 110
+        text : "型号", 
+        dataIndex : "pr_orispeccode", 
+        width : 150.0
     }, {
-        text: "单位",
-        dataIndex: "pr_unit",
-        width: 80
+        text : "规格", 
+        dataIndex : "pr_spec", 
+        width : 150.0
     },{
         text: "品牌",
         dataIndex: "pr_brand",
@@ -71,6 +71,10 @@ 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/purchase/purchase/FormPanel.js

@@ -24,364 +24,368 @@ Ext.define('saas.view.purchase.purchase.FormPanel', {
      _deleteUrl:'/api/purchase/purchase/delete',
      _turnInUrl:'/api/purchase/purchase/turnProdin',
      initId:0,
- 
-     toolBtns: [{
-         xtype: 'button',
-         text: '转采购验收单',
-         hidden: true,
-         bind: {
-            hidden: '{turnHidden}'
-        },
-         handler: 'turnIn'
-     }],
-
-    defaultItems: [{
-        xtype: 'hidden',
-        name: 'id',
-        fieldLabel: 'id'
-    },{
-        xtype : "hidden", 
-        name : "pu_vendid", 
-        fieldLabel : "供应商ID"
-    }, {
-        xtype : "hidden", 
-        name : "pu_vendcode", 
-        fieldLabel : "供应商编号"
-    }, {
-        xtype : "vendorDbfindTrigger", 
-        name : "pu_vendname", 
-        fieldLabel : "供应商名称",
-        allowBlank : false,
-    },{
-        xtype : "datefield", 
-        name : "pu_delivery", 
-        fieldLabel : "交货日期",
-        allowBlank:false,
-        defaultValue: new Date(),
-        columnWidth : 0.25,
-    },{
-        name : "pu_shipaddresscode", 
-        editable:false,
-        xtype : "remotecombo", 
-        storeUrl:'/api/document/address/getCombo',
-        fieldLabel : "交货地址", 
-        allowBlank : false, 
-        columnWidth : 0.5,
-        hiddenBtn:false,//true 则会关闭新增按钮功能
-        addHandler:function(b){
-            var form = this.ownerCmp.ownerCt;
-            this.dialog = form.add({
-                xtype: 'document-address-window',
-                bind: {
-                    title: '新增交货地址'
-                },
-                _parent:form,
-                _combo:this.ownerCmp,
-                record:null,
-                session: true
-            });
-            this.dialog.show();
-        }
-    },{
-        name : "detailGridField", 
-        xtype : "detailGridField", 
-        storeModel:'saas.model.purchase.Purchasedetail',
-        detnoColumn:  'pd_detno',
-        deleteDetailUrl:'/api/purchase/purchase/deleteDetail',
-        allowEmpty: false,
-        columns : [
-            {
-                text : "id", 
-                dataIndex : "id", 
-                xtype : "numbercolumn",
-                hidden:true
+     initComponent:function() {
+        Ext.applyIf(this,{
+            defaultItems: [{
+                xtype: 'hidden',
+                name: 'id',
+                fieldLabel: 'id'
             },{
-                text : "物料id", 
-                dataIndex : "pd_prodid", 
-                xtype : "numbercolumn",
-                hidden:true
-            },
-            {
-                text : "物料编号", 
-                width : 150.0, 
-                dataIndex : "pd_prodcode", 
-                xtype : "", 
-                items : null,
+                xtype : "hidden", 
+                name : "pu_vendid", 
+                fieldLabel : "供应商ID"
+            }, {
+                xtype : "hidden", 
+                name : "pu_vendcode", 
+                fieldLabel : "供应商编号"
+            }, {
+                xtype : "vendorDbfindTrigger", 
+                name : "pu_vendname", 
+                fieldLabel : "供应商名称",
                 allowBlank : false,
-                editor : {
-                    xtype : "productMultiDbfindTrigger"
-                }
-            },
-            {
-                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: 'model映射需要',
-                dataIndex: 'productDTO',
-                hidden: true,
-            },
-            {
-                text : "规格", 
-                dataIndex : "pr_spec", 
-                width : 150.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 : "pd_qty", 
-                xtype: 'numbercolumn',
-                width : 110.0,
-                allowBlank : false,
-                editor : {
-                    xtype : "numberfield",
-                    decimalPrecision: 3,
-                    minValue: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);
-                },
-                summaryType: 'sum',
-                summaryRenderer: 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 : "单价", 
-                xtype: 'numbercolumn',
-                dataIndex : "pd_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 : "已转数", 
-                dataIndex : "pd_yqty", 
-                xtype: 'numbercolumn',
-                width : 0,
-                hidden:true,
-                editor : {
-                    xtype : "numberfield",
-                    decimalPrecision: 3,
-                    editable : false
-                },
-                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);
-                },
-                summaryType: 'sum',
-                summaryRenderer: 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 : "税率", 
-                xtype: 'numbercolumn',
-                dataIndex : "pd_taxrate", 
-                width : 80.0,
-                editor : {
-                    xtype : "numberfield",
-                    decimalPrecision: 0,
-                    minValue: 0,
-                    maxValue: 100
-                },
-                renderer : function(v) {
-                    return Ext.util.Format.number(v, '0');
-                }
+                xtype : "datefield", 
+                name : "pu_delivery", 
+                fieldLabel : "交货日期",
+                allowBlank:false,
+                defaultValue: new Date(),
+                columnWidth : 0.25,
             },{
-                text : "需求日期", 
-                dataIndex : "pd_delivery", 
-                xtype:'datecolumn',
-                width : 110.0, 
-                editor : {
-                    xtype : "datefield",
-                    editable : false, 
-                    hideTrigger : false
+                name : "pu_shipaddresscode", 
+                editable:false,
+                xtype : "remotecombo", 
+                storeUrl:'/api/document/address/getCombo',
+                fieldLabel : "交货地址", 
+                allowBlank : false, 
+                columnWidth : 0.5,
+                hiddenBtn:false,//true 则会关闭新增按钮功能
+                addHandler:function(b){
+                    var form = this.ownerCmp.ownerCt;
+                    this.dialog = form.add({
+                        xtype: 'document-address-window',
+                        bind: {
+                            title: '新增交货地址'
+                        },
+                        _parent:form,
+                        _combo:this.ownerCmp,
+                        record:null,
+                        session: true
+                    });
+                    this.dialog.show();
                 }
+            },{
+                name : "detailGridField", 
+                xtype : "detailGridField", 
+                storeModel:'saas.model.purchase.Purchasedetail',
+                detnoColumn:  'pd_detno',
+                deleteDetailUrl:'/api/purchase/purchase/deleteDetail',
+                allowEmpty: false,
+                columns : [
+                    {
+                        text : "id", 
+                        dataIndex : "id", 
+                        xtype : "numbercolumn",
+                        hidden:true
+                    },{
+                        text : "物料id", 
+                        dataIndex : "pd_prodid", 
+                        xtype : "numbercolumn",
+                        hidden:true
+                    },
+                    {
+                        text : "物料编号", 
+                        width : 150.0, 
+                        dataIndex : "pd_prodcode", 
+                        xtype : "", 
+                        items : null,
+                        allowBlank : false,
+                        editor : {
+                            xtype : "productMultiDbfindTrigger"
+                        }
+                    },
+                    {
+                        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: 'model映射需要',
+                        dataIndex: 'productDTO',
+                        hidden: true,
+                    },
+                    {
+                        text : "规格", 
+                        dataIndex : "pr_spec", 
+                        width : 150.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 : "pd_qty", 
+                        xtype: 'numbercolumn',
+                        width : 110.0,
+                        allowBlank : false,
+                        editor : {
+                            xtype : "numberfield",
+                            decimalPrecision: 3,
+                            minValue: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);
+                        },
+                        summaryType: 'sum',
+                        summaryRenderer: 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 : "单价", 
+                        xtype: 'numbercolumn',
+                        dataIndex : "pd_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 : "已转数", 
+                        dataIndex : "pd_yqty", 
+                        xtype: 'numbercolumn',
+                        width : 0,
+                        hidden:true,
+                        editor : {
+                            xtype : "numberfield",
+                            decimalPrecision: 3,
+                            editable : false
+                        },
+                        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);
+                        },
+                        summaryType: 'sum',
+                        summaryRenderer: 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 : "税率", 
+                        xtype: 'numbercolumn',
+                        dataIndex : "pd_taxrate", 
+                        width : 80.0,
+                        editor : {
+                            xtype : "numberfield",
+                            decimalPrecision: 0,
+                            minValue: 0,
+                            maxValue: 100
+                        },
+                        renderer : function(v) {
+                            return Ext.util.Format.number(v, '0');
+                        }
+                    },{
+                        text : "需求日期", 
+                        dataIndex : "pd_delivery", 
+                        xtype:'datecolumn',
+                        width : 110.0, 
+                        editor : {
+                            xtype : "datefield",
+                            editable : false, 
+                            hideTrigger : false
+                        }
+                    },
+                    {
+                        text : "含税金额", 
+                        xtype: 'numbercolumn',
+                        dataIndex : "pd_total", 
+                        width : 110.0, 
+                        // editor : {
+                        //     xtype : "numberfield",
+                        //     decimalPrecision: 2,
+                        //     editable : false
+                        // },
+                        renderer : function(v) {
+                            var arr = (v + '.').split('.');
+                            var xr = (new Array(arr[1].length > 2 ? 2 : arr[1].length)).fill('0');
+                            var format = '0,000.' + xr.join();
+                            return Ext.util.Format.number(v, format);
+                        },
+                        summaryType: 'sum',
+                        summaryRenderer: function(v) {
+                            var arr = (v + '.').split('.');
+                            var xr = (new Array(arr[1].length > 2 ? 2 : arr[1].length)).fill('0');
+                            var format = '0,000.' + xr.join();
+                            return Ext.util.Format.number(v, format);
+                        }
+                    }, 
+                    {
+                        text : "未税金额", 
+                        xtype: 'numbercolumn',
+                        dataIndex : "pd_taxtotal", 
+                        width : 110.0,
+                        // editor : {
+                        //     xtype : "numberfield",
+                        //     decimalPrecision: 2,
+                        //     editable : false
+                        // },
+                        renderer : function(v) {
+                            var arr = (v + '.').split('.');
+                            var xr = (new Array(arr[1].length > 2 ? 2 : arr[1].length)).fill('0');
+                            var format = '0,000.' + xr.join();
+                            return Ext.util.Format.number(v, format);
+                        },
+                        summaryType: 'sum',
+                        summaryRenderer: function(v) {
+                            var arr = (v + '.').split('.');
+                            var xr = (new Array(arr[1].length > 2 ? 2 : arr[1].length)).fill('0');
+                            var format = '0,000.' + xr.join();
+                            return Ext.util.Format.number(v, format);
+                        }
+                    },
+                    {
+                        text : "最小包装数", 
+                        xtype: 'numbercolumn',
+                        dataIndex : "pr_zxbzs",
+                        width : 110.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 : "pd_salecode", 
+                        width : 150.0
+                    },{
+                        text : "备注", 
+                        dataIndex : "pd_remark",
+                        width : 250, 
+                        items : null,
+                        editor : {
+                            xtype : "textfield"
+                        },
+                    }
+                ]
+            }, {
+                xtype : "textfield", 
+                name : "pu_remark", 
+                fieldLabel : "备注", 
+                columnWidth : 1
+            }, {
+                xtype : "datefield", 
+                name : "pu_date", 
+                fieldLabel : "单据日期", 
+                defaultValue: new Date()
+            }, {
+                xtype : "textfield", 
+                name : "pu_total", 
+                fieldLabel : "采购金额",
+                readOnly:true,
+                columnWidth : 0.25,
+            },{
+                xtype : "hidden", 
+                name : "pu_buyercode", 
+                fieldLabel : "采购员编号"
+            },{
+                xtype : "employeeDbfindTrigger", 
+                name : "pu_buyername", 
+                fieldLabel : "采购员",
+                columnWidth : 0.25,
+                defaultValue:saas.util.BaseUtil.getCurrentUser().realname
+            },{
+                xtype : "hidden", 
+                name : "pu_buyerid", 
+                fieldLabel : "采购员ID",
+                defaultValue:saas.util.BaseUtil.getCurrentUser().id
             },
             {
-                text : "含税金额", 
-                xtype: 'numbercolumn',
-                dataIndex : "pd_total", 
-                width : 110.0, 
-                // editor : {
-                //     xtype : "numberfield",
-                //     decimalPrecision: 2,
-                //     editable : false
-                // },
-                renderer : function(v) {
-                    var arr = (v + '.').split('.');
-                    var xr = (new Array(arr[1].length > 2 ? 2 : arr[1].length)).fill('0');
-                    var format = '0,000.' + xr.join();
-                    return Ext.util.Format.number(v, format);
-                },
-                summaryType: 'sum',
-                summaryRenderer: function(v) {
-                    var arr = (v + '.').split('.');
-                    var xr = (new Array(arr[1].length > 2 ? 2 : arr[1].length)).fill('0');
-                    var format = '0,000.' + xr.join();
-                    return Ext.util.Format.number(v, format);
-                }
-            }, 
-            {
-                text : "未税金额", 
-                xtype: 'numbercolumn',
-                dataIndex : "pd_taxtotal", 
-                width : 110.0,
-                // editor : {
-                //     xtype : "numberfield",
-                //     decimalPrecision: 2,
-                //     editable : false
-                // },
-                renderer : function(v) {
-                    var arr = (v + '.').split('.');
-                    var xr = (new Array(arr[1].length > 2 ? 2 : arr[1].length)).fill('0');
-                    var format = '0,000.' + xr.join();
-                    return Ext.util.Format.number(v, format);
-                },
-                summaryType: 'sum',
-                summaryRenderer: function(v) {
-                    var arr = (v + '.').split('.');
-                    var xr = (new Array(arr[1].length > 2 ? 2 : arr[1].length)).fill('0');
-                    var format = '0,000.' + xr.join();
-                    return Ext.util.Format.number(v, format);
-                }
+                xtype : "hidden", 
+                name : "creatorId", 
+                fieldLabel : "录入人ID", 
+                readOnly:true
             },
             {
-                text : "最小包装数", 
-                xtype: 'numbercolumn',
-                dataIndex : "pr_zxbzs",
-                width : 110.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 : "pd_salecode", 
-                width : 150.0
+                xtype : "textfield", 
+                name : "creatorName", 
+                fieldLabel : "录入人", 
+                readOnly:true
+            }, {
+                xtype : "datefield", 
+                name : "createTime", 
+                fieldLabel : "录入日期",
+                readOnly:true, 
+                defaultValue: new Date()
             },{
-                text : "备注", 
-                dataIndex : "pd_remark",
-                width : 250, 
-                items : null,
-                editor : {
-                    xtype : "textfield"
-                },
-            }
-        ]
-    }, {
-        xtype : "textfield", 
-        name : "pu_remark", 
-        fieldLabel : "备注", 
-        columnWidth : 1
-    }, {
-        xtype : "datefield", 
-        name : "pu_date", 
-        fieldLabel : "单据日期", 
-        defaultValue: new Date()
-    }, {
-        xtype : "textfield", 
-        name : "pu_total", 
-        fieldLabel : "采购金额",
-        readOnly:true,
-        columnWidth : 0.25,
-    },{
-        xtype : "hidden", 
-        name : "pu_buyercode", 
-        fieldLabel : "采购员编号"
-    },{
-        xtype : "employeeDbfindTrigger", 
-        name : "pu_buyername", 
-        fieldLabel : "采购员",
-        columnWidth : 0.25,
-        defaultValue:saas.util.BaseUtil.getCurrentUser().realname
-    },{
-        xtype : "hidden", 
-        name : "pu_buyerid", 
-        fieldLabel : "采购员ID",
-        defaultValue:saas.util.BaseUtil.getCurrentUser().id
-    },
-    {
-        xtype : "hidden", 
-        name : "creatorId", 
-        fieldLabel : "录入人ID", 
-        readOnly:true
+                xtype : "hidden", 
+                name : "updaterId", 
+                fieldLabel : "更新人ID", 
+                readOnly:true
+            },{
+                xtype : "hidden", 
+                name : "updaterName", 
+                fieldLabel : "更新人", 
+                readOnly:true
+            }, {
+                xtype : "hidden", 
+                name : "updateTime", 
+                fieldLabel : "更新日期",
+                readOnly:true, 
+                defaultValue: new Date()
+            }, {
+                xtype : "textfield", 
+                name : "pu_auditman", 
+                fieldLabel : "审核人", 
+                readOnly:true
+            }, {
+                xtype : "datefield", 
+                name : "pu_auditdate", 
+                fieldLabel : "审核日期",
+                readOnly:true
+            }]
+        });
+        this.callParent();
     },
-    {
-        xtype : "textfield", 
-        name : "creatorName", 
-        fieldLabel : "录入人", 
-        readOnly:true
-    }, {
-        xtype : "datefield", 
-        name : "createTime", 
-        fieldLabel : "录入日期",
-        readOnly:true, 
-        defaultValue: new Date()
-    },{
-        xtype : "hidden", 
-        name : "updaterId", 
-        fieldLabel : "更新人ID", 
-        readOnly:true
-    },{
-        xtype : "hidden", 
-        name : "updaterName", 
-        fieldLabel : "更新人", 
-        readOnly:true
-    }, {
-        xtype : "hidden", 
-        name : "updateTime", 
-        fieldLabel : "更新日期",
-        readOnly:true, 
-        defaultValue: new Date()
-    }, {
-        xtype : "textfield", 
-        name : "pu_auditman", 
-        fieldLabel : "审核人", 
-        readOnly:true
-    }, {
-        xtype : "datefield", 
-        name : "pu_auditdate", 
-        fieldLabel : "审核日期",
-        readOnly:true
-    }]
+     toolBtns: [{
+         xtype: 'button',
+         text: '转采购验收单',
+         hidden: true,
+         bind: {
+            hidden: '{turnHidden}'
+        },
+         handler: 'turnIn'
+     }]
+
 
 });

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

@@ -25,7 +25,323 @@ Ext.define('saas.view.sale.sale.FormPanel', {
      _turnOutUrl:'/api/sale/sale/turnProdOut',
      _turnPurchase:'/api/sale/sale/saleTurnPurchase',
      initId:0,
- 
+     initComponent:function() {
+        Ext.applyIf(this,{
+            defaultItems: [{
+                xtype: 'hidden',
+                name: 'id',
+                fieldLabel: 'id'
+            }, {
+                xtype : 'hidden',
+                name : 'sa_custid', 
+                fieldLabel : '客户ID'
+            }
+            , {
+                xtype : 'hidden', 
+                name : 'sa_custcode', 
+                fieldLabel : '客户编号'
+            }, {
+                xtype : "customerDbfindTrigger", 
+                name : "sa_custname", 
+                fieldLabel : "客户名称",
+                allowBlank : false
+            }, {
+                name : "sa_toplace", 
+                xtype : "textfield", 
+                fieldLabel : "交货地址", 
+                allowBlank : false, 
+                columnWidth : 0.5,
+                hiddenBtn:false,//true 则会关闭新增按钮功能
+                addHandler:function(b){
+                    var form = this.ownerCmp.ownerCt;
+                    this.dialog = form.add({
+                        xtype: 'document-address-window',
+                        bind: {
+                            title: '新增交货地址'
+                        },
+                        _parent:form,
+                        _combo:this.ownerCmp,
+                        record:null,
+                        session: true
+                    });
+                    this.dialog.show();
+                }
+            }, {
+                name : "detailGridField", 
+                xtype : "detailGridField", 
+                detnoColumn: 'sd_detno',
+                storeModel:'saas.model.sale.Saledetail',
+                deleteDetailUrl:'/api/sale/sale/deleteDetail',
+                columns : [
+                   {
+                        text : "id", 
+                        dataIndex : "id", 
+                        xtype : "numbercolumn",
+                        hidden:true
+                    }, {
+                        text : "物料id", 
+                        dataIndex : "sd_prodid", 
+                        width : 0
+                    }, {
+                        text : "物料编号", 
+                        width : 150.0, 
+                        dataIndex : "sd_prodcode", 
+                        xtype : "", 
+                        items : null,
+                        allowBlank:false,
+                        editor : {
+                            displayField : "display", 
+                            editable : true, 
+                            format : "", 
+                            hideTrigger : false, 
+                            maxLength : 100.0, 
+                            minValue : null, 
+                            positiveNum : false, 
+                            queryMode : "local", 
+                            store : null, 
+                            valueField : "value", 
+                            xtype : "productMultiDbfindTrigger"
+                        }
+                    },{
+                        text: 'model映射需要',
+                        dataIndex: 'productDTO',
+                        hidden: true,
+                    }, {
+                        text : "名称", 
+                        dataIndex : "pr_detail", 
+                        width : 200.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 : "pr_spec",
+                        ignore:true,
+                        width : 150.0, 
+                        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,
+                        xtype: 'numbercolumn',
+                        allowBlank:false, 
+                        editor : {
+                            xtype : "numberfield",
+                            decimalPrecision: 3,
+                            minValue: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);
+                        },
+                        summaryType: 'sum',
+                        summaryRenderer: 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 : "已转数", 
+                        xtype: 'numbercolumn',
+                        dataIndex : "sd_yqty", 
+                        width : 0, 
+                        hidden : true,
+                        editor : {
+                            xtype : "numberfield",
+                            decimalPrecision: 3
+                        },
+                        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);
+                        },
+                        summaryType: 'sum',
+                        summaryRenderer: 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 : "单价", 
+                        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_taxrate", 
+                        width : 80.0, 
+                        editor : {
+                            xtype : "numberfield",
+                            decimalPrecision: 0,
+                            minValue: 0,
+                            maxValue: 100
+                        },
+                        renderer : function(v) {
+                            return Ext.util.Format.number(v, '0');
+                        }
+                    },{
+                        text : "交货日期", 
+                        dataIndex : "sd_delivery", 
+                        width : 110.0, 
+                        xtype:'datecolumn',
+                        editor : {
+                            xtype : "datefield",
+                            editable : true, 
+                            hideTrigger : false
+                        }
+                    },
+                    {
+                        text : "含税金额", 
+                        xtype: 'numbercolumn',
+                        dataIndex : "sd_total", 
+                        width : 110.0,
+                        renderer : function(v) {
+                            var arr = (v + '.').split('.');
+                            var xr = (new Array(arr[1].length > 2 ? 2 : arr[1].length)).fill('0');
+                            var format = '0,000.' + xr.join();
+                            return Ext.util.Format.number(v, format);
+                        },
+                        summaryType: 'sum',
+                        summaryRenderer: function(v) {
+                            var arr = (v + '.').split('.');
+                            var xr = (new Array(arr[1].length > 2 ? 2 : arr[1].length)).fill('0');
+                            var format = '0,000.' + xr.join();
+                            return Ext.util.Format.number(v, format);
+                        }
+                    }, 
+                    {
+                        text : "未税金额", 
+                        xtype: 'numbercolumn',
+                        dataIndex : "sd_nettotal", 
+                        width : 110.0,
+                        renderer : function(v) {
+                            var arr = (v + '.').split('.');
+                            var xr = (new Array(arr[1].length > 2 ? 2 : arr[1].length)).fill('0');
+                            var format = '0,000.' + xr.join();
+                            return Ext.util.Format.number(v, format);
+                        },
+                        summaryType: 'sum',
+                        summaryRenderer: function(v) {
+                            var arr = (v + '.').split('.');
+                            var xr = (new Array(arr[1].length > 2 ? 2 : arr[1].length)).fill('0');
+                            var format = '0,000.' + xr.join();
+                            return Ext.util.Format.number(v, format);
+                        }
+                    },{
+                        text : "备注", 
+                        dataIndex : "sd_remark",
+                        width : 250, 
+                        items : null,
+                        editor : {
+                            xtype : "textfield"
+                        },
+                    }
+                ]
+            }, {
+                xtype : "textfield", 
+                name : "sa_remark", 
+                fieldLabel : "备注", 
+                columnWidth : 1
+            }, {
+                xtype : "datefield", 
+                name : "sa_date", 
+                fieldLabel : "单据日期", 
+                defaultValue: new Date()
+            }, {
+                xtype : "textfield", 
+                name : "sa_total", 
+                fieldLabel : "销售金额",
+                readOnly:true
+            },{
+                xtype : "hidden", 
+                name : "sa_sellercode", 
+                fieldLabel : "业务员编号",
+            },{
+                xtype : "employeeDbfindTrigger", 
+                name : "sa_seller", 
+                fieldLabel : "业务员",
+                defaultValue:saas.util.BaseUtil.getCurrentUser().realname
+            }, {
+                xtype : 'textfield', 
+                name : 'sa_sendstatus', 
+                fieldLabel : '出货状态', 
+                hidden : true,
+                defaultValue:saas.util.BaseUtil.getCurrentUser().id
+             },{
+                xtype : "hidden", 
+                name : "creatorId", 
+                fieldLabel : "录入人ID", 
+                readOnly:true
+            },
+            {
+                xtype : "textfield", 
+                name : "creatorName", 
+                fieldLabel : "录入人", 
+                readOnly:true
+            }, {
+                xtype : "datefield", 
+                name : "createTime", 
+                fieldLabel : "录入日期",
+                readOnly:true, 
+                defaultValue: new Date()
+            },{
+                xtype : "hidden", 
+                name : "updaterId", 
+                fieldLabel : "更新人ID", 
+                readOnly:true
+            },{
+                xtype : "hidden", 
+                name : "updaterName", 
+                fieldLabel : "更新人", 
+                readOnly:true
+            }, {
+                xtype : "hidden", 
+                name : "updateTime", 
+                fieldLabel : "更新日期",
+                readOnly:true, 
+                defaultValue: new Date()
+            }, {
+                xtype : "textfield", 
+                name : "sa_auditman", 
+                fieldLabel : "审核人", 
+                readOnly:true
+            }, {
+                xtype : "datefield", 
+                name : "sa_auditdate", 
+                fieldLabel : "审核日期",
+                readOnly:true
+            }]
+        });
+       this.callParent();
+     },   
      toolBtns: [{
          xtype: 'button',
          text: '转出货单',
@@ -42,319 +358,5 @@ Ext.define('saas.view.sale.sale.FormPanel', {
          bind: {
              hidden: '{sa_statuscode!="AUDITED"}'
          }
-     }],
-
-    defaultItems: [{
-        xtype: 'hidden',
-        name: 'id',
-        fieldLabel: 'id'
-    }, {
-        xtype : 'hidden',
-        name : 'sa_custid', 
-        fieldLabel : '客户ID'
-    }
-    , {
-        xtype : 'hidden', 
-        name : 'sa_custcode', 
-        fieldLabel : '客户编号'
-    }, {
-        xtype : "customerDbfindTrigger", 
-        name : "sa_custname", 
-        fieldLabel : "客户名称",
-        allowBlank : false
-    }, {
-        name : "sa_toplace", 
-        xtype : "textfield", 
-        fieldLabel : "交货地址", 
-        allowBlank : false, 
-        columnWidth : 0.5,
-        hiddenBtn:false,//true 则会关闭新增按钮功能
-        addHandler:function(b){
-            var form = this.ownerCmp.ownerCt;
-            this.dialog = form.add({
-                xtype: 'document-address-window',
-                bind: {
-                    title: '新增交货地址'
-                },
-                _parent:form,
-                _combo:this.ownerCmp,
-                record:null,
-                session: true
-            });
-            this.dialog.show();
-        }
-    }, {
-        name : "detailGridField", 
-        xtype : "detailGridField", 
-        detnoColumn: 'sd_detno',
-        storeModel:'saas.model.sale.Saledetail',
-        deleteDetailUrl:'/api/sale/sale/deleteDetail',
-        columns : [
-           {
-                text : "id", 
-                dataIndex : "id", 
-                xtype : "numbercolumn",
-                hidden:true
-            }, {
-                text : "物料id", 
-                dataIndex : "sd_prodid", 
-                width : 0
-            }, {
-                text : "物料编号", 
-                width : 150.0, 
-                dataIndex : "sd_prodcode", 
-                xtype : "", 
-                items : null,
-                allowBlank:false,
-                editor : {
-                    displayField : "display", 
-                    editable : true, 
-                    format : "", 
-                    hideTrigger : false, 
-                    maxLength : 100.0, 
-                    minValue : null, 
-                    positiveNum : false, 
-                    queryMode : "local", 
-                    store : null, 
-                    valueField : "value", 
-                    xtype : "productMultiDbfindTrigger"
-                }
-            },{
-                text: 'model映射需要',
-                dataIndex: 'productDTO',
-                hidden: true,
-            }, {
-                text : "名称", 
-                dataIndex : "pr_detail", 
-                width : 200.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 : "pr_spec",
-                ignore:true,
-                width : 150.0, 
-                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,
-                xtype: 'numbercolumn',
-                allowBlank:false, 
-                editor : {
-                    xtype : "numberfield",
-                    decimalPrecision: 3,
-                    minValue: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);
-                },
-                summaryType: 'sum',
-                summaryRenderer: 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 : "已转数", 
-                xtype: 'numbercolumn',
-                dataIndex : "sd_yqty", 
-                width : 0, 
-                hidden : true,
-                editor : {
-                    xtype : "numberfield",
-                    decimalPrecision: 3
-                },
-                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);
-                },
-                summaryType: 'sum',
-                summaryRenderer: 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 : "单价", 
-                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_taxrate", 
-                width : 80.0, 
-                editor : {
-                    xtype : "numberfield",
-                    decimalPrecision: 0,
-                    minValue: 0,
-                    maxValue: 100
-                },
-                renderer : function(v) {
-                    return Ext.util.Format.number(v, '0');
-                }
-            },{
-                text : "交货日期", 
-                dataIndex : "sd_delivery", 
-                width : 110.0, 
-                xtype:'datecolumn',
-                editor : {
-                    xtype : "datefield",
-                    editable : true, 
-                    hideTrigger : false
-                }
-            },
-            {
-                text : "含税金额", 
-                xtype: 'numbercolumn',
-                dataIndex : "sd_total", 
-                width : 110.0,
-                renderer : function(v) {
-                    var arr = (v + '.').split('.');
-                    var xr = (new Array(arr[1].length > 2 ? 2 : arr[1].length)).fill('0');
-                    var format = '0,000.' + xr.join();
-                    return Ext.util.Format.number(v, format);
-                },
-                summaryType: 'sum',
-                summaryRenderer: function(v) {
-                    var arr = (v + '.').split('.');
-                    var xr = (new Array(arr[1].length > 2 ? 2 : arr[1].length)).fill('0');
-                    var format = '0,000.' + xr.join();
-                    return Ext.util.Format.number(v, format);
-                }
-            }, 
-            {
-                text : "未税金额", 
-                xtype: 'numbercolumn',
-                dataIndex : "sd_nettotal", 
-                width : 110.0,
-                renderer : function(v) {
-                    var arr = (v + '.').split('.');
-                    var xr = (new Array(arr[1].length > 2 ? 2 : arr[1].length)).fill('0');
-                    var format = '0,000.' + xr.join();
-                    return Ext.util.Format.number(v, format);
-                },
-                summaryType: 'sum',
-                summaryRenderer: function(v) {
-                    var arr = (v + '.').split('.');
-                    var xr = (new Array(arr[1].length > 2 ? 2 : arr[1].length)).fill('0');
-                    var format = '0,000.' + xr.join();
-                    return Ext.util.Format.number(v, format);
-                }
-            },{
-                text : "备注", 
-                dataIndex : "sd_remark",
-                width : 250, 
-                items : null,
-                editor : {
-                    xtype : "textfield"
-                },
-            }
-        ]
-    }, {
-        xtype : "textfield", 
-        name : "sa_remark", 
-        fieldLabel : "备注", 
-        columnWidth : 1
-    }, {
-        xtype : "datefield", 
-        name : "sa_date", 
-        fieldLabel : "单据日期", 
-        defaultValue: new Date()
-    }, {
-        xtype : "textfield", 
-        name : "sa_total", 
-        fieldLabel : "销售金额",
-        readOnly:true
-    },{
-        xtype : "hidden", 
-        name : "sa_sellercode", 
-        fieldLabel : "业务员编号",
-    },{
-        xtype : "employeeDbfindTrigger", 
-        name : "sa_seller", 
-        fieldLabel : "业务员",
-        defaultValue:saas.util.BaseUtil.getCurrentUser().realname
-    }, {
-        xtype : 'textfield', 
-        name : 'sa_sendstatus', 
-        fieldLabel : '出货状态', 
-        hidden : true,
-        defaultValue:saas.util.BaseUtil.getCurrentUser().id
-     },{
-        xtype : "hidden", 
-        name : "creatorId", 
-        fieldLabel : "录入人ID", 
-        readOnly:true
-    },
-    {
-        xtype : "textfield", 
-        name : "creatorName", 
-        fieldLabel : "录入人", 
-        readOnly:true
-    }, {
-        xtype : "datefield", 
-        name : "createTime", 
-        fieldLabel : "录入日期",
-        readOnly:true, 
-        defaultValue: new Date()
-    },{
-        xtype : "hidden", 
-        name : "updaterId", 
-        fieldLabel : "更新人ID", 
-        readOnly:true
-    },{
-        xtype : "hidden", 
-        name : "updaterName", 
-        fieldLabel : "更新人", 
-        readOnly:true
-    }, {
-        xtype : "hidden", 
-        name : "updateTime", 
-        fieldLabel : "更新日期",
-        readOnly:true, 
-        defaultValue: new Date()
-    }, {
-        xtype : "textfield", 
-        name : "sa_auditman", 
-        fieldLabel : "审核人", 
-        readOnly:true
-    }, {
-        xtype : "datefield", 
-        name : "sa_auditdate", 
-        fieldLabel : "审核日期",
-        readOnly:true
-    }
-    ]
+     }]
 });