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

src/api/dormitory/accommodations.js

@@ -0,0 +1,52 @@
+import request from '@/utils/request'
+
+// 查询外宿申请列表
+export function listAccommodations(query) {
+  return request({
+    url: '/dormitory/accommodations/list',
+    method: 'get',
+    params: query
+  })
+}
+
+// 查询外宿申请详细
+export function getAccommodations(id) {
+  return request({
+    url: '/dormitory/accommodations/' + id,
+    method: 'get'
+  })
+}
+
+// 新增外宿申请
+export function addAccommodations(data) {
+  return request({
+    url: '/dormitory/accommodations/add',
+    method: 'post',
+    data: data
+  })
+}
+
+// 修改外宿申请
+export function updateAccommodations(data) {
+  return request({
+    url: '/dormitory/accommodations/update',
+    method: 'post',
+    data: data
+  })
+}
+
+// 删除外宿申请
+export function delAccommodations(id) {
+  return request({
+    url: '/dormitory/accommodations/' + id,
+    method: 'post'
+  })
+}
+
+//获取学生住宿信息
+export function getStuDormitory(){
+   return request({
+    url: '/dormitory/accommodations/getStuDormitory',
+    method: 'get'
+  })
+}

src/api/dormitory/outsideAccommodation/outsideAccommodationApply.js

@@ -0,0 +1,68 @@
+import request from '@/utils/request'
+
+// 查询外宿申请列表
+export function listOutsideAccommodationApply(query) {
+  return request({
+    url: '/dormitory/outsideAccommodationApply/list',
+    method: 'get',
+    params: query
+  })
+}
+
+// 查询外宿申请详细
+export function getOutsideAccommodationApply(id) {
+  return request({
+    url: '/dormitory/outsideAccommodationApply/' + id,
+    method: 'get'
+  })
+}
+
+// 查询外宿申请详细
+export function getOutsideAccommodationApplyByProcessInstanceId(processInstanceId) {
+  return request({
+    url: '/dormitory/outsideAccommodationApply/process/' + processInstanceId,
+    method: 'get'
+  })
+}
+
+// 新增外宿申请
+export function addOutsideAccommodationApply(data) {
+  return request({
+    url: '/routine/enlistmentReserve/outsideAccommodationApply/add',
+    method: 'post',
+    data: data
+  })
+}
+
+// 修改外宿申请
+export function updateOutsideAccommodationApply(data) {
+  return request({
+    url: '/routine/enlistmentReserve/outsideAccommodationApply/update',
+    method: 'post',
+    data: data
+  })
+}
+
+// 删除外宿申请
+export function delOutsideAccommodationApply(id) {
+  return request({
+    url: '/dormitory/outsideAccommodationApply/' + id,
+    method: 'post'
+  })
+}
+
+export function getOwnInfo(){
+  return request({
+    url:'/comprehensive/stuInfoView/getOwnInfo',
+    method:'GET'
+  })
+}
+
+// 查询宿舍学生关联列表
+export function listStudent(query) {
+  return request({
+    url: '/dormitory/srs-dormitory-student/checkInInformation',
+    method: 'get',
+    params: query
+  })
+}

src/api/dormitory/outsideAccommodation/outsideAccommodationApproval.js

@@ -0,0 +1,44 @@
+import request from '@/utils/request'
+
+// 查询外宿申请审批记录列表
+export function listOutsideAccommodationApproval(query) {
+  return request({
+    url: '/dormitory/outsideAccommodationApproval/list',
+    method: 'get',
+    params: query
+  })
+}
+
+// 查询外宿申请审批记录详细
+export function getOutsideAccommodationApproval(id) {
+  return request({
+    url: '/dormitory/outsideAccommodationApproval/' + id,
+    method: 'get'
+  })
+}
+
+// 新增外宿申请审批记录
+export function addOutsideAccommodationApproval(data) {
+  return request({
+    url: '/dormitory/outsideAccommodationApproval/add',
+    method: 'post',
+    data: data
+  })
+}
+
+// 修改外宿申请审批记录
+export function updateOutsideAccommodationApproval(data) {
+  return request({
+    url: '/dormitory/outsideAccommodationApproval/update',
+    method: 'post',
+    data: data
+  })
+}
+
+// 删除外宿申请审批记录
+export function delOutsideAccommodationApproval(id) {
+  return request({
+    url: '/dormitory/outsideAccommodationApproval/' + id,
+    method: 'post'
+  })
+}

src/api/dormitory/outsideAccommodation/outsideAccommodationAttachment.js

@@ -0,0 +1,44 @@
+import request from '@/utils/request'
+
+// 查询外宿申请附件列表
+export function listOutsideAccommodationAttachment(query) {
+  return request({
+    url: '/dormitory/outsideAccommodationAttachment/list',
+    method: 'get',
+    params: query
+  })
+}
+
+// 查询外宿申请附件详细
+export function getOutsideAccommodationAttachment(id) {
+  return request({
+    url: '/dormitory/outsideAccommodationAttachment/' + id,
+    method: 'get'
+  })
+}
+
+// 新增外宿申请附件
+export function addOutsideAccommodationAttachment(data) {
+  return request({
+    url: '/dormitory/outsideAccommodationAttachment/add',
+    method: 'post',
+    data: data
+  })
+}
+
+// 修改外宿申请附件
+export function updateOutsideAccommodationAttachment(data) {
+  return request({
+    url: '/dormitory/outsideAccommodationAttachment/update',
+    method: 'post',
+    data: data
+  })
+}
+
+// 删除外宿申请附件
+export function delOutsideAccommodationAttachment(id) {
+  return request({
+    url: '/dormitory/outsideAccommodationAttachment/' + id,
+    method: 'post'
+  })
+}

src/api/routine/basic.js

@@ -1,5 +1,21 @@
 import request from '@/utils/request'
 
+// 根据流程编号查询数据
+// 根据学号查询信息
+export function getProcessId(processId) {
+  return request({
+    url: '/routine/basic/processId/' + processId,
+    method: 'get'
+  })
+}
+
+// 根据学号查询信息
+export function getStname(stName) {
+  return request({
+    url: '/routine/basic/name/' + stName,
+    method: 'get'
+  })
+}
 // 查询退伍复学申请列表
 export function listBasic(query) {
   return request({

src/api/stuCQS/basedata/class.js

@@ -40,7 +40,13 @@ export function getMajorsName() {
     method: 'get'
   })
 }
-
+//查询专业名称
+export function getOwnMajorName(){
+ return request({
+    url: '/system/majors/getOwnMajorName',
+    method: 'get'
+  })
+}
 
 // 查询班级信息详细
 export function getClass(classId) {

src/api/stuCQS/basedata/student.js

@@ -108,6 +108,13 @@ export function getStudent(stuId) {
     method: 'get'
   })
 }
+//获取登陆学生信息
+export function getLoginStudent() {
+  return request({
+    url: '/system/student/getLoginStudent',
+    method: 'get'
+  })
+}
 
 // 新增学生信息
 export function addStudent(data) {
@@ -143,7 +150,7 @@ export function listAllStudent(query) {
     params: query
   })
 }
-//统计各个名族有多少学生
+//统计各个民族有多少学生
 export function getSrsMZCount(){
   return request({
     url: '/system/student/getSrsMZCount',
@@ -218,7 +225,6 @@ export function getNotSchoolTotalCount(){
 
 }
 //统计各个年级各个专业的人数
-
 export function getMajorsCount(){
   return request({
     url: '/system/student/getMajorsCount',
@@ -227,7 +233,6 @@ export function getMajorsCount(){
 
 }
 //统计近5年的人数
-
 export function getFiveSchoolTotalCount(){
   return request({
     url: '/system/student/getFiveSchoolTotalCount',
@@ -240,3 +245,4 @@ export function getFiveSchoolTotalCount(){
 
 
 
+

src/api/zxj/apply.js

@@ -202,3 +202,11 @@ export function updateSignature(data) {
     data: data
   })
 }
+
+export function updateSqly(data) {
+  return request({
+    url: '/comprehensive/zxj/apply/updateSqly',
+    method: 'post',
+    data: data
+  })
+}