From 0b71315791bd15a024afc774f8ce002e81e598b6 Mon Sep 17 00:00:00 2001
From: wanglei <wl2666675>
Date: Wed, 16 Jul 2025 08:35:08 +0800
Subject: [PATCH] =?UTF-8?q?=E7=94=9F=E6=88=90=E6=B1=87=E6=80=BB=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/components/RecursiveTree/index.vue    |   3 +-
 ruoyi-ui/src/views/kaohe/gather/index.vue     | 130 ++++++++++++++----
 2 files changed, 108 insertions(+), 25 deletions(-)

diff --git a/ruoyi-ui/src/components/RecursiveTree/index.vue b/ruoyi-ui/src/components/RecursiveTree/index.vue
index ed63293..ba89e22 100644
--- a/ruoyi-ui/src/components/RecursiveTree/index.vue
+++ b/ruoyi-ui/src/components/RecursiveTree/index.vue
@@ -1,6 +1,7 @@
 <template>
   <div class="tree-node">
     <div class="node-content">
+      <span style="margin-right: 5px;">▪{{ nodeData.code }} »</span>
       <el-input v-model="nodeData.title" placeholder="请输入标题名称" style="width: 250px;" v-if="isRoot"/>
       <el-input v-model="nodeData.title" placeholder="请输入标题名称" style="width: 250px;" v-if="nodeData.type1==='0'"/>
 
@@ -75,7 +76,7 @@ export default {
 
 <style scoped lang="scss">
 .tree-node {
-  margin-left: 35px;
+  margin-left: 30px;
   padding: 5px 0px 5px 5px;
   border-left: 1px solid #ccc;
 }
diff --git a/ruoyi-ui/src/views/kaohe/gather/index.vue b/ruoyi-ui/src/views/kaohe/gather/index.vue
index 2f4e907..58a071a 100644
--- a/ruoyi-ui/src/views/kaohe/gather/index.vue
+++ b/ruoyi-ui/src/views/kaohe/gather/index.vue
@@ -105,7 +105,7 @@
     />
 
     <!-- 添加或修改生成汇总对话框 -->
-    <el-dialog :title="title" :visible.sync="open" width="99%" append-to-body>
+    <el-dialog :title="title" :visible.sync="open" width="99%" append-to-body top="15px !important">
       <div style="min-height: 400px">
         <recursive-tree
           style="margin-left: 0px"
@@ -211,8 +211,9 @@ export default {
       // 是否显示弹出层
       open: false,
       treeData: {
-        hz_name: '',
-        data: []
+        title: '',
+        data: [],
+        code: '根',
       },
       // 查询参数
       queryParams: {
@@ -262,7 +263,8 @@ export default {
     reset() {
       this.treeData = {
         title: '',
-        data: []
+        data: [],
+        code: '根',
       }
     },
     /** 搜索按钮操作 */
@@ -299,28 +301,105 @@ export default {
     },
     /** 提交按钮 */
     submitForm() {
-      addGather(JSON.stringify(this.treeData)).then(response => {
-        this.$modal.msgSuccess("新增成功")
-        this.open = false
-        this.getList();
-      })
-      /*this.$refs["form"].validate(valid => {
-        if (valid) {
-          if (this.form.id != null) {
-            updateGather(this.form).then(response => {
-              this.$modal.msgSuccess("修改成功")
-              this.open = false
-              this.getList()
+      let obj={flag: true}
+      if(this.treeData.title===''||this.treeData.title===null){
+        obj.flag = false;
+        this.$alert(`【根】标题不能为空！`, `提示`, {
+          type: 'Danger'
+        })
+      } else if(this.treeData.data && this.treeData.data.length<1 ){
+        obj.flag = false;
+        this.$alert(`【根】级节点的子级不能为空，请添加子级节点！`, `提示`, {
+          type: 'Danger'
+        })
+      }
+      if(this.treeData.data && this.treeData.data.length>0){
+        let list = this.treeData.data;
+        let sumZb = 0
+        for (let i=0; i<list.length; i++){
+          if(list[i].zb){
+            sumZb += list[i].zb
+          }
+          if(list[i].type1==='0' && (list[i].title==='' || list[i].title===null) ){
+            this.$alert(`【${list[i].code}】标题不能为空`, `提示`, {
+              type: 'Danger'
             })
-          } else {
-            addGather(this.form).then(response => {
-              this.$modal.msgSuccess("新增成功")
-              this.open = false
-              this.getList()
+            obj.flag = false;
+            break;
+          }
+          if(list[i].type1!=='0' && (list[i].title==='' || list[i].title===null) ){
+            this.$alert(`【${list[i].code}】引用考核任务不能为空`, `提示`, {
+              type: 'Danger'
+            })
+            obj.flag = false;
+            break;
+          }
+          if(list[i].data && list[i].data.length < 1){
+            this.$alert(`【${list[i].code}】的子级不能为空，请添加子级节点！`, `提示`, {
+              type: 'Danger'
             })
+            obj.flag = false;
+            break;
+          }
+          if(i===(list.length-1) && sumZb!==1){
+            this.$alert(`【根】评分占比合计不等于1，请检查修改！`, `提示`, {
+              type: 'Danger'
+            })
+            obj.flag = false;
+            break;
+          }
+          if(list[i].data && list[i].data.length > 0){
+            this.msgFun(list[i].data,list[i].code,obj);
           }
         }
-      })*/
+      }
+      if(obj.flag){
+        addGather(JSON.stringify(this.treeData)).then(response => {
+          this.$modal.msgSuccess("新增成功")
+          this.open = false
+          this.getList();
+        })
+      }
+    },
+    msgFun(children, pNodeName, objFlag){
+      let list = children;
+      let sumZb = 0
+      for (let i=0; i<list.length; i++) {
+        if (list[i].zb) {
+          sumZb += list[i].zb
+        }
+        if (list[i].type1 === '0' && (list[i].title === '' || list[i].title === null)) {
+          this.$alert(`【${list[i].code}】标题不能为空`, `提示`, {
+            type: 'Danger'
+          })
+          objFlag.flag = false;
+          break;
+        }
+        if (list[i].type1 !== '0' && (list[i].title === '' || list[i].title === null)) {
+          this.$alert(`【${list[i].code}】引用考核任务不能为空`, `提示`, {
+            type: 'Danger'
+          })
+          objFlag.flag = false;
+          break;
+        }
+        if (list[i].data && list[i].data.length < 1) {
+          this.$alert(`【${list[i].code}】的子级不能为空，请添加子级节点！`, `提示`, {
+            type: 'Danger'
+          })
+          objFlag.flag = false;
+          break;
+        }
+        if (i === (list.length - 1) && sumZb !== 1) {
+          this.$alert(`【${ pNodeName }】评分占比合计不等于1，请检查修改！`, `提示`, {
+            type: 'Danger'
+          })
+          objFlag.flag = false;
+          break;
+        }
+        if(list[i].data && list[i].data.length > 0){
+          this.msgFun(list[i].data,list[i].code, objFlag);
+        }
+      }
     },
     /** 删除按钮操作 */
     handleDelete(row) {
@@ -342,8 +421,11 @@ export default {
       if (!parentNode.data) {
         this.$set(parentNode, 'data', [])
       }
+      let code = 'N' + new Date().getTime();
+
       if(type1==='0'){
         parentNode.data.push({
+          code: code,
           type1: type1,
           type: '0',
           title: null,
@@ -355,6 +437,7 @@ export default {
       }
       if(type1==='1'){
         parentNode.data.push({
+          code: code,
           type1: type1,
           type: '1',
           title: null,
@@ -365,6 +448,7 @@ export default {
       }
       if(type1==='2'){
         parentNode.data.push({
+          code: code,
           type1: type1,
           type: '1',
           title: null,
@@ -435,8 +519,6 @@ export default {
           }
         })
         this.khdf.tableHeader = btTabelTree;
-
-
       })
     },
     // 递归函数 设置prop参数