From 33880145617845479c6e3ba9d069eb9935d8d2ce Mon Sep 17 00:00:00 2001
From: zzw <wander.zheng@qq.com>
Date: 星期二, 14 十一月 2023 16:27:06 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
web/src/views/modules/project/SoftwareTestOrder-AddOrUpdate.vue | 17 +++--------------
1 files changed, 3 insertions(+), 14 deletions(-)
diff --git a/web/src/views/modules/project/SoftwareTestOrder-AddOrUpdate.vue b/web/src/views/modules/project/SoftwareTestOrder-AddOrUpdate.vue
index c7e5be6..8635ab8 100644
--- a/web/src/views/modules/project/SoftwareTestOrder-AddOrUpdate.vue
+++ b/web/src/views/modules/project/SoftwareTestOrder-AddOrUpdate.vue
@@ -392,18 +392,7 @@
<span>{{ dataForm.write }}</span>
</div>
<div class="el-flex">
- <div style="width: 60px;text-align: center">
- {{ getYearMonDay(dataForm.softwareTestOrder.startDate).year }}
- </div>
- 骞�
- <div style="width: 40px;text-align: center">
- {{ getYearMonDay(dataForm.softwareTestOrder.startDate).month }}
- </div>
- 鏈�
- <div style="width: 40px;text-align: center">
- {{ getYearMonDay(dataForm.softwareTestOrder.startDate).day }}
- </div>
- 鏃�
+ {{ dataForm.softwareTestOrder.deliveryDate | filterTime('YYYY骞碝M鏈圖D鏃�') }}
</div>
</div>
</div>
@@ -460,7 +449,7 @@
entrustUnitContWay: '',
entrustUnitContact: '',
entrustUnitName: '',
- identity: '',
+ softwareIdentity: '',
isContract: '',
projectLeader: '',
projectReviewer: '',
@@ -501,7 +490,7 @@
console.log(this.editingCell, 'this.editingCell')
},
- init(data){
+ init2(data){
this.dataForm.id = null
this.dataForm.projectId = data.id
this.getInfo()
--
Gitblit v1.9.1