ysc 1 год назад
Родитель
Сommit
9d62ad3906
2 измененных файлов с 10 добавлено и 0 удалено
  1. 6 0
      src/utils/date.js
  2. 4 0
      src/views/material/receive.vue

+ 6 - 0
src/utils/date.js

@@ -89,6 +89,12 @@ export default {
   getMonthDays(date) {
     return moment(date).daysInMonth();
   },
+  lastDayOfMonth(date){
+    if (date) {
+      return moment(date).endOf('month').format(DATE_FORMAT)
+    }
+    return moment().endOf('month').format(DATE_FORMAT)
+  },
   afterWeek(date, num = 1) {
     if (date) {
       return moment(date).add(num, 'weeks').format(DATE_FORMAT)

+ 4 - 0
src/views/material/receive.vue

@@ -503,6 +503,7 @@ export default {
       if (type === 'week') {
         let limitTime = 0
         if (this.addList.length > 0) {
+          DateUtil.lastDayOfMonth(DateUtil.beforeMonth(this.addList[0].recordDate))
           limitTime = DateUtil.unix(this.addList[0].recordDate + '-01') * 1000
         }
         let nextWeekFirstDay = DateUtil.unix(DateUtil.firstDayOfNextWeek()) * 1000;
@@ -515,6 +516,9 @@ export default {
     },
     showEditBtn(row) {
       if (row.monthOrWeek === '1') {
+        if (row.receivedNum > 0) {
+          return false;
+        }
         if (DateUtil.getMinutes() < DateUtil.getMinutes(DateUtil.day(DateUtil.month() + '25'))) {
           return DateUtil.unix(row.recordDate) >= DateUtil.unix(DateUtil.afterMonth())
         } else {