Browse Source

序号提交

hy 7 years ago
parent
commit
0c865f2d5b

+ 2 - 3
frontend/saas-web/app/view/core/form/FormPanelController.js

@@ -80,11 +80,11 @@ Ext.define('saas.view.core.form.FormPanelController', {
                     if((typeof item.data.id) != "number" && item.data.id.indexOf('extMode')>-1){
                         item.data.id = '';
                     }
-                    item.data[form._detnoColumn] = index + 1;
                     dirtyGridData.push(item.data)
                 }
             });
-        }   
+        }  
+        debugger 
         var params = {
             main:formData.main,
             items:dirtyGridData
@@ -128,7 +128,6 @@ Ext.define('saas.view.core.form.FormPanelController', {
                     if((typeof item.data.id) != "number" && item.data.id.indexOf('extMode')>-1){
                         item.data.id = '';
                     }
-                    item.data[form._detnoColumn] = index + 1;
                     dirtyGridData.push(item.data)
                 }
             });

+ 27 - 12
frontend/saas-web/app/view/core/form/field/DetailGridField.js

@@ -75,45 +75,60 @@ Ext.define('saas.view.core.form.field.DetailGridField', {
     },
 
     listeners: {
-        afterrender:function(grid){
-            var count = grid.store.getCount();
-            if(count==0){
-                //grid.add10EmptyRow();
-            }
-        },
         itemClick: function(tableView, record, item, index, e, eOpts) {
             var grid = tableView.up('grid'),
                 store = grid.store,
                 count = store.getCount();
 
             if(index == count - 1) {
-                //grid.add10EmptyRow();
+                grid.add10EmptyRow();
             }
         }
     },
 
     add10EmptyRow: function() {
         var me = this,
-            store = me.getStore(),
-            selectedRecord = me.selModel.lastSelected,
-            datas = [];
+        form = me.ownerCt,
+        detnoColumn = form._detnoColumn,
+        store = me.getStore(),
+        selectedRecord = me.selModel.lastSelected,
+        datas = [];
 
+        //当前行后序号全部加1
+        var detno = selectedRecord.data[form._detnoColumn];
         Ext.Array.each(new Array(10), function() {
-            datas.push({});
+            detno += 1;
+            var data = {};
+            data[detnoColumn] = detno;
+            datas.push(data);
         })
         store.insert(store.indexOf(selectedRecord) + 1, datas);
     },
 
     addDetail: function() {
         var me = this,
+            form = me.ownerCt,
+            detnoColumn = form._detnoColumn,
             store = me.getStore(),
             selectedRecord = me.selModel.lastSelected;
 
-        store.insert(store.indexOf(selectedRecord) + 1, {});
+        //当前行后序号全部加1
+        var detno = selectedRecord.data[form._detnoColumn];
+        var store = me.store;
+        store.each(function(item){
+            d = item.data[detnoColumn];
+            if(Number(d) > detno) {
+                item.set(detnoColumn, Number(d) + 1);
+            }
+        });
+        var data = {};
+        data[detnoColumn] = detno + 1;
+        store.insert(store.indexOf(selectedRecord) + 1, data);
     },
 
     deleteDetail: function() {
         var me = this,
+            form = me.ownerCt;
             store = me.getStore(),
             selectedRecord = me.selModel.lastSelected;
 

+ 13 - 3
frontend/saas-web/app/view/test/order/FormPanel.js

@@ -129,8 +129,10 @@ Ext.define('saas.view.test.order.FormPanel', {
                 text : "序号", 
                 dataIndex : "pd_detno", 
                 width : 80.0, 
-                xtype : "rownumberer",
-                summaryType: 'count'
+                xtype : "numbercolumn",
+                summaryType: 'count',
+                align : 'center',
+                format:'0',
             }, 
             {
                 editor : {
@@ -165,16 +167,24 @@ Ext.define('saas.view.test.order.FormPanel', {
             {
                 text : "数量", 
                 dataIndex : "pd_yqty", 
+                editor : {
+                    xtype : "numberfield"
+                },
                 width : 120.0, 
                 xtype : "numbercolumn", 
+                format:'0',
                 items : null,
                 summaryType: 'sum'
             }, 
             {
                 text : "单价", 
+                editor : {
+                    xtype : "numberfield"
+                },
+                format:'0,000.00',
                 dataIndex : "pd_price", 
                 width : 120.0, 
-                xtype : "numbercolumn", 
+                xtype : "numbercolumn",
                 items : null,
                 summaryType: 'sum'
             },