From 9247ffa2d7991e996b13df9b32d448972fd3cbfc Mon Sep 17 00:00:00 2001
From: jinlin <jinlin>
Date: 星期三, 15 十一月 2023 16:20:21 +0800
Subject: [PATCH] Changes
---
web/src/views/modules/project/SoftwareTestOrder-AddOrUpdate.vue | 11 ++++++++---
modules/mainPart/src/main/java/com/zt/life/modules/project/controller/SoftwareTestOrderController.java | 4 ++--
2 files changed, 10 insertions(+), 5 deletions(-)
diff --git a/modules/mainPart/src/main/java/com/zt/life/modules/project/controller/SoftwareTestOrderController.java b/modules/mainPart/src/main/java/com/zt/life/modules/project/controller/SoftwareTestOrderController.java
index 3c09f3b..dcaf91c 100644
--- a/modules/mainPart/src/main/java/com/zt/life/modules/project/controller/SoftwareTestOrderController.java
+++ b/modules/mainPart/src/main/java/com/zt/life/modules/project/controller/SoftwareTestOrderController.java
@@ -123,10 +123,10 @@
return Result.ok();
}
- @GetMapping("exportWord/{id}")
+ @GetMapping("exportWord")
@ApiOperation("鎵撳嵃娴嬭瘯濮旀墭鍗�")
@LogOperation("鎵撳嵃娴嬭瘯濮旀墭鍗�")
- public void exportWord(@PathVariable("id") Long id, HttpServletRequest request, HttpServletResponse response) {
+ public void exportWord(Long id, HttpServletRequest request, HttpServletResponse response) {
softwareTestOrderService.exportWord(id, request, response);
}
}
diff --git a/web/src/views/modules/project/SoftwareTestOrder-AddOrUpdate.vue b/web/src/views/modules/project/SoftwareTestOrder-AddOrUpdate.vue
index bdc189e..9687ce7 100644
--- a/web/src/views/modules/project/SoftwareTestOrder-AddOrUpdate.vue
+++ b/web/src/views/modules/project/SoftwareTestOrder-AddOrUpdate.vue
@@ -402,7 +402,8 @@
</template>
<script>
-
+ import Cookies from 'js-cookie'
+ import qs from 'qs'
export default {
data() {
return {
@@ -516,8 +517,12 @@
// console.log(this.dataForm, "this.dataForm")
},
async print(){
- let res = await this.$http.get(`/project/SoftwareTestOrder/exportWord/${this.dataForm.id}`)
- console.log(res.data)
+ var params = qs.stringify({
+ token: Cookies.get('token'),
+ id:this.dataForm.id
+ })
+ let apiURL = `/project/SoftwareTestOrder/exportWord/`
+ window.location.href = `${window.SITE_CONFIG['apiURL']}${apiURL}?${params}`
},
// 琛ㄥ崟鎻愪氦
async formSubmit() {
--
Gitblit v1.9.1