From 217ee4c54b5cedfe71e72249981ea79040811284 Mon Sep 17 00:00:00 2001
From: Gzx1999 <guozhengxin@kylinos.cn>
Date: Mon, 4 Dec 2023 16:11:31 +0800
Subject: [PATCH 1/2] PGTree support hide header

---
 frontend/src/components/PGTree.vue | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/frontend/src/components/PGTree.vue b/frontend/src/components/PGTree.vue
index 04703ec..e337ff3 100644
--- a/frontend/src/components/PGTree.vue
+++ b/frontend/src/components/PGTree.vue
@@ -1,6 +1,6 @@
 <template>
     <div>
-        <div class="header">
+        <div class="header" v-if="showHeader">
             <slot name="header"></slot>
         </div>
         <el-tree :data="department" :props="defaultProps" :show-checkbox="selectable" @node-click="onNodeClicked"
@@ -24,6 +24,11 @@ const props = defineProps({
         }
     },
 
+    // 是否显示header
+    showHeader: {
+        type: Boolean,
+        default: true,
+    },
     // 是否可选择节点
     selectable: {
         type: Boolean,
-- 
Gitee


From 5f6611b5730ff375de8d9227b4cb50c5b8b6c9df Mon Sep 17 00:00:00 2001
From: Gzx1999 <guozhengxin@kylinos.cn>
Date: Tue, 5 Dec 2023 15:31:34 +0800
Subject: [PATCH 2/2] update batch list after edit batch info

---
 frontend/src/views/Batch/Batch.vue                  | 5 ++---
 frontend/src/views/Batch/components/UpdateBatch.vue | 6 +++++-
 2 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/frontend/src/views/Batch/Batch.vue b/frontend/src/views/Batch/Batch.vue
index 8c4f23c..de91461 100644
--- a/frontend/src/views/Batch/Batch.vue
+++ b/frontend/src/views/Batch/Batch.vue
@@ -47,7 +47,7 @@
         </PGTable>
 
         <el-dialog title="编辑批次" v-model="showChangeBatchDialog">
-            <UpdateBatch :batchID="updateBatchID" />
+            <UpdateBatch :batchID="updateBatchID" @batchUpdated="updateBatchInfo" @close="showChangeBatchDialog = false" />
         </el-dialog>
     </div>
 </template>
@@ -116,9 +116,8 @@ function batchDelete() {
 
             deleteBatch({ BatchID: params }).then((resp: any) => {
                 if (resp.code === RespCodeOK) {
-                    ElMessage.success('批次删除成功')
-
                     updateBatchInfo()
+                    ElMessage.success('批次删除成功')
                 } else {
                     ElMessage.error("failed to delete batch: " + resp.msg)
                 }
diff --git a/frontend/src/views/Batch/components/UpdateBatch.vue b/frontend/src/views/Batch/components/UpdateBatch.vue
index e768891..4f017ef 100644
--- a/frontend/src/views/Batch/components/UpdateBatch.vue
+++ b/frontend/src/views/Batch/components/UpdateBatch.vue
@@ -13,12 +13,14 @@
 </template>
 
 <script lang="ts" setup>
-import { ref, defineProps } from "vue";
+import { ref, defineProps, defineEmits } from "vue";
 import { ElMessage } from 'element-plus';
 
 import { RespCodeOK } from "@/request/request";
 import { updateBatch } from "@/request/batch";
 
+const emits = defineEmits(["batchUpdated", "close"])
+
 const rules = {
     name: [{
         required: true,
@@ -46,6 +48,8 @@ function onUpdateBatch() {
                 Description: formData.value.description,
             }).then((resp: any) => {
                 if (resp.code == RespCodeOK) {
+                    emits('batchUpdated')
+                    emits('close')
                     ElMessage.success("update batch info success")
                 } else {
                     ElMessage.error("failed to update batch info:" + resp.msg)
-- 
Gitee