Эх сурвалжийг харах

fix:跨年系统有一些年份获取方式不对

(cherry picked from commit 544ef3a8623718591bd0a1dc581b6dd6d0bdaf8f)
ly 9 сар өмнө
parent
commit
488b59be64

+ 1 - 1
src/views/business/housingFund/confirm/index.vue

@@ -75,7 +75,7 @@
         <template #default="scope">
           <!-- {{ scope.row.currentDate != null && scope.row.currentDate > scope.row.checkoutDate ? scope.row.currentDate :
             scope.row.checkoutDate }} -->
-          {{ proxy.moment().subtract(1, "month").format("yyyy")+"-"+queryParams.month}}
+          {{ proxy.moment().format("yyyy")+"-"+queryParams.month}}
         </template>
       </el-table-column>
       <el-table-column align="center">

+ 2 - 2
src/views/business/production/archiveTicket/index.vue

@@ -212,8 +212,8 @@
     pageNum: 1,
     pageSize: 20,
     orderByColumn: "create_time",
-    year: proxy.moment().format("YYYY"),
-    month: proxy.moment().format("MM")-1,
+    year: proxy.moment().subtract(1, "month").format("yyyy"),
+    month: proxy.moment().subtract(1, "month").format("MM"),
     principal: tenant.versionId !== '4' && !flag.value ? useUserStore().user.userId : null,
   });
 

+ 1 - 1
src/views/business/socialSecurity/confirm/index.vue

@@ -76,7 +76,7 @@
         <template #default="scope">
           <!-- {{ scope.row.currentDate != null && scope.row.currentDate > scope.row.checkoutDate ? scope.row.currentDate :
             scope.row.checkoutDate }} -->
-          {{ proxy.moment().subtract(1, "month").format("yyyy")+"-"+queryParams.month}}
+          {{ proxy.moment().format("yyyy")+"-"+queryParams.month}}
         </template>
       </el-table-column>
       <el-table-column align="center">