From 99d20e69dc66ed1f17e3d34214bb5fe971fe7626 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=99=88=E6=81=92=E6=88=90?= <962704835@qq.com>
Date: Fri, 7 Nov 2025 12:20:47 +0800
Subject: [PATCH] =?UTF-8?q?=E5=BA=94=E5=BE=81=E5=85=A5=E4=BC=8D=E4=BF=9D?=
 =?UTF-8?q?=E7=95=99=E5=AD=A6=E7=B1=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../enlistmentReserve/applicationForm.vue     | 65 +++++++++++++++----
 src/views/routine/enlistmentReserve/index.vue |  3 +
 2 files changed, 55 insertions(+), 13 deletions(-)

diff --git a/src/views/routine/enlistmentReserve/applicationForm.vue b/src/views/routine/enlistmentReserve/applicationForm.vue
index 42b3462..3be6006 100644
--- a/src/views/routine/enlistmentReserve/applicationForm.vue
+++ b/src/views/routine/enlistmentReserve/applicationForm.vue
@@ -25,7 +25,10 @@
           <td class="label">民族</td>
           <td class="input-cell">
             <el-form-item prop="nation" class="form-item-custom">
-              <el-input v-model="formData.nation" placeholder="请输入民族" class="basic-input"></el-input>
+              <el-select v-model="formData.nation" placeholder="请选择民族">
+                <el-option v-for="dict in dict.type.rt_nation" :key="dict.value" :label="dict.label"
+                  :value="dict.value"></el-option>
+              </el-select>
             </el-form-item>
           </td>
           <td class="label">年级</td>
@@ -41,19 +44,22 @@
           <td class="label" rowspan="2">专业<br />名称</td>
           <td class="input-cell" colspan="3" rowspan="2">
             <el-form-item prop="major" class="form-item-custom">
-              <el-input v-model="formData.major" placeholder="请输入专业名称" class="major-input" type="textarea" :rows="3"></el-input>
+              <el-input v-model="formData.major" placeholder="请输入专业名称" class="major-input" type="textarea"
+                :rows="3"></el-input>
             </el-form-item>
           </td>
           <td class="label">学号</td>
           <td class="input-cell">
             <el-form-item prop="studentNo" class="form-item-custom">
-              <el-input v-model="formData.studentNo" placeholder="请输入学号" class="basic-input" type="textarea" :rows="3"></el-input>
+              <el-input v-model="formData.studentNo" placeholder="请输入学号" class="basic-input" type="textarea"
+                :rows="3"></el-input>
             </el-form-item>
           </td>
           <td class="label">班级</td>
           <td class="input-cell" colspan="2">
             <el-form-item prop="className" class="form-item-custom">
-              <el-input v-model="formData.className" placeholder="请输入班级" class="basic-input" type="textarea" :rows="3"></el-input>
+              <el-input v-model="formData.className" placeholder="请输入班级" class="basic-input" type="textarea"
+                :rows="3"></el-input>
             </el-form-item>
           </td>
         </tr>
@@ -64,7 +70,8 @@
           <td class="label" rowspan="2">家庭<br />地址</td>
           <td class="input-cell" colspan="5" rowspan="2">
             <el-form-item prop="familyAddress" class="form-item-custom">
-              <el-input v-model="formData.familyAddress" placeholder="请输入家庭地址" class="address-input" type="textarea" :rows="3"></el-input>
+              <el-input v-model="formData.familyAddress" placeholder="请输入家庭地址" class="address-input" type="textarea"
+                :rows="3"></el-input>
             </el-form-item>
           </td>
           <td class="label">家长联系电话</td>
@@ -108,7 +115,7 @@
         <tr></tr>
 
         <!-- 辅导员意见行 -->
-        <tr>
+        <tr v-if="!roleGroup.includes('学生')">
           <td class="label" rowspan="4">辅导员<br />意见</td>
           <td class="input-cell" colspan="8" rowspan="4">
             <el-input v-model="counselorApproval.approvalOpinion" type="textarea" :rows="3" placeholder="请填写辅导员意见..."
@@ -132,7 +139,7 @@
         <tr></tr>
 
         <!-- 学务意见行 -->
-        <tr>
+        <tr v-if="!roleGroup.includes('学生')">
           <td class="label" rowspan="4">学务<br />意见</td>
           <td class="input-cell" colspan="8" rowspan="4">
             <el-input v-model="academicApproval.approvalOpinion" type="textarea" :rows="3" placeholder="请填写学务意见..."
@@ -156,7 +163,7 @@
         <tr></tr>
 
         <!-- 二级学院意见行 -->
-        <tr>
+        <tr v-if="!roleGroup.includes('学生')">
           <td class="label" rowspan="4">二级学院意见</td>
           <td class="input-cell" colspan="8" rowspan="4">
             <el-input v-model="collegeApproval.approvalOpinion" type="textarea" :rows="3" placeholder="请填写二级学院意见..."
@@ -180,7 +187,7 @@
         <tr></tr>
 
         <!-- 学籍管理科意见行 -->
-        <tr>
+        <tr v-if="!roleGroup.includes('学生')">
           <td class="label" rowspan="5">学籍管理科<br />意见</td>
           <td class="input-cell" colspan="8" rowspan="5">
             <el-input v-model="studentStatusApproval.approvalOpinion" type="textarea" :rows="3"
@@ -206,7 +213,7 @@
         <tr></tr>
 
         <!-- 教务处主管领导意见行 -->
-        <tr>
+        <tr v-if="!roleGroup.includes('学生')">
           <td class="label" rowspan="4">教务处<br />主管领导意见</td>
           <td class="input-cell" colspan="8" rowspan="4">
             <el-input v-model="deanApproval.approvalOpinion" type="textarea" :rows="3" placeholder="请填写教务处主管领导意见..."
@@ -267,8 +274,11 @@
 </template>
 
 <script>
+import { listEnlistmentReserve, getEnlistmentReserve, delEnlistmentReserve, addEnlistmentReserve, updateEnlistmentReserve } from "@/api/routine/enlistmentReserve/enlistmentReserve";
+import { getUserProfile } from '@/api/system/user' // 获取当前登录用户
 export default {
   name: 'EnlistmentReserveForm',
+  dicts: ['rt_nation'],
   data() {
     return {
       formData: {
@@ -394,7 +404,9 @@ export default {
         approvalOpinion: '',
         approvalResult: null,
         approvalTime: ''
-      }
+      },
+      roleGroup: '',
+      user: null
     };
   },
   watch: {
@@ -408,7 +420,24 @@ export default {
       }
     }
   },
+  mounted() {
+    this.getUser()
+  },
   methods: {
+    // 获取当前登录信息
+    getUser() {
+      getUserProfile().then(response => {
+        this.user = response.data
+        this.roleGroup = response.roleGroup;
+        // this.postGroup = response.postGroup;
+        console.log(this.user);
+        if (this.user) {
+          this.formData.studentName = this.user.nickName
+          this.formData.gender = this.user.sex
+          this.formData.studentId = this.user.userId
+        }
+      })
+    },
     submitForm() {
       this.$refs.formRef.validate((valid) => {
         if (valid) {
@@ -432,7 +461,16 @@ export default {
           };
 
           console.log('提交数据:', submitData);
-          this.$message.success('提交成功！');
+          if (this.formData.id != null) {
+            updateEnlistmentReserve(submitData.formData).then(response => {
+              this.$modal.msgSuccess("修改成功");
+            });
+          } else {
+            addEnlistmentReserve(submitData.formData).then(response => {
+              this.$modal.msgSuccess("新增成功");
+            });
+          }
+          // this.$message.success('提交成功！');
         } else {
           this.$message.error('表单填写不完整，请检查！');
           return false;
@@ -473,7 +511,8 @@ export default {
 
 <style scoped>
 .application-form-container {
-  width: 100%;
+  width: 70%;
+  margin: auto;
   padding: 30px;
   box-sizing: border-box;
   font-family: "Source Han Sans CN", "PingFang SC", "Microsoft YaHei", sans-serif;
diff --git a/src/views/routine/enlistmentReserve/index.vue b/src/views/routine/enlistmentReserve/index.vue
index 7b24a5a..8c6e588 100644
--- a/src/views/routine/enlistmentReserve/index.vue
+++ b/src/views/routine/enlistmentReserve/index.vue
@@ -182,6 +182,9 @@
         <el-form-item label="批文号" prop="approvalNo">
           <el-input v-model="form.approvalNo" placeholder="请输入批文号" />
         </el-form-item>
+        <el-form-item label="状态" prop="applyStatus">
+          <el-input v-model="form.applyStatus" placeholder="请输入批文号" />
+        </el-form-item>
       </el-form>
       <div slot="footer" class="dialog-footer">
         <el-button type="primary" @click="submitForm">确 定</el-button>