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.vue | 13 +++++++------
1 files changed, 7 insertions(+), 6 deletions(-)
diff --git a/web/src/views/modules/project/SoftwareTestOrder.vue b/web/src/views/modules/project/SoftwareTestOrder.vue
index 7261028..823e5b2 100644
--- a/web/src/views/modules/project/SoftwareTestOrder.vue
+++ b/web/src/views/modules/project/SoftwareTestOrder.vue
@@ -17,7 +17,7 @@
</el-form-item>
<el-form-item>
<zt-button type="query" @click="table.query()"/>
- <zt-button type="add" perm="project:add" @click="table.editHandle()"/>
+<!-- <zt-button type="add" perm="project:add" @click="table.editHandle()"/>-->
<zt-button type="primary" class="el-icon-edit" perm="project:add" @click="add()">鏂板</zt-button>
<zt-button type="delete" perm="project:delete" @click="table.deleteHandle()"/>
</el-form-item>
@@ -26,7 +26,7 @@
<el-table-column type="selection" align="center" width="40"/>
<el-table-column prop="softwareName" label="杞欢鍚嶇О"/>
<el-table-column prop="code" label="濮旀墭鍗曠紪鍙�"/>
- <el-table-column prop="identity" label="椤圭洰鏍囪瘑"/>
+ <el-table-column prop="softwareIdentity" label="椤圭洰鏍囪瘑"/>
<zt-table-column-dict prop="testBasis" label="娴嬭瘯渚濇嵁" dict="test_basis"/>
<zt-table-column-dict prop="testStandard" width="370px" label="娴嬭瘯鏍囧噯" dict="test_standard"/>
<zt-table-column-dict prop="articleNature" label="鐗╁搧鎬ц川" dict="article_nature"/>
@@ -36,7 +36,7 @@
<add-or-update ref="addOrUpdate" @refreshDataList="table.query"/>
<ProjectSelect ref="projectSelect"
@refreshDataList="table.query"
- @setConstructionInfo="getConstructionInfo">
+ @setProjectInfo="openAddWin">
</ProjectSelect>
</zt-table-wraper>
@@ -64,10 +64,11 @@
},
methods:{
add(){
- this.$refs.projectSelect.$refs.dialog.init()
+ this.$refs.projectSelect.$refs.dialog.init("software_test_order")
},
- getConstructionInfo(row){
- this.$refs.addOrUpdate.$refs.dialog.init(row)
+ openAddWin(row){
+ console.log(row.id,'row.id')
+ this.$refs.addOrUpdate.$refs.dialog.init(row.id,row)
}
}
}
--
Gitblit v1.9.1