From 7ce2d2cc98ee4ed0361d8376b8d49d567af7b268 Mon Sep 17 00:00:00 2001
From: jinlin <jinlin>
Date: 星期二, 21 十一月 2023 08:36:45 +0800
Subject: [PATCH] Changes
---
web/src/views/modules/project/SoftwareTestOrder-AddOrUpdate.vue | 38 ++++++++++++++++++++++----------------
1 files changed, 22 insertions(+), 16 deletions(-)
diff --git a/web/src/views/modules/project/SoftwareTestOrder-AddOrUpdate.vue b/web/src/views/modules/project/SoftwareTestOrder-AddOrUpdate.vue
index d0f482f..139e0ed 100644
--- a/web/src/views/modules/project/SoftwareTestOrder-AddOrUpdate.vue
+++ b/web/src/views/modules/project/SoftwareTestOrder-AddOrUpdate.vue
@@ -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">
@@ -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: '',
@@ -438,7 +442,6 @@
softwareType: '',
tenantId: '',
testLevel: '',
-
},
testAgencyInfo: {
agencyName:'',
@@ -640,6 +643,9 @@
.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;
}
--
Gitblit v1.9.1