Merge remote-tracking branch 'origin/developer' into developer

src/views/home/widgets/components/calendar.vue

@@ -145,23 +145,23 @@ const changeSwitch = async (id: string) => {
 
 const initscheduleList = () => {
 	// 初始化日程列表
-	list({
-		startDate: startDateRef.value,
-		endDate: endDateRef.value,
-	}).then((res) => {
-		// 获取返回结果的数据并转换为合适的格式
-		reminders.value = res.data.map((item: any) => {
-			return {
-				key: item.id,
-				highlight: {
-					color: 'primary',
-					fillMode: 'outline',
-				},
-				dates: item.scheduleDate,
-				customData: item,
-			};
-		});
-	});
+	// list({
+	// 	startDate: startDateRef.value,
+	// 	endDate: endDateRef.value,
+	// }).then((res) => {
+	// 	// 获取返回结果的数据并转换为合适的格式
+	// 	reminders.value = res.data.map((item: any) => {
+	// 		return {
+	// 			key: item.id,
+	// 			highlight: {
+	// 				color: 'primary',
+	// 				fillMode: 'outline',
+	// 			},
+	// 			dates: item.scheduleDate,
+	// 			customData: item,
+	// 		};
+	// 	});
+	// });
 };
 
 // 过滤日历中选中的单元格是否有日程

src/views/home/widgets/components/flow-data.vue

@@ -80,9 +80,9 @@ const state = reactive({
 
 onMounted(async () => {
 	try {
-		const { data } = await queryTaskData();
-		state.pendingNum = Number.parseInt(data?.pendingNum || 0);
-		state.copyNum = Number.parseInt(data?.copyNum || 0);
+		// const { data } = await queryTaskData();
+		// state.pendingNum = Number.parseInt(data?.pendingNum || 0);
+		// state.copyNum = Number.parseInt(data?.copyNum || 0);
 	} catch (error) {
 		// 避免没有启动 flow模块 vue 组件渲染 warning
 	}

src/views/professional/teacherbase/index.vue

@@ -2248,10 +2248,10 @@
     fetchSecondTree()
     await Promise.all([
       // 批量获取字典数据 religious_belief宗教信仰  health健康状况 teacher_cate授课类型 teacher_classify职位类别 yes_no_type是否类型
-      getDictsByTypes(['religious_belief', 'heath', 'teacher_cate', 'teacher_classify', 'yes_no_type']).then((response: any) => {
+      getDictsByTypes(['religious_belief', 'heath', 'professional_teacher_cate', 'teacher_classify', 'yes_no_type']).then((response: any) => {
         religiousBeliefDic.value = response.data.religious_belief;
         healthList.value = response.data.heath;
-        teacherCateList.value = response.data.teacher_cate;
+        teacherCateList.value = response.data.professional_teacher_cate;
         teacherClassifyData.value = response.data.teacher_classify || [];
         inoutFlagOptions.value = response.data.yes_no_type || [];       
       }),

src/views/recruit/recruitstudentsignup/detaiform.vue

@@ -1099,10 +1099,10 @@ const init = (id: string | null, typeParam: number, groupId?: string) => {
     areaHomeAreaList.value = []
     
     // 批量获取数据字典（新增和编辑都需要）  文化程度  学费 代办费  户口性质  学校归属地
-    getDictsByTypes(['id_type','finance_student_source', 'agency_fee', 'tuition_fee','house_hold_properties','recruit_school_form']).then((res: any) => {
+    getDictsByTypes(['id_type','finance_student_source', 'recruit_agency_fee', 'tuition_fee','house_hold_properties','recruit_school_form']).then((res: any) => {
       idCardTypeList.value = res.data.id_type || []
       eduList.value = res.data.finance_student_source || []
-      agencyFeeList.value = res.data.agency_fee || []
+      agencyFeeList.value = res.data.recruit_agency_fee || []
       tuitionFeeList.value = res.data.tuition_fee || []
       residenceTypeList.value = res.data.house_hold_properties || []
       schoolFromList.value = res.data.recruit_school_form || []

src/views/recruit/recruitstudentsignup/dormFW.vue

@@ -103,7 +103,7 @@ const init = () => {
   canSubmit.value = true
   circleShow.value = true
   nextTick(() => {
-    getDicts("dorm_jw").then((data: any) => {
+    getDicts("recruit_dorm_jw").then((data: any) => {
       const arr = data.data
       arr.forEach((e: any) => {
         if (e.label == 'bj') {

src/views/recruit/recruitstudentsignup/majorChange.vue

@@ -311,7 +311,7 @@ const init = (id: string | null) => {
     dataFormRef.value?.resetFields()
     if (dataForm.id) {
       // 获取数据字典代办费
-      getDicts('agency_fee').then((res: any) => {
+      getDicts('recruit_agency_fee').then((res: any) => {
         agencyFeeList.value = res.data
         getObj(dataForm.id).then((response: any) => {
           Object.assign(dataForm, response.data)

src/views/recruit/recruitstudentsignup/showMap.vue

@@ -56,7 +56,7 @@ const init = (row: any) => {
   form.homeLng = row.homeLng || row.homeLongitude || 0
   form.homeLat = row.homeLat || row.homeLatitude || 0
   nextTick(() => {
-    getDicts("dorm_jw").then((data: any) => {
+    getDicts("recruit_dorm_jw").then((data: any) => {
       const arr = data.data
       arr.forEach((e: any) => {
         if (e.label == 'bj') {