代码提交

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/FormUtil.js

@@ -23,7 +23,6 @@ Ext.define('saas.util.FormUtil', {
         .then(function(response) {
             var res = Ext.decode(response.responseText);
             if(res.success) {
-                
                 var config = res.data || true, items = defaultItems || [];
                 if(config) {
                     var cusItems = config.items || [];
@@ -37,20 +36,21 @@ Ext.define('saas.util.FormUtil', {
                         if(item.xtype == 'detailGridField') {
                             var storeName = item.name || item.xtype + Ext.id();
                             item.bind = {
-                                store: '{' + storeName + '}'
-                            };
-                            
-                            formModel.set(storeName, Ext.create('Ext.data.Store', {
+                                store: {
+                                    data : '{' + storeName + '}'
+                                }
+                            };           
+
+                            item.store = {
                                 fields: item.columns ? item.columns.filter(function(c) {
                                     return !!c.dataIndex;
                                 }).map(function(c) {
                                     return c.dataIndex;
                                 }) : [],
                                 data: []
-                            }));
+                            };
                         }
                     });
-
                     form.addItems(items);
                 }
 

frontend/saas-web/app/view/core/dbfind/DbfindGridPanel.js

@@ -42,17 +42,29 @@ Ext.define('saas.view.core.dbfind.DbfindGridPanel', {
             var me = this;
             var dbfinds = me.dbfinds;
             if(dbfinds&&dbfinds.length>0){
-                for (let index = 0; index < dbfinds.length; index++) {
-                    var item = dbfinds[index];
-                    var field = me.ownerCt.belong.down('[name='+item.to+']');
-                    if(field){
-                        var val = record.get(item.from);
-                        if(field.xtype=='dbfindtrigger'){
-                            field.setRawValue(val);
-                            field.lastTriggerValue=val;
-                        }else{
-                            field.setValue(val);
-                        }    
+                if(me.belong=='grid'){
+                    for (let index = 0; index < dbfinds.length; index++) {
+                        var item = dbfinds[index];
+                        var rec = me.dbfindtrigger.column.ownerCt.ownerCt.selModel.getLastSelected();
+                        if(rec){
+                            var nowRec = me.dbfindtrigger.column.ownerCt.ownerCt.store.getData().getByKey(rec.id);
+                            nowRec.set(item.to,record.get(item.from));
+                            //me.column.getEditor().setValue(record.get(item.from));
+                        }
+                    }
+                }else if(me.belong=='form'){
+                    for (let index = 0; index < dbfinds.length; index++) {
+                        var item = dbfinds[index];
+                        var field = me.ownerCt.belong.down('[name='+item.to+']');
+                        if(field){
+                            var val = record.get(item.from);
+                            if(field.xtype=='dbfindtrigger'){
+                                field.setRawValue(val);
+                                field.lastTriggerValue=val;
+                            }else{
+                                field.setValue(val);
+                            }    
+                        }
                     }
                 }
             }

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

@@ -36,30 +36,31 @@ Ext.define('saas.view.core.form.FormPanel', {
     initComponent: function() {
 
         var me = this;
-        me.FormUtil.setItems(me);
+        //me.FormUtil.setItems(me);
+
         //判断是否加载数据
+
         if(me.initId&&me.initId!=0){
-            var url = me._dataModelUrl,async=false;
-            url = url.replace(/(.*){id}(.*)/g, '$1' + me.initId);
+            var url = me._dataModelUrl + me.initId,async=false;
             me.BaseUtil.request({url,async })
             .then(function(response) {
                 var res = Ext.decode(response.responseText);
                 if(res.success) {
                     viewModel = me.getViewModel();
-                    viewModel.data = res.data.main;
-                    viewModel._data = res.data.main;
-                    viewModel.data.detailGridStore = res.data.items;                   
-                    viewModel._data.detailGridStore = res.data.items;
+                    viewModel.setData(res.data.main);
+                    viewModel.setData({'detailGridField':res.data.items});                   
                 }
             })
             .catch(function(response) {
                 console.error(response);
             });
+        }else{
+            viewModel = me.getViewModel();
+            viewModel.setData({'detailGridField':[{},{}]});     
         }
 
         Ext.apply(me, {
-            remoteConfig: me.remoteConfig,
-            items:me._baseItems,
+            items:me.defaultItems,
             dockedItems: [{
                 xtype: 'toolbar',
                 dock: 'top',

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

@@ -32,16 +32,15 @@ Ext.define('saas.view.core.form.FormPanelController', {
         if(id&&id.value!=0){
             Ext.Ajax.request({
                 url: form._deleteUrl,
-                params: {
-                    id:id.value
-                },
-                method: 'POST',
-                data:{_method:"DELETE"},
+                params: JSON.stringify({id:id.value}),
+                method: 'DELETE',
                 headers: {
                     'Access-Control-Allow-Origin': '*',
                     "Content-Type": 'application/json;charset=UTF-8' 
                 },
                 success: function (response, opts) {
+                    var mainTab = Ext.getCmp('main-tab-panel');
+                    mainTab.getActiveTab().close();
                     //解析参数
                     Ext.Msg.alert('提示','删除成功');
                 },
@@ -71,19 +70,24 @@ Ext.define('saas.view.core.form.FormPanelController', {
         if(formData.detailGridField){
             gridData = formData.detailGridField;
         }
+
         var grid = form.query('detailGridField')[0];
-        var updRecords = grid.store.getUpdatedRecords();
-        if(updRecords.length>0){
-            Ext.each(updRecords, function(rec){
-                Ext.each(gridData, function(data,index){
-                    if(data.id==rec.id){
-                        if(data.id.indexOf('extMode')>-1){
+        var items = grid.store.data.items;
+        if(items.length>0){
+            Ext.each(items, function(rec){
+                if(rec.dirty==true){
+                    Ext.each(gridData, function(data,index){
+                        data[form._detnoColumn] = index + 1;
+                        if(rec.id == data.id){
+                            newGridData.push(data);
+                            return false;
+                        }else if ((typeof data.id) != 'number'&&data.id.indexOf('extMode')>-1){
                             data.id = '';
-                            data[form._detnoColumn] = index + 1;
+                            newGridData.push(data);
+                            return false;
                         }
-                        newGridData.push(data);
-                    }
-                });
+                    });
+                }
             });
         }   
         var params = {

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

@@ -15,15 +15,14 @@ Ext.define('saas.view.core.form.RemoteCombo', {
 
     setStore:function(v){
        var me=this;
-       me.url='resources/json/combotest.json';
        var store=Ext.create('Ext.data.Store',{
-           fields:['value','text'],
+           fields:['display','value'],
            autoLoad: true,
            proxy: {
                type: 'ajax',
-               url: me.url,
+               url: me.storeUrl,
                reader: {
-                   type: 'array',
+                   type: 'json',
                    rootProperty: 'data'
                }
            }
@@ -32,7 +31,6 @@ Ext.define('saas.view.core.form.RemoteCombo', {
 
     },
     createPicker: function() {
-
         var me = this,
             picker,
             pickerCfg = Ext.apply({

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

@@ -18,7 +18,7 @@ Ext.define('saas.view.core.form.field.DetailGridField', {
     },
     plugins: {
         cellediting: {
-            clicksToEdit: 2
+            clicksToEdit: 1
         }
     },
 
@@ -64,19 +64,19 @@ Ext.define('saas.view.core.form.field.DetailGridField', {
     },
 
     listeners: {
-        afterrender:function(grid){
-            var count = grid.store.getCount();
-            if(count==0){
-                grid.add10EmptyRow();
-            }
-        },
+        // 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();
             }
         }
     },
@@ -106,7 +106,29 @@ Ext.define('saas.view.core.form.field.DetailGridField', {
             store = me.getStore(),
             selectedRecord = me.selModel.lastSelected;
 
-        store.remove(selectedRecord);
+        var id = selectedRecord.data.id;
+        var form = me.ownerGrid.ownerCt;
+        if(id&&id!=0&&(typeof id) == 'number'){
+            Ext.Ajax.request({
+                url: form._deleteDetailUrl,
+                params: {id:id},
+                method: 'DELETE',
+                headers: {
+                    'Access-Control-Allow-Origin': '*'
+                },
+                success: function (response, opts) {
+                    store.remove(selectedRecord);
+                    //解析参数
+                    Ext.Msg.alert('提示','删除成功');
+                },
+                failure: function (response, opts) {
+                    //失败
+                    Ext.Msg.alert('提示','删除失败');
+                }
+            });
+        }else{
+            store.remove(selectedRecord);
+        }
     },
 
     swapUp: function() {

frontend/saas-web/app/view/test/order/FormController.js

@@ -12,45 +12,48 @@ Ext.define('saas.view.test.order.FormController', {
                 }
             },
             //放大镜赋值关系 以及 tpl模板
-            'dbfindtrigger[name=puVendcode]':{
+            'dbfindtrigger[name=pu_vendcode]':{
                 beforerender:function(f){
                     Ext.apply(f,{
-                        conditionCode:'ve_code',
-                        dataUrl:'http://192.168.253.41:8800/purchase/component/dbfind/vendor',
+                        dataUrl:'http://192.168.253.41:9480/api/document/vendor/getVendorsByCondition',
                         dbfinds:[{
-                            from:'vendCode',to:'puVendcode'
+                            from:'ve_code',to:'pu_vendcode'
                         },{
-                            from:'vendName',to:'puVendname'
+                            from:'ve_name',to:'pu_vendname'
                         }],
                         dbtpls:[{
-                            field:'vendCode',width:100
+                            field:'ve_code',width:100
                         },{
-                            field:'vendName',width:100
+                            field:'ve_name',width:100
                         }],
                         dbColumns:[{
+                            conditionCode:'ve_id',
                             "text": "供应商ID",
                             "flex": 0,
-                            "dataIndex": "vendId",
+                            "dataIndex": "ve_id",
                             "width": 0,
                             "xtype": "",
                             "items": null
                         },{
+                            conditionCode:'ve_code',
                             "text": "供应商编号",
                             "flex": 1,
-                            "dataIndex": "vendCode",
+                            "dataIndex": "ve_code",
                             "width": 100,
                             "xtype": "",
                             "items": null
                         }, {
+                            conditionCode:'ve_name',
                             "text": "供应商名称",
                             "flex": 1,
-                            "dataIndex": "vendName",
+                            "dataIndex": "ve_name",
                             "xtype": "",
                             "items": null
                         }, {
+                            conditionCode:'ve_type',
                             "text": "供应商类型",
                             "flex": 0,
-                            "dataIndex": "vendType",
+                            "dataIndex": "ve_type",
                             "width": 200,
                             "xtype": "",
                             "items": null
@@ -60,13 +63,13 @@ Ext.define('saas.view.test.order.FormController', {
                 }
             },
             //放大镜赋值关系 以及 tpl模板
-            'dbfindtrigger[name=pdProdcode]':{
+            'dbfindtrigger[name=pd_prodcode]':{
                 beforerender:function(f){
                     Ext.apply(f,{
                         conditionCode:'pr_code',
-                        dataUrl:'http://192.168.253.41:8800/purchase/component/dbfind/product',
+                        dataUrl:'http://192.168.253.41:9480/api/document/product/getProductsByCondition',
                         dbfinds:[{
-                            from:'pr_code',to:'pdVendcode'
+                            from:'pr_code',to:'pd_prodcode'
                         }],
                         dbtpls:[{
                             field:'pr_code',width:100

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

@@ -6,15 +6,16 @@ Ext.define('saas.view.test.order.FormPanel', {
     viewModel: 'test-order-formmodel',
     
     _title:'采购单',
-    _codeField: 'puCode',
-    _statusField: 'puStatuscode',
+    _codeField: 'pu_ode',
+    _statusField: 'pu_statuscode',
     _idField: 'id',
-    _detnoColumn:  'pdDetno',
-    _dataModelUrl:'http://192.168.253.58:8800/purchase/form?id={id}',
-    _saveUrl:'http://192.168.253.58:8800/purchase/form',
+    _detnoColumn:  'pd_detno',
+    _dataModelUrl:'http://192.168.253.58:8800/purchase/read/',
+    _saveUrl:'http://192.168.253.58:8800/purchase/save',
     _auditUrl:'http://192.168.253.58:8800/purchase/audit',
-    _deleteUrl:'http://192.168.253.58:8800/purchase/detele',
-    initId:0,
+    _deleteUrl:'http://192.168.253.58:8800/purchase/delete',
+    _deleteDetailUrl:'http://192.168.253.58:8800/purchase/deletdetail',
+    initId:37,
 
     toolBtns: [{
         xtype: 'button',
@@ -33,63 +34,97 @@ Ext.define('saas.view.test.order.FormPanel', {
         columnWidth: 0
     }, {
         xtype : "textfield", 
-        name : "puCode", 
-        bind : "{puCode}", 
+        name : "pu_code", 
+        bind : "{pu_code}", 
         fieldLabel : "采购单号", 
         allowBlank : true, 
         columnWidth : 0.25
     }, {
         xtype : "datefield", 
-        name : "puDate", 
-        bind : "{puDate}", 
+        name : "pu_date", 
+        bind : "{pu_date}", 
         fieldLabel : "采购日期", 
         allowBlank : true, 
         columnWidth : 0.25
     }, {
         xtype : "hidden", 
-        name : "puVendid", 
-        bind : "{puVendid}", 
+        name : "pu_vendid", 
+        bind : "{pu_vendid}", 
         fieldLabel : "供应商ID", 
         allowBlank : true, 
         columnWidth : 0.0
     }, {
         xtype : "dbfindtrigger", 
-        name : "puVendcode", 
-        bind : "{puVendcode}", 
+        name : "pu_vendcode", 
+        bind : "{pu_vendcode}", 
         fieldLabel : "供应商编号", 
         allowBlank : true, 
         columnWidth : 0.25, 
     }, {
         xtype : "textfield", 
-        name : "puVendname", 
-        bind : "{puVendname}", 
+        name : "pu_vendname", 
+        bind : "{pu_vendname}", 
         fieldLabel : "供应商名称", 
         allowBlank : true, 
         columnWidth : 0.25
     }, {
         xtype : "hidden", 
-        name : "puBuyerid", 
-        bind : "{puBuyerid}", 
+        name : "pu_buyerid", 
+        bind : "{pu_buyerid}", 
         fieldLabel : "采购员ID", 
         allowBlank : true, 
         columnWidth : 0.0
     }, {
         xtype : "dbfindtrigger", 
-        name : "puBuyercode", 
-        bind : "{puBuyercode}", 
+        name : "pu_buyercode", 
+        bind : "{pu_buyercode}", 
         fieldLabel : "采购员编号", 
         allowBlank : true, 
         columnWidth : 0.25
     }, {
         xtype : "textfield", 
-        name : "puBuyername", 
-        bind : "{puBuyername}", 
+        name : "pu_buyername", 
+        bind : "{pu_buyername}", 
         fieldLabel : "采购员名称", 
         allowBlank : true, 
         columnWidth : 0.25
+    },{
+        xtype : "combo", 
+        name : "pu_total", 
+        bind : "{pu_total}", 
+        fieldLabel : "下拉框", 
+        allowBlank : true, 
+        queryMode: 'local',
+        displayField: 'display',
+        valueField: 'value',
+        store:{
+            fields: ['display', 'value'],
+            data : [
+                {"display":"1", "value":"1"},
+                {"display":"2", "value":"2"},
+                {"display":"3", "value":"3"}
+            ]
+        },
+        columnWidth : 0.25
+    },{
+        xtype : "remotecombo", 
+        storeUrl:"http://192.168.253.41:9480/api/document/product/getProdUnit",
+        name : "pu_text1", 
+        bind : "{pu_text1}", 
+        fieldLabel : "物料下拉框", 
+        allowBlank : true, 
+        queryMode: 'local',
+        displayField: 'display',
+        valueField: 'value',
+        columnWidth : 0.25
     }, {
         name : "detailGridField", 
         xtype : "detailGridField", 
+        bind: {
+            store:{
+                data:'{detailGridField}'
+            }
+        },
         columns : [
             {
                 text : "序号", 
@@ -113,7 +148,7 @@ Ext.define('saas.view.test.order.FormPanel', {
                 }, 
                 text : "物料编号", 
                 width : 200.0, 
-                dataIndex : "pdProdcode", 
+                dataIndex : "pd_prodcode", 
                 xtype : "", 
                 items : null
             }, 
@@ -122,34 +157,34 @@ Ext.define('saas.view.test.order.FormPanel', {
                 editor : {
                     xtype : "textfield"
                 }, 
-                dataIndex : "pdUnit", 
+                dataIndex : "pd_unit", 
                 width : 120.0, 
                 xtype : "", 
                 items : null
             }, 
             {
                 text : "数量", 
-                dataIndex : "pdQty", 
+                dataIndex : "pd_yqty", 
                 width : 120.0, 
                 xtype : "", 
                 items : null
             }, 
             {
                 text : "单价", 
-                dataIndex : "pdPrice", 
+                dataIndex : "pd_price", 
                 width : 120.0, 
                 xtype : "numbercolumn", 
                 items : null
             }, 
             {
                 text : "总额", 
-                dataIndex : "pdTotal", 
+                dataIndex : "pd_total", 
                 width : 120.0, 
                 xtype : "numbercolumn"
             }, 
             {
                 text : "税额", 
-                dataIndex : "pdTaxtotal", 
+                dataIndex : "pd_taxtotal", 
                 flex : 1.0, 
                 xtype : "numbercolumn"
             }, 
@@ -188,8 +223,8 @@ Ext.define('saas.view.test.order.FormPanel', {
         xtype : "hidden", 
         readOnly : true, 
         editable : false, 
-        name : "puStatuscode", 
-        bind : "{puStatuscode}", 
+        name : "pu_statuscode", 
+        bind : "{pu_statuscode}", 
         fieldLabel : "单据状态码", 
         allowBlank : true, 
         columnWidth : 0.0