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

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>