Merge remote-tracking branch 'origin/master'

FormInsertDiy/AffairPage/AuditPage/AuditPage.js

@@ -19,9 +19,10 @@ class AuditPage extends Component {
 	// }
 
 	handleButtonSet = () => {
-		const { hasBatchAudit, batchAuditButtonName, noNeedForm, tab2Buttons = [] } = this.props;
+		const { hasBatchAudit, batchAuditButtonName, noNeedForm, tab2Buttons = [], tab1Buttons } = this.props;
 		return {
 			tab1: [
+        ...tab1Buttons,
 				hasBatchAudit
 					? {
 							type: 'audit',

FormInsertDiy/AffairPage/AuditPage/exportHandledInfo.js

@@ -38,6 +38,7 @@ export default function exportHandledInfo({
     let url = window.CONFIG.OAUTH_ACTION_PATH + '/UnifiedAppFormApi/exportData';
     // uaaRequest('/UnifiedAppFormApi/getHandledPage', data);
     // downloadFile(url, data);
+    console.log(data, url);
     giveBase16EnCode(data, url)
       .then((newData) => {
         if (typeof newData === 'object' && newData.url && newData.datas) {

FormInsertDiy/AffairPage/AuditPage/index.js

@@ -13,6 +13,7 @@ import CreateC from '../../ExportComponent/ContextCreate';
 import exportHandledInfo from '@/webPublic/FormInsertDiy/AffairPage/AuditPage/exportHandledInfo';
 import { connect } from 'dva';
 import router from 'umi/router';
+import { getIsBei_Dian } from '@/webPublic/zyd_public/utils/getSchoolType';
 
 @connect(({ keepAlive }) => ({
 	keepAlive,
@@ -211,7 +212,22 @@ class Index extends React.Component {
 					exportHandledInfo({
 						columns,
 						appId: workId,
-						handled: 'handled',
+            type: 'handled',
+					});
+				},
+			}); // 解决禅道 32366 二级学院审核，所有二级学院审核后在已处理中加导出功能 103152
+		}
+    const tab1Buttons = [];
+    if (isExport === '1' && false) { // 2023年9月27日 钟是志 待处理 增加导出功能 测试性功能只对 北电科生效  接口有问题没法搞
+      tab1Buttons.push({
+        type: 'export',
+        name: '导出',
+        component: 'Normal',
+        handleClick: (selectRows, formValues, getPage, search, columns) => {
+          exportHandledInfo({
+            columns,
+            appId: workId,
+            type: null,
           });
         },
       }); // 解决禅道 32366 二级学院审核，所有二级学院审核后在已处理中加导出功能 103152
@@ -242,6 +258,7 @@ class Index extends React.Component {
 				showPrint={showPrint}
 				noNeedForm={noNeedForm}
 				tab2Buttons={tab2Buttons}
+        tab1Buttons={tab1Buttons}
         keepAliveData={this.props.keepAlive?.AuditPageData[window.location.href.split('#')[1]]}
 				setRefInfo={this.setRefInfo}
 			/>

zyd_public/utils/downloadFile.js

@@ -33,7 +33,7 @@ export function downloadFile(
 				const contentDisposition = res.headers.get('content-disposition');
 				let fileNameEncode =
 					contentDisposition && contentDisposition.split('filename=');
-				if (fileNameEncode.length > 1) {
+				if (fileNameEncode && fileNameEncode.length > 1) {
 					fileNameEncode = fileNameEncode[1];
 					responseHeadersFileName = decodeURIComponent(escape(fileNameEncode));
 					// https://blog.csdn.net/erdfty/article/details/106134284