|
@@ -1,5 +1,4 @@
|
|
import React, { useEffect, useState, useRef, useMemo, useCallback } from 'react';
|
|
import React, { useEffect, useState, useRef, useMemo, useCallback } from 'react';
|
|
-import React, { useEffect, useState, useRef, useMemo, useCallback } from 'react';
|
|
|
|
import '@ant-design/compatible/assets/index.css';
|
|
import '@ant-design/compatible/assets/index.css';
|
|
import {
|
|
import {
|
|
Modal,
|
|
Modal,
|
|
@@ -754,7 +753,7 @@ function CommitAuditModal(props) {
|
|
json: JSON.stringify({ approvalProcess, formList }),
|
|
json: JSON.stringify({ approvalProcess, formList }),
|
|
});
|
|
});
|
|
params.audit_series = uuidv4();
|
|
params.audit_series = uuidv4();
|
|
- if(version.audit_status == 5) {
|
|
|
|
|
|
+ if (version.audit_status == 5) {
|
|
params.audit_status = version.audit_status;
|
|
params.audit_status = version.audit_status;
|
|
}
|
|
}
|
|
params.files = uploadList.current.join(',');
|
|
params.files = uploadList.current.join(',');
|
|
@@ -946,7 +945,7 @@ async function getExcel(gridKey) {
|
|
return JSON.parse(JSON.parse(res));
|
|
return JSON.parse(JSON.parse(res));
|
|
}
|
|
}
|
|
|
|
|
|
-export default connect(({ xflow, detail, user }) => ({
|
|
|
|
|
|
+export default connect(({ xflow, detail, user, list }) => ({
|
|
flowDetail: xflow.flowDetail,
|
|
flowDetail: xflow.flowDetail,
|
|
versionList: detail.versionList,
|
|
versionList: detail.versionList,
|
|
currentUser: user.currentUser,
|
|
currentUser: user.currentUser,
|