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

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>