Merge remote-tracking branch 'origin/master'

FormInsertDiy/AffairPage/AuditPage/index.js

@@ -34,6 +34,7 @@ export default class Index extends React.Component {
 			tableInfo: {}, // 表格配置属性
 			allConfigSetInfo: {}, // getFormDetail 返回的数据
 		};
+    window.callbackSubmitInfoZhiYong = undefined;
   }
 
 	getFormDetail = (workId) => {

FormInsertDiy/AuditButton/index.js

@@ -12,6 +12,8 @@ import { connect } from 'dva';
 import Btn from './pagesBtn';
 import styles from './styles.less';
 import ModalDiy from '@/baseComponent/ModalDiy';
+import { callbackSubmitData } from '@/webPublic/one_stop_public/models/callbackExamineProcess';
+import { getToken } from '@/utils/authority';
 
 function AuditButton(props) {
 	const [visible, setVisible] = useState(false);
@@ -28,9 +30,7 @@ function AuditButton(props) {
 			if (err) return;
 			setSubmitLoading(true);
 			preHandle(values);
-			dispatch({
-				type: 'affair/getExamineProcess',
-				payload: {
+			let payload = {
 				taskIds: taskIds || [data.taskId], // 接口里面的taskId 任务Id
 				code: taskIds ? undefined : data.code,
 				// 审核相关内容
@@ -40,7 +40,18 @@ function AuditButton(props) {
 					code: taskIds ? undefined : data.code,
 				}),
 				taskForm: JSON.stringify(values), // 审批表单的参数值
-				},
+				apiData: data,
+				taskFormKey: data?.taskFormKey,
+				userNowInfo:
+					(localStorage.getItem('user') && JSON.parse(localStorage.getItem('user'))) || {},
+				buttonInfo:
+					data?.btns && data?.btns.length ? data?.btns.find((x) => x.value === btnValue) : {},
+				token: getToken(),
+			};
+			payload = callbackSubmitData(payload);
+			dispatch({
+				type: 'affair/getExamineProcess',
+				payload,
 				callback: (val) => {
 					setSubmitLoading(false);
 					setVisible(false);