Merge branch 'dev' of ssh://10.10.100.21/source/saas-platform into dev

applications/document/document-server/src/main/resources/mapper/VendorcontactMapper.xml

@@ -262,7 +262,7 @@
       #{item.updateTime,jdbcType=TIMESTAMP}, #{item.vc_text1,jdbcType=VARCHAR}, #{item.vc_text2,jdbcType=VARCHAR},
       #{item.vc_text3,jdbcType=VARCHAR}, #{item.vc_text4,jdbcType=VARCHAR}, #{item.vc_text5,jdbcType=VARCHAR},
       #{item.vc_default,jdbcType=VARCHAR},
-      #{creatorId,jdbcType=INTEGER}, #{createTime,jdbcType=TIMESTAMP}, #{creatorName,jdbcType=VARCHAR}
+      #{item.creatorId,jdbcType=INTEGER}, #{item.createTime,jdbcType=TIMESTAMP}, #{item.creatorName,jdbcType=VARCHAR}
       )
     </foreach>
   </insert>

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

@@ -81,20 +81,19 @@ Ext.define('saas.view.core.query.QueryFormPanel', {
             }
         },
         beforerender: function(form) {
-            // var fiels = form.getForm().getFields();
-            // fiels.each(function(f) {
-            //     console.log(f, f.on);
-            //     f.on && f.on({
-            //         keydown: {
-            //             // fn: 'onQuery',
-            //             fn: function(th, e, eOpts) {
-            //                 if(e.keyCode == 13) {
-            //                     form.up('core-query-querypanel').getController().onQuery()
-            //                 }
-            //             }
-            //         }
-            //     });
-            // });
+            var fiels = form.getForm().getFields();
+            fiels.each(function(f) {
+                f.enableKeyEvents = true;
+                f.on && f.on({
+                    keydown: {
+                        fn: function(th, e, eOpts) {
+                            if(e.keyCode == 13) {
+                                form.up('core-query-querypanel').getController().onQuery()
+                            }
+                        }
+                    }
+                });
+            });
         }
     }
 

frontend/saas-web/app/view/core/report/ReportPanelController.js

@@ -45,9 +45,21 @@ Ext.define('saas.view.core.report.ReportPanelController', {
         });
     },
     printHtml: function(html){
-        var d = window.open("", "print");
-        d.document.write(html);
-        d.document.close();
-        d.print();
+        var iframe=document.getElementById("saas-print-iframe");
+        if(!iframe){
+            iframe = document.createElement('IFRAME');
+            var doc = null;
+            iframe.setAttribute("id", "saas-print-iframe");
+            iframe.setAttribute('style', 'position:absolute;width:0px;height:0px;left:-500px;top:-500px;');
+            document.body.appendChild(iframe);
+            doc = iframe.contentWindow.document;
+            doc.write(html);
+            doc.close();
+            iframe.contentWindow.focus();
+        }
+        iframe.contentWindow.print();
+        if (navigator.userAgent.indexOf("MSIE") > 0){
+            document.body.removeChild(iframe);
+        }
     },
 });

frontend/saas-web/app/view/home/InfoCard.js

@@ -71,7 +71,7 @@ Ext.define('saas.view.home.InfoCard', {
                 unauditship: {
                     title: '未审核出货',
                     color: 'default',
-                    viewType: 'purchase-purchasein-querypanel',
+                    viewType: 'sale-saleout-querypanel',
                     condition: 'pi_statuscode<>\'AUDITED\' and pi_class=\'出货单\' and prodinout.companyId=' + companyId
                 }
             },

frontend/saas-web/app/view/home/charts/SaleTrend.js

@@ -67,7 +67,7 @@ Ext.define('saas.view.home.charts.SaleTrend', {
                 }],
                 series: [{
                     type: 'line',
-                    smooth: true,
+                    // smooth: true,
                     title: '销售额',
                     xField: 'x',
                     yField: 'sale',
@@ -100,7 +100,7 @@ Ext.define('saas.view.home.charts.SaleTrend', {
                     // renderer: me.onSeriesRenderer
                 }, {
                     type: 'line',
-                    smooth: true,
+                    // smooth: true,
                     title: '销售回款',
                     xField: 'x',
                     yField: 'saleback',
@@ -131,6 +131,14 @@ Ext.define('saas.view.home.charts.SaleTrend', {
                         fillOpacity: 0.1,
                     },
                 }],
+                legend: {
+                    type: 'dom',
+                    docked: 'top',
+                    padding: 0,
+                    bodyPadding: 0,
+                    border: 0,
+                    cls: 'x-monthio-legend'
+                },
                 listeners: {
                     itemhighlightchange: me.itemhighlightchange
                 }

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

@@ -172,6 +172,10 @@ Ext.define('saas.view.sale.saleout.QueryPanel', {
             text: '物料编号',
             dataIndex: 'pd_prodcode',
             width: 150
+        }, {
+            text: '物料名称',
+            dataIndex: 'pr_detail',
+            width: 150
         }, {
             text: '出货数量',
             dataIndex: 'pd_outqty',