1

src/api/recruit/recruitImitateAdjustBatch.ts

@@ -76,8 +76,9 @@ export const getMNObj = (id: string | number) => {
  */
 export const delObj = (id: string | number) => {
 	return request({
-		url: `/recruit/recruitImitateAdjustBatch/${id}`,
+		url: `/recruit/recruitImitateAdjustBatch/delete`,
-		method: 'delete',
+		method: 'post',
+		data: { id:id }
 	});
 };
 
@@ -87,8 +88,9 @@ export const delObj = (id: string | number) => {
  */
 export const delMNObj = (id: string | number) => {
 	return request({
-		url: `/recruit/recruitImitateAdjustBatch/delMNObj/${id}`,
+		url: `/recruit/recruitImitateAdjustBatch/delMNObj`,
-		method: 'delete',
+		method: 'post',
+		data: { id:id }
 	});
 };
 

src/api/recruit/recruitfile.ts

@@ -1,10 +1,19 @@
 import request from '/@/utils/request';
 
 
-export const makeExportTeacherInfoBySelfTask = (data?: any) => {
+export const exportPreStuSuccess = (data?: any) => {
     return request({
         url: '/recruit/file/exportPreStuSuccess',
         method: 'post',
         data: data,
     });
 };
+
+
+export const exportAdjustExcel = (data?: any) => {
+    return request({
+        url: '/recruit/file/exportAdjustExcel',
+        method: 'post',
+        data: data,
+    });
+};

src/views/recruit/recruitImitateAdjustBatch/addMNStu.vue

@@ -177,7 +177,7 @@ const remoteTeacherByQuery = (query: string) => {
   serialNumberList.value = []
   if (query !== '') {
     setTimeout(() => {
-      getList({ groupId: dataForm.groupId, name: query }).then((response: any) => {
+      getList({ groupId: dataForm.groupId, serialNumber: query }).then((response: any) => {
         serialNumberList.value = response.data
       })
     }, 200)

src/views/recruit/recruitImitateAdjustBatch/index.vue

@@ -85,7 +85,8 @@
               type="warning"
               link
               icon="Download"
-              @click="handleExport(scope.row.batchCode, scope.row.groupId)"
+              :loading="btnLoading"
+              @click="handleExport(scope.row)"
             >
               导出模拟结果
             </el-button>
@@ -132,6 +133,7 @@ import { BasicTableProps, useTable } from '/@/hooks/table'
 import { useMessage, useMessageBox } from '/@/hooks/message'
 import { getList } from '/@/api/recruit/recruitstudentplangroup'
 import { delObj, fetchList } from '/@/api/recruit/recruitImitateAdjustBatch'
+import {exportAdjustExcel} from "/@/api/recruit/recruitfile"
 
 const TableForm = defineAsyncComponent(() => import('./detaiform.vue'))
 const MnTable = defineAsyncComponent(() => import('./mnTable.vue'))
@@ -204,17 +206,14 @@ const showTable = (batchNo: string, groupId: string) => {
   })
 }
 
+const btnLoading=ref(false)
 // 导出模拟结果
-const handleExport = async (code: string, gid: string) => {
+const handleExport = async (data:any) => {
-  try {
+  btnLoading.value=true
-    await downBlobFile(
+  exportAdjustExcel(data).then((res:any)=>{
-      '/recruit/recruitImitateAdjustBatch/exportExcel',
+    messageBox.success('导出后台执行中,请稍后查看下载任务')
-      { batchNo: code, groupId: gid },
+    btnLoading.value=false
-      '招生模拟统计.xls'
+  })
-    )
-  } catch (error: any) {
-    message.error(error.msg || '导出失败')
-  }
 }
 
 // 删除

src/views/recruit/recruitImitateAdjustBatch/mnTable.vue

@@ -3,7 +3,7 @@
     title="模拟列表"
     :close-on-click-modal="false"
     v-model="visible"
-    width="80%"
+    width="98%"
   >
     <el-form :inline="true">
       <el-form-item>
@@ -109,6 +109,7 @@
         <el-table-column
           header-align="center"
           align="center"
+          min-width="200"
           label="操作">
           <template #default="scope">
             <el-button v-if="hasAuth('recruit_recruitImitateAdjustBatch_edit')" type="text" size="small" :icon="Edit" @click="addOrUpdateHandle(scope.row.id)">修改</el-button>

src/views/recruit/recruitplanmajor/index.vue

@@ -79,6 +79,15 @@
 				</el-table-column>
 				<el-table-column prop="majorCode" label="专业序号" align="center" show-overflow-tooltip />
 				<el-table-column prop="majorName" label="专业名称" align="center" show-overflow-tooltip />
+				<el-table-column prop="majorName" label="规范专业名称" align="center" show-overflow-tooltip >
+          <template #default="scope">
+            <span v-if="scope.row.standardMajorName">
+                  {{ scope.row.standardMajorName+"-"+scope.row.standardMajorTwoName }}
+            </span>
+            <span v-else>
+            </span>
+          </template>
+        </el-table-column>
 				<el-table-column prop="deptCode" label="学院" align="center" show-overflow-tooltip>
 					<template #default="scope">
 						{{ getDeptName(scope.row.deptCode) }}

src/views/recruit/recruitprestudent/index.vue

@@ -214,7 +214,7 @@ import { getList } from '/@/api/recruit/recruitstudentplangroup'
 import { listcz } from '/@/api/recruit/recruitstudentplan'
 import { queryByGroupId as schoolListApi} from '/@/api/recruit/recruitstudentschool'
 import { getDeptListByLevelTwo } from '/@/api/basic/basicdept'
-import {makeExportTeacherInfoBySelfTask} from '/@/api/recruit/recruitfile'
+import {exportPreStuSuccess} from '/@/api/recruit/recruitfile'
 
 const PreExamPeopleIndex = defineAsyncComponent(() => import('@/views/recruit/recruitPreexamPeople/index.vue'));
 
@@ -377,8 +377,10 @@ const resetQuery = () => {
 
 // 导出
 const dataExportHandle = async () => {
-  makeExportTeacherInfoBySelfTask(queryForm).then((res:any)=>{
+  exportLoading.value = true
+  exportPreStuSuccess(queryForm).then((res:any)=>{
     message.success('导出后台执行中,请稍后查看下载任务')
+    exportLoading.value = false
   })
 
 }

src/views/recruit/recruitstudentsignup/index.vue

@@ -289,6 +289,15 @@
               @click="handleImportDialog"
           >导入中招平台数据
           </el-button>
+          <el-button
+              v-auth="'recruit_sign_sync'"
+              type="warning"
+              plain
+              icon="Refresh"
+              :loading="exportLoading"
+              @click="handleSyncData"
+          >一键同步省人社
+          </el-button>
 <!--          <el-button-->
 <!--            v-if="hasAuth('zipExport')"-->
 <!--            type="warning"-->
@@ -1158,6 +1167,16 @@ const handleImportDialog = () => {
   ImportRecruitInfoRef.value?.init("R10003");
 };
 
+const exportLoading=ref(false);
+const handleSyncData=()=>{
+  exportLoading.value=true;
+
+  setTimeout(() => {
+    exportLoading.value=false;
+    message.success('同步成功');
+  }, 3000);
+}
+
 onMounted(() => {
   init()
 })