Browse Source

Merge branch 'develop_yh13' of http://git.chelingzhu.com/jianguan-web/jg-ocs-html into develop_yh13

lilei 2 years ago
parent
commit
2386483f3f
1 changed files with 3 additions and 3 deletions
  1. 3 3
      src/views/reportData/receivedSendStorageReport/index.vue

+ 3 - 3
src/views/reportData/receivedSendStorageReport/index.vue

@@ -213,16 +213,16 @@ export default {
     disabledStartDate (startValue) {
     disabledStartDate (startValue) {
       const endValue = this.endValue
       const endValue = this.endValue
       if (!startValue || !endValue) {
       if (!startValue || !endValue) {
-        return startValue.valueOf() > this.moment().valueOf()
+        return startValue.valueOf() > this.moment().month(this.moment().month() - 1).valueOf()
       }
       }
       return startValue.valueOf() >= endValue.valueOf()
       return startValue.valueOf() >= endValue.valueOf()
     },
     },
     disabledEndDate (endValue) {
     disabledEndDate (endValue) {
       const startValue = this.startValue
       const startValue = this.startValue
       if (!startValue) {
       if (!startValue) {
-        return endValue.valueOf() > this.moment().valueOf()
+        return endValue.valueOf() > this.moment().month(this.moment().month() - 1).valueOf()
       }
       }
-      return endValue.valueOf() < startValue.valueOf() || endValue.valueOf() > this.moment().valueOf()
+      return endValue.valueOf() < startValue.valueOf() || endValue.valueOf() > this.moment().month(this.moment().month() - 1).valueOf()
     },
     },
     // 开始时间
     // 开始时间
     handleStartOpenChange (open) {
     handleStartOpenChange (open) {