From 0b08d373869c91dda58dd0e33b13fe59688234f9 Mon Sep 17 00:00:00 2001
From: zzw <wander.zheng@qq.com>
Date: 星期三, 29 十一月 2023 17:03:54 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
web/src/views/modules/project/SoftwareTestOrder.vue | 19 ++++++-------------
1 files changed, 6 insertions(+), 13 deletions(-)
diff --git a/web/src/views/modules/project/SoftwareTestOrder.vue b/web/src/views/modules/project/SoftwareTestOrder.vue
index 8f912d7..80b448b 100644
--- a/web/src/views/modules/project/SoftwareTestOrder.vue
+++ b/web/src/views/modules/project/SoftwareTestOrder.vue
@@ -1,6 +1,5 @@
<template>
- <el-card shadow="never" class="aui-card--fill">
- <div class="mod-project-softwareTestOrder}">
+ <div class="fa-card-a">
<zt-table-wraper query-url="/project/SoftwareTestOrder/page" delete-url="/project/SoftwareTestOrder/deleteOrder"
v-slot="{ table }">
<el-form :inline="true" :model="dataForm" @keyup.enter.native="table.query()">
@@ -36,7 +35,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,16 +47,15 @@
@refreshDataList="table.query"
@setProjectInfo="openAddWin">
</ProjectSelect>
- <ViewAccessory ref="ViewAccessory" :pageMarkerfun="SoftwareTestOrder"></ViewAccessory>
+ <Preview ref="view" :pageMarkerfun="SoftwareTestOrder"></Preview>
</zt-table-wraper>
</div>
- </el-card>
</template>
<script>
import AddOrUpdate from './SoftwareTestOrder-AddOrUpdate'
import ProjectSelect from "./Project-select.vue"
-import ViewAccessory from '../../pages/view'
+import Preview from '@/views/pages/view'
export default {
data() {
@@ -74,7 +72,7 @@
components: {
AddOrUpdate,
ProjectSelect,
- ViewAccessory
+ Preview
},
methods: {
add() {
@@ -85,12 +83,7 @@
this.$refs.addOrUpdate.$refs.dialog.init(null, {id: null, projectId: row.id})
},
preview(row){
- // let _this = this
- console.log(row,'preview(row)')
-
- console.log(this.$refs.ViewAccessory)
- this.$refs.ViewAccessory.setAccessory(row)
-
+ this.$refs.view.openAccessoryFormatSingle(row)
}
}
}
--
Gitblit v1.9.1