提交 6ee393d4 authored 作者: 钟是志's avatar 钟是志

2073 开发需求1229

上级 19aa49d0
...@@ -68,8 +68,8 @@ export default class Detail extends Component { ...@@ -68,8 +68,8 @@ export default class Detail extends Component {
getButtons = () => { getButtons = () => {
const { showAll } = this.state; const { showAll } = this.state;
const { hiddenButton } = this.props; const { hiddenButton, fromCheckRecord } = this.props;
if(hiddenButton){ if (hiddenButton) {
return null; return null;
} }
return ( return (
...@@ -85,7 +85,11 @@ export default class Detail extends Component { ...@@ -85,7 +85,11 @@ export default class Detail extends Component {
name="返回" name="返回"
className="defaultBlue" className="defaultBlue"
handleClick={() => { handleClick={() => {
if (fromCheckRecord) {
window.keepAliveCheckRecord.showList();
} else {
router.goBack(); router.goBack();
}
}} }}
icon="arrow-left" icon="arrow-left"
/> />
...@@ -101,7 +105,7 @@ export default class Detail extends Component { ...@@ -101,7 +105,7 @@ export default class Detail extends Component {
</Shell> </Shell>
</> </>
); );
} };
render() { render() {
const { from, hiddenButton } = this.props; const { from, hiddenButton } = this.props;
...@@ -126,9 +130,7 @@ export default class Detail extends Component { ...@@ -126,9 +130,7 @@ export default class Detail extends Component {
// console.log(showPrint); // console.log(showPrint);
return ( return (
<PageHeaderWrapper title=""> <PageHeaderWrapper title="">
{ {this.getButtons()}
this.getButtons()
}
<Shell> <Shell>
{from === 'onestopApp2.0' ? ( {from === 'onestopApp2.0' ? (
<iframe <iframe
...@@ -154,9 +156,7 @@ export default class Detail extends Component { ...@@ -154,9 +156,7 @@ export default class Detail extends Component {
</div> </div>
)} )}
</Shell> </Shell>
{ {this.getButtons()}
this.getButtons()
}
</PageHeaderWrapper> </PageHeaderWrapper>
); );
} }
......
...@@ -6,6 +6,17 @@ import { isJSON } from '@/webPublic/zyd_public/utils/utils'; ...@@ -6,6 +6,17 @@ import { isJSON } from '@/webPublic/zyd_public/utils/utils';
import SelectPerson from '@/webPublic/FormInsertDiy/ExportComponent/SelectPerson/Index'; import SelectPerson from '@/webPublic/FormInsertDiy/ExportComponent/SelectPerson/Index';
import Detail from '@/webPublic/FormInsertDiy/AffairPage/Detail'; import Detail from '@/webPublic/FormInsertDiy/AffairPage/Detail';
const showDiv = () => {
document.getElementById('listZdyTable').style.position = 'static';
document.getElementById('listZdyTable').style.zIndex = 'auto';
};
const hideDiv = () => {
document.getElementById('listZdyTable').style.position = 'absolute';
document.getElementById('listZdyTable').style.zIndex = '-10';
};
export default function RenderForm({ get = 'web', isCg = 'yes', style, ...rest }) { export default function RenderForm({ get = 'web', isCg = 'yes', style, ...rest }) {
let content = rest?.postData?.unifiedServicePatternModel?.content; let content = rest?.postData?.unifiedServicePatternModel?.content;
if (isJSON(content)) { if (isJSON(content)) {
...@@ -32,7 +43,7 @@ export default function RenderForm({ get = 'web', isCg = 'yes', style, ...rest } ...@@ -32,7 +43,7 @@ export default function RenderForm({ get = 'web', isCg = 'yes', style, ...rest }
showList: (props) => { showList: (props) => {
setShowPageType(0); setShowPageType(0);
setPageProps({}); setPageProps({});
document.getElementById('listZdyTable').style.display = 'block'; showDiv();
}, },
showDetail: (p) => { showDetail: (p) => {
setPageProps({ setPageProps({
...@@ -41,7 +52,7 @@ export default function RenderForm({ get = 'web', isCg = 'yes', style, ...rest } ...@@ -41,7 +52,7 @@ export default function RenderForm({ get = 'web', isCg = 'yes', style, ...rest }
}); });
setShowPageType(1); setShowPageType(1);
console.log(p); console.log(p);
document.getElementById('listZdyTable').style.display = 'none'; hideDiv();
}, },
}; };
...@@ -68,7 +79,8 @@ export default function RenderForm({ get = 'web', isCg = 'yes', style, ...rest } ...@@ -68,7 +79,8 @@ export default function RenderForm({ get = 'web', isCg = 'yes', style, ...rest }
/> />
<SelectPerson /> <SelectPerson />
</div> </div>
{showPageType === 1 && <Detail {...pageProps} />} {showPageType === 1 && <Detail fromCheckRecord={true}
{...pageProps} />}
</> </>
); );
} }
......
...@@ -18,6 +18,7 @@ export default function countWidth({ ...@@ -18,6 +18,7 @@ export default function countWidth({
// 这个是一站式的元素的宽度 // 这个是一站式的元素的宽度
} }
changeVisitor(json, uuid); changeVisitor(json, uuid);
// console.log('showDiv', showDiv);
return showDiv; return showDiv;
} }
...@@ -47,6 +48,7 @@ function changeVisitor(json, uuid) { ...@@ -47,6 +48,7 @@ function changeVisitor(json, uuid) {
// 变动时回调 // 变动时回调
const callback = function (mutations) { const callback = function (mutations) {
// console.log('变动观察器callback')
if(!json.twidth){ if(!json.twidth){
let dxx = document.querySelector(`td[data-cell-id="${uuid}"] .mobelDivClassName`); let dxx = document.querySelector(`td[data-cell-id="${uuid}"] .mobelDivClassName`);
if(dxx && dxx.style.width === '500px'){ if(dxx && dxx.style.width === '500px'){
......
Markdown 格式
0%
您添加了 0 到此讨论。请谨慎行事。
请先完成此评论的编辑!
注册 或者 后发表评论