Merge remote-tracking branch 'origin/dev' into dev

applications/document/document-server/src/main/resources/application.yml

@@ -47,7 +47,7 @@ eureka:
   client:
     registryFetchIntervalSeconds: 5
     serviceUrl:
-      defaultZone: http://${spring.security.user.name}:${spring.security.user.password}@127.0.0.1:8500/eureka/
+      defaultZone: http://${spring.security.user.name}:${spring.security.user.password}@192.168.0.181:8510/eureka/
 management:
   endpoints:
     web:

frontend/saas-portal-web/config/env.js

@@ -10,7 +10,7 @@ if (process.env.NODE_ENV == 'production') {
     window.env = {
         profile: 'development',
         server: {
-            baseUrl: 'http://192.168.0.174:8560',
+            baseUrl: 'http://192.168.0.181:8560',
             ssoUrl: 'http://192.168.253.12:32323'
         }
     }

frontend/saas-portal-web/src/js/main.js

@@ -103,6 +103,33 @@ $(document).ready(function(){
             }
         };
     })();
+    var Session = (function(){
+        var key = 'session';
+        return {
+            load: function() {
+                return Store.get(key);
+            },
+            loadData: function(data) {
+                data.span = data.timestamp - new Date().getTime();
+                Store.set(key, data);
+            },
+            isValid: function() {
+                var token = this.load();
+                return token && token.timestamp + token.expire * 1000 > new Date().getTime() + token.span;
+            },
+            get: function(prop) {
+                var token = this.load();
+                return token ? token[prop] : null;
+            },
+            set: function(prop, value) {
+                var token = this.load();
+                if (token) {
+                    token[prop] = value;
+                    Store.set(key, token);
+                }
+            }
+        }
+    })();
     var setUserProfile = function(account) {
         if (account) {
             $(".login").css("display","none");
@@ -115,14 +142,16 @@ $(document).ready(function(){
         }
     };
     // 已经登录过从Store取出信息
-    setUserProfile(Store.get('account'));
+    setUserProfile(Session.get('account'));
     // socket
     var listenOnCallback = function(clientId, resolve) {
         var socket = new SockJS(env.server.baseUrl + "/ws");
         stompClient = Stomp.over(socket);
         stompClient.connect({}, function(frame) {
             stompClient.subscribe('/clients/' + clientId + '/sso/callback', function(message){
-                resolve(JSON.parse(message.body));
+                stompClient.disconnect(function(){
+                    resolve(JSON.parse(message.body));
+                });
             });
         });
     };
@@ -142,8 +171,9 @@ $(document).ready(function(){
                 encodeURIComponent(env.server.baseUrl + '/api/auth/sso/callback/' + clientId));
             $('#box').show();
             listenOnCallback(clientId, function(data){
-                var account = data.account;
-                Store.set('account', account);
+                var session = data.token, account = data.account;
+                session.account = account;
+                Session.loadData(session);
                 setUserProfile(account);
                 $('#box').hide();
                 $(".zhezhao").css("display","none");

frontend/saas-web/app/view/core/dbfind/types/CustomerDbfindTrigger.js~2496f4a5e0d652d0a04afaa39f7ce066459fbea1

@@ -1,89 +0,0 @@
-/**
- * 客户资料放大镜
- */
-Ext.define('saas.view.core.dbfind.types.CustomerDbfindTrigger', {
-    extend: 'saas.view.core.dbfind.DbfindTrigger',
-    xtype: 'customerDbfindTrigger',
-
-    dataUrl: '/api/document/customer/dbfind',
-    addXtype: 'document-customer-formpanel',
-    addTitle: '客户资料',
-    defaultCondition: "cu_statuscode='OPEN'",
-    
-    dbtpls: [{
-        field: 'cu_code',
-        width: 100
-    }, {
-        field: 'cu_name',
-        width: 100
-    }],
-    dbSearchFields: [{
-        emptyText: '输入客户编号或客户名称',
-        xtype: "textfield",
-        name: "search",
-        getCondition: function (v) {
-            return "(upper(cu_code) like '%" + v.toUpperCase() + "%' or upper(cu_name) like '%" + v.toUpperCase() + "%')";
-        },
-        allowBlank: true,
-        columnWidth: 0.25
-    }],
-    dbColumns: [{
-        conditionCode: 'id',
-        text: "客户ID",
-        dataIndex: "id",
-        width: 0,
-        xtype: "",
-    }, {
-        conditionCode: 'cu_code',
-        text: "客户编号",
-        dataIndex: "cu_code",
-        width: 150,
-        xtype: "",
-    }, {
-        conditionCode: 'cu_name',
-        text: "客户名称",
-        dataIndex: "cu_name",
-        width: 180,
-        xtype: "",
-    }, {
-        conditionCode: 'cu_type',
-        text: "客户类型",
-        dataIndex: "cu_type",
-        width: 150,
-        xtype: "",
-    }, {
-        text: "业务员编号",
-        dataIndex: "cu_sellercode",
-        width:150
-    }, {
-        text: "业务员",
-        dataIndex: "cu_sellername",
-        width:180
-    }, {
-        text: "税率",
-        dataIndex: "cu_taxrate",
-        xtype: 'numbercolumn',
-        width:80,
-        renderer: function (v) {
-            return Ext.util.Format.number(v, '0');
-        }
-    }, {
-        text: "承付天数",
-        dataIndex: "cu_promisedays",
-        width:100,
-        xtype: 'numbercolumn',
-        renderer: function (v) {
-            return Ext.util.Format.number(v, '0');
-        }
-    }, {
-        text: "额度",
-        dataIndex: "cu_credit",
-        width:100,
-        xtype: 'numbercolumn',
-    }, {
-        text: "客户地址",
-        dataIndex: "ca_address",
-        width: 250
-    }]
-
-});

frontend/saas-web/app/view/core/dbfind/types/ProductDbfindTrigger.js~2496f4a5e0d652d0a04afaa39f7ce066459fbea1

@@ -1,110 +0,0 @@
-/**
- * 物料资料放大镜（单选）
- */
-Ext.define('saas.view.core.dbfind.types.ProductDbfindTrigger', {
-    extend: 'saas.view.core.dbfind.DbfindTrigger',
-    xtype: 'productDbfindTrigger',
-
-    dataUrl:'/api/document/product/list',
-    addXtype: 'document-product-formpanel',
-    addTitle: '物料资料',
-    dbtpls:[{
-        field:'pr_code',width:100
-    },{
-        field:'pr_detail',width:100
-    }],
-    defaultCondition: "pr_statuscode='OPEN'",
-    dbSearchFields:[{
-        emptyText:'输入物料编号、名称或规格',
-        xtype : "textfield", 
-        name : "search", 
-        width: 200,
-        getCondition: function(v) {
-            return "(upper(pr_spec) like '%" + v.toUpperCase()+"%' or upper(pr_code) like '%"+v.toUpperCase()+"%' or upper(pr_detail) like '%"+v.toUpperCase()+"%')";
-        },
-        allowBlank : true, 
-        columnWidth : 0.25
-    }],
-    dbColumns:[{
-        text: "物料ID",
-        hidden: true,
-        dataIndex: "id",
-    }, {
-        text: "物料编号",       
-        dataIndex: "pr_code",
-        width: 200,
-    }, {
-        text: "物料名称",
-        width: 200,
-        dataIndex: "pr_detail",
-    }, {
-        text: "规格",
-        dataIndex: "pr_spec",
-        width: 100,
-    }, {
-        text: "单位",
-        dataIndex: "pr_spec",
-        width: 100,
-    },{
-        text: "仓库id",
-        dataIndex: "pr_whid",
-        hidden: true,
-    },{
-        text: "仓库编号",
-        dataIndex: "pr_whcode",
-        hidden: true,
-    },{
-        text: "仓库",
-        dataIndex: "pr_whname",
-        width: 200,
-        hidden: true
-    },{
-        text: "总库存数",
-        dataIndex: "po_onhand",
-        width: 100,
-        xtype: 'numbercolumn',
-        renderer : function(v) {
-            var arr = (v + '.').split('.');
-            var xr = (new Array(arr[1].length)).fill('0');
-            var format = '0,000.' + xr.join();
-            return Ext.util.Format.number(v, format);
-        },                            
-        align:'end'
-    },{
-        text: "类型",
-        dataIndex: "pr_kind",
-        width: 100,
-    },{
-        text: "型号",
-        dataIndex: "pr_orispeccode",
-        width: 100,
-    },{
-        text: "品牌",
-        dataIndex: "pr_brand",
-        width: 100,
-    },{
-        text: "供应商",
-        dataIndex: "pr_vendname",
-        width: 100,
-    },{
-        text: "最小包装",
-        dataIndex: "pr_zxbzs",
-        width: 100,
-        xtype: 'numbercolumn',
-        align: 'end',
-        renderer : function(v) {
-            if(!v) {
-                return 0;
-            }
-            var arr = (v + '.').split('.');
-            var xr = (new Array(arr[1].length > 3 ? 3 : arr[1].length)).fill('0');
-            var format = '0.' + xr.join();
-            return Ext.util.Format.number(v, format);
-        }
-    },{
-        text: "L/T",
-        dataIndex: "pr_leadtime",
-        width: 100,
-    }]
-
-});

frontend/saas-web/app/view/core/dbfind/types/VendorDbfindTrigger.js

@@ -73,15 +73,15 @@ Ext.define('saas.view.core.dbfind.types.VendorDbfindTrigger', {
         }
     }, {
         text: "纳税人识别号",
-        dataIndex: "ve_bankaccount",
+        dataIndex: "ve_nsrzh",
         width: 150
     }, {
         text: "开户银行",
-        dataIndex: "ve_bankaccount",
+        dataIndex: "ve_bankcode",
         width: 150
     }, {
         text: "银行账户",
-        dataIndex: "ve_bankcode",
+        dataIndex: "ve_bankaccount",
         width: 200
     }]
 

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

@@ -15,7 +15,7 @@ Ext.define('saas.view.core.query.QueryFormPanel', {
         labelAlign: 'right',
         labelWidth: 90,
         columnWidth: 0.25,
-        blankText: '该字段不能为空'
+        blankText: '该字段不能为空',
 	},
 
     dockedItems: [{
@@ -30,6 +30,19 @@ Ext.define('saas.view.core.query.QueryFormPanel', {
             text: '查询',
             handler: 'onQuery'
         },'->']
-    }]
+    }],
+
+    listeners: {
+        beforerender: function(form) {
+            var fiels = form.getForm().getFields();
+            fiels.each(function(f) {
+                f.on && f.on({
+                    keydown: {
+                        fn: 'onQuery',
+                    }
+                });
+            });
+        }
+    }
 
 });

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

@@ -13,7 +13,7 @@ Ext.define('saas.view.core.query.QueryPanelController', {
         });
         this.queryWin.show();
     },
-    onQuery: function (btn) {
+    onQuery: function () {
         var me = this,
         queryPanel = me.getView(),
         viewModel = me.getViewModel(),

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

@@ -202,7 +202,7 @@ Ext.define('saas.view.purchase.purchase.QueryPanel', {
             xtype: 'numbercolumn',
             width: 120, 
             renderer : function(v) {
-            return Ext.util.Format.number(v, '0');
+                return Ext.util.Format.number(v, '0');
             }
         }, {
             text: '物料编号',
@@ -218,7 +218,7 @@ Ext.define('saas.view.purchase.purchase.QueryPanel', {
             width: 180
         }, {
             text: '单位',
-            dataIndex: 'pr_spec',
+            dataIndex: 'pr_unit',
             width: 100
         },{
             text: '采购数量',
@@ -232,7 +232,8 @@ Ext.define('saas.view.purchase.purchase.QueryPanel', {
                 return Ext.util.Format.number(v, format);
             },
         }, {
-            text: '交货日期',
+            // text: '交货日期',
+            text: '需求日期',
             dataIndex: 'pd_delivery',
             xtype: 'datecolumn',
             width: 200
@@ -243,7 +244,7 @@ Ext.define('saas.view.purchase.purchase.QueryPanel', {
             width: 100,
             renderer : function(v) {
                 var arr = (v + '.').split('.');
-                var xr = (new Array(arr[1].length > 3 ? 3 : arr[1].length)).fill('0');
+                var xr = (new Array(arr[1].length > 8 ? 8 : arr[1].length)).fill('0');
                 var format = '0,000.' + xr.join();
                 return Ext.util.Format.number(v, format);
             }

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

@@ -190,13 +190,7 @@ Ext.define('saas.view.purchase.purchaseIn.QueryPanel', {
         },{
             text: '单位',
             dataIndex: 'pr_unit',
-            width: 120,
-            renderer : function(v) {
-                var arr = (v + '.').split('.');
-                var xr = (new Array(arr[1].length > 8 ? 8 : arr[1].length)).fill('0');
-                var format = '0,000.' + xr.join();
-                return Ext.util.Format.number(v, format);
-            },
+            width: 120
         },{
             text: '数量',
             dataIndex: 'pd_inqty',

frontend/saas-web/app/view/purchase/report/Purchase.js

@@ -8,7 +8,7 @@ Ext.define('saas.view.purchase.report.Purchase', {
     viewName: 'purchase-report-purchase',
 
     groupField: null,
-    listUrl: '/api/purchase/purchase/list',
+    listUrl: '/api/purchase/report/purchaseDetail',
     defaultCondition: null,
     reportTitle: '采购明细报表',
     QueryWidth:0.2,

frontend/saas-web/app/view/sale/sale/QueryPanel.js

@@ -162,20 +162,23 @@ Ext.define('saas.view.sale.sale.QueryPanel', {
             width: 200
         }, {
             text: '客户名称',
-            dataIndex: 'sa_cuname',
+            dataIndex: 'sa_custname',
             width: 120
         }, {
             text: '明细序号',
             dataIndex: 'sd_detno',
             xtype: 'numbercolumn',
-            width: 120
+            width: 120,
+            renderer : function(v) {
+                return Ext.util.Format.number(v, '0');
+            }
         }, {
             text: '物料编号',
             dataIndex: 'sd_prodcode',
             width: 120
         }, {
             text: '物料名称',
-            dataIndex: 'pe_detail',
+            dataIndex: 'pr_detail',
             width: 120
         }, {
             text: '物料规格',