From 1d92d1ba80928578b54a9baba13e9c2cdd12d9e9 Mon Sep 17 00:00:00 2001
From: jinlin <jinlin>
Date: 星期三, 22 十一月 2023 14:20:53 +0800
Subject: [PATCH] Changes
---
web/src/views/modules/project/Environ.vue | 2 +-
web/src/views/modules/itemCirculatOrder/ItemCirculatOrder.vue | 22 ++++++++++++++++++++--
modules/mainPart/src/main/java/com/zt/life/modules/project/controller/EnvironController.java | 11 -----------
3 files changed, 21 insertions(+), 14 deletions(-)
diff --git a/modules/mainPart/src/main/java/com/zt/life/modules/project/controller/EnvironController.java b/modules/mainPart/src/main/java/com/zt/life/modules/project/controller/EnvironController.java
index 114e3c0..d0c3dd8 100644
--- a/modules/mainPart/src/main/java/com/zt/life/modules/project/controller/EnvironController.java
+++ b/modules/mainPart/src/main/java/com/zt/life/modules/project/controller/EnvironController.java
@@ -129,15 +129,4 @@
return Result.ok();
}
-
- @PostMapping("uploadDiagram")
- @ApiOperation("涓婁紶娴嬭瘯鐜鍥剧墖")
- @LogOperation("涓婁紶娴嬭瘯鐜鍥剧墖")
- public Result uploadDiagram(@RequestBody Long[] ids) {
- //鏁堥獙鏁版嵁
- AssertUtils.isArrayEmpty(ids, "id");
- environService.delete(ids);
-
- return Result.ok();
- }
}
diff --git a/web/src/views/modules/itemCirculatOrder/ItemCirculatOrder.vue b/web/src/views/modules/itemCirculatOrder/ItemCirculatOrder.vue
index e1c274a..89ea7e9 100644
--- a/web/src/views/modules/itemCirculatOrder/ItemCirculatOrder.vue
+++ b/web/src/views/modules/itemCirculatOrder/ItemCirculatOrder.vue
@@ -9,7 +9,7 @@
</el-form-item>
<el-form-item>
<zt-button type="query" @click="table.query()"/>
- <zt-button type="add" perm="itemCirculatOrder:add" @click="table.editHandle()"/>
+ <zt-button type="primary" class="el-icon-edit" perm="itemCirculatOrder:add" @click="add()">鏂板</zt-button>
<zt-button type="delete" perm="itemCirculatOrder:delete" @click="table.deleteHandle()"/>
</el-form-item>
</el-form>
@@ -20,6 +20,10 @@
</el-table>
<!-- 寮圭獥, 鏂板 / 淇敼 -->
<add-or-update @refreshDataList="table.query"/>
+ <ProjectSelect ref="projectSelect"
+ @refreshDataList="table.query"
+ @setProjectInfo="openAddWin">
+ </ProjectSelect>
</zt-table-wraper>
</div>
</el-card>
@@ -27,6 +31,7 @@
<script>
import AddOrUpdate from './ItemCirculatOrder-AddOrUpdate'
+ import ProjectSelect from "../project/Project-select";
export default {
data() {
return {
@@ -36,7 +41,20 @@
}
},
components: {
- AddOrUpdate
+ AddOrUpdate,
+ ProjectSelect
+ },
+ methods:{
+ dataLoaded(data){
+ console.log(data,'data daraList')
+ },
+ add() {
+ this.$refs.projectSelect.$refs.dialog.init("itemCirculatOrder")
+ },
+ openAddWin(row) {
+ console.log(row.id, 'row.id')
+ this.$refs.addOrUpdate.$refs.dialog.init(null, {id: null, projectId: row.id})
+ },
}
}
</script>
diff --git a/web/src/views/modules/project/Environ.vue b/web/src/views/modules/project/Environ.vue
index 182cdf1..89676ed 100644
--- a/web/src/views/modules/project/Environ.vue
+++ b/web/src/views/modules/project/Environ.vue
@@ -1,7 +1,7 @@
<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 }" @dataLoaded="dataLoaded">
+ <zt-table-wraper query-url="/project/Environ/page" delete-url="/project/Environ/deleteEnviron" 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>
--
Gitblit v1.9.1