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/Environ.vue | 33 +++++++++++++++++++++++++++------
1 files changed, 27 insertions(+), 6 deletions(-)
diff --git a/web/src/views/modules/project/Environ.vue b/web/src/views/modules/project/Environ.vue
index ae2bfb1..31489a1 100644
--- a/web/src/views/modules/project/Environ.vue
+++ b/web/src/views/modules/project/Environ.vue
@@ -1,25 +1,32 @@
<template>
<el-card shadow="never" class="aui-card--fill">
<div class="mod-project-environ}">
- <zt-table-wraper query-url="/project/Environ/page" delete-url="/project/Environ" v-slot="{ table }">
+ <zt-table-wraper query-url="/project/Environ/page" delete-url="/project/Environ" v-slot="{ table }" @dataLoaded="dataLoaded">
<el-form :inline="true" :model="dataForm" @keyup.enter.native="table.query()">
<el-form-item>
<el-input v-model="dataForm.code" placeholder="璇疯緭鍏ョ紪鍙�" clearable></el-input>
-
+
</el-form-item>
<el-form-item>
- <zt-button type="query" @click="table.query()"/>
+<!-- <zt-button type="query" @click="table.query()"/>-->
+ <zt-button type="primary" class="el-icon-edit" perm="project:add" @click="add()">鏂板</zt-button>
<zt-button type="add" perm="project:add" @click="table.editHandle()"/>
<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 align="center" type="selection" width="40"/>
<el-table-column prop="code" label="缂栧彿"/>
+ <el-table-column prop="softwareName" label="杞欢鍚嶇О"/>
+ <el-table-column prop="softwareIdentity" label="鏍囪瘑"/>
<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>
@@ -27,6 +34,7 @@
<script>
import AddOrUpdate from './Environ-AddOrUpdate'
+ import ProjectSelect from "./Project-select.vue"
export default {
data() {
return {
@@ -36,7 +44,20 @@
}
},
components: {
- AddOrUpdate
+ AddOrUpdate,
+ ProjectSelect
+ },
+ methods:{
+ dataLoaded(data){
+ console.log(data,'data daraList')
+ },
+ add() {
+ this.$refs.projectSelect.$refs.dialog.init("environ")
+ },
+ openAddWin(row) {
+ console.log(row.id, 'row.id')
+ this.$refs.addOrUpdate.$refs.dialog.init(null, {id: null, projectId: row.id})
+ },
}
}
</script>
--
Gitblit v1.9.1