daiqisheng пре 3 година
родитељ
комит
186b8ada5a

+ 20 - 8
src/pages/main/performance/components/sheet.vue

@@ -2,7 +2,7 @@
  * @Author       : yuanrunwei
  * @Date         : 2021-12-04 14:23:58
  * @LastEditors: daiqisheng
- * @LastEditTime: 2022-04-17 11:54:05
+ * @LastEditTime: 2022-04-17 21:06:11
  * @FilePath     : \spfm-market-front\src\pages\main\performance\components\sheet.vue
 -->
 <template>
@@ -375,8 +375,16 @@ export default {
         endTime: "", // 截止时间
       },
       originSuperviseForm: {},
-      pickOptions: {},
-      pickWrite: {},
+      pickOptions: {
+        disabledDate(time) {
+          return time.getTime() < new Date().getTime()- 8.64e7;
+        },
+      },
+      pickWrite: {
+        disabledDate(time) {
+          return time.getTime() < new Date().getTime()- 8.64e7;
+        },
+      },
       // 可提交标志
       addFlag: "0",
       // 督办标志
@@ -416,15 +424,19 @@ export default {
     // 填报日期
     handleWrite(value) {
       if (value) {
+        let range =
+          new Date().getTime() > value.getTime()
+            ? new Date().getTime()
+            : value.getTime();
         this.pickOptions = {
           disabledDate(time) {
-            return time.getTime() < value.getTime();
+            return time.getTime() < range;
           },
         };
       } else {
         this.pickOptions = {
-          disabledDate() {
-            return false;
+          disabledDate(time) {
+            return time.getTime() < new Date().getTime() - 864000;
           },
         };
       }
@@ -444,8 +456,8 @@ export default {
         }
       } else {
         this.pickWrite = {
-          disabledDate() {
-            return false;
+          disabledDate(time) {
+            return time.getTime() - 864000 < new Date().getTime();
           },
         };
       }

+ 2 - 1
src/pages/main/performance/department.vue

@@ -647,9 +647,10 @@ export default {
       this.table_search = {
         ...data,
         issuedDate: data.issuedDate
-          ? this.$formatDate(data.issuedDate, "YYYY-MM-DD HH:00:00")
+          ? this.$formatDate(data.issuedDate, "YYYY-MM-DD HH:mm:ss")
           : data.issuedDate,
       };
+      console.log(this.table_search,'daaad');
       this.page = 1;
       this.handleInit({
         ...this.table_search,