|
@@ -35,6 +35,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 {
|
|
@@ -86,6 +87,8 @@ function Detail(props) {
|
|
|
});
|
|
|
const cellPosition = useRef({});
|
|
|
|
|
|
+ const [imgPic, setImgPic] = useState('');
|
|
|
+
|
|
|
useEffect(() => {
|
|
|
// if (!version.id) return
|
|
|
// 不请求excelFileList 时清空excelFileList,否则会出现清单切换后如果attachment_id不存在,附件信息没有更新
|
|
@@ -249,24 +252,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 +378,7 @@ function Detail(props) {
|
|
|
// 同步清单
|
|
|
setMergeVisible(true);
|
|
|
break;
|
|
|
- case 'compare':
|
|
|
+ case 'closeCompare':
|
|
|
// 同步
|
|
|
onCompare(e.data);
|
|
|
break;
|
|
@@ -555,6 +560,15 @@ function Detail(props) {
|
|
|
新建清单
|
|
|
</Button>
|
|
|
)}
|
|
|
+ <Button
|
|
|
+ onClick={() => {
|
|
|
+ const src = sheetRef.current?.luckysheet.getScreenshot();
|
|
|
+ exportExcelImg(src).then(res => setImgPic(res));
|
|
|
+ // setImgPic(src);
|
|
|
+ }}
|
|
|
+ >
|
|
|
+ 导出图片
|
|
|
+ </Button>
|
|
|
<CurrentInfo version={version} flowDetail={flowDetail} />
|
|
|
</div>
|
|
|
<div className={styles.btns}>
|
|
@@ -603,6 +617,7 @@ function Detail(props) {
|
|
|
onChange={e => exportExcl(e.target.files)}
|
|
|
/>
|
|
|
</div>
|
|
|
+ {imgPic && <img src={imgPic} />}
|
|
|
{showPsrBtns && <PsrControl sheetRef={sheetRef} />}
|
|
|
<div style={{ display: 'flex' }}>
|
|
|
<div
|