From d33e687ff5b3fdb50e3dccf50e3a276baf2e6c5c Mon Sep 17 00:00:00 2001
From: zzw <wander.zheng@qq.com>
Date: 星期五, 17 十一月 2023 17:03:50 +0800
Subject: [PATCH] 编号
---
web/src/views/modules/project/SoftwareTestOrder-AddOrUpdate.vue | 138 ++++++++++++++++++++++-----------------------
1 files changed, 68 insertions(+), 70 deletions(-)
diff --git a/web/src/views/modules/project/SoftwareTestOrder-AddOrUpdate.vue b/web/src/views/modules/project/SoftwareTestOrder-AddOrUpdate.vue
index 481bda5..b1e8a9b 100644
--- a/web/src/views/modules/project/SoftwareTestOrder-AddOrUpdate.vue
+++ b/web/src/views/modules/project/SoftwareTestOrder-AddOrUpdate.vue
@@ -1,10 +1,10 @@
<template>
<zt-dialog ref="dialog" column="2" @confirm="formSubmit">
<el-form ref="form" :inline="true" :model="dataForm" :disabled="dataForm.disabled" label-width="120px"
- class="weiTuoDanAuto">
+ class="weiTuoDanAuto" style="padding-top: 0">
<div class="DManageForm">
- <el-form-item readonly label-width="60px" label="缂栧彿:" style="width: 99% ;margin-bottom:-5px">
- <span>{{ dataForm.project.code }}</span>
+ <el-form-item readonly label-width="50px" label="缂栧彿:" style="width: 99% ;margin-bottom:-5px">
+ <span>{{ dataForm.softwareTestOrder.code}}</span>
</el-form-item>
</div>
<div style="border: 1px solid rgba(0,0,0,.2)">
@@ -105,13 +105,9 @@
<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 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 prop="no" align="center" width="80" label="搴忓彿"/>
+ <el-table-column prop="name" min-width="300" 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>
@@ -122,10 +118,6 @@
<el-table-column label="鏄惁琚祴浠�" width="180" align="center">
<template slot-scope="scope">
<zt-dict v-model="scope.row.isMeasured" dict="is_or_not" :radio="true"></zt-dict>
- <!-- <el-radio-group v-model="scope.row.isMeasured">-->
- <!-- <el-radio :label="1">鏄�</el-radio>-->
- <!-- <el-radio :label="0">鍚�</el-radio>-->
- <!-- </el-radio-group>-->
</template>
</el-table-column>
</el-table>
@@ -137,11 +129,6 @@
</div>
<div style="width: calc(100% - 120px)">
<zt-dict v-model="dataForm.project.softwareType" :radio="true" dict="software_type"></zt-dict>
- <!-- <el-checkbox-group v-model="dataForm.checkList">-->
- <!-- <el-checkbox :label="0">閫氱敤搴旂敤杞欢</el-checkbox>-->
- <!-- <el-checkbox :label="1">琛屼笟搴旂敤杞欢</el-checkbox>-->
- <!-- <el-checkbox :label="2">宓屽叆寮忚蒋浠�</el-checkbox>-->
- <!-- </el-checkbox-group>-->
</div>
</div>
</div>
@@ -159,11 +146,6 @@
<el-form-item style="width: 20%;padding-left:5%;margin-bottom: 0">
<zt-dict v-model="dataForm.softwareTestOrder.testBasis" :radio="true" dict="test_basis"
clearable></zt-dict>
- <!-- <el-checkbox-group v-model="dataForm.checkList">-->
- <!-- <el-checkbox :label="0">GB/T 25000.21-2016</el-checkbox>-->
- <!-- <el-checkbox :label="1">GJB/Z 141-2004</el-checkbox>-->
- <!-- <el-checkbox :label="2">鍏朵粬锛歿{dataForm.other}}</el-checkbox>-->
- <!-- </el-checkbox-group>-->
</el-form-item>
</div>
</div>
@@ -171,7 +153,7 @@
<div class="DWidth DAlign DHold">
娴嬭瘯绫诲瀷
</div>
- <div class="el-border-left" style="width: 98%">
+ <div class="el-border-left test-type-line-height" style="width: 98%">
<el-form-item style="width: 40%;padding-left:5%;margin-bottom: 0">
<zt-dict-checkbox v-model="dataForm.softwareTestOrder.testType1" column="2" dict="test_type1"
clearable></zt-dict-checkbox>
@@ -188,15 +170,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>
@@ -206,11 +180,7 @@
</div>
<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>-->
+ <zt-dict v-model="dataForm.softwareTestOrder.testLevel" :radio="true" dict="test_level"></zt-dict>
</el-form-item>
</div>
</div>
@@ -243,7 +213,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="other_require"></zt-dict>
</el-form-item>
</div>
</div>
@@ -256,15 +226,10 @@
<div class="" style="width: 100%;">
<div class="el-flex " style="height: 40px">
<div style="width: 70%">
- <span>{{ dataForm.write }}</span>
+ <span>{{ dataForm.softwareTestOrder.entrustSign }}</span>
</div>
<div class="el-flex">
- <div style="width: 60px;text-align: center">{{ dataForm.year }}</div>
- 骞�
- <div style="width: 40px;text-align: center">{{ dataForm.month }}</div>
- 鏈�
- <div style="width: 40px;text-align: center">{{ dataForm.day }}</div>
- 鏃�
+ {{ dataForm.softwareTestOrder.entrustSignDate | filterTime('YYYY骞碝M鏈圖D鏃�') }}
</div>
</div>
</div>
@@ -281,7 +246,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 +253,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 +260,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 +275,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 +283,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>
@@ -393,17 +342,17 @@
<div class="" style="width: 100%;">
<div class="el-flex" style="height: 40px">
<div style="width: 70%">
- <span>{{ dataForm.write }}</span>
+ <span>{{ dataForm.contractSign }}</span>
</div>
<div class="el-flex">
- {{ dataForm.softwareTestOrder.deliveryDate | filterTime('YYYY骞碝M鏈圖D鏃�') }}
+ {{ dataForm.softwareTestOrder.contractSignDate | filterTime('YYYY骞碝M鏈圖D鏃�') }}
</div>
</div>
</div>
</div>
</div>
</div>
- <div class="el-flex">
+ <div class="el-flex el-border-bottom">
<div class="DPadding3 DAlign DHold">
璇存槑
</div>
@@ -420,6 +369,15 @@
</div>
</div>
</div>
+ <div class="el-flex order-sc" style="height: 170px">
+<!-- <div class="DPadding3 DAlign DHold">-->
+<!-- 濮旀墭鍗曚笂浼�-->
+<!-- </div>-->
+ <el-form-item class="marginTopAndMarginBottom" style="width: 100%">
+ <config-uploader busi-type="test_order" model-name="dataForm" :dataForm="dataForm"
+ v-model="dataForm.files"/>
+ </el-form-item>
+ </div>
</div>
</el-form>
@@ -430,7 +388,8 @@
</template>
<script>
-
+ import Cookies from 'js-cookie'
+ import qs from 'qs'
export default {
data() {
return {
@@ -440,6 +399,7 @@
id: null,
projectId: null,
softwareTestOrder: {
+ code:'',
optEnviron:'',
programLang:'',
testBasis:'',
@@ -455,6 +415,10 @@
testCost:'',
articleNature:'',
sampleStatus:'',
+ entrustSign:'',
+ entrustSignDate:'',
+ contractSign:'',
+ contractSignDate:''
},
project: {
code: '',
@@ -526,6 +490,16 @@
...this.dataForm,
...res.data
}
+ if(this.dataForm.softwareTestOrder){
+ if(this.dataForm.softwareTestOrder.testType1){
+ this.dataForm.softwareTestOrder.testType1=this.dataForm.softwareTestOrder.testType1.split(',')
+ console.log(this.dataForm.softwareTestOrder.testType1)
+ }
+ if(this.dataForm.softwareTestOrder.testType2){
+ this.dataForm.softwareTestOrder.testType2=this.dataForm.softwareTestOrder.testType2.split(',')
+ console.log(this.dataForm.softwareTestOrder.testType2)
+ }
+ }
if(this.dataForm.project === null){
this.dataForm.project={}
}
@@ -539,17 +513,35 @@
// 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')
+ if(this.dataForm.softwareTestOrder.testType1){
+ this.dataForm.softwareTestOrder.testType1=this.dataForm.softwareTestOrder.testType1.join(',')
+ }
+ if(this.dataForm.softwareTestOrder.testType2){
+ 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{
+ if(this.dataForm.softwareTestOrder.testType1){
+ this.dataForm.softwareTestOrder.testType1=this.dataForm.softwareTestOrder.testType1.split(',')
+ }
+ if(this.dataForm.softwareTestOrder.testType2){
+ this.dataForm.softwareTestOrder.testType2=this.dataForm.softwareTestOrder.testType2.split(',')
+ }
}
}
}
@@ -652,4 +644,10 @@
.csjgxx > .el-form-item > .el-form-item__content {
width: calc(100% - 130px);
}
+.order-sc > .el-form-item > .el-form-item__content {
+ width:100%;
+}
+.test-type-line-height>.el-form-item>.el-form-item__content{
+ line-height: 30px;
+}
</style>
--
Gitblit v1.9.1