|
@@ -22,6 +22,7 @@ import {
|
|
|
queryDelSheetRecord,
|
|
|
queryDetail,
|
|
|
queryDingInstanceExecute,
|
|
|
+ queryDownloadLogCreate,
|
|
|
setLastVersion,
|
|
|
} from '@/services/boom';
|
|
|
import HistoryDrawer from './HistoryDrawer';
|
|
@@ -35,6 +36,7 @@ import DropdownMenu from './DropdownMenu';
|
|
|
import CurrentInfo from './CurrentInfo';
|
|
|
import moment from 'moment';
|
|
|
import PsrControl from './PsrControl';
|
|
|
+import exportExcelImg from './exportExcelImg';
|
|
|
|
|
|
function Detail(props) {
|
|
|
const {
|
|
@@ -249,24 +251,26 @@ function Detail(props) {
|
|
|
};
|
|
|
// 更新表单,flag为true时不判断是否属于审批,强制更新
|
|
|
const onUpdate = flag => {
|
|
|
- if (!flag && flow.active != 0) return;
|
|
|
- let currentData = sheetRef.current.getSheetJson().data;
|
|
|
- let sheets = JSON.parse(JSON.stringify(currentData));
|
|
|
- sheets.forEach(item => {
|
|
|
- delete item.data;
|
|
|
- });
|
|
|
- let params = {
|
|
|
- ...version,
|
|
|
- data: JSON.stringify(sheets),
|
|
|
- };
|
|
|
+ // if (!flag && flow.active != 0) return;
|
|
|
+ if (node?.node_type_psr == 6 || flag || flow.active == 0) {
|
|
|
+ let currentData = sheetRef.current.getSheetJson().data;
|
|
|
+ let sheets = JSON.parse(JSON.stringify(currentData));
|
|
|
+ sheets.forEach(item => {
|
|
|
+ delete item.data;
|
|
|
+ });
|
|
|
+ let params = {
|
|
|
+ ...version,
|
|
|
+ data: JSON.stringify(sheets),
|
|
|
+ };
|
|
|
|
|
|
- dispatch({
|
|
|
- type: 'detail/saveSheet',
|
|
|
- payload: params,
|
|
|
- callback: () => {
|
|
|
- setSaveTime(moment().format('HH:mm:ss'));
|
|
|
- },
|
|
|
- });
|
|
|
+ dispatch({
|
|
|
+ type: 'detail/saveSheet',
|
|
|
+ payload: params,
|
|
|
+ callback: () => {
|
|
|
+ setSaveTime(moment().format('HH:mm:ss'));
|
|
|
+ },
|
|
|
+ });
|
|
|
+ }
|
|
|
};
|
|
|
|
|
|
const onDelSheet = async id => {
|
|
@@ -373,7 +377,7 @@ function Detail(props) {
|
|
|
// 同步清单
|
|
|
setMergeVisible(true);
|
|
|
break;
|
|
|
- case 'compare':
|
|
|
+ case 'closeCompare':
|
|
|
// 同步
|
|
|
onCompare(e.data);
|
|
|
break;
|
|
@@ -532,7 +536,6 @@ function Detail(props) {
|
|
|
}, [compareList]);
|
|
|
|
|
|
useEffect(() => {
|
|
|
- // if (versionList.length == 0) return;
|
|
|
if (!currentUser.ID) return;
|
|
|
if (!version.id) {
|
|
|
changeVersion(excelID);
|
|
@@ -564,12 +567,23 @@ function Detail(props) {
|
|
|
保存
|
|
|
</Button>
|
|
|
)}
|
|
|
+ <Button type="primary" onClick={() => setVersionTreeVisible(true)}>
|
|
|
+ 历史版本
|
|
|
+ </Button>
|
|
|
<Button
|
|
|
type="primary"
|
|
|
style={{ marginRight: 20 }}
|
|
|
- onClick={() => setVersionTreeVisible(true)}
|
|
|
+ onClick={() => {
|
|
|
+ queryDownloadLogCreate({
|
|
|
+ excel_id: version.id,
|
|
|
+ node_id: version.template_node_id,
|
|
|
+ url: '',
|
|
|
+ });
|
|
|
+ const src = sheetRef.current?.luckysheet.getScreenshot();
|
|
|
+ exportExcelImg(src, currentUser?.CName);
|
|
|
+ }}
|
|
|
>
|
|
|
- 历史版本
|
|
|
+ 导出图片
|
|
|
</Button>
|
|
|
<Avatar.Group style={{ marginRight: 20 }}>
|
|
|
{user.map((item, id) => (
|