From 2c89ccdc9e008060f8cd6608c9fcb014616987a3 Mon Sep 17 00:00:00 2001
From: zzw <wander.zheng@qq.com>
Date: 星期一, 20 十一月 2023 10:27:45 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
web/src/views/modules/project/SoftwareTestOrder.vue | 13 ++++++-------
1 files changed, 6 insertions(+), 7 deletions(-)
diff --git a/web/src/views/modules/project/SoftwareTestOrder.vue b/web/src/views/modules/project/SoftwareTestOrder.vue
index ac09575..431fa8f 100644
--- a/web/src/views/modules/project/SoftwareTestOrder.vue
+++ b/web/src/views/modules/project/SoftwareTestOrder.vue
@@ -36,7 +36,7 @@
<zt-table-column-dict prop="articleNature" width="120px" label="鐗╁搧鎬ц川" dict="article_nature"/>
<zt-table-column-handle :table="table" width="150px" edit-perm="project:update" delete-perm="project::delete">
<template v-slot="{ row }">
- <zt-table-button size="small" type="primary"
+ <zt-table-button size="small" v-show = "row.accessoryMap" type="primary"
@click="preview(row)">棰勮
</zt-table-button>
</template>
@@ -48,9 +48,8 @@
@refreshDataList="table.query"
@setProjectInfo="openAddWin">
</ProjectSelect>
+ <Preview ref="view" :pageMarkerfun="SoftwareTestOrder"></Preview>
</zt-table-wraper>
- <View ref="view22" :pageMarkerfun="SoftwareTestOrder">
- </View>
</div>
</el-card>
</template>
@@ -58,11 +57,12 @@
<script>
import AddOrUpdate from './SoftwareTestOrder-AddOrUpdate'
import ProjectSelect from "./Project-select.vue"
-import View from '@/views/pages/view.vue'
+import Preview from '@/views/pages/view'
export default {
data() {
return {
+ SoftwareTestOrder:'SoftwareTestOrder',
dataForm: {
testBasis: '',
testType: '',
@@ -74,7 +74,7 @@
components: {
AddOrUpdate,
ProjectSelect,
- View
+ Preview
},
methods: {
add() {
@@ -85,8 +85,7 @@
this.$refs.addOrUpdate.$refs.dialog.init(null, {id: null, projectId: row.id})
},
preview(row){
- console.log(row,'preview(row)');
- this.$refs.view22.setAccessoryFormatSingle(row)
+ this.$refs.view.openAccessoryFormatSingle(row)
}
}
}
--
Gitblit v1.9.1