From fbdc3cb5768e3484648edf3ff96df03c881e78fa Mon Sep 17 00:00:00 2001
From: zzw <wander.zheng@qq.com>
Date: 星期四, 16 十一月 2023 09:32:57 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
web/src/views/modules/project/SoftwareTestOrder-AddOrUpdate.vue | 16 +++++++++++-----
1 files changed, 11 insertions(+), 5 deletions(-)
diff --git a/web/src/views/modules/project/SoftwareTestOrder-AddOrUpdate.vue b/web/src/views/modules/project/SoftwareTestOrder-AddOrUpdate.vue
index bdc189e..f7b563f 100644
--- a/web/src/views/modules/project/SoftwareTestOrder-AddOrUpdate.vue
+++ b/web/src/views/modules/project/SoftwareTestOrder-AddOrUpdate.vue
@@ -4,7 +4,7 @@
class="weiTuoDanAuto">
<div class="DManageForm">
<el-form-item readonly label-width="60px" label="缂栧彿:" style="width: 99% ;margin-bottom:-5px">
- <span>{{ dataForm.project.code }}</span>
+ <span>{{ dataForm.softwareTestOrder.code}}</span>
</el-form-item>
</div>
<div style="border: 1px solid rgba(0,0,0,.2)">
@@ -231,7 +231,7 @@
<div class="el-border-left" style="width: 98%;">
<el-form-item label="鏄惁鐩朇NAS绔�" label-width="130px" style="padding-left:5%;margin-bottom:0">
<zt-dict v-model="dataForm.softwareTestOrder.otherRequire" :radio="true"
- dict="is_or_not"></zt-dict>
+ dict="is_stamp"></zt-dict>
</el-form-item>
</div>
</div>
@@ -402,7 +402,8 @@
</template>
<script>
-
+ import Cookies from 'js-cookie'
+ import qs from 'qs'
export default {
data() {
return {
@@ -412,6 +413,7 @@
id: null,
projectId: null,
softwareTestOrder: {
+ code:'',
optEnviron:'',
programLang:'',
testBasis:'',
@@ -516,8 +518,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