解决合并冲突

openhis-ui-vue3/src/api/gf/ratioApplicationRecord.js

@@ -0,0 +1,61 @@
+import request from '@/utils/request'
+
+// 查询比例调整申请记录分页
+export function getPage(query) {
+  return request({
+    url: '/nenu/gf-ratio-application-record/page',
+    method: 'get',
+    params: query
+  })
+}
+
+// 查询比例调整申请记录详情
+export function getDetail(id) {
+  return request({
+    url: `/nenu/gf-ratio-application-record/${id}`,
+    method: 'get'
+  })
+}
+
+// 创建比例调整申请
+export function add(gfRatioApplicationRecordDto) {
+  return request({
+    url: '/nenu/gf-ratio-application-record',
+    method: 'post',
+    data: gfRatioApplicationRecordDto
+  })
+}
+
+// 取消比例调整申请
+export function cancel(id) {
+  return request({
+    url: `/nenu/gf-ratio-application-record/${id}`,
+    method: 'delete'
+  })
+}
+
+// 处理比例调整申请
+export function process(gfRatioApplicationProcessDto) {
+  return request({
+    url: '/nenu/gf-ratio-application-record',
+    method: 'put',
+    data: gfRatioApplicationProcessDto
+  })
+}
+
+// 查询申请项目选择弹窗分页
+export function getDefinitionSelectPage(query) {
+  return request({
+    url: '/nenu/gf-ratio-application-record/definition-select-page',
+    method: 'get',
+    params: query
+  })
+}
+
+// 查询申请单打印列表
+export function getPrintList(ids) {
+  return request({
+    url: '/nenu/gf-ratio-application-record/print-list?ids='+ids,
+    method: 'get'
+  })
+}

openhis-ui-vue3/src/api/gf/ratioManage.js

@@ -0,0 +1,28 @@
+import request from '@/utils/request'
+
+// 查询大项比例列表
+export function getTypeRatioList() {
+  return request({
+    url: `/nenu/gf-ratio-manage/type-ratio-list`,
+    method: 'get'
+  })
+}
+
+// 保存大项比例列表
+export function saveTypeRatioList(gfTypeRatioSaveDto) {
+  return request({
+    url: '/nenu/gf-ratio-manage/type-ratio-list',
+    method: 'put',
+    data: gfTypeRatioSaveDto
+  })
+}
+
+// 查询单项比例分页
+export function getIndividualRatioPage(query) {
+  return request({
+    url: '/nenu/gf-ratio-manage/individual-ratio-page',
+    method: 'get',
+    params: query
+  })
+}
+

openhis-ui-vue3/src/api/gf/studentList.js

@@ -0,0 +1,44 @@
+import request from '@/utils/request'
+
+// 查询学生名单分页
+export function getPage(query) {
+  return request({
+    url: '/nenu/gf-student-list/page',
+    method: 'get',
+    params: query
+  })
+}
+
+// 查询学生名单详情
+export function getDetail(id) {
+  return request({
+    url: `/nenu/gf-student-list/${id}`,
+    method: 'get'
+  })
+}
+
+// 添加学生名单
+export function add(gfStudentListDto) {
+  return request({
+    url: '/nenu/gf-student-list',
+    method: 'post',
+    data: gfStudentListDto
+  })
+}
+
+// 编辑学生名单
+export function edit(gfStudentListDto) {
+  return request({
+    url: '/nenu/gf-student-list',
+    method: 'put',
+    data: gfStudentListDto
+  })
+}
+
+// 删除学生名单
+export function remove(id) {
+  return request({
+    url: `/nenu/gf-student-list/${id}`,
+    method: 'delete'
+  })
+}