From 8caeb17c27473a748f97ced5ba6e78b5ad63c01d Mon Sep 17 00:00:00 2001
From: jinlin <jinlin>
Date: 星期五, 17 十一月 2023 15:00:59 +0800
Subject: [PATCH] Changes
---
web/src/views/modules/project/SoftwareTestOrder-AddOrUpdate.vue | 73 ++++++++++++++++++++++++------------
1 files changed, 48 insertions(+), 25 deletions(-)
diff --git a/web/src/views/modules/project/SoftwareTestOrder-AddOrUpdate.vue b/web/src/views/modules/project/SoftwareTestOrder-AddOrUpdate.vue
index f90fcec..b1e8a9b 100644
--- a/web/src/views/modules/project/SoftwareTestOrder-AddOrUpdate.vue
+++ b/web/src/views/modules/project/SoftwareTestOrder-AddOrUpdate.vue
@@ -1,9 +1,9 @@
<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">
+ <el-form-item readonly label-width="50px" label="缂栧彿:" style="width: 99% ;margin-bottom:-5px">
<span>{{ dataForm.softwareTestOrder.code}}</span>
</el-form-item>
</div>
@@ -106,11 +106,7 @@
@cell-click="handleCellClick"
stripe>
<el-table-column prop="no" 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 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">
@@ -157,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>
@@ -230,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>
@@ -351,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>
@@ -377,6 +368,15 @@
</span>
</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>
@@ -415,6 +415,10 @@
testCost:'',
articleNature:'',
sampleStatus:'',
+ entrustSign:'',
+ entrustSignDate:'',
+ contractSign:'',
+ contractSignDate:''
},
project: {
code: '',
@@ -487,9 +491,14 @@
...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.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={}
@@ -514,8 +523,12 @@
// 琛ㄥ崟鎻愪氦
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(',')
+ 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) {
@@ -523,8 +536,12 @@
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(',')
+ 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(',')
+ }
}
}
}
@@ -627,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