qukaidi 3 rokov pred
rodič
commit
d2f5597a59

+ 17 - 15
src/views/statisticAnalysis/commissionStatistics/index.vue

@@ -180,22 +180,24 @@ export default {
     editOpen(row) {
     },
     outExport() {
-      let queryParams = this.search
-      if (queryParams.actualDate) {
-        queryParams.actualDateStart = queryParams.actualDate[0]
-        queryParams.actualDateEnd = queryParams.actualDate[1]
-        delete queryParams.actualDate
-      }
-      const routeData = this.$router.resolve({
-        path: '/api/trade-project/project/statisticsExport',      //跳转目标窗口的地址
-        query: {
-          "Blade-Auth": getToken(),
-          type: "TC",
-          branch: "Y",
-          ...queryParams    //括号内是要传递给新窗口的参数
+           let params = { ...this.search }
+      if (params.beginTime && params.beginTime.length > 0) {
+        params = {
+          ...params,
+          beginTimeStart: params.beginTime[0],
+          beginTimeEnd: params.beginTime[1],
+        }
+      } else {
+        params = {
+          ...params,
+          beginTimeStart: '',
+          beginTimeEnd: '',
         }
-      })
-      window.open(routeData.href.slice(1, routeData.href.length - 1));
+      }
+      window.open(
+        `/api/trade-project/project/statisticsExport?${this.website.tokenHeader
+        }=${getToken()}&type=TC&branch=Y&beginTimeStart=${params.beginTimeStart}&beginTimeEnd=${params.beginTimeEnd}&userName=${params.userName}&taskStatus=${params.taskStatus}`
+      );
     }
   }
 };

+ 17 - 15
src/views/statisticAnalysis/taskStatistics/index.vue

@@ -194,22 +194,24 @@ export default {
     editOpen(row) {
     },
     outExport() {
-      let queryParams = this.search
-      if (queryParams.beginTime) {
-        queryParams.beginTimeStart = queryParams.beginTime[0]
-        queryParams.beginTimeEnd = queryParams.beginTime[1]
-        delete queryParams.beginTime
-      }
-      const routeData = this.$router.resolve({
-        path: '/api/trade-project/project/statisticsExport',      //跳转目标窗口的地址
-        query: {
-          "Blade-Auth": getToken(),
-          type: "RW",
-          branch: "Y",
-          ...queryParams    //括号内是要传递给新窗口的参数
+      let params = { ...this.search }
+      if (params.beginTime && params.beginTime.length > 0) {
+        params = {
+          ...params,
+          beginTimeStart: params.beginTime[0],
+          beginTimeEnd: params.beginTime[1],
+        }
+      } else {
+        params = {
+          ...params,
+          beginTimeStart: '',
+          beginTimeEnd: '',
         }
-      })
-      window.open(routeData.href.slice(1, routeData.href.length - 1));
+      }
+      window.open(
+        `/api/trade-project/project/statisticsExport?${this.website.tokenHeader
+        }=${getToken()}&type=RW&branch=Y&beginTimeStart=${params.beginTimeStart}&beginTimeEnd=${params.beginTimeEnd}&userName=${params.userName}&taskStatus=${params.taskStatus}`
+      );
     }
   }
 };