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

frontend/saas-web/app/util/FormUtil.js

@@ -113,10 +113,12 @@ Ext.define('saas.util.FormUtil', {
                                 }
                             });
 
-                            columns.push({
-                                flex: 1,
-                                allowBlank: true
-                            });
+                            if(columns[columns.length - 1].flex != 1) {
+                                columns.push({
+                                    flex: 1,
+                                    allowBlank: true
+                                });
+                            }
 
                             cnames.push(item.detnoColumn);
 

frontend/saas-web/app/view/core/form/FormPanel.js

@@ -36,6 +36,7 @@ Ext.define('saas.view.core.form.FormPanel', {
 
     remoteConfig: true, // 是否需要从远端读取form配置
     toolBtns: [], // 自定义按钮
+    codeInHeader: true, // 单据编号显示在toolbar
 
     auditTexts: {
         auditCode: 'AUDITED',
@@ -60,84 +61,7 @@ Ext.define('saas.view.core.form.FormPanel', {
                 style: {
                     'border-bottom': '1px solid #35baf6 !important'
                 },
-                items: [{
-                    xtype: 'tbtext',
-                    bind: {
-                        html: '<span class="x-tb x-no">NO. </span>' +
-                            '<span class="x-tb x-code">{base.codeEditable ? "" : ' + me._codeField + '}</span>'
-                    }
-                }, {
-                    xtype: 'textfield',
-                    minHeight: 24,
-                    maxHeight: 24,
-                    width: 150,
-                    cls: 'x-codeeditor',
-                    hidden: true,
-                    bind: {
-                        value: '{' + me._codeField + '}',
-                        hidden: '{!base.codeEditable}'
-                    },
-                    listeners: {
-                        blur: 'codeEditorBlur',
-                        show: function (field, eOpts) {
-                            field.focus();
-                        }
-                    }
-                }, {
-                    xtype: 'tbtext',
-                    // html: '已审核',
-                    html: auditTexts.auditText,
-                    cls: 'x-audited',
-                    hidden: true,
-                    bind: {
-                        // hidden: '{!(' + me._statusCodeField + ' == "AUDITED")}'
-                        hidden: '{!(' + me._statusCodeField + ' == "' + auditTexts.auditCode + '")}'
-                    }
-                }, {
-                    xtype: 'button',
-                    cls: 'x-codeeditor-btn',
-                    bind: {
-                        iconCls: 'fa {base.codeEditable ? "fa-check-circle" : "fa-edit"}',
-                        // hidden: '{(' + me._statusCodeField + ' == "AUDITED")}'
-                        hidden: '{(' + me._statusCodeField + ' == "' + auditTexts.auditCode + '")}'
-                    },
-                    handler: 'codeEditorClick'
-                }, '->'].concat(me.toolBtns.map(function (btn) {
-                    btn.cls = btn.cls ? btn.cls + ' x-formpanel-btn-blue' : 'x-formpanel-btn-blue';
-                    return btn;
-                }).concat([{
-                    cls: 'x-formpanel-btn-orange',
-                    xtype: 'button',
-                    text: '新增',
-                    bind: {
-                        hidden: '{!id}'
-                    },
-                    handler: 'add'
-                }, {
-                    xtype: 'button',
-                    text: '保存',
-                    handler: 'onSave',
-                    bind: {
-                        // disabled: '{!base.valid || '+ me._statusCodeField + ' == "AUDITED" || ' + me._statusCodeField + ' == "OPEN"}'
-                        disabled: '{!base.valid || '+ me._statusCodeField + ' == "' + auditTexts.auditCode + '"}'
-                    }
-                }, {
-                    xtype: 'button',
-                    text: '删除',
-                    bind: {
-                        hidden: '{deleteHidden || ' + me._statusCodeField + '=="' + auditTexts.auditCode + '"}'
-                    },
-                    handler: 'delete'
-                }, {
-                    xtype: 'button',
-                    bind: {
-                        text: '{auditBtnText}',
-                        disabled: '{!base.valid}',
-                        hidden:'{!showAuditBtn}'
-                    },
-                    handler: "auditBtnClick",
-
-                }]))
+                items: me.getToolBarItems(),
             }],
             listeners: {
                 validitychange: function() {
@@ -148,6 +72,99 @@ Ext.define('saas.view.core.form.FormPanel', {
         me.callParent(arguments);
     },
 
+    getToolBarItems: function() {
+        var me = this, items = [];
+        var codeHeaderItems = [{
+            xtype: 'tbtext',
+            bind: {
+                html: '<span class="x-tb x-no">NO. </span>' +
+                    '<span class="x-tb x-code">{base.codeEditable ? "" : ' + me._codeField + '}</span>'
+            }
+        }, {
+            xtype: 'textfield',
+            minHeight: 24,
+            maxHeight: 24,
+            width: 150,
+            cls: 'x-codeeditor',
+            hidden: true,
+            bind: {
+                value: '{' + me._codeField + '}',
+                hidden: '{!base.codeEditable}'
+            },
+            listeners: {
+                blur: 'codeEditorBlur',
+                show: function (field, eOpts) {
+                    field.focus();
+                }
+            }
+        }, {
+            xtype: 'tbtext',
+            // html: '已审核',
+            html: me.auditTexts.auditText,
+            cls: 'x-audited',
+            hidden: true,
+            bind: {
+                // hidden: '{!(' + me._statusCodeField + ' == "AUDITED")}'
+                hidden: '{!(' + me._statusCodeField + ' == "' + me.auditTexts.auditCode + '")}'
+            }
+        }, {
+            xtype: 'button',
+            cls: 'x-codeeditor-btn',
+            bind: {
+                iconCls: 'fa {base.codeEditable ? "fa-check-circle" : "fa-edit"}',
+                // hidden: '{(' + me._statusCodeField + ' == "AUDITED")}'
+                hidden: '{(' + me._statusCodeField + ' == "' + me.auditTexts.auditCode + '")}'
+            },
+            handler: 'codeEditorClick'
+        }, '->'];
+        
+        var defaultBtns = [{
+            cls: 'x-formpanel-btn-orange',
+            xtype: 'button',
+            text: '新增',
+            bind: {
+                hidden: '{!id}'
+            },
+            handler: 'add'
+        }, {
+            xtype: 'button',
+            text: '保存',
+            handler: 'onSave',
+            bind: {
+                // disabled: '{!base.valid || '+ me._statusCodeField + ' == "AUDITED" || ' + me._statusCodeField + ' == "OPEN"}'
+                disabled: '{!base.valid || '+ me._statusCodeField + ' == "' + me.auditTexts.auditCode + '"}'
+            }
+        }, {
+            xtype: 'button',
+            text: '删除',
+            bind: {
+                hidden: '{deleteHidden || ' + me._statusCodeField + '=="' + me.auditTexts.auditCode + '"}'
+            },
+            handler: 'delete'
+        }, {
+            xtype: 'button',
+            bind: {
+                text: '{auditBtnText}',
+                disabled: '{!base.valid}',
+                hidden:'{!showAuditBtn}'
+            },
+            handler: "auditBtnClick",
+        }];
+
+        if(me.codeInHeader) {
+            items = items.concat(codeHeaderItems);
+        }
+
+        items.push('->');
+
+        items = items.concat(me.toolBtns.map(function (btn) {
+            btn.cls = btn.cls ? btn.cls + ' x-formpanel-btn-blue' : 'x-formpanel-btn-blue';
+            return btn;
+        }).concat(defaultBtns))
+
+        return items;
+    },
+
     isValid: function() {
         var me = this;
         var viewModel = me.getViewModel();

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

@@ -20,6 +20,8 @@ Ext.define('saas.view.document.bom.FormPanel', {
     _deleteUrl:'/api/document/bom/delete/',
     initId:0,
 
+    codeInHeader: false,
+
     defaultItems: [{
         xtype: 'hidden',
         name: 'id',

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

@@ -20,6 +20,8 @@ Ext.define('saas.view.document.customer.FormPanel', {
     _deleteUrl:'/api/document/customer/delete/',
     initId:0,
 
+    codeInHeader: false,
+
     defaultItems: [{
         xtype: 'hidden',
         name: 'id',

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

@@ -20,6 +20,9 @@ Ext.define('saas.view.document.product.FormPanel', {
     _deleteUrl:'/api/document/product/delete/',
     initId:0,
 
+    codeInHeader: false,
+
+
     defaultItems: [{
         xtype: 'hidden',
         name: 'id',

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

@@ -20,6 +20,8 @@ Ext.define('saas.view.document.vendor.FormPanel', {
     _deleteUrl:'/api/document/vendor/delete/',
     initId:0,
 
+    codeInHeader: false,
+
     defaultItems: [{
         xtype: 'hidden',
         name: 'id',

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

@@ -278,10 +278,14 @@ Ext.define('saas.view.purchase.purchaseIn.FormPanel', {
                 dataIndex : "pd_ordercode", 
                 width : 120.0
             },{
-                text : "采购序号", 
+                text : "采购序号",
                 dataIndex : "pd_orderdetno", 
                 xtype : "numbercolumn",
-                width : 120.0
+                width : 120.0,
+                format: '0000',
+                renderer: function(v) {
+                    return v ? v : null;
+                }
             }
         ]
     }, {

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

@@ -243,7 +243,11 @@ Ext.define('saas.view.purchase.purchaseOut.FormPanel', {
                 text : "采购序号", 
                 dataIndex : "pd_orderdetno", 
                 xtype : "numbercolumn",
-                flex:1
+                flex:1,
+                format: '0000',
+                renderer: function(v) {
+                    return v ? v : null;
+                }
             }
         ]
     }, {

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

@@ -186,7 +186,11 @@ Ext.define('saas.view.sale.saleIn.FormPanel', {
                 text : "销售序号", 
                 dataIndex : "pd_orderdetno", 
                 xtype : "numbercolumn",
-                flex:1
+                flex:1,
+                format: '0000',
+                renderer: function(v) {
+                    return v ? v : null;
+                }
             }
         ]
     }, {

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

@@ -196,7 +196,11 @@ Ext.define('saas.view.sale.saleout.FormPanel', {
                 text : "销售序号", 
                 dataIndex : "pd_orderdetno", 
                 xtype : "numbercolumn",
-                width : 120.0
+                width : 120.0,
+                format: '0000',
+                renderer: function(v) {
+                    return v ? v : null;
+                }
             }
         ]
     }, {