招生

src/api/recruit/recruitplanmajor.ts

@@ -1,119 +0,0 @@
-import request from '/@/utils/request';
-
-/**
- * 获取列表
- * @param query
- */
-export const fetchList = (query?: any) => {
-	return request({
-		url: '/recruit/recruitplanmajor/page',
-		method: 'get',
-		params: query,
-	});
-};
-
-/**
- * 列表
- * @param query
- */
-export const list = (query?: any) => {
-	return request({
-		url: '/recruit/recruitplanmajor/list',
-		method: 'get',
-		params: query,
-	});
-};
-
-/**
- * 按统计获取列表
- * @param query
- */
-export const fetchListByStatic = (query?: any) => {
-	return request({
-		url: '/recruit/recruitplanmajor/fetchListByStatic',
-		method: 'get',
-		params: query,
-	});
-};
-
-/**
- * 按教育程度列表
- * @param query
- */
-export const listByEdu = (query?: any) => {
-	return request({
-		url: '/recruit/recruitplanmajor/listByEdu',
-		method: 'get',
-		params: query,
-	});
-};
-
-/**
- * 列表（城市）
- * @param query
- */
-export const listcz = (query?: any) => {
-	return request({
-		url: '/recruit/recruitplanmajor/listcz',
-		method: 'get',
-		params: query,
-	});
-};
-
-/**
- * 新增
- * @param obj
- */
-export const addObj = (obj: any) => {
-	return request({
-		url: '/recruit/recruitplanmajor',
-		method: 'post',
-		data: obj,
-	});
-};
-
-/**
- * 获取详情
- * @param id
- */
-export const getObj = (id: string | number) => {
-	return request({
-		url: `/recruit/recruitplanmajor/${id}`,
-		method: 'get',
-	});
-};
-
-/**
- * 获取城市计划
- * @param obj
- */
-export const getCityPlan = (obj?: any) => {
-	return request({
-		url: '/recruit/recruitplanmajor/getCityPlan',
-		method: 'get',
-		params: obj,
-	});
-};
-
-/**
- * 删除
- * @param id
- */
-export const delObj = (id: string | number) => {
-	return request({
-		url: `/recruit/recruitplanmajor/${id}`,
-		method: 'delete',
-	});
-};
-
-/**
- * 更新
- * @param obj
- */
-export const putObj = (obj: any) => {
-	return request({
-		url: '/recruit/recruitplanmajor',
-		method: 'put',
-		data: obj,
-	});
-};

src/api/recruit/recruitstudentplan.ts

@@ -18,7 +18,7 @@ export const fetchList = (query?: any) => {
  */
 export const addObj = (obj: any) => {
 	return request({
-		url: '/recruit/recruitstudentplan',
+		url: '/recruit/recruitstudentplan/add',
 		method: 'post',
 		data: obj,
 	});
@@ -30,8 +30,9 @@ export const addObj = (obj: any) => {
  */
 export const getObj = (id: string | number) => {
 	return request({
-		url: `/recruit/recruitstudentplan/${id}`,
+		url: `/recruit/recruitstudentplan/getById`,
 		method: 'get',
+		params: { id :id},
 	});
 };
 
@@ -41,8 +42,9 @@ export const getObj = (id: string | number) => {
  */
 export const delObj = (id: string | number) => {
 	return request({
-		url: `/recruit/recruitstudentplan/${id}`,
+		url: `/recruit/recruitstudentplan/deletById`,
-		method: 'delete',
+		method: 'post',
+		data: { id :id},
 	});
 };
 
@@ -52,8 +54,46 @@ export const delObj = (id: string | number) => {
  */
 export const putObj = (obj: any) => {
 	return request({
-		url: '/recruit/recruitstudentplan',
+		url: '/recruit/recruitstudentplan/edit',
-		method: 'put',
+		method: 'post',
 		data: obj,
 	});
 };
+
+
+
+/**
+ * 按教育程度列表
+ * @param query
+ */
+export const listByEdu = (query?: any) => {
+	return request({
+		url: '/recruit/recruitstudentplan/listByEdu',
+		method: 'get',
+		params: query,
+	});
+};
+
+/**
+ * 按学历列表	初中
+ * @param query
+ */
+export const listcz = (query?: any) => {
+	return request({
+		url: '/recruit/recruitstudentplan/listcz',
+		method: 'get',
+		params: query,
+	});
+};
+
+/**
+ * 列表
+ * @param query
+ */
+export const listPlanByCondition = (query?: any) => {
+	return request({
+		url: '/recruit/recruitstudentplan/listPlanByCondition',
+		method: 'get',
+		params: query,
+	});
+};

src/views/recruit/backSchoolCheckin/tabIndex.vue

@@ -239,11 +239,11 @@ import { useMessage, useMessageBox } from '/@/hooks/message'
 import { list } from '/@/api/recruit/recruitstudentplangroup'
 import { backPush, backSchoolStuPage, batchPushAll } from '/@/api/recruit/recruitstudentsignup'
 import { getDeptList } from '/@/api/basic/basicclass'
-import { list as planMajor } from '/@/api/recruit/recruitplanmajor'
+import { listPlanByCondition as planMajor } from '/@/api/recruit/recruitstudentplan'
 import { updateFs, updateAllFS } from '/@/api/finance/financenormalstu'
 import { getTypeValue } from '/@/api/admin/dict'
 // @ts-ignore
-import global from '@/components/tools/commondict'
+import global from '@/components/tools/commondict.vue'
 
 const StuCheckIn = defineAsyncComponent(() => import('./stu-check-in.vue'))
 

src/views/recruit/recruitImitateAdjustBatch/addMNStu.vue

@@ -99,7 +99,7 @@ import { ref, reactive, nextTick } from 'vue'
 import { ElNotification } from 'element-plus'
 import { addMNObj, getMNObj, putMNObj } from '@/api/recruit/recruitImitateAdjustBatch'
 import { getList } from "@/api/recruit/recruitstudentsignup"
-import { list as planMajor, listByEdu } from "@/api/recruit/recruitplanmajor"
+import { listPlanByCondition as planMajor, listByEdu } from "@/api/recruit/recruitstudentplan"
 
 // Emits
 const emit = defineEmits<{

src/views/recruit/recruitImitateAdjustBatch/mnTable.vue

@@ -131,7 +131,7 @@ import { useUserInfo } from '/@/stores/userInfo'
 import { useMessage, useMessageBox } from '/@/hooks/message'
 import { Plus, Edit, Delete } from '@element-plus/icons-vue'
 import { getMNStuList, delMNObj } from '@/api/recruit/recruitImitateAdjustBatch'
-import { list as planMajor } from "@/api/recruit/recruitplanmajor"
+import { listPlanByCondition as planMajor } from "@/api/recruit/recruitstudentplan"
 import { getTypeValue } from "@/api/admin/dict"
 // @ts-ignore
 import global from '@/components/tools/commondict'

src/views/recruit/recruitplanmajor/detaiform.vue

@@ -119,7 +119,7 @@
 <script setup lang="ts">
 import { ref, reactive, nextTick } from 'vue'
 import { ElNotification } from 'element-plus'
-import { addObj, getObj, putObj, getCityPlan } from '/@/api/recruit/recruitplanmajor'
+import { addObj, getObj, putObj } from '/@/api/recruit/recruitstudentplan'
 import { getDeptList } from '/@/api/basic/basicclass'
 import { list } from '/@/api/recruit/recruitstudentplangroup'
 import { getMajorNameList } from '/@/api/basic/major'
@@ -297,9 +297,9 @@ const init = (id: string | null) => {
       getObj(dataForm.id).then((response: any) => {
         Object.assign(dataForm, response.data)
         // 获取市平台对应年份下的招生计划
-        getCityPlan({ id: dataForm.id }).then((data: any) => {
+        // getCityPlan({ id: dataForm.id }).then((data: any) => {
-          cityPlanIdList.value = data.data
+        //   cityPlanIdList.value = data.data
-        })
+        // })
       })
     }
   })

src/views/recruit/recruitplanmajor/index.vue

@@ -176,7 +176,7 @@ import { BasicTableProps, useTable } from '/@/hooks/table'
 import { useMessage, useMessageBox } from '/@/hooks/message'
 import { useDict } from '/@/hooks/dict'
 import { list } from '/@/api/recruit/recruitstudentplangroup'
-import { fetchList, putObj, delObj } from '/@/api/recruit/recruitplanmajor'
+import { fetchList, putObj, delObj } from '/@/api/recruit/recruitstudentplan'
 import { getDeptList } from '/@/api/basic/basicclass'
 import { getMajorNameList } from '/@/api/basic/major'
 

src/views/recruit/recruitplanmajor/majorGroupByDept.vue

@@ -111,8 +111,7 @@
 import { ref, reactive } from 'vue'
 import { useMessage, useMessageBox } from '/@/hooks/message'
 import { ElNotification } from 'element-plus'
-import { list, delObj } from '/@/api/recruit/recruitplanmajor'
+import { listPlanByCondition as list, delObj ,putObj} from '/@/api/recruit/recruitstudentplan'
-import { putObj } from '/@/api/recruit/recruitstudentplan'
 import { fetchSecondTree } from '/@/api/basic/basicdept'
 import { getDicts } from "/@/api/admin/dict"
 

src/views/recruit/recruitprestudent/index.vue

@@ -196,7 +196,7 @@ import { useDict } from '/@/hooks/dict'
 import { useMessage, useMessageBox } from '/@/hooks/message'
 import { delObj, fetchList, sureDJ } from '/@/api/recruit/recruitprestudent'
 import { list } from '/@/api/recruit/recruitstudentplangroup'
-import { listcz } from '/@/api/recruit/recruitplanmajor'
+import { listcz } from '/@/api/recruit/recruitstudentplan'
 import { list as schoolListApi } from '/@/api/recruit/recruitstudentschool'
 import { getDeptListByLevelTwo } from '/@/api/basic/basicdept'
 

src/views/recruit/recruitstudentsignup/detaiform.vue

@@ -587,7 +587,7 @@ import { getObj, putObj } from '@/api/recruit/recruitstudentsignup'
 import { list as listByGroupId } from '@/api/recruit/recruitstudentschool'
 import { getDeptList } from "@/api/basic/basicclass"
 import { list } from "@/api/recruit/recruitstudentplangroup"
-import { listByEdu } from "@/api/recruit/recruitplanmajor"
+import { listByEdu } from "@/api/recruit/recruitstudentplan"
 import { getDictByType } from "@/api/contract/contract"
 import { areaList, areaSonList } from "@/api/recruit/recruitstudentschool"
 import { list as scoreList } from "@/api/recruit/recruitstudentplancorrectscoreconfig"

src/views/recruit/recruitstudentsignup/index.vue

@@ -533,7 +533,7 @@ import {defineAsyncComponent} from 'vue'
 // import global from '@/components/tools/commondict' // global 已废弃
 import { getLabelValue, getLabelValueByProps, getMajorLabelWithYears } from '/@/utils/dictLabel'
 import {getDeptList} from "/@/api/basic/basicclass";
-import {list as planMajor} from "/@/api/recruit/recruitplanmajor";
+import {listPlanByCondition as planMajor} from "/@/api/recruit/recruitstudentplan";
 import {getTypeValue, getDictsByTypes} from "/@/api/admin/dict";
 import {getUserListByRole} from "/@/api/admin/user";
 import {ROLE_CODE} from "/@/config/global";

src/views/recruit/recruitstudentsignup/indexClass.vue

@@ -447,7 +447,7 @@ import {
 } from '@/api/recruit/recruitstudentsignup'
 import global from '@/components/tools/commondict'
 import { getClassListByRole, getDeptList, queryAllClassByInfo } from "@/api/basic/basicclass"
-import { list as planMajor } from "@/api/recruit/recruitplanmajor"
+import {listPlanByCondition as planMajor} from "@/api/recruit/recruitstudentplan"
 import { getTypeValue } from "@/api/admin/dict"
 import { getUserListByRole } from "@/api/admin/user"
 import { ROLE_CODE } from "@/config/global"

src/views/recruit/recruitstudentsignup/list.vue

@@ -268,7 +268,6 @@ import { useMessage, useMessageBox } from '/@/hooks/message'
 import { list } from '/@/api/recruit/recruitstudentplangroup'
 import { fetchListStuDorm, yjOut, setFw, delFw, yjSend } from '/@/api/recruit/recruitstudentsignup'
 import { getDeptList } from '/@/api/basic/basicclass'
-import { list as planMajor } from '/@/api/recruit/recruitplanmajor'
 // @ts-ignore
 import global from '@/components/tools/commondict'
 

src/views/recruit/recruitstudentsignup/majorChange.vue

@@ -113,7 +113,7 @@ import { ElNotification } from 'element-plus'
 import { useMessageBox } from '/@/hooks/message'
 import { getObj, changeMajor } from '@/api/recruit/recruitstudentsignup'
 import { list } from "@/api/recruit/recruitstudentplangroup"
-import { listByEdu } from "@/api/recruit/recruitplanmajor"
+import { listByEdu } from "@/api/recruit/recruitstudentplan"
 import { getDictByType } from "@/api/contract/contract"
 import { list as scoreList } from "@/api/recruit/recruitstudentplancorrectscoreconfig"
 

src/views/recruit/recruitstudentsignup/static.vue

@@ -58,7 +58,7 @@ import { BasicTableProps, useTable } from '/@/hooks/table'
 import { useMessage } from '/@/hooks/message'
 import { useDict } from '/@/hooks/dict'
 import { list } from '/@/api/recruit/recruitstudentplangroup'
-import { fetchListByStatic, list as planMajor } from '/@/api/recruit/recruitplanmajor'
+import { fetchListByStatic, listPlanByCondition as planMajor } from '/@/api/recruit/recruitstudentplan'
 import { getDeptList } from '/@/api/basic/basicclass'
 // @ts-ignore
 import global from '/@/components/tools/commondict.vue'
@@ -135,7 +135,7 @@ const init = async () => {
 const handleExport = async () => {
   try {
     exportLoading.value = true
-    await downBlobFile('/recruit/recruitplanmajor/exportExcel', queryForm, '招生统计.xls')
+    await downBlobFile('/recruit/recruitstudentsignup/exportExcel', queryForm, '招生统计.xls')
   } catch (error: any) {
     message.error(error.msg || '导出失败')
   } finally {