merge

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

@@ -19,7 +19,7 @@ Ext.define('saas.util.BaseUtil', {
                 async: async,
                 method: method,
                 timeout: timeout,
-                header: {
+                headers: {
                     'Access-Control-Allow-Origin': '*',
                     "Content-Type": 'application/json;charset=UTF-8' 
                 },

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

@@ -256,25 +256,34 @@ Ext.define('saas.util.QueryUtil', {
 			if(!Ext.isEmpty(item.data[grid._idField])&&!Ext.isEmpty(item.data[grid._codeField])){
 				var o = new Object();
 				if(grid._idField){
-					o[grid._idField] = item.data[grid._idField];
+					o['id'] = item.data[grid._idField];
                 }
                 if(grid._codeField){
-					o[grid._codeField] = item.data[grid._codeField];
+					o['code'] = item.data[grid._codeField];
 				}
 				data.push(o);
             }
 		});
-		return JSON.stringify(data);
-    }
-    // me.BaseUtil.request({
-    //     url: form._saveUrl,
-    //     params: JSON.stringify(params),
-    //     method: 'POST',
-    // })
-    // .then(function() {
-    //     Ext.Msg.alert('提示','保存成功');
-    // })
-    // .catch(function() {
-    //     Ext.Msg.alert('提示','保存失败');
-    // });
+		return data;
+    },
+    /**
+     * 发起批量操作请求
+	 * grid:原始字符串
+	 */
+    vastRes:function(url,params){
+        var me = this;
+        me.BaseUtil.request({
+                url: url,
+                params: JSON.stringify(params),
+                method: 'POST',
+            })
+            .then(function() {
+                Ext.Msg.alert('提示','操作成功');
+            })
+            .catch(function(response) {
+                console.log(response);
+                Ext.Msg.alert('提示','操作失败');
+            });
+        }
+    
 });

frontend/saas-web/app/view/core/query/QueryGridPanel.js

@@ -9,9 +9,8 @@ Ext.define('saas.view.core.query.QueryGridPanel', {
     //字段属性
     _BaseColumn: '',
     _RelativeColumn: '',
-    _auditUrl:'',
-    _printUrl:'',
-    _deleteUrl:'',
+    _idField:'',
+    _codeField:'',
     //数据属性
     listUrl:'http://192.168.253.58:8800/purchase/list',
 
@@ -124,7 +123,7 @@ Ext.define('saas.view.core.query.QueryGridPanel', {
                 displayMsg: '当前显示第{0}到{1}条数据,一共有{2}条',
                 beforePageText: "当前第",
                 afterPageText: "页,共{0}页"
-            }],
+            }]
         });
         me.callParent(arguments);
     },
@@ -142,7 +141,6 @@ Ext.define('saas.view.core.query.QueryGridPanel', {
 
     getFields: function() {
         var me = this;
-
         return me.columns.filter(function(c) {
             return !!c.dataIndex;
         }).map(function(c) {
@@ -151,29 +149,25 @@ Ext.define('saas.view.core.query.QueryGridPanel', {
     },
     onAddMore: function (btn) {
         console.log("跳转到主从表");
-        var form = btn.ownerCt.ownerCt;
-        var mainTab = Ext.getCmp('main-tab-panel'),
-        id = 'test-order-formpanel' + '_add',
-        existingItem = mainTab.down('[id=' + id + ']');
+        var form = btn.ownerCt.ownerCt,
+            mainTab = Ext.getCmp('main-tab-panel'),
+            id = form.xtype + '_add';
+            existingItem = mainTab.down('[id=' + id + ']');
+
         if (!existingItem) {
-            var form = {
+            var form = Ext.create('saas.view.purchase.panel.FormPanel', {
                 id,
-                title:'采购单',
-                xtype:'test-order-formpanel'
-            };
+                title:'新增采购单'
+            });
             mainTab.setActiveTab(mainTab.add(form));
-        }else{
-            mainTab.setActiveTab(existingItem);
         }
     },
     onAudit: function(btn){
-        var grid = btn.ownerCt.ownerCt;
-        console.log("审核");
-        console.log("grid");
-        var selectsd = grid.up('core-query-formpanel').QueryUtil.getGridSelected(grid);
-        console.log(selectsd);
-        //_baseVastUrl+"batchAudit"
-
+        var grid = btn.ownerCt.ownerCt,
+        vastUrl = grid.ownerCt._baseVastUrl+"batchAudit";
+        var selectsd = grid.QueryUtil.getGridSelected(grid);
+        console.log("审核","vastUrl:"+vastUrl,grid,"selectsd:"+selectsd);
+        grid.QueryUtil.vastRes(vastUrl,selectsd);
     },
     onPrint: function () {
         console.log("打印");
@@ -181,7 +175,12 @@ Ext.define('saas.view.core.query.QueryGridPanel', {
     onExport: function () {
         console.log("导出");
     },
-    onDelete: function () {
+    onDelete: function (btn) {
         console.log("删除该行");
+        var grid = btn.ownerCt.ownerCt,
+        vastUrl = grid.ownerCt._baseVastUrl+"batchDelete";
+        var selectsd = grid.QueryUtil.getGridSelected(grid);
+        console.log("删除该行","vastUrl:"+vastUrl,grid,"selectsd:"+selectsd);
+        grid.QueryUtil.vastRes(vastUrl,selectsd);
     }
 });

frontend/saas-web/app/view/core/query/QueryPanel.js

@@ -8,7 +8,7 @@ Ext.define('saas.view.core.query.QueryPanel', {
     layout: 'anchor',
     autoScroll: true,
     margin: '0',
-
+    _baseVastUrl:'',
     items: [{
         anchor: '100% 30%',
         reference: 'queryform',
@@ -22,7 +22,7 @@ Ext.define('saas.view.core.query.QueryPanel', {
     initComponent: function () {
         var me = this;
         me.setQueryItems(me.queryFormItems);
-        me.setQuertGridColumns(me.queryGridConfig);
+        me.setQuertGridConfigs();
         me.callParent(arguments);
     },
 
@@ -47,11 +47,10 @@ Ext.define('saas.view.core.query.QueryPanel', {
         queryForm.items = items;
     },
 
-    setQuertGridColumns: function(config) {
+    setQuertGridConfigs: function() {
         var me = this,
         queryGrid = me.items[1];
-
-        Ext.apply(queryGrid, config);
+        Ext.apply(queryGrid, me.queryGridConfig);
     }
 
 });

frontend/saas-web/app/view/test/query/QueryPanel.js

@@ -5,7 +5,9 @@ Ext.define('saas.view.test.query.QueryPanel', {
     // controller: 'test-query-formcontroller',
     // viewModel: 'test-query-formmodel',
     viewName: 'test-query-formpanel',
-
+    _baseVastUrl:'http://192.168.253.58:8800/purchase/',
+    _idField:'pu_id',
+    _codeField:'pu_code',
     queryFormItems: [{
         xtype: 'hidden',
         name: 'pu_id',
@@ -121,6 +123,8 @@ Ext.define('saas.view.test.query.QueryPanel', {
         columnWidth: 1
     }],
     queryGridConfig: {
+        _idField:'pu_id',
+        _codeField:'pu_code',
         columns: [{
             text: '序号',
             width: 80,
@@ -138,6 +142,25 @@ Ext.define('saas.view.test.query.QueryPanel', {
             text: '单据状态',
             dataIndex: 'pu_status',
             width: 120
+        }, {
+            text: '下单日期',
+            dataIndex: 'pu_indate',
+            xtype:'datecolumn',
+            width: 200
+        },{
+            text: '供应商名称',
+            dataIndex: 'pu_vendname',
+            width: 120
+        },{
+            text: '含税金额',
+            dataIndex: 'pu_taxtotal',
+            xtype:'numbercolumn',
+            width: 120
+        },{
+            text: '金额',
+            dataIndex: 'pu_total',
+            xtype:'numbercolumn',
+            width: 120
         }]
     }
 });