报表导出时间格式

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

@@ -101,8 +101,7 @@ Ext.define('saas.view.core.query.QueryGridPanel', {
                                 type: 'condition',
                                 value: defaultCondition1
                             });
-                        }
-                        if(defaultCondition2) {
+                        }else if(defaultCondition2) {
                             condition.push({
                                 type: 'condition',
                                 value: defaultCondition2

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

@@ -259,8 +259,12 @@ Ext.define('saas.view.core.report.ReportPanel', {
             if(c.xtype == 'datecolumn') {
                 Ext.applyIf(c, {
                     format: 'Y-m-d',
-                    exportStyle: {
+                    exportStyle: [{
+                        type: 'csv',
                         format: 'Short Date'
+                    }],
+                    exportRenderer: function (value) {
+                        return Ext.Date.format(new Date(value), 'Y-m-d');
                     }
                 })
             }else if(c.xtype == 'numbercolumn') {

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

@@ -36,37 +36,37 @@ Ext.define('saas.view.home.InfoCard', {
             title: '七天内待出货销售',
             color: 'yellow',
             viewType: 'sale-sale-querypanel',
-            condition: '1=1'
+            condition: 'sale.companyid=1 and sa_statuscode=\'AUDITED\' and exists (select 1 from saledetail where sd_said=sa_id and  IFNULL(sd_sendqty,0)<ifnull(sd_qty,0) and TO_DAYS(sd_delivery)-TO_DAYS(now()) <7)'
         },
         unstorage: {
             title: '七天内待入库采购',
             color: 'purple',
             viewType: 'purchase-purchase-querypanel',
-            condition: '1=1'
+            condition: 'purchase.companyId=1 and pu_statuscode=\'AUDITED\' and exists (select 1 from purchasedetail where pd_puid=pu_id and IFNULL(pd_acceptqty,0)<ifnull(pd_qty,0) and TO_DAYS(PD_DELIVERY)-TO_DAYS(now()) <7)'
         },
         unpay: {
             title: '七天内待付款',
             color: 'red',
-            viewType: 'money-paybalance-querypanel',
-            condition: '1=1'
+            viewType: 'purchase-purchasein-querypanel',
+            condition: 'pi_class in(\'采购验收单\',\'采购验退单\') and prodinout.companyId=1 and TO_DAYS(pi_date+ifnull(ve_promisedays,0))-TO_DAYS(now())<7 and exists (select 1 from subledger where sl_code=pi_inoutno and sl_kind=pi_class and subledger.companyId=1 and ifnull(sl_namount,0)<>0)'
         },
         unreceive: {
             title: '七天内待收款',
             color: 'pink',
-            viewType: 'money-recbalance-querypanel',
-            condition: '1=1'
+            viewType: 'sale-saleout-querypanel',
+            condition: 'pi_class in(\'出货单\',\'销售退货单\') and prodinout.companyId=1 and TO_DAYS(pi_date+ifnull(cu_promisedays,0))-TO_DAYS(now())<7and exists (select 1 from subledger where sl_code=pi_inoutno and sl_kind=pi_class and subledger.companyId=1 and ifnull(sl_namount,0)<>0)'
         },
         unauditcheck: {
             title: '未审核验收',
             color: 'blue',
             viewType: 'purchase-purchasein-querypanel',
-            condition: '1=1'
+            condition: 'pi_statuscode<>\'AUDITED\' and pi_class=\'采购验收单\' and prodinout.companyId=1'
         },
         unauditship: {
             title: '未审核出货',
             color: 'default',
-            viewType: 'sale-saleout-querypanel',
-            condition: '1=1'
+            viewType: 'purchase-purchasein-querypanel',
+            condition: 'pi_statuscode<>\'AUDITED\' and pi_class=\'出货单\' and prodinout.companyId=1'
         }
     },