Merge branch 'main' of http://47.112.118.149:10082/xgxt_sd/zhxg_pc

src/api/routine/enlistmentReserve/enlistmentReserveApproval.js

@@ -42,3 +42,13 @@ export function delEnlistmentReserveApproval(id) {
     method: 'post'
   })
 }
+
+
+// 新增保留学籍审批记录
+export function insertOrUpdateByStuAndApprover(data) {
+  return request({
+    url: '/routine/enlistmentReserveApproval/insertOrUpdateByStuAndApprover',
+    method: 'post',
+    data: data
+  })
+}

src/api/routine/enlistmentReserve/enlistmentReserveAttach.js

@@ -51,3 +51,12 @@ export function delEnlistmentReserveAttach(id) {
     method: 'post'
   })
 }
+
+// 删除保留学籍申请附件（入伍通知书等）
+export function deleteRtEnlistmentReserveAttachByFileNameAndStuName(query) {
+  return request({
+    url: '/routine/enlistmentReserveAttach/deleteRtEnlistmentReserve',
+    method: 'post',
+    params: query
+  })
+}

src/api/stuCQS/basedata/year.js

@@ -75,3 +75,12 @@ export function delYear(id) {
     method: 'post'
   })
 }
+
+//为学年分配标签
+export function assignTag(yearId,tag){
+  return request({
+    url:`/system/year/${yearId}/assign-tag`,
+    method: 'post',
+    params:{ tag: tag }
+  })
+}