From 1772fc5e211f9e9e0ab4cdc6c29b436aac178c2a Mon Sep 17 00:00:00 2001 From: jinlin <jinlin> Date: 星期五, 23 二月 2024 12:19:55 +0800 Subject: [PATCH] 修改 --- web/src/views/modules/project/SoftwareTestOrder.vue | 42 ++++++++++++++++++++++++++++-------------- 1 files changed, 28 insertions(+), 14 deletions(-) diff --git a/web/src/views/modules/project/SoftwareTestOrder.vue b/web/src/views/modules/project/SoftwareTestOrder.vue index d8888a3..0499a6f 100644 --- a/web/src/views/modules/project/SoftwareTestOrder.vue +++ b/web/src/views/modules/project/SoftwareTestOrder.vue @@ -1,7 +1,6 @@ <template> - <el-card shadow="never" class="aui-card--fill"> - <div class="mod-project-softwareTestOrder}"> - <zt-table-wraper query-url="/project/SoftwareTestOrder/page" delete-url="/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()"> <el-form-item> @@ -27,14 +26,20 @@ </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" align="center" width="40"/> - <el-table-column prop="softwareName" 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" 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-column :selectable="isCheckbox" type="selection" align="center" width="40"/> + <el-table-column prop="softwareName" width="250px" label="杞欢鍚嶇О"/> + <el-table-column prop="code" width="270" label="濮旀墭鍗曠紪鍙�"/> + <el-table-column prop="softwareIdentity" width="150px" label="椤圭洰鏍囪瘑"/> + <zt-table-column-dict prop="testBasis" width="150px" label="娴嬭瘯渚濇嵁" dict="test_basis"/> + <zt-table-column-dict prop="testStandard" min-width="420" label="娴嬭瘯鏍囧噯" dict="test_standard"/> + <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" v-show = "row.accessoryMap" type="primary" + @click="preview(row)">棰勮 + </zt-table-button> + </template> + </zt-table-column-handle> </el-table> <!-- 寮圭獥, 鏂板 / 淇敼 --> <add-or-update ref="addOrUpdate" @refreshDataList="table.query"/> @@ -42,19 +47,20 @@ @refreshDataList="table.query" @setProjectInfo="openAddWin"> </ProjectSelect> - + <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 Preview from '@/views/pages/view' export default { data() { return { + SoftwareTestOrder:'SoftwareTestOrder', dataForm: { testBasis: '', testType: '', @@ -65,16 +71,24 @@ }, components: { AddOrUpdate, - ProjectSelect + ProjectSelect, + Preview }, methods: { add() { this.$refs.projectSelect.$refs.dialog.init("software_test_order") }, + isCheckbox(row,index){ + return !(row.flowInfo && row.flowInfo.bizId); + }, openAddWin(row) { console.log(row.id, 'row.id') this.$refs.addOrUpdate.$refs.dialog.init(null, {id: null, projectId: row.id}) + }, + preview(row){ + this.$refs.view.openAccessoryFormatSingle(row) } } } </script> + -- Gitblit v1.9.1