代码提交

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

@@ -32,7 +32,14 @@ Ext.define('saas.view.core.dbfind.DbfindGridPanel', {
                     beforeload: function (store, op) {
                         var condition = me.condition;
                         if (Ext.isEmpty(condition)) {
-                            condition = '';
+                            condition = [];
+                        }
+                        //添加默认条件
+                        if(me.ownerCt.trigger.defaultCondition) {
+                            condition.push({
+                                type: 'condition',
+                                value: me.ownerCt.trigger.defaultCondition
+                            });
                         }
                         Ext.apply(store.proxy.extraParams, {
                             number: op._page,

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

@@ -60,12 +60,19 @@ Ext.define('saas.view.core.dbfind.MultiDbfindGridPanel', {
                     beforeload: function (store, op) {
                         var condition = me.condition;
                         if (Ext.isEmpty(condition)) {
-                            condition = " 1=1 ";
+                            condition = [];
+                        }
+                        //添加默认条件
+                        if(me.ownerCt.trigger.defaultCondition) {
+                            condition.push({
+                                type: 'condition',
+                                value: me.ownerCt.trigger.defaultCondition
+                            });
                         }
                         Ext.apply(store.proxy.extraParams, {
                             number: op._page,
                             size: store.pageSize,
-                            keyword: condition
+                            condition: JSON.stringify(condition)
                         });
                     }
                 }
@@ -107,7 +114,7 @@ Ext.define('saas.view.core.dbfind.MultiDbfindGridPanel', {
                             //点开放大镜的行
                             var rec = grid.dbfindtrigger.column.ownerCt.ownerCt.selModel.getLastSelected();
                             var mainGrid = grid.dbfindtrigger.column.ownerCt.ownerCt;
-                            Ext.Array.each(selectRecordArr,function(record,index) {
+                            Ext.Array.each(selectRecordArr,function(record,x) {
                                 Ext.Array.each(dbfinds,function(dbfind) {
                                     if(rec){
                                         var nowRec = grid.dbfindtrigger.column.ownerCt.ownerCt.store.getData().getByKey(rec.id);
@@ -118,6 +125,12 @@ Ext.define('saas.view.core.dbfind.MultiDbfindGridPanel', {
                                     return f.id==(rec&&rec.id?rec.id:0)
                                 });
                                 rec = mainGrid.store.data.getAt(index+1);
+                                if(!rec&&x!=selectRecordArr.length-1){//添加下一行
+                                    var data = {};
+                                    data[mainGrid.ownerCt.detnoColumn] = index + 2;
+                                    mainGrid.store.insert(index+1, data);
+                                    rec = mainGrid.store.data.getAt(index+1);
+                                }
                             });
                             grid.ownerCt.close();
                         }

frontend/saas-web/app/view/main/Main.scss

@@ -153,3 +153,9 @@ $treelist-nav-ui: (
 .x-query-menu .x-menu-item-text-default.x-menu-item-indent-no-separator {
     margin-left: 11px !important;
 }
+.x-tbar-display  {
+    margin-top: 2.5px !important;
+}
+.x-tbar-display .x-form-display-field-default {
+    font: 400 16px/17px 'Microsoft YaHei';
+}

frontend/saas-web/app/view/purchase/purchase/FormPanelController.js

@@ -12,6 +12,7 @@ Ext.define('saas.view.purchase.purchase.FormPanelController', {
                         dataUrl:'/api/document/vendor/list',
                         addXtype: 'document-vendor-formpanel',
                         addTitle: '供应商资料',
+                        defaultCondition:"ve_statuscode='OPEN'",
                         //赋值 
                         dbfinds:[{
                             from:'ve_code',to:'pu_vendcode'
@@ -81,11 +82,12 @@ Ext.define('saas.view.purchase.purchase.FormPanelController', {
                         //数据接口
                         // dataUrl:'http://192.168.253.31:9480/product/getProductsByCondition',
                         dataUrl: '/api/document/product/list',
+                        defaultCondition:"pr_statuscode='OPEN'",
                         //放大镜赋值设置
                         dbfinds:[{
                             from:'pr_code',to:'pd_prodcode'
                         },{
-                            from:'pr_unit',to:'pd_unit'
+                            from:'pr_detail',to:'pr_detail'
                         }],
                         //联想查询条件
                         dbCondition:"CONCAT(pr_code, pr_detail) like '{0}%'",

frontend/saas-web/app/view/sys/finish/DataList.js

@@ -7,19 +7,60 @@ Ext.define('saas.view.sys.finish.DataList', {
     autoScroll: true,
     frame:true,
     layout:'fit',
-    dataUrl:'/api/common/finish/list',
-
+    dataUrl:'http://192.168.253.31:8920/endProduct/list',
+    endAccount:'http://192.168.253.31:8920/endProduct/endAccount',
+    unEndAccount:'http://192.168.253.31:8920/endProduct/unEndAccount',
     tbar: [{
-        width: 250,
-        name: 'ml_caller',
-        xtype: 'displayfield',
-        fieldLable : '结账日'
+        cls:'x-tbar-display',
+        width: 180,
+        name: 'day',
+        xtype: 'displayfield'
     },{
         xtype:'button',
         text:'结账',
+        listeners: {
+            click:function(b){
+                var grid = b.ownerCt.ownerCt;
+                grid.BaseUtil.request({
+                    url: grid.endAccount,
+                    params: '',
+                    method: 'POST',
+                })
+                .then(function(localJson) {
+                    if(localJson.success){
+                        showToast('结账成功');
+                        grid.store.loadPage(1);
+                    }
+                })
+                .catch(function(res) {
+                    console.error(res);
+                    showToast('结账失败: ' + res.message);
+                });
+            }
+        }
     },{
         xtype:'button',
         text:'反结账',
+        listeners: {
+            click:function(b){
+                var grid = b.ownerCt.ownerCt;
+                grid.BaseUtil.request({
+                    url: grid.unEndAccount,
+                    params: '',
+                    method: 'POST',
+                })
+                .then(function(localJson) {
+                    if(localJson.success){
+                        showToast('反结账成功');
+                        grid.store.loadPage(1);
+                    }
+                })
+                .catch(function(res) {
+                    console.error(res);
+                    showToast('反结账失败: ' + res.message);
+                });
+            }
+        }
     },'->',{
         cls:'x-formpanel-btn-blue',
         xtype:'button',
@@ -67,6 +108,8 @@ Ext.define('saas.view.sys.finish.DataList', {
                 pageSize: 11,
                 data: [],
                 proxy: {
+                    parent:this,
+                    async:false,
                     timeout:8000,
                     type: 'ajax',
                     url: me.dataUrl,
@@ -75,8 +118,17 @@ Ext.define('saas.view.sys.finish.DataList', {
                     },
                     reader: {
                         type: 'json',
-                        rootProperty: 'data.list',
+                        rootProperty: 'data.item.list',
                         totalProperty: 'data.total',
+                    },
+                    listeners:{
+                        endprocessresponse:function(proxy,res){
+                            if(res.status=='200'){
+                                var nowTime = res.responseJson.data.main;
+                                var day = proxy.parent.dockedItems.items[2].down('[name=day]');
+                                day.setValue('当前结算年月：' + nowTime);
+                            }
+                        }
                     }
                 },
                 listeners: {
@@ -90,6 +142,9 @@ Ext.define('saas.view.sys.finish.DataList', {
                             size: store.pageSize,
                             condition: JSON.stringify(condition)
                         });
+                    },
+                    datachanged:function(){
+                        
                     }
                 }
             });