Browse Source

Merge branch 'feature_20251117_日报填写内容自定义配置' into uat(dev)

zhujindu 1 week ago
parent
commit
a6934f10f7
1 changed files with 18 additions and 6 deletions
  1. 18 6
      src/views/week/daily.vue

+ 18 - 6
src/views/week/daily.vue

@@ -738,9 +738,15 @@ export default {
           this.tsContentsFun();
         } else {
           // 新的
-          this.filterReportCustomData((reportCustomAnswers) => {
-            this.tsContentsFun(reportCustomAnswers);
-          });
+          if (this.reportTarget.customTaskList.length) {
+            // 配置任务
+            this.filterReportCustomData((reportCustomAnswers) => {
+              this.tsContentsFun(reportCustomAnswers);
+            });
+          } else {
+            // 没有配置任务
+            this.tsContentsFun(null);
+          }
         }
       }
     },
@@ -813,9 +819,15 @@ export default {
           this.submintFun();
         } else {
           // 新的
-          this.reportCustomTabstoreVal((reportCustomAnswers) => {
-            this.submintFun(reportCustomAnswers);
-          });
+          if (this.reportTarget.customTaskList.length) {
+            // 配置任务
+            this.reportCustomTabstoreVal((reportCustomAnswers) => {
+              this.submintFun(reportCustomAnswers);
+            });
+          } else {
+            // 没有配置任务
+            this.submintFun(null);
+          }
         }
       }
     },