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

applications/money/money-server/src/main/resources/mapper/CustmonthMapper.xml

@@ -32,7 +32,7 @@
         and  companyId = #{companyId} and (cm_endamount +cm_nowamount+ cm_nowpreamount + cm_beginamount) != 0
       </if>
     </where>
-    order by cm_id desc, cm_yearmonth desc
+    order by cm_yearmonth desc,cm_custcode
   </select>
 
 

applications/money/money-server/src/main/resources/mapper/VendmonthMapper.xml

@@ -32,7 +32,7 @@
         and  companyid = #{companyId} and (vm_endamount+ vm_nowamount+vm_nowpreamount+vm_beginamount) != 0
       </if>
     </where>
-    order by vm_id desc, vm_yearmonth desc
+    order by vm_yearmonth desc,vm_vendcode
   </select>
 
   <parameterMap id="ymParamMap" type="java.util.Map">

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

@@ -33,7 +33,12 @@ Ext.define('saas.view.money.report.TotalPayDetail', {
         columnWidth: 0.4
     }],
 
-    reportColumns: [{
+    reportColumns: [
+        {
+        text: '期间',
+        dataIndex: 'vm_yearmonth',
+        width: 110,
+        },{
         text: '供应商编号',
         dataIndex: 'vm_vendcode',
         width: 190
@@ -42,10 +47,6 @@ Ext.define('saas.view.money.report.TotalPayDetail', {
         dataIndex: 'vm_vendname',
         width: 210,
     }, {
-        fieldLabel: '期间',
-        dataIndex: 'vm_yearmonth',
-        width: 110,
-    },{
         text: '期初预付',
         xtype: 'numbercolumn',
         exportFormat: 'Amount',

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

@@ -33,7 +33,12 @@ Ext.define('saas.view.money.report.TotalRecDetail', {
         columnWidth: 0.4
     }],
 
-    reportColumns: [{
+    reportColumns: [
+    {
+        text: '期间',
+        dataIndex: 'cm_yearmonth',
+        width: 110
+    },{
         text: '客户编号',
         dataIndex: 'cm_custcode',
         width: 190
@@ -41,10 +46,6 @@ Ext.define('saas.view.money.report.TotalRecDetail', {
         text: '客户名称',
         dataIndex: 'cm_custname',
         width: 210,
-    }, {
-        fieldLabel: '期间',
-        dataIndex: 'cm_yearmonth',
-        width: 110
     },{
         text: '期初预收',
         dataIndex: 'cm_beginpreamount',