From 3b4aa567f459bed6c961c757d8f89fa7f5aae9bc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=99=88=E6=81=92=E6=88=90?= <962704835@qq.com>
Date: Tue, 18 Nov 2025 11:48:03 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=9D=E7=95=99=E5=AD=A6=E7=B1=8D=E6=A0=B9?=
 =?UTF-8?q?=E6=8D=AE=E5=AF=B9=E5=BA=94=E8=A7=92=E8=89=B2=E6=9F=A5=E7=9C=8B?=
 =?UTF-8?q?=E5=AF=B9=E5=BA=94=E6=95=B0=E6=8D=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../enlistmentReserve/applicationForm.vue     | 69 -------------------
 .../enlistmentReserveApproval/index.vue       | 32 ++++++---
 .../enlistmentReserveAttach/index.vue         | 26 +++++--
 src/views/routine/enlistmentReserve/index.vue | 61 ++++++++++++----
 4 files changed, 92 insertions(+), 96 deletions(-)

diff --git a/src/views/routine/enlistmentReserve/applicationForm.vue b/src/views/routine/enlistmentReserve/applicationForm.vue
index c9680c1..cdb7a3d 100644
--- a/src/views/routine/enlistmentReserve/applicationForm.vue
+++ b/src/views/routine/enlistmentReserve/applicationForm.vue
@@ -361,66 +361,6 @@ export default {
           { required: true, message: '请选择提交日期', trigger: 'change' }
         ]
       },
-      counselorApproval: {
-        id: null,
-        applyId: null,
-        processInstanceId: '',
-        taskId: '',
-        nodeName: '辅导员',
-        approverId: null,
-        approverName: '',
-        approvalOpinion: '',
-        approvalResult: null,
-        approvalTime: ''
-      },
-      academicApproval: {
-        id: null,
-        applyId: null,
-        processInstanceId: '',
-        taskId: '',
-        nodeName: '学务',
-        approverId: null,
-        approverName: '',
-        approvalOpinion: '',
-        approvalResult: null,
-        approvalTime: ''
-      },
-      collegeApproval: {
-        id: null,
-        applyId: null,
-        processInstanceId: '',
-        taskId: '',
-        nodeName: '二级学院',
-        approverId: null,
-        approverName: '',
-        approvalOpinion: '',
-        approvalResult: null,
-        approvalTime: ''
-      },
-      studentStatusApproval: {
-        id: null,
-        applyId: null,
-        processInstanceId: '',
-        taskId: '',
-        nodeName: '学籍管理科',
-        approverId: null,
-        approverName: '',
-        approvalOpinion: '',
-        approvalResult: null,
-        approvalTime: ''
-      },
-      deanApproval: {
-        id: null,
-        applyId: null,
-        processInstanceId: '',
-        taskId: '',
-        nodeName: '教务处主管领导',
-        approverId: null,
-        approverName: '',
-        approvalOpinion: '',
-        approvalResult: null,
-        approvalTime: ''
-      },
       roleGroup: '',
       user: null,
       currentId: null // 用于存储当前接收的 id
@@ -518,16 +458,7 @@ export default {
 
           const submitData = {
             formData: this.formData,
-            approvals: [
-              this.counselorApproval,
-              this.academicApproval,
-              this.collegeApproval,
-              this.studentStatusApproval,
-              this.deanApproval
-            ].filter(item => item.approvalResult !== null)
           };
-
-          console.log('提交数据:', submitData);
           if (this.formData.id != null) {
             updateEnlistmentReserve(submitData.formData).then(response => {
               this.$modal.msgSuccess("修改成功");
diff --git a/src/views/routine/enlistmentReserve/enlistmentReserveApproval/index.vue b/src/views/routine/enlistmentReserve/enlistmentReserveApproval/index.vue
index 71dfc77..7e71f95 100644
--- a/src/views/routine/enlistmentReserve/enlistmentReserveApproval/index.vue
+++ b/src/views/routine/enlistmentReserve/enlistmentReserveApproval/index.vue
@@ -18,7 +18,7 @@
       <!-- <el-form-item label="审批人ID" prop="approverId">
         <el-input v-model="queryParams.approverId" placeholder="请输入审批人ID" clearable @keyup.enter.native="handleQuery" />
       </el-form-item> -->
-      <el-form-item label="审批人姓名" prop="approverName">
+      <el-form-item label="审批人姓名" prop="approverName" v-if="roleGroup.includes('管理员')">
         <el-input v-model="queryParams.approverName" placeholder="请输入审批人姓名" clearable
           @keyup.enter.native="handleQuery" />
       </el-form-item>
@@ -96,15 +96,15 @@
     <!-- 添加或修改保留学籍审批记录对话框 -->
     <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
       <el-form ref="form" :model="form" :rules="rules" label-width="80px">
-        <el-form-item label="申请表ID" prop="applyId">
+        <!-- <el-form-item label="申请表ID" prop="applyId">
           <el-input v-model="form.applyId" placeholder="请输入申请表ID" />
-        </el-form-item>
-        <el-form-item label="流程实例ID" prop="processInstanceId">
+        </el-form-item> -->
+        <!-- <el-form-item label="流程实例ID" prop="processInstanceId">
           <el-input v-model="form.processInstanceId" placeholder="请输入流程实例ID" />
         </el-form-item>
         <el-form-item label="Flowable任务ID" prop="taskId">
           <el-input v-model="form.taskId" placeholder="请输入Flowable任务ID" />
-        </el-form-item>
+        </el-form-item> -->
         <el-form-item label="审批节点" prop="nodeName">
           <el-input v-model="form.nodeName" placeholder="请输入审批节点" />
         </el-form-item>
@@ -136,7 +136,7 @@
 
 <script>
 import { listEnlistmentReserveApproval, getEnlistmentReserveApproval, delEnlistmentReserveApproval, addEnlistmentReserveApproval, updateEnlistmentReserveApproval } from "@/api/routine/enlistmentReserve/enlistmentReserveApproval";
-
+import { getUserProfile } from '@/api/system/user' // 获取当前登录用户
 export default {
   name: "EnlistmentReserveApproval",
   data() {
@@ -201,11 +201,13 @@ export default {
         approvalTime: [
           { required: true, message: "审批时间不能为空", trigger: "blur" }
         ]
-      }
+      },
+      roleGroup: '',
+      user: ''
     };
   },
   created() {
-    this.getList();
+    this.getUser();
   },
   methods: {
     /** 查询保留学籍审批记录列表 */
@@ -217,6 +219,20 @@ export default {
         this.loading = false;
       });
     },
+    getUser() {
+      getUserProfile().then(response => {
+        this.user = response.data
+        this.roleGroup = response.roleGroup;
+        // this.postGroup = response.postGroup;
+        if (this.roleGroup) {
+          if (!this.roleGroup.includes("管理员")) {
+            this.queryParams.approverName = this.user.nickName
+          }
+          this.getList()
+        }
+        
+      })
+    },
     // 取消按钮
     cancel() {
       this.open = false;
diff --git a/src/views/routine/enlistmentReserve/enlistmentReserveAttach/index.vue b/src/views/routine/enlistmentReserve/enlistmentReserveAttach/index.vue
index 77f6c05..07fefb0 100644
--- a/src/views/routine/enlistmentReserve/enlistmentReserveAttach/index.vue
+++ b/src/views/routine/enlistmentReserve/enlistmentReserveAttach/index.vue
@@ -1,8 +1,8 @@
 <template>
   <div class="app-container">
     <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
-      <el-form-item label="申请表ID" prop="applyId">
-        <el-input v-model="queryParams.applyId" placeholder="请输入申请表ID" clearable @keyup.enter.native="handleQuery" />
+      <el-form-item label="姓名" prop="studentName" v-if="!roleGroup.includes('学生')">
+        <el-input v-model="queryParams.studentName" placeholder="请输入姓名" clearable @keyup.enter.native="handleQuery" />
       </el-form-item>
       <el-form-item label="文件名" prop="fileName">
         <el-input v-model="queryParams.fileName" placeholder="请输入文件名" clearable @keyup.enter.native="handleQuery" />
@@ -96,7 +96,7 @@
 
 <script>
 import { listEnlistmentReserveAttach, getEnlistmentReserveAttach, delEnlistmentReserveAttach, addEnlistmentReserveAttach, updateEnlistmentReserveAttach } from "@/api/routine/enlistmentReserve/enlistmentReserveAttach";
-
+import { getUserProfile } from '@/api/system/user' // 获取当前登录用户
 export default {
   name: "EnlistmentReserveAttach",
   data() {
@@ -151,11 +151,13 @@ export default {
         createTime: [
           { required: true, message: "上传时间不能为空", trigger: "blur" }
         ]
-      }
+      },
+      roleGroup: '',
+      user: ''
     };
   },
   created() {
-    this.getList();
+    this.getUser();
   },
   methods: {
     /** 查询保留学籍申请附件（入伍通知书等）列表 */
@@ -167,6 +169,20 @@ export default {
         this.loading = false;
       });
     },
+    getUser() {
+      getUserProfile().then(response => {
+        this.user = response.data
+        this.roleGroup = response.roleGroup;
+        // this.postGroup = response.postGroup;
+        if (this.roleGroup) {
+          if (this.roleGroup.includes("学生")) {
+            this.queryParams.studentName = this.user.nickName
+          }
+          this.getList()
+        }
+        
+      })
+    },
     // 取消按钮
     cancel() {
       this.open = false;
diff --git a/src/views/routine/enlistmentReserve/index.vue b/src/views/routine/enlistmentReserve/index.vue
index 1a6a7f0..e5a05a8 100644
--- a/src/views/routine/enlistmentReserve/index.vue
+++ b/src/views/routine/enlistmentReserve/index.vue
@@ -1,7 +1,7 @@
 <template>
   <div class="app-container">
     <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
-      <el-form-item label="姓名" prop="studentName">
+      <el-form-item label="姓名" prop="studentName" v-if="!roleGroup.includes('学生')">
         <el-input v-model="queryParams.studentName" placeholder="请输入姓名" clearable @keyup.enter.native="handleQuery" />
       </el-form-item>
       <el-form-item label="民族" prop="nation">
@@ -123,9 +123,11 @@
       <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
         <template slot-scope="scope">
           <el-button size="mini" type="text" icon="el-icon-edit" @click="handleUpdate(scope.row)"
-            v-hasPermi="['routine:enlistmentReserve:edit']">修改</el-button>
+            v-hasPermi="['routine:enlistmentReserve:edit']" v-if="scope.row.applyStatus == 0">修改</el-button>
           <el-button size="mini" type="text" icon="el-icon-delete" @click="handleDelete(scope.row)"
-            v-hasPermi="['routine:enlistmentReserve:remove']">删除</el-button>
+            v-hasPermi="['routine:enlistmentReserve:remove']" v-if="scope.row.applyStatus == 0">删除</el-button>
+          <el-button v-if="scope.row.applyStatus == 1" size="mini" type="text" icon="el-icon-info"
+            @click="detail(scope.row)">详情</el-button>
         </template>
       </el-table-column>
     </el-table>
@@ -213,8 +215,8 @@
 </template>
 
 <script>
-import { listEnlistmentReserve, getEnlistmentReserve, delEnlistmentReserve, addEnlistmentReserve, updateEnlistmentReserve } from "@/api/routine/enlistmentReserve/enlistmentReserve";
-
+import { listEnlistmentReserve, getOwnInfo, delEnlistmentReserve, addEnlistmentReserve, updateEnlistmentReserve } from "@/api/routine/enlistmentReserve/enlistmentReserve";
+import { getUserProfile } from '@/api/system/user' // 获取当前登录用户
 export default {
   name: "EnlistmentReserve",
   dicts: ['rt_classes', 'rt_nation', 'rt_grade'],
@@ -307,11 +309,13 @@ export default {
         createTime: [
           { required: true, message: "提交时间不能为空", trigger: "blur" }
         ],
-      }
+      },
+      roleGroup: '',
+      user: ''
     };
   },
   created() {
-    this.getList();
+    this.getUser();
   },
   methods: {
     /** 查询应征入伍保留学籍申请列表 */
@@ -323,6 +327,26 @@ export default {
         this.loading = false;
       });
     },
+    getUser() {
+      getUserProfile().then(response => {
+        this.user = response.data
+        this.roleGroup = response.roleGroup;
+        // this.postGroup = response.postGroup;
+        if (this.roleGroup) {
+          if (this.roleGroup.includes("学生")) {
+            this.queryParams.studentName = this.user.nickName
+          } else if (this.roleGroup.includes("辅导员")) {
+            getOwnInfo().then(res => {
+              if (res.data) {
+                this.queryParams.teacherName = res.data.teacherName
+              }
+            })
+          }
+          this.getList()
+        }
+
+      })
+    },
     // 取消按钮
     cancel() {
       this.open = false;
@@ -429,17 +453,26 @@ export default {
       }, `enlistmentReserve_${new Date().getTime()}.xlsx`)
     },
     // 跳转申请表
-    openForm () {
+    openForm() {
       this.$router.push("/routine/enlistmentReserve/applicationForm")
-    }
+    },
+    detail(row) {
+      this.$router.push({
+        path: "/routine/enlistmentReserve/applicationForm",
+        query: { id: row.id } // 将 row.id 放在 query 中
+      })
+    },
   }
 };
 </script>
 
 <style scoped>
-  .text-ellipsis {
-    white-space: nowrap; /* 防止文本换行 */
-    overflow: hidden; /* 隐藏溢出的内容 */
-    text-overflow: ellipsis; /* 显示省略号 */
-  }
+.text-ellipsis {
+  white-space: nowrap;
+  /* 防止文本换行 */
+  overflow: hidden;
+  /* 隐藏溢出的内容 */
+  text-overflow: ellipsis;
+  /* 显示省略号 */
+}
 </style>