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/baselineRelease/BaselineRelease.vue | 41 +++++++++++++++++++++++++++--------------
1 files changed, 27 insertions(+), 14 deletions(-)
diff --git a/web/src/views/modules/baselineRelease/BaselineRelease.vue b/web/src/views/modules/baselineRelease/BaselineRelease.vue
index 489de7f..d1b413e 100644
--- a/web/src/views/modules/baselineRelease/BaselineRelease.vue
+++ b/web/src/views/modules/baselineRelease/BaselineRelease.vue
@@ -1,7 +1,9 @@
<template>
- <el-card shadow="never" class="aui-card--fill">
- <div class="mod-baselineRelease-baselineRelease}">
- <zt-table-wraper query-url="/baselineRelease/BaselineRelease/page" delete-url="/baselineRelease/BaselineRelease" v-slot="{ table }">
+ <div class="fa-card-a">
+ <zt-table-wraper :dataForm="dataForm"
+ @dataLoaded="dataLoaded"
+ query-url="/baselineRelease/BaselineRelease/page"
+ delete-url="/baselineRelease/BaselineRelease/deleteBaseline" v-slot="{ table }">
<el-form :inline="true" :model="dataForm" @keyup.enter.native="table.query()">
<el-form-item>
<el-input v-model="dataForm.code" placeholder="璇疯緭鍏ュ熀绾垮彂甯冪紪鍙�" clearable></el-input>
@@ -18,19 +20,24 @@
<zt-button type="delete" perm="baselineRelease: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 v-loading="table.dataLoading" :data="table.dataList"
+ height="100px"
+ v-adaptive="{bottomOffset:70}"
+ border @selection-change="table.selectionChangeHandle">
+ <el-table-column :selectable="isCheckbox" align="center" type="selection" width="40"/>
<el-table-column prop="code" label="鍩虹嚎鍙戝竷缂栧彿"/>
- <el-table-column prop="softwareIdentity" label="椤圭洰鍚嶇О"/>
+ <el-table-column prop="softwareName" label="椤圭洰鍚嶇О"/>
<zt-table-column-dict prop="baselineType" label="鍩虹嚎绫诲瀷" dict="baseline_type"/>
<el-table-column prop="baselineName" label="鍩虹嚎鍚嶇О"/>
<el-table-column prop="baselineVersion" label="鍩虹嚎鐗堟湰"/>
- <template v-slot="{row}">
- <zt-table-button type="primary" @click="openEditWin(row)">淇敼</zt-table-button>
- </template>
+ <zt-table-column-handle :table="table" :hasEdit='false'>
+ <template v-slot="{row}">
+ <zt-table-button type="primary" v-if="(!(row.flowInfo && row.flowInfo.bizId)) && (!(pageCode==='plan' || pageCode==='explain' || pageCode==='record' || pageCode==='report'))" @click="openEditWin(row)">淇敼</zt-table-button>
+ </template>
+ </zt-table-column-handle>
</el-table>
<!-- 寮圭獥, 鏂板 / 淇敼 -->
- <add-or-update ref="addOrUpdate" @recall="table.query"/>
+ <add-or-update ref="addOrUpdate" @refreshDataList="table.query"/>
<ProjectSelect :pageCode="pageCode" ref="projectSelect"
@refreshDataList="table.query"
@setProjectInfo="openAddWin">
@@ -38,7 +45,6 @@
<Preview ref="view"></Preview>
</zt-table-wraper>
</div>
- </el-card>
</template>
<script>
@@ -53,6 +59,7 @@
code: '',
baselineType: '',
baselineName: '',
+ softwareName:'',
pageCode:this.$route.query.pageCode
}
}
@@ -68,17 +75,23 @@
Preview
},
methods: {
+ dataLoaded(data){
+ console.log(data,'data dataLoaded')
+ },
add() {
console.log(this.pageCode, 'this.pageCode')
this.$refs.projectSelect.$refs.dialog.init("baseline_release", {pageCode: this.pageCode})
+ },
+ isCheckbox(row,index){
+ return !(row.flowInfo && row.flowInfo.bizId);
},
openAddWin(projectRow) {
console.log(projectRow, 'openAddWin(projectRow) projectRow')
this.$refs.addOrUpdate.$refs.dialog.init(null, {id: null, projectId: projectRow.id, pageCode: this.pageCode})
},
- openEditWin(checkOrderRow){
- console.log(checkOrderRow,'openEditWin(checkOrderRow)')
- this.$refs.addOrUpdate.$refs.dialog.init(checkOrderRow.id, {id: checkOrderRow.id, projectId: checkOrderRow.projectId, pageCode: this.pageCode})
+ openEditWin(row){
+ console.log(row,'openEditWin(checkOrderRow)')
+ this.$refs.addOrUpdate.$refs.dialog.init(row.id, {id: row.id, projectId: row.projectId, pageCode: this.pageCode})
},
preview(row) {
this.$refs.view.openAccessoryFormatSingle(row)
--
Gitblit v1.9.1