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

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

@@ -329,7 +329,7 @@
       <if test="companyId != null">
         and   bankinformation.companyId = #{companyId}
       </if>
-    </where>  order by bk_id
+    </where>  order by bk_date desc, bk_id desc
   </select>
   <select id="getCombo" resultType="com.usoftchina.saas.commons.dto.ComboDTO">
         SELECT CONCAT(bk_bankcode,' ',bk_bankname) display,bk_bankname value FROM bankinformation WHERE COMPANYID=#{companyId}

base-servers/account/account-dto/src/main/java/com/usoftchina/saas/account/dto/RoleDTO.java

@@ -67,9 +67,9 @@ public class RoleDTO extends CommonBaseDTO implements Serializable{
                 ", description='" + description + '\'' +
                 ", id=" + id +
                 ", createTime=" + createTime +
-                ", creatorName='" + creatorName + '\'' +
+                ", creatorName='" + creator + '\'' +
                 ", updateTime=" + updateTime +
-                ", updaterName='" + updaterName + '\'' +
+                ", updaterName='" + updater + '\'' +
                 '}';
     }
 }

frontend/saas-web/app/util/FormUtil.js

@@ -203,6 +203,7 @@ Ext.define('saas.util.FormUtil', {
                         }
                     }
                     form.initFormData(o);
+                    form.fireEvent('load', form, o);
                 }
             })
             .catch(function(response) {

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/document/customer/BasePanel.js

@@ -132,7 +132,12 @@ Ext.define('saas.view.document.customer.BasePanel', {
             text : "税率", 
             dataIndex : "cu_taxrate", 
             xtype: 'numbercolumn'
-        },{
+        }, {
+            text: '应收款余额',
+            dataIndex: 'cu_leftamount',
+            width: 120,
+            xtype: 'numbercolumn'
+        }, {
             text : "承付天数", 
             xtype: 'numbercolumn',
             dataIndex : "cu_promisedays", 

frontend/saas-web/app/view/document/customer/FormPanel.js

@@ -193,7 +193,6 @@ Ext.define('saas.view.document.customer.FormPanel', {
         ignore:true,
         columnWidth : 0.25,
         decimalPrecision: 8,
-        minValue:0,
         renderer : function(v) {
             var arr = (v + '.').split('.');
             var xr = (new Array(arr[1].length)).fill('0');

frontend/saas-web/app/view/document/product/FormModel.js

@@ -12,7 +12,18 @@ Ext.define('saas.view.document.product.FormModel', {
             get:function(value){
                 return value;
             }
-        }/* ,
+        },
+        qcsz_change: {
+            bind: '{qcsz}',
+            get: function(v) {
+                var form = this.getView(),
+                detailGrid = form.down('detailGridField');
+
+                detailGrid.setHidden(!v);
+            }
+        },
+        
+        /* ,
         pd_num_change: {
             bind: '{pd_num}',
             get: function(v) {

frontend/saas-web/app/view/document/product/FormPanel.js

@@ -198,12 +198,22 @@ Ext.define('saas.view.document.product.FormPanel', {
         xtype : "datefield", 
         name : "updateTime", 
         fieldLabel : "更新时间"
-    },{
+    }, {
+        xtype: 'numberfield',
+        fieldLabel: 'L/T',
+        name: 'pr_leadtime'
+    }, {
+        xtype: 'checkbox',
+        fieldLabel: '期初设置',
+        name: 'qcsz',
+        ignore: true,
+    }, {
         xtype : "detailGridField", 
         storeModel:'saas.model.document.ProductDetail',
         detnoColumn: 'pd_detno',
         showCount: false,
         allowEmpty:true,
+        hidden: true,
         deleteDetailUrl:'/api/document/product/deleteDetail/',
         columns : [{
             text : "ID", 
@@ -361,5 +371,13 @@ Ext.define('saas.view.document.product.FormPanel', {
         unAuditText: '已开启',
         auditBtnText: '禁用',
         unAuditBtnText: '启用',
+    },
+    listeners: {
+        load: function(form, data) {
+            var viewModel = form.getViewModel();
+            var store = viewModel.get('detail0').detailStore;
+
+            viewModel.set('qcsz', store.getCount() > 0);
+        }
     }
 });

frontend/saas-web/app/view/document/vendor/FormPanel.js

@@ -180,7 +180,6 @@ Ext.define('saas.view.document.vendor.FormPanel', {
         ignore:true,
         columnWidth : 0.25,
         decimalPrecision: 8,
-        minValue:0,
         renderer : function(v) {
             var arr = (v + '.').split('.');
             var xr = (new Array(arr[1].length)).fill('0');

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'
         }
     },
 

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

@@ -28,6 +28,10 @@ Ext.define('saas.view.home.charts.PurchaseTrend', {
                     store: '{purchase_trend}',
                 },
                 axes: [{
+                    title: {
+                        text: '月',
+                        fontSize: 14,
+                    },
                     type: 'category',
                     fields: ['x'],
                     position: 'bottom',

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

@@ -34,14 +34,13 @@ Ext.define('saas.view.home.charts.SaleTrend', {
 
                 // },
                 axes: [{
+                    title: {
+                        text: '月',
+                        fontSize: 14,
+                    },
                     type: 'category',
                     fields: ['x'],
                     position: 'bottom',
-                    label: {
-                        rotate: {
-                            degrees: -25
-                        }
-                    },
                     style: {
                         fill: '#E7EBEF',
                         strokeStyle: 'transparent'

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

@@ -28,6 +28,10 @@ Ext.define('saas.view.home.charts.StockAmount', {
                     store: '{stock_amount}',
                 },
                 axes: [{
+                    title: {
+                        text: '月',
+                        fontSize: 14,
+                    },
                     type: 'category',
                     fields: ['x'],
                     position: 'bottom',