From 7adee41ff145c50e244e4565de4dbf5240c35e04 Mon Sep 17 00:00:00 2001
From: wente <329538422@qq.com>
Date: 星期二, 14 十一月 2023 17:47:14 +0800
Subject: [PATCH] 项目表
---
web/src/views/modules/project/SoftwareTestOrder-AddOrUpdate.vue | 57 ++++++++++++++++++++++++++++++++-------------------------
1 files changed, 32 insertions(+), 25 deletions(-)
diff --git a/web/src/views/modules/project/SoftwareTestOrder-AddOrUpdate.vue b/web/src/views/modules/project/SoftwareTestOrder-AddOrUpdate.vue
index 8635ab8..3e8bf73 100644
--- a/web/src/views/modules/project/SoftwareTestOrder-AddOrUpdate.vue
+++ b/web/src/views/modules/project/SoftwareTestOrder-AddOrUpdate.vue
@@ -102,7 +102,7 @@
琚祴浠跺強鍏朵粬鐩稿叧鐗╁搧娓呭崟
</div>
<div style="width: calc(100% - 120px);padding: 5px">
- <el-table class="el-software" height="230" border :data="dataForm.softwareTestOrderMeasuredList"
+ <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="搴忓彿"/>
@@ -330,7 +330,7 @@
浜や粯鐗╂竻鍗�
</div>
<div style="width: calc(100% - 120px);padding: 5px">
- <el-table class="el-software" height="230" border :data="dataForm.softwareTestOrderDeliverableList"
+ <el-table class="el-software" height="230" border :data="dataForm.deliverableList"
stripe>
<el-table-column type="index" align="center" width="80" label="搴忓彿"/>
<el-table-column prop="dictLabel" min-width="300" label="鍚嶇О"></el-table-column>
@@ -420,13 +420,12 @@
</el-form>
<template v-slot:footer>
- <el-button perm="project:view" type="primary">鎵撳嵃</el-button>
+ <zt-button v-if="dataForm.disabled" type="primary">鎵撳嵃</zt-button>
</template>
</zt-dialog>
</template>
<script>
-import {getYearMonDay} from '@/commonJS/common'
export default {
data() {
@@ -435,8 +434,24 @@
editingCell:null,
dataForm: {
id: null,
- testAgencyInfo: {},
projectId: null,
+ softwareTestOrder: {
+ optEnviron:'',
+ programLang:'',
+ testBasis:'',
+ testType1:'',
+ testType2:'',
+ testStandard:'',
+ startDate:'',
+ endDate:'',
+ testVenue:'',
+ otherRequire:'',
+ testDate:'',
+ deliveryDate:'',
+ testCost:'',
+ articleNature:'',
+ sampleStatus:'',
+ },
project: {
code: '',
creator: '',
@@ -458,28 +473,15 @@
softwareName: '',
softwareType: '',
tenantId: '',
- testLevel: '',
-
+ testLevel: ''
},
- softwareTestOrder: {},
- softwareTestOrderDeliverableList: [],
- softwareTestOrderMeasuredList: [],
+ deliverableList: [],
+ measuredList: [],
+ testAgencyInfo: {}
}
}
},
- computed: {
- getYear() {
- return getYearMonDay(this.dataForm.softwareTestOrder.startDate).year
- },
- getMon() {
- return getYearMonDay(this.dataForm.softwareTestOrder.startDate).month
- },
- getDay() {
- return getYearMonDay(this.dataForm.softwareTestOrder.startDate).day
- },
- },
methods: {
- getYearMonDay,
handleCellClick(row, column) {
this.editingCell = {row, column}
this.$nextTick(() => {
@@ -490,10 +492,11 @@
console.log(this.editingCell, 'this.editingCell')
},
- init2(data){
- this.dataForm.id = null
- this.dataForm.projectId = data.id
+ init(id,row){
+ this.dataForm.id = row.id
+ this.dataForm.projectId = row.projectId
this.getInfo()
+ console.log(this.dataForm.id,this.dataForm.projectId,'params params')
},
// 鑾峰彇淇℃伅
async getInfo() {
@@ -501,11 +504,15 @@
orderId: this.dataForm.id,
projectId: this.dataForm.projectId
}
+
let res = await this.$http.get(`/project/SoftwareTestOrder/getDto`, {params: params})
if (res.data) {
this.dataForm = {
...res.data
}
+ if(this.dataForm.softwareTestOrder === null){
+ this.dataForm.softwareTestOrder={}
+ }
}
console.log(this.dataForm, "this.dataForm")
},
--
Gitblit v1.9.1