入伍保留学籍、外宿申请-审批人修改成电子签名

src/views/dormitory/outsideAccommodation/outsideAccommodationApply/components/detailApply.vue

@@ -182,13 +182,13 @@
                     </div>
                     <div
                       style="display: flex;justify-content: center;align-items: center;min-width: 130px;text-align: left;">
-                      <div>审批人： </div>
+                      <div>签名： </div>
                       <div>
-                        <!-- <el-image style="width: 100px; height: 50px; margin-left: 10px; border: 1px solid #eee"
-                          :src="baseUrl + renderData.studentPromiseSign"
-                          :preview-src-list="[baseUrl + renderData.studentPromiseSign]">
-                        </el-image> -->
-                        {{ item.approverName }}
+                        <el-image style="width: 100px; height: 50px; margin-left: 10px; border: 1px solid #eee"
+                          :src="baseUrl + item.signature"
+                          :preview-src-list="[baseUrl + item.signature]" :alt="item.approverName">
+                        </el-image>
+                        <!-- {{ item.approverName }} -->
                       </div>
                     </div>
                     <div style="margin-left: 10px;">日期： {{ item.approvalTime }}</div>

src/views/dormitory/outsideAccommodation/outsideAccommodationApply/index.vue

@@ -152,7 +152,7 @@
             v-hasPermi="['dormitory:outsideAccommodationApply:edit']"
             v-if="scope.row.status == 0 || getRejectInfo(scope.row.outsideAccommodationApprovals).isReject">修改</el-button>
           <el-button size="mini" type="text" icon="el-icon-delete" @click="handleDelete(scope.row)"
-            v-hasPermi="['dormitory:outsideAccommodationApply:remove']" v-if="scope.row.status == 0 && scope.row.processInstanceId == null">删除</el-button>
+            v-hasPermi="['dormitory:outsideAccommodationApply:remove']" v-if="scope.row.status == 0 || roleGroup.includes('管理员')">删除</el-button>
           <el-button v-if="scope.row.applyStatus != 0" size="mini" type="text" icon="el-icon-info"
             @click="detail(scope.row)">详情</el-button>
         </template>

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

@@ -387,7 +387,16 @@
                         <el-tag v-if="item.approvalResult == 1" type="success">通过</el-tag>
                         <el-tag v-else type="danger">驳回</el-tag>
                       </div>
-                      <div style="padding:  0 10px;">签名： {{ item.approverName }}</div>
+                      <div
+                        style="display: flex;justify-content: center;align-items: center;min-width: 130px;text-align: left;">
+                        <div>签名： </div>
+                        <div>
+                          <el-image style="width: 100px; height: 50px; margin-left: 10px; border: 1px solid #eee"
+                            :src="baseUrl + item.signature" :preview-src-list="[baseUrl + item.signature]"
+                            :alt="item.approverName">
+                          </el-image>
+                        </div>
+                      </div>
                       <div style="padding:  0 10px;">日期： {{ item.approvalTime }}</div>
                     </div>
                   </div>
@@ -405,6 +414,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 +689,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 +743,7 @@ export default {
       quitSchoolForm: false, // 休学申请表单
       enlistmentReserveForm: false, // 入伍保留学籍表单
       outsideAccommodationForm: false, // 外宿申请表单
+      basicForm:false,//退伍复学表单
       form: {},
       // 学生基础信息
       stuInfo: {},
@@ -551,6 +774,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 +853,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/myProcess/detail/index.vue

@@ -374,7 +374,16 @@
                         <el-tag v-if="item.approvalResult == 1" type="success">通过</el-tag>
                         <el-tag v-else type="danger">驳回</el-tag>
                       </div>
-                      <div style="padding:  0 10px;">签名： {{ item.approverName }}</div>
+                      <div
+                        style="display: flex;justify-content: center;align-items: center;min-width: 130px;text-align: left;">
+                        <div>签名： </div>
+                        <div>
+                          <el-image style="width: 100px; height: 50px; margin-left: 10px; border: 1px solid #eee"
+                            :src="baseUrl + item.signature" :preview-src-list="[baseUrl + item.signature]"
+                            :alt="item.approverName">
+                          </el-image>
+                        </div>
+                      </div>
                       <div style="padding:  0 10px;">日期： {{ item.approvalTime }}</div>
                     </div>
                   </div>

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

@@ -413,7 +413,16 @@
                         <el-tag v-if="item.approvalResult == 1" type="success">通过</el-tag>
                         <el-tag v-else type="danger">驳回</el-tag>
                       </div>
-                      <div style="padding:  0 10px;">签名： {{ item.approverName }}</div>
+                      <div
+                        style="display: flex;justify-content: center;align-items: center;min-width: 130px;text-align: left;">
+                        <div>签名： </div>
+                        <div>
+                          <el-image style="width: 100px; height: 50px; margin-left: 10px; border: 1px solid #eee"
+                            :src="baseUrl + item.signature" :preview-src-list="[baseUrl + item.signature]"
+                            :alt="item.approverName">
+                          </el-image>
+                        </div>
+                      </div>
                       <div style="padding:  0 10px;">日期： {{ item.approvalTime }}</div>
                     </div>
                   </div>
@@ -431,7 +440,9 @@
               </el-descriptions>
 
               <!-- 外宿申请表单 -->
-              <div v-if="outsideAccommodationForm"><detailApply :formData="form" :isShwo="false"></detailApply></div>
+              <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
@@ -739,7 +750,7 @@
             <h1>休学证明</h1>
             <h4>桂水电院 {{ form.quitYear }} 休字第 {{ form.quitNumber }}号</h4>
             <p>{{ form.stuName }},{{ form.gender }},{{ form.mz }},{{ form.birthday }}出生,{{ form.jg }}人,{{ form.className
-              }}学生,学号:{{ form.stuNo }}.该生于个人原因-{{ form.reasonApplying }},申请休学.经学校研究,同意休学,时间从{{ form.quitStartTime }}至{{
+            }}学生,学号:{{ form.stuNo }}.该生于个人原因-{{ form.reasonApplying }},申请休学.经学校研究,同意休学,时间从{{ form.quitStartTime }}至{{
                 form.quitEndTime }}.</p>
             <p>抄送:教务处、财务处、{{ form.departmentName }}</p>
             <div class="stamp">
@@ -907,6 +918,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 +957,10 @@ export default {
       flowRecordList: [], // 流程流转数据
       formConfCopy: {},
       src: null,
+      // 班级名称
+      saveClassName: null,
+      // 年级名称
+      saveGradeName: null,
       rules: {
         penaltyNumber: [{ required: true, message: '请输入处分文号', trigger: 'blur' }],
         letterServiceContent: [{ required: true, message: '请输入送达书', trigger: 'blur' }],
@@ -976,7 +993,8 @@ export default {
           variables: {},
           approvalOpinion: '', // 必须初始化，避免 null 报错
           approvalResult: '',
-          targetNodeName: ''
+          targetNodeName: '',
+          signature: ''
         },
         penaltyNumber: '',
         letterServiceContent: '',
@@ -1031,7 +1049,7 @@ export default {
       outsideAccommodationForm: false, // 外宿申请表单
       basicForm: false,//退伍复学表单
       BasicTestData: 0, // 新增：默认0，仅退回学生申请时改为1
-
+      user: [], // 当前登录用户
     }
   },
   created() {
@@ -1086,9 +1104,15 @@ export default {
       } else if (this.category == 'enlistmentReserve') {
         this.enlistmentReserveForm = true
         this.getEnlistmentReserve(this.taskForm.procInsId)
+        getUserProfile().then(res => {
+          this.user = res.data
+        })
       } else if (this.category == 'outsideAccommodation') {
         this.outsideAccommodationForm = true
         this.getOutsideAccommodation(this.taskForm.procInsId)
+        getUserProfile().then(res => {
+          this.user = res.data
+        })
       } else if (this.category == '退伍复学') {
         this.basicForm = true
         this.getBasicApplication(this.startUser)
@@ -1183,8 +1207,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) => {
@@ -1301,6 +1367,8 @@ export default {
       // this.completeOpen = true;
       // this.completeTitle = "流程审批";
       this.submitForm(null)
+      // 获取当前用户的签名，并赋值给this.taskForm.variables.signature传入监听器
+      this.taskForm.variables.signature = this.user.signature
     },
     /** 用户审批任务 */
     taskComplete() {
@@ -1361,23 +1429,22 @@ export default {
                 this.updateRtStuQuitSchool()
               } else if (this.category == 'enlistmentReserve') { // 是应征入伍保留学籍申请，才执行
                 if (this.taskName == '教务处主管领导审批') { // (最后一个领导审核完成之后，修改学生学籍状态, status：07是入伍保留学籍)
-                  updateStudent({ stuId: this.form.studentId, status: '07'}).then(response => { })
+                  updateStudent({ stuId: this.form.studentId, status: '07' }).then(response => { })
                 }
                 this.$modal.msgSuccess(response.msg)
               } else if (this.category == "退伍复学") {
                 // 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 +1455,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 +1472,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)
                     })
@@ -1666,23 +1735,23 @@ export default {
     },
 
 
-     // 监听退回节点选择变化
-  handleReturnNodeChange(val) {
-   // 1. 找到选中的节点
-  const selectedNode = this.returnTaskList.find(item => item.id === val);
-    if (!selectedNode) {
-      this.BasicTestData = 0;
-      return;
-    }
+    // 监听退回节点选择变化
+    handleReturnNodeChange(val) {
+      // 1. 找到选中的节点
+      const selectedNode = this.returnTaskList.find(item => item.id === val);
+      if (!selectedNode) {
+        this.BasicTestData = 0;
+        return;
+      }
 
-    // 2. 仅退伍复学场景 + 节点name是“学生申请” → testData=1
-    if (this.category === "退伍复学" && selectedNode.name === "学生申请") {
-      this.BasicTestData = 1;
-      // console.log("已选中学生申请，testData=", this.testData); // 调试
-    } else {
-      this.BasicTestData = 0;
-    }
-  },
+      // 2. 仅退伍复学场景 + 节点name是“学生申请” → testData=1
+      if (this.category === "退伍复学" && selectedNode.name === "学生申请") {
+        this.BasicTestData = 1;
+        // console.log("已选中学生申请，testData=", this.testData); // 调试
+      } else {
+        this.BasicTestData = 0;
+      }
+    },
 
     /** 可退回任务列表 */
     handleReturn() {
@@ -1711,7 +1780,7 @@ export default {
 
         else if (this.category == "退伍复学") {
 
-          console.log("数据",this.returnTaskList)
+          console.log("数据", this.returnTaskList)
           // updateBasic({stuId:this.form.stuId,fdStatus:"1",fdIdea:this.taskForm.comment}).then(response => {})
           var stNameData = ''
           // let newName = this.startUser.replace(/-/g, "");
@@ -2012,7 +2081,8 @@ export default {
           variables: {}, // 保留原有的嵌套 variables 结构（后端可能依赖）
           approvalOpinion: '', // 初始化审批意见为空白
           approvalResult: '', // 审批状态
-          targetNodeName: '' // 审批节点
+          targetNodeName: '', // 审批节点
+          signature: '' // 签名
         }
       } else {
         // 情况2：variables 已存在 → 保留原有字段，补充 approvalOpinion（无则添加，有则保留原值）
@@ -2020,74 +2090,73 @@ export default {
           ...this.taskForm.variables, // 展开原有所有字段（如 variables、其他自定义字段）
           approvalOpinion: this.taskForm.variables.approvalOpinion || '', // 兜底：若原有未定义则设为空白
           approvalResult: this.taskForm.variables.approvalResult || '',
-          targetNodeName: this.taskForm.variables.targetNodeName || ''
+          targetNodeName: this.taskForm.variables.targetNodeName || '',
+          signature: this.taskForm.variables.signature || '',
         }
       }
     },
     // 退回或驳回的时候生成入伍保留学籍申请审核
     taskReturnApproval(text) {
-      getUserProfile().then(res => {
-        let data = {
-          applyId: this.form.id,
-          processInstanceId: this.form.processInstanceId,
-          taskId: this.taskForm.taskId,
-          nodeName: this.taskName,
-          approverId: res.data.userId,
-          approverName: res.data.nickName,
-          approvalOpinion: this.taskForm.comment,
-          approvalResult: 2,
-          studentName: this.form.studentName,
-          studentNo: this.form.studentNo
-        }
-        // 生成审核记录
-        insertOrUpdateByStuAndApprover(data).then(ress => {
-          // 审核记录生成之后，判断退回或驳回是不是到学生申请，如果是则更新申请表状态
-          // if (text == '退回') {
-          //   let nodeName = ''
-          //   this.returnTaskList.forEach(element => {
-          //     if (element.id == this.taskForm.targetKey) { // 如果选中的节点id等于列表里面的id，就将节点名称获取到nodeName
-          //       nodeName = element.documentation
-          //     }
-          //   });
-          //   if (nodeName == '学生申请') {  // 如果退回选择的是学生节点更新申请表状态
-          //     this.form.applyStatus = 0
-          //     updateEnlistmentReserve(this.form).then(result => {
-          //       this.$modal.closeLoading()
-          //     })
-          //   }
-          // } else {
-          //   // 驳回
-          //   if (this.taskName == '辅导员审批') {  // 当前节点如果是辅导员审批，证明驳回就到了学生，所以更新申请表状态
-          //     this.form.applyStatus = 0
-          //     updateEnlistmentReserve(this.form).then(result => {
-          //       this.$modal.closeLoading()
-          //     })
-          //   }
-          // }
-          this.$modal.closeLoading()
-        })
+      let data = {
+        applyId: this.form.id,
+        processInstanceId: this.form.processInstanceId,
+        taskId: this.taskForm.taskId,
+        nodeName: this.taskName,
+        approverId: this.user.userId,
+        approverName: this.user.nickName,
+        approvalOpinion: this.taskForm.comment,
+        approvalResult: 2,
+        studentName: this.form.studentName,
+        studentNo: this.form.studentNo,
+        signature: this.user.signature
+      }
+      // 生成审核记录
+      insertOrUpdateByStuAndApprover(data).then(ress => {
+        // 审核记录生成之后，判断退回或驳回是不是到学生申请，如果是则更新申请表状态
+        // if (text == '退回') {
+        //   let nodeName = ''
+        //   this.returnTaskList.forEach(element => {
+        //     if (element.id == this.taskForm.targetKey) { // 如果选中的节点id等于列表里面的id，就将节点名称获取到nodeName
+        //       nodeName = element.documentation
+        //     }
+        //   });
+        //   if (nodeName == '学生申请') {  // 如果退回选择的是学生节点更新申请表状态
+        //     this.form.applyStatus = 0
+        //     updateEnlistmentReserve(this.form).then(result => {
+        //       this.$modal.closeLoading()
+        //     })
+        //   }
+        // } else {
+        //   // 驳回
+        //   if (this.taskName == '辅导员审批') {  // 当前节点如果是辅导员审批，证明驳回就到了学生，所以更新申请表状态
+        //     this.form.applyStatus = 0
+        //     updateEnlistmentReserve(this.form).then(result => {
+        //       this.$modal.closeLoading()
+        //     })
+        //   }
+        // }
+        this.$modal.closeLoading()
       })
     },
     // 退回或驳回的时候生成外宿申请审核
     taskReturnAccommodationApproval() {
-      getUserProfile().then(res => {
-        let data = {
-          applyId: this.form.id,
-          processInstanceId: this.form.processInstanceId,
-          applyNo: this.form.applyNo,
-          approvalNode: this.taskName,
-          approverId: res.data.userId,
-          approverName: res.data.nickName,
-          approvalOpinion: this.taskForm.comment,
-          approvalResult: 0,
-          studentName: this.form.studentName,
-          studentNo: this.form.studentNo
-        }
-        // 生成审核记录
-        addOrUpdateAccommodationApproval(data).then(ress => {
-          // 退回或者驳回生产审批记录之后，更新申请表里面的驳回信息
-          updateOutsideAccommodationApply({id: this.form.id, rejectReason: this.taskForm.comment})
-        })
+      let data = {
+        applyId: this.form.id,
+        processInstanceId: this.form.processInstanceId,
+        applyNo: this.form.applyNo,
+        approvalNode: this.taskName,
+        approverId: this.user.userId,
+        approverName: this.user.nickName,
+        approvalOpinion: this.taskForm.comment,
+        approvalResult: 0,
+        studentName: this.form.studentName,
+        studentNo: this.form.studentNo,
+        signature: this.user.signature
+      }
+      // 生成审核记录
+      addOrUpdateAccommodationApproval(data).then(ress => {
+        // 退回或者驳回生产审批记录之后，更新申请表里面的驳回信息
+        updateOutsideAccommodationApply({ id: this.form.id, rejectReason: this.taskForm.comment })
       })
     }
   },

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>

src/views/routine/enlistmentReserve/applicationForm.vue

@@ -83,7 +83,16 @@
                       <el-tag v-if="item.approvalResult == 1" type="success">通过</el-tag>
                       <el-tag v-else type="danger">驳回</el-tag>
                     </div>
-                    <div style="padding:  0 10px;">签名： {{ item.approverName }}</div>
+                    <div
+                        style="display: flex;justify-content: center;align-items: center;min-width: 130px;text-align: left;">
+                        <div>签名： </div>
+                        <div>
+                          <el-image style="width: 100px; height: 50px; margin-left: 10px; border: 1px solid #eee"
+                            :src="baseUrl + item.signature" :preview-src-list="[baseUrl + item.signature]"
+                            :alt="item.approverName">
+                          </el-image>
+                        </div>
+                      </div>
                     <div style="padding:  0 10px;">日期： {{ item.approvalTime }}</div>
                   </div>
                 </div>
@@ -372,7 +381,8 @@ export default {
         createTime: '',
         updateTime: '',
         remark: '',
-        affixId: null
+        affixId: null,
+        baseUrl: process.env.VUE_APP_BASE_API,
       },
       enlistmentReserveAttachList: [],
       formRules: {
@@ -595,7 +605,7 @@ export default {
           };
           if (this.formData.id != null) {
             updateEnlistmentReserve(submitData.formData).then(response => {
-              
+
               // 填写附件里面的申请编号
               this.enlistmentReserveAttachList.forEach(element => {
                 element.applyNo = this.formData.applyNo
@@ -608,12 +618,12 @@ export default {
               this.loading = false;
               this.$modal.msgSuccess("修改成功");
               this.goBack()
-              
+
             });
-            
+
           } else {
             addEnlistmentReserve(submitData.formData).then(response => {
-              
+
               // 申请表新增成功之后，进行附件的添加
               if (response.code == 200) {
                 // 填写附件里面的申请编号
@@ -691,7 +701,7 @@ export default {
             this.$message.success(`成功删除文件：${fileName}`);
           })
         }
-    } 
+    }
   }
 };
 </script>
@@ -887,4 +897,4 @@ export default {
     padding-bottom: 8px !important;
   }
 }
-</style>
+</style>

src/views/routine/enlistmentReserve/index.vue

@@ -135,7 +135,7 @@
           <el-button size="mini" type="text" icon="el-icon-edit" @click="handleUpdate(scope.row)"
             v-hasPermi="['routine:enlistmentReserve:edit']" v-if="scope.row.applyStatus == 0 || getRejectInfo(scope.row.enlistmentReserveApprovalList).isReject">修改</el-button>
           <el-button size="mini" type="text" icon="el-icon-delete" @click="handleDelete(scope.row)"
-            v-hasPermi="['routine:enlistmentReserve:remove']" v-if="scope.row.applyStatus == 0 && scope.row.processInstanceId == ''">删除</el-button>
+            v-hasPermi="['routine:enlistmentReserve:remove']" v-if="scope.row.applyStatus == 0 || roleGroup.includes('管理员')">删除</el-button>
           <el-button size="mini" type="text" icon="el-icon-info"
             @click="detail(scope.row)">详情</el-button>
         </template>