退伍复学表单数据显示

src/views/flowable/task/finished/detail/index.vue

@@ -376,6 +376,10 @@
                 </el-descriptions-item>
 
               <el-descriptions-item span="4" v-for="item in form.enlistmentReserveApprovalList" >
+
+
+
+                
                   <template slot="label"> {{ item.opinionType }} </template>
                   <div style="padding-top: 10px;">
                     {{ item.approvalOpinion || "暂无意见" }}
@@ -405,6 +409,216 @@
               </el-descriptions>
               <!-- 外宿申请表单 -->
               <div v-if="outsideAccommodationForm"><detailApply :formData="form" :isShwo="false"></detailApply></div>
+
+              <!-- 退伍复学表单 -->
+               <el-descriptions v-if="basicForm" class="margin-top" title="退伍复学申请表" :column="4" size="medium" border
+                style="width: 100%; ">
+
+                <el-descriptions-item>
+                  <template slot="label"> 姓名 </template>
+                  {{ form.stName }}
+                </el-descriptions-item>
+                <el-descriptions-item>
+                  <template slot="label"> 性别 </template>
+                  {{ form.sex }}
+                </el-descriptions-item>
+
+                <el-descriptions-item>
+                  <template slot="label"> 民族 </template>
+                  <!-- {{ form.nation }} -->
+                  <dict-tag :options="dict.type.rt_nation" :value="form.nations" />
+                </el-descriptions-item>
+                <el-descriptions-item>
+                  <template slot="label"> 年级 </template>
+                  {{ form.grade }}
+                </el-descriptions-item>
+                <el-descriptions-item>
+                  <template slot="label"> 班级 </template>
+                  {{ form.stClass }}
+                </el-descriptions-item>
+                <el-descriptions-item>
+                  <template slot="label"> 学号 </template>
+                  {{ form.stId }}
+                </el-descriptions-item>
+                <el-descriptions-item>
+                  <template slot="label"> 专业 </template>
+                  {{ form.majors }}
+                </el-descriptions-item>
+                <el-descriptions-item>
+                  <template slot="label"> 联系电话 </template>
+                  {{ form.datab }}
+                </el-descriptions-item>
+
+                <el-descriptions-item span="4">
+                  <template slot="label"> 申请理由 </template>
+                  <div style="padding-top: 10px; line-height: 1.8;">
+                    <p class="reason-text">本人于 {{ form.rwTime | formatDate }} 应征入伍，于 {{ form.dataa | formatDate }}
+                      日退役，退役后申请复学。</p>
+                    <p class="reason-text" v-if="form.conversion == 'Y'">是否申请转专业：（√）是 （）否</p>
+                    <p class="reason-text" v-else>是否申请转专业：（）是 （×）否</p>
+
+                    <p v-if="form.conversion === 'Y'" class="reason-text" style="color: red;">
+                      原年级和专业:__{{ form.maList.length > 0 ? form.maList[0].oldgrade : '' }}__{{ form.maList.length > 0 ?
+                        form.maList[0].oldmajor : '' }}__
+                      申请转入年级和专业：__{{ saveGradeName }}__{{ saveClassName }}__
+                    </p>
+
+                    <!-- 附件预览区域 -->
+                    <div style="margin: 10px 0; display: flex; gap: 10px; flex-wrap: wrap;">
+                      <image-preview v-if="form.maList.length > 0 && form.maList[0].proof" :src="form.maList[0].proof"
+                        :width="240" :height="160" />
+                      <image-preview v-if="form.maList.length > 0 && form.maList[0].idcard" :src="form.maList[0].idcard"
+                        :width="240" :height="160" />
+                      <image-preview v-if="form.maList.length > 0 && form.maList[0].material"
+                        :src="form.maList[0].material" :width="240" :height="160" />
+                    </div>
+
+                    <!-- 申请人信息 -->
+                    <div class="applicant-info right-align" style="padding: 20px 0 0 0;">
+                      <span>申请人：</span>
+                      {{ form.stName }}
+                      <span class="date-label" style="margin-left: 10px;">日期：</span>
+                      {{ form.times | formatDate }}
+                    </div>
+                  </div>
+                </el-descriptions-item>
+
+                <!-- 招生与就业处意见（仅转专业时显示） -->
+                <el-descriptions-item span="4" v-if="form.conversion === 'Y'">
+                  <template slot="label"> 招生与就业处意见 </template>
+                  <div style="padding-top: 10px; line-height: 1.8;">
+                    <p class="reason-text" style="color: red;">
+                      符合转专业条件，拟同意转入年级和专业：__{{ saveGradeName }}__{{ saveClassName }}__
+                    </p>
+                    <div class="signature-area right-align" style="padding: 10px 0 0 0;">
+                      <span>审批结果：</span>
+                      <el-select v-model="form.zsStatus" placeholder="" class="short-select" disabled
+                        style="width: 100px; margin: 0 5px;">
+                        <el-option label="重新审核" value="0"></el-option>
+                        <el-option label="通过" value="1"></el-option>
+                        <el-option label="退回" value="2"></el-option>
+                        <el-option label="驳回" value="3"></el-option>
+                      </el-select>
+                      <span class="date-label">签名：</span>
+                      {{ form.zsIdea || '无' }}
+                      <span class="date-label" style="margin-left: 10px;">日期：</span>
+                      {{ form.zsTime | formatDate }}
+                    </div>
+                  </div>
+                </el-descriptions-item>
+
+                <!-- 辅导员意见 -->
+                <el-descriptions-item span="4">
+                  <template slot="label"> 辅导员意见 </template>
+                  <div style="padding-top: 10px; line-height: 1.8;">
+                    {{ form.fdIdea || '暂无意见' }}
+                    <div class="signature-area right-align" style="padding: 10px 0 0 0;">
+                      <span>审批结果：</span>
+                      <el-select v-model="form.fdStatus" placeholder="待审核" class="short-select" disabled
+                        style="width: 100px; margin: 0 5px;">
+                        <el-option label="重新审核" value="0"></el-option>
+                        <el-option label="通过" value="1"></el-option>
+                        <el-option label="退回" value="2"></el-option>
+                        <el-option label="驳回" value="3"></el-option>
+                      </el-select>
+                      <span class="date-label">签名：</span>
+                      {{ form.fdQm || '无' }}
+                      <span class="date-label" style="margin-left: 10px;">日期：</span>
+                      {{ form.fdTime | formatDate }}
+                    </div>
+                  </div>
+                </el-descriptions-item>
+
+                <!-- 学务意见 -->
+                <el-descriptions-item span="4">
+                  <template slot="label"> 学务意见 </template>
+                  <div style="padding-top: 10px; line-height: 1.8;">
+                    {{ form.xwIdea || '暂无意见' }}
+                    <div class="signature-area right-align" style="padding: 10px 0 0 0;">
+                      <span>审批结果：</span>
+                      <el-select v-model="form.xwStatus" placeholder="待审核" class="short-select" disabled
+                        style="width: 100px; margin: 0 5px;">
+                        <el-option label="重新审核" value="0"></el-option>
+                        <el-option label="通过" value="1"></el-option>
+                        <el-option label="退回" value="2"></el-option>
+                        <el-option label="驳回" value="3"></el-option>
+                      </el-select>
+                      <span class="date-label">签名：</span>
+                      {{ form.xwQm || '无' }}
+                      <span class="date-label" style="margin-left: 10px;">日期：</span>
+                      {{ form.xwTime | formatDate }}
+                    </div>
+                  </div>
+                </el-descriptions-item>
+
+                <!-- 二级学院意见 -->
+                <el-descriptions-item span="4">
+                  <template slot="label"> 二级学院意见 </template>
+                  <div style="padding-top: 10px; line-height: 1.8;">
+                    {{ form.twoIdea || '暂无意见' }}
+                    <div class="signature-area right-align" style="padding: 10px 0 0 0;">
+                      <span>审批结果：</span>
+                      <el-select v-model="form.twoStatus" placeholder="待审核" class="short-select" disabled
+                        style="width: 100px; margin: 0 5px;">
+                        <el-option label="重新审核" value="0"></el-option>
+                        <el-option label="通过" value="1"></el-option>
+                        <el-option label="退回" value="2"></el-option>
+                        <el-option label="驳回" value="3"></el-option>
+                      </el-select>
+                      <span class="date-label">签名：</span>
+                      {{ form.erQm || '无' }}
+                      <span class="date-label" style="margin-left: 10px;">日期：</span>
+                      {{ form.twoTime | formatDate }}
+                    </div>
+                  </div>
+                </el-descriptions-item>
+
+                <!-- 学籍管理科意见 -->
+                <el-descriptions-item span="4">
+                  <template slot="label"> 学籍管理科意见 </template>
+                  <div style="padding-top: 10px; line-height: 1.8;">
+                    {{ form.xjIdea || '暂无意见' }}
+                    <div class="signature-area right-align" style="padding: 10px 0 0 0;">
+                      <span>审批结果：</span>
+                      <el-select v-model="form.xjglStatus" placeholder="待审核" class="short-select" disabled
+                        style="width: 100px; margin: 0 5px;">
+                        <el-option label="重新审核" value="0"></el-option>
+                        <el-option label="通过" value="1"></el-option>
+                        <el-option label="退回" value="2"></el-option>
+                        <el-option label="驳回" value="3"></el-option>
+                      </el-select>
+                      <span class="date-label">签名：</span>
+                      {{ form.xjQm || '无' }}
+                      <span class="date-label" style="margin-left: 10px;">日期：</span>
+                      {{ form.xjTime | formatDate }}
+                    </div>
+                  </div>
+                </el-descriptions-item>
+
+                <!-- 教务处主管领导意见 -->
+                <el-descriptions-item span="4">
+                  <template slot="label"> 教务处主管领导意见 </template>
+                  <div style="padding-top: 10px; line-height: 1.8;">
+                    {{ form.jwIdea || '暂无意见' }}
+                    <div class="signature-area right-align" style="padding: 10px 0 0 0;">
+                      <span>审批结果：</span>
+                      <el-select v-model="form.jwStatus" placeholder="待审核" class="short-select" disabled
+                        style="width: 100px; margin: 0 5px;">
+                        <el-option label="重新审核" value="0"></el-option>
+                        <el-option label="通过" value="1"></el-option>
+                        <el-option label="退回" value="2"></el-option>
+                        <el-option label="驳回" value="3"></el-option>
+                      </el-select>
+                      <span class="date-label">签名：</span>
+                      {{ form.jwQm || '无' }}
+                      <span class="date-label" style="margin-left: 10px;">日期：</span>
+                      {{ form.jwTime | formatDate }}
+                    </div>
+                  </div>
+                </el-descriptions-item>
+
+              </el-descriptions>
+
             </div>
           </el-col>
         </el-tab-pane>
@@ -470,6 +684,9 @@ import '@riophae/vue-treeselect/dist/vue-treeselect.css'
 import { getEnlistmentReserveByProcessInstanceId} from "@/api/routine/enlistmentReserve/enlistmentReserve";
 import { getOutsideAccommodationApplyByProcessInstanceId } from "@/api/dormitory/outsideAccommodation/outsideAccommodationApply";
 import detailApply from "@/views/dormitory/outsideAccommodation/outsideAccommodationApply/components/detailApply" // 外宿申请表详细
+import {getStname, getProcessId } from "@/api/routine/basic";
+import { listStudent, getClassName } from '@/api/stuCQS/basedata/student'
+import { listGrade } from '@/api/stuCQS/basedata/grade'
 
 export default {
   name: 'Record',
@@ -521,6 +738,7 @@ export default {
       quitSchoolForm: false, // 休学申请表单
       enlistmentReserveForm: false, // 入伍保留学籍表单
       outsideAccommodationForm: false, // 外宿申请表单
+      basicForm:false,//退伍复学表单
       form: {},
       // 学生基础信息
       stuInfo: {},
@@ -551,6 +769,9 @@ export default {
     } else if (this.category == 'outsideAccommodation') {
       this.outsideAccommodationForm = true
       this.getOutsideAccommodation(this.taskForm.procInsId)
+    }else if (this.category == '退伍复学') {
+      this.basicForm = true
+      this.getBasicApplication(this.taskForm.procInsId)
     }
     // 回显流程记录
     // 流程任务重获取变量表单
@@ -627,6 +848,55 @@ export default {
         this.form = res.data
       })
     },
+     // 退伍复学申请表单数据
+    getBasicApplication(procInsId) {
+      getProcessId(procInsId.toString()).then((res) => {
+        // console.log("后端返回原始数据：",res.data);
+        this.form = res.data
+        this.getClassNameList()
+        this.listGrade()
+      });
+    },
+     /** 获取班级名称列表 */
+    getClassNameList() {
+      getClassName().then(res => {
+        this.ClassNameList = res.data
+        // console.log(this.ClassNameList)
+        if (this.ClassNameList != null) {
+          this.ClassNameList.forEach(element => {
+            if (element.value == this.form.maList[0].data1) {
+              // console.log(element.label)
+              element.children.forEach(elementTwo => {
+                  if (elementTwo.value == this.form.maList[0].data2) {
+                    //  console.log(elementTwo.label)
+                    elementTwo.children.forEach(elementFree => {
+                      this.saveClassName = elementFree.label
+                      // console.log(elementFree.label)
+                    });
+                  }
+                });
+            }
+          });
+        }
+      })
+    },
+      /** 获取年级列表 */
+        async listGrade() {
+            try {
+                let res = await listGrade()
+                if (res.code == 200) {
+                    this.grade_list = [...res.rows]
+                    console.log(this.grade_list)
+                    this.grade_list.forEach(element => {
+                      if(element.gradeId == this.form.maList[0].newgrade){
+                          this.saveGradeName = element.gradeName
+                      }
+                    });
+                }
+            } catch (error) {
+                console.error('获取年级列表失败:', error)
+            }
+        },
     getStuInfo (stuNo) {
       getStuInfo(stuNo).then((res) => {
         if (res.code == 200) {

src/views/flowable/task/todo/detail/index.vue

@@ -907,6 +907,8 @@ import { getOutsideAccommodationApplyByProcessInstanceId, updateOutsideAccommoda
 import { listBasic, getBasic, delBasic, addBasic, updateBasic, getStname, getProcessId } from "@/api/routine/basic";
 import detailApply from "@/views/dormitory/outsideAccommodation/outsideAccommodationApply/components/detailApply" // 外宿申请表详细
 import { addOrUpdateAccommodationApproval } from "@/api/dormitory/outsideAccommodation/outsideAccommodationApproval";
+import { listStudent, getClassName } from '@/api/stuCQS/basedata/student'
+import { listGrade } from '@/api/stuCQS/basedata/grade'
 
 export default {
   name: 'Record',
@@ -944,6 +946,10 @@ export default {
       flowRecordList: [], // 流程流转数据
       formConfCopy: {},
       src: null,
+       // 班级名称
+      saveClassName:null,
+      // 年级名称
+      saveGradeName:null,
       rules: {
         penaltyNumber: [{ required: true, message: '请输入处分文号', trigger: 'blur' }],
         letterServiceContent: [{ required: true, message: '请输入送达书', trigger: 'blur' }],
@@ -1183,8 +1189,50 @@ export default {
       getStname(newName).then((res) => {
         // console.log("后端返回原始数据：",res.data);
         this.form = res.data
+        this.getClassNameList()
+        this.listGrade()
       });
     },
+     /** 获取班级名称列表 */
+    getClassNameList() {
+      getClassName().then(res => {
+        this.ClassNameList = res.data
+        // console.log(this.ClassNameList)
+        if (this.ClassNameList != null) {
+          this.ClassNameList.forEach(element => {
+            if (element.value == this.form.maList[0].data1) {
+              // console.log(element.label)
+              element.children.forEach(elementTwo => {
+                  if (elementTwo.value == this.form.maList[0].data2) {
+                    //  console.log(elementTwo.label)
+                    elementTwo.children.forEach(elementFree => {
+                      this.saveClassName = elementFree.label
+                      // console.log(elementFree.label)
+                    });
+                  }
+                });
+            }
+          });
+        }
+      })
+    },
+      /** 获取年级列表 */
+        async listGrade() {
+            try {
+                let res = await listGrade()
+                if (res.code == 200) {
+                    this.grade_list = [...res.rows]
+                    console.log(this.grade_list)
+                    this.grade_list.forEach(element => {
+                      if(element.gradeId == this.form.maList[0].newgrade){
+                          this.saveGradeName = element.gradeName
+                      }
+                    });
+                }
+            } catch (error) {
+                console.error('获取年级列表失败:', error)
+            }
+        },
 
     getStuInfo(stuNo) {
       getStuInfo(stuNo).then((res) => {
@@ -1368,16 +1416,15 @@ export default {
                 // updateBasic({stuId:this.form.stuId,fdStatus:"1",fdIdea:this.taskForm.comment}).then(response => {})
                 var stNameData = ''
                 let newName = this.startUser.split('-')[0].trim();
+                // console.log(this.taskForm.procInsId)
                 // 异步请求的回调内处理后续逻辑
                 getStname(newName).then(response => {
                   stNameData = response.data;
+                  
                   // console.log("这个是审批数据:", stNameData)
                   // console.log("stNameData.id:", stNameData.id);
                   // console.log("stNameData.newgrade" + stNameData.maList[0].data1)
                   // console.log("stNameData.newmajor" + stNameData.maList[0].data2)
-
-
-
                   // 招生与就业处
                   if (this.taskName == "招生与就业处") {
                     const currentFlowItem = this.flowRecordList.find(item => item.taskName === this.taskName);
@@ -1388,7 +1435,8 @@ export default {
                       // zsIdea: this.taskForm.comment,
                       zsTime: new Date(),
                       // zsIdea：字段缺失改为zsIdea字段
-                      zsIdea: assigneeName
+                      zsIdea: assigneeName,
+                      processId:this.taskForm.procInsId
                     }).then(response => {
                       this.$modal.msgSuccess(response.msg)
                     })
@@ -1404,7 +1452,8 @@ export default {
                       fdStatus: "1",
                       fdIdea: this.taskForm.comment,
                       fdTime: new Date(),
-                      fdQm: assigneeName
+                      fdQm: assigneeName,
+                      processId:this.taskForm.procInsId
                     }).then(response => {
                       this.$modal.msgSuccess(response.msg)
                     })

src/views/routine/dis/formSt.vue

@@ -205,7 +205,7 @@
             <td class="input-cell" colspan="8" rowspan="4">
               <!-- <el-input v-model="form.xwIdea" type="textarea" :rows="3" placeholder="请填写意见..."
                 class="opinion-textarea"></el-input> -->
-              {{ form.xwIdea }}
+              {{ form.xwIdea }}拟编入___
               <div class="signature-area right-align">
                 <span>审批结果：</span>
                 <el-select v-model="form.xwStatus" placeholder="待审核" class="short-select" disabled>