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 | 31 ++++++++++++++++++++++++-------
1 files changed, 24 insertions(+), 7 deletions(-)
diff --git a/web/src/views/modules/project/SoftwareTestOrder.vue b/web/src/views/modules/project/SoftwareTestOrder.vue
index 4c42107..823e5b2 100644
--- a/web/src/views/modules/project/SoftwareTestOrder.vue
+++ b/web/src/views/modules/project/SoftwareTestOrder.vue
@@ -17,22 +17,28 @@
</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>
</el-form>
<el-table v-loading="table.dataLoading" :data="table.dataList" height="100px" v-adaptive="{bottomOffset:70}" border @selection-change="table.selectionChangeHandle">
- <el-table-column type="selection" width="40"/>
+ <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="code" label="濮旀墭鍗曠紪鍙�"/>
+ <el-table-column prop="softwareIdentity" label="椤圭洰鏍囪瘑"/>
<zt-table-column-dict prop="testBasis" label="娴嬭瘯渚濇嵁" dict="test_basis"/>
- <zt-table-column-dict prop="testStandard" label="娴嬭瘯鏍囧噯" dict="test_standard"/>
+ <zt-table-column-dict prop="testStandard" width="370px" label="娴嬭瘯鏍囧噯" dict="test_standard"/>
<zt-table-column-dict prop="articleNature" label="鐗╁搧鎬ц川" dict="article_nature"/>
<zt-table-column-handle :table="table" edit-perm="project:update" delete-perm="project::delete"/>
</el-table>
<!-- 寮圭獥, 鏂板 / 淇敼 -->
- <add-or-update @refreshDataList="table.query"/>
+ <add-or-update ref="addOrUpdate" @refreshDataList="table.query"/>
+ <ProjectSelect ref="projectSelect"
+ @refreshDataList="table.query"
+ @setProjectInfo="openAddWin">
+ </ProjectSelect>
+
</zt-table-wraper>
</div>
</el-card>
@@ -40,6 +46,7 @@
<script>
import AddOrUpdate from './SoftwareTestOrder-AddOrUpdate'
+ import ProjectSelect from "./Project-select.vue"
export default {
data() {
return {
@@ -52,7 +59,17 @@
}
},
components: {
- AddOrUpdate
+ AddOrUpdate,
+ ProjectSelect
+ },
+ methods:{
+ add(){
+ this.$refs.projectSelect.$refs.dialog.init("software_test_order")
+ },
+ openAddWin(row){
+ console.log(row.id,'row.id')
+ this.$refs.addOrUpdate.$refs.dialog.init(row.id,row)
+ }
}
}
</script>
--
Gitblit v1.9.1