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

frontend/saas-web/app/view/money/report/TotalPayDetail.js

@@ -15,7 +15,7 @@ Ext.define('saas.view.money.report.TotalPayDetail', {
     // listUrl: 'http://192.168.253.139:8560/api/money/report/vendormonthdetails',
     defaultCondition: null,
     reportTitle: '应收总账明细表',
-    QueryWidth: 0.5,
+    QueryWidth: 0.35,
     searchItems: [{
         xtype: 'textfield',
         name: 'vm_vendcode',
@@ -27,8 +27,13 @@ Ext.define('saas.view.money.report.TotalPayDetail', {
     }, {
         xtype: 'monthdatefield',
         name: 'vm_yearmonth',
-        emptyText: '期间',
-        columnWidth: 0.25
+        fieldLabel: '起始期间',
+        columnWidth: 0.2
+    }, {
+        xtype: 'monthdatefield',
+        name: 'vm_yearmonthTo',
+        fieldLabel: '结束期间',
+        columnWidth: 0.2
     }],
 
     reportColumns: [{

frontend/saas-web/app/view/money/report/TotalRecDetail.js

@@ -15,7 +15,7 @@ Ext.define('saas.view.money.report.TotalRecDetail', {
     // listUrl: 'http://192.168.253.139:8560/api/money/report/custormonthdetails',
     defaultCondition: null,
     reportTitle: '应收总账明细表',
-    QueryWidth: 0.5,
+    QueryWidth: 0.35,
     searchItems: [{
         xtype: 'textfield',
         name: 'cm_custcode',
@@ -26,9 +26,14 @@ Ext.define('saas.view.money.report.TotalRecDetail', {
         },
     }, {
         xtype: 'monthdatefield',
-        name: 'cm_yearmonth',
-        fieldLabel: '期间',
-        columnWidth: 0.25
+        name: 'vm_yearmonth',
+        fieldLabel: '起始期间',
+        columnWidth: 0.2
+    }, {
+        xtype: 'monthdatefield',
+        name: 'vm_yearmonthTo',
+        fieldLabel: '结束期间',
+        columnWidth: 0.2
     }],
 
     reportColumns: [{