From 43094c8793de5af81904eb49eebacfb76e209fe3 Mon Sep 17 00:00:00 2001
From: jinlin <jinlin>
Date: 星期三, 15 十一月 2023 16:49:49 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
web/src/views/modules/project/SoftwareTestOrder-AddOrUpdate.vue | 58 +++++++++++++++++++++++-----------------------------------
1 files changed, 23 insertions(+), 35 deletions(-)
diff --git a/web/src/views/modules/project/SoftwareTestOrder-AddOrUpdate.vue b/web/src/views/modules/project/SoftwareTestOrder-AddOrUpdate.vue
index 481bda5..9687ce7 100644
--- a/web/src/views/modules/project/SoftwareTestOrder-AddOrUpdate.vue
+++ b/web/src/views/modules/project/SoftwareTestOrder-AddOrUpdate.vue
@@ -105,13 +105,13 @@
<el-table class="el-software" height="230" border :data="dataForm.measuredList"
@cell-click="handleCellClick"
stripe>
- <el-table-column type="index" align="center" width="80" label="搴忓彿"/>
+ <el-table-column type="index" align="center" width="80" label="搴忓彿"/>
<el-table-column min-width="300" label="鍚嶇О">
<template slot-scope="scope">
<span>{{ (dataForm.project.softwareName||'') + scope.row.name }}</span>
</template>
</el-table-column>
- <el-table-column align="center" width="180" label="鏍囪瘑/鐗堟湰">
+ <el-table-column align="center" prop="identify" width="180" label="鏍囪瘑/鐗堟湰">
<template slot-scope="scope">
<span v-if="editingCell && editingCell.row === scope.row && editingCell.column.property === scope.column.property">
<el-input ref="editInput" v-model="scope.row.identify" placeholder="鏍囪瘑/鐗堟湰"></el-input>
@@ -188,15 +188,7 @@
</div>
<div class="el-border-left" style="width: 98%">
<el-form-item style="width: 20%;padding-left:5%;margin-bottom: 0">
- <zt-dict v-model="dataForm.softwareTestOrder.testStandard" :radio="true"
- dict="test_standard"></zt-dict>
- <!-- <el-checkbox-group v-model="dataForm.checkList">-->
- <!-- <el-checkbox :label="0">GJB 438B-2009銆婂啗鐢ㄨ蒋浠跺紑鍙戞枃妗ｉ�氱敤瑕佹眰銆�</el-checkbox>-->
- <!-- <el-checkbox :label="1">HJB 754-2017 銆婃捣鍐涘啗鐢ㄨ蒋浠跺畾鍨嬫祴璇勫ぇ绾茬紪鍒惰姹傘��</el-checkbox>-->
- <!-- <el-checkbox :label="2">HJB 753-2017 銆婃捣鍐涘啗鐢ㄨ蒋浠跺畾鍨嬫祴璇勬姤鍛婄紪鍒惰姹傘��</el-checkbox>-->
- <!-- <el-checkbox :label="3">銆婃捣鍐涜澶囪蒋浠舵祴璇曠粏鍒欍��</el-checkbox>-->
- <!-- <el-checkbox :label="4">鍏朵粬锛歿{dataForm.other}}</el-checkbox>-->
- <!-- </el-checkbox-group>-->
+ <zt-dict v-model="dataForm.softwareTestOrder.testStandard" :radio="true" dict="test_standard"></zt-dict>
</el-form-item>
</div>
</div>
@@ -207,10 +199,6 @@
<div class="el-border-left" style="width: 98%">
<el-form-item style="padding-left:5%;margin-bottom:0">
<zt-dict v-model="dataForm.project.testLevel" :radio="true" dict="test_level"></zt-dict>
- <!-- <el-checkbox-group v-model="dataForm.checkList">-->
- <!-- <el-checkbox :label="0">閰嶇疆椤规祴璇�</el-checkbox>-->
- <!-- <el-checkbox :label="1">绯荤粺娴嬭瘯</el-checkbox>-->
- <!-- </el-checkbox-group>-->
</el-form-item>
</div>
</div>
@@ -281,7 +269,6 @@
娴嬭瘯淇℃伅
</div>
<div class="DOldForm el-border-left">
- <!-- 鍗曚綅鍚嶇О -->
<el-form-item class="marginTopAndMarginBottom" label="娴嬭瘯鏃ユ湡" style="width: 49%">
<el-date-picker
v-model="dataForm.softwareTestOrder.testDate"
@@ -289,7 +276,6 @@
placeholder="娴嬭瘯鏃ユ湡">
</el-date-picker>
</el-form-item>
- <!-- 鑱旂郴浜� -->
<el-form-item class="marginTopAndMarginBottom" label="浜や粯鏃ユ湡" style="width: 49%">
<el-date-picker
v-model="dataForm.softwareTestOrder.deliveryDate"
@@ -297,22 +283,12 @@
placeholder="浜や粯鏃ユ湡">
</el-date-picker>
</el-form-item>
- <!-- 璇︾粏鍦板潃 -->
<el-form-item label="妫�娴嬭垂鐢�" style="width: 98%">
<el-input v-model="dataForm.softwareTestOrder.testCost" placeholder="璇疯緭鍏ユ娴嬭垂鐢�"></el-input>
</el-form-item>
- <!-- <zt-form-item label="淇濆瘑绾у埆" prop="secretClass" style="width: 25%">-->
- <!-- <zt-dict v-model="datadataForm.secretClass" dict="secret_class" placeholder="淇濆瘑绾у埆" style="width:200px"></zt-dict>-->
- <!-- </zt-form-item>-->
- <!-- 鑱旂郴鏂瑰紡 -->
<el-form-item class="el-border-bottom marginTopAndMarginBottom2" label="鐗╁搧鎬ц川" style="width: 100%">
<zt-dict v-model="dataForm.softwareTestOrder.articleNature" :radio="true"
dict="article_nature"></zt-dict>
- <!-- <el-radio-group v-model="dataForm.criticalLevel">-->
- <!-- <el-radio :label="0">鐜板満妫�娴�</el-radio>-->
- <!-- <el-radio :label="1">瀹㈡埛閫佹牱</el-radio>-->
- <!-- <el-radio :label="2">鍏朵粬锛歿{dataForm.other}}</el-radio>-->
- <!-- </el-radio-group>-->
</el-form-item>
<div class="el-flex el-border-bottom" style="margin-top: -10px;">
<div class="DWidth DAlign DHold">
@@ -322,10 +298,6 @@
<el-form-item label="鏄惁婊¤冻娴嬭瘯瑕佹眰:" label-width="160px" style="margin-bottom: 0">
<zt-dict v-model="dataForm.softwareTestOrder.sampleStatus" :radio="true"
dict="is_satisfy"></zt-dict>
- <!-- <el-radio-group v-model="dataForm.checkList">-->
- <!-- <el-radio :label="0">鏄�</el-radio>-->
- <!-- <el-radio :label="1">鍚�</el-radio>-->
- <!-- </el-radio-group>-->
</el-form-item>
</div>
</div>
@@ -334,7 +306,7 @@
浜や粯鐗╂竻鍗�
</div>
<div style="width: calc(100% - 120px);padding: 5px">
- <el-table class="el-software" height="230" border :data="dataForm.deliverableList"
+ <el-table class="el-software" height="100" border :data="dataForm.deliverableList"
stripe>
<el-table-column type="index" align="center" width="80" label="搴忓彿"/>
<el-table-column prop="name" min-width="300" label="鍚嶇О"></el-table-column>
@@ -430,7 +402,8 @@
</template>
<script>
-
+ import Cookies from 'js-cookie'
+ import qs from 'qs'
export default {
data() {
return {
@@ -526,6 +499,11 @@
...this.dataForm,
...res.data
}
+ if(this.dataForm.softwareTestOrder){
+ this.dataForm.softwareTestOrder.testType1=this.dataForm.softwareTestOrder.testType1.split(',')
+ this.dataForm.softwareTestOrder.testType2=this.dataForm.softwareTestOrder.testType2.split(',')
+ console.log(this.dataForm.softwareTestOrder.testType1)
+ }
if(this.dataForm.project === null){
this.dataForm.project={}
}
@@ -539,17 +517,27 @@
// 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() {
console.log(this.dataForm, ' this.dataForm')
+ this.dataForm.softwareTestOrder.testType1=this.dataForm.softwareTestOrder.testType1.join(',')
+ this.dataForm.softwareTestOrder.testType2=this.dataForm.softwareTestOrder.testType2.join(',')
+ console.log(this.dataForm.softwareTestOrder.testType1)
let res = await this.$http[!this.dataForm.id ? 'post' : 'put']('/project/SoftwareTestOrder/', this.dataForm)
if (res.success) {
await this.$tip.success()
this.$refs.dialog.close()
this.$emit('refreshDataList')
+ }else{
+ this.dataForm.softwareTestOrder.testType1=this.dataForm.softwareTestOrder.testType1.split(',')
+ this.dataForm.softwareTestOrder.testType2=this.dataForm.softwareTestOrder.testType2.split(',')
}
}
}
--
Gitblit v1.9.1