Skip to content

W
WebPublic
提交 c0f7cedf authored 作者: 徐立's avatar 徐立
浏览文件
操作

解决冲突

上级 efc88f79 5c8dfe88
全部展开 隐藏空白字符变更
内嵌 并排
正在显示 包含 558 行增加 和 876 行删除
FormInsertDiy/AffairPage/ApplyPage/index.js
浏览文件 @ c0f7cedf
...@@ -9,10 +9,9 @@ import { message } from 'antd'; ...@@ -9,10 +9,9 @@ import { message } from 'antd';
import React, { Fragment } from 'react'; import React, { Fragment } from 'react';
import * as service from '../publicApiService'; import * as service from '../publicApiService';
import * as destructionFunc from '../destruction'; import * as destructionFunc from '../destruction';
import { Link, hashHistory } from 'dva/router'; import { Link } from 'dva/router';
import { getDefaultValues } from '../destruction';
import { getApplyPage } from '../publicApiService'; import { getApplyPage } from '../publicApiService';
import { getHuanGeToken } from '@/utils/authority'; import { getToken } from '@/utils/authority';
import PageHeaderWrapper from '@/components/PageHeaderWrapper'; import PageHeaderWrapper from '@/components/PageHeaderWrapper';
import List from './List'; import List from './List';
...@@ -20,12 +19,12 @@ import pageSetting from './pageSetting'; ...@@ -20,12 +19,12 @@ import pageSetting from './pageSetting';
import ButtonDiy from '@/baseComponent/ButtonDiy'; import ButtonDiy from '@/baseComponent/ButtonDiy';
import Shell from '@/baseComponent/Shell'; import Shell from '@/baseComponent/Shell';
import config from '@/config/config'; import config from '@/config/config';
// import test from './2333';
export default class AffairPage extends React.Component { export default class AffairPage extends React.Component {
constructor(props) { constructor(props) {
super(props); super(props);
// const idObj = service.getId(); let pathname = this.props.location.pathname;
const idObj = service.getId(pathname);
if (!idObj) { if (!idObj) {
message.error('没有配置数据id,无法使用该功能'); message.error('没有配置数据id,无法使用该功能');
} }
...@@ -122,7 +121,7 @@ export default class AffairPage extends React.Component { ...@@ -122,7 +121,7 @@ export default class AffairPage extends React.Component {
}; };
componentDidMount() { componentDidMount() {
if (!getHuanGeToken()) { if (!getToken()) {
message.error('您的数据未同步,请联系管理员!'); message.error('您的数据未同步,请联系管理员!');
return false; return false;
} }
...@@ -145,7 +144,7 @@ export default class AffairPage extends React.Component { ...@@ -145,7 +144,7 @@ export default class AffairPage extends React.Component {
this.ListComponent.getPage(); this.ListComponent.getPage();
}); });
} }
if(event.data.indexOf('iframeHeight') > -1){ if (event.data.indexOf('iframeHeight') > -1) {
let height = Number(event.data.split('-')[1]); let height = Number(event.data.split('-')[1]);
document.getElementById('applyIframeId').height = height; document.getElementById('applyIframeId').height = height;
} }
...@@ -157,8 +156,8 @@ export default class AffairPage extends React.Component { ...@@ -157,8 +156,8 @@ export default class AffairPage extends React.Component {
render() { render() {
const { workId, dataBaseId, addFields, showIframe } = this.state; const { workId, dataBaseId, addFields, showIframe } = this.state;
const url = config.onestopPC.split('/#/'); const url = config.onestopPC.split('/#/');
let iframeUrl = `${url[0]}/#/IFrameForApply?id=${workId}&token=${getHuanGeToken()}`; let iframeUrl = `${url[0]}/#/IFrameForApply?id=${workId}&token=${getToken()}`;
// iframeUrl = `http://localhost:8000/onestop/IFrameForApply?id=${workId}&token=${getHuanGeToken()}`; // iframeUrl = `http://localhost:8000/onestop/IFrameForApply?id=${workId}&token=${getHuanGeToken()}`;
return ( return (
<PageHeaderWrapper title=""> <PageHeaderWrapper title="">
<div style={{ <div style={{
......
FormInsertDiy/AffairPage/AuditPage/AuditPage.js
浏览文件 @ c0f7cedf
...@@ -6,7 +6,7 @@ import PageHeaderWrapper from '@/components/PageHeaderWrapper'; ...@@ -6,7 +6,7 @@ import PageHeaderWrapper from '@/components/PageHeaderWrapper';
import List from '../ApplyPage/List'; import List from '../ApplyPage/List';
import ListTab from './ListTab'; import ListTab from './ListTab';
import { deepCopy } from '@/baseComponent/utils'; import { deepCopy } from '@/baseComponent/utils';
import { getApplyPage, getHandledPage, getWaitPage } from '@/pages/App/FormInsertDiy/AffairPage/publicApiService'; import { getApplyPage, getHandledPage, getWaitPage } from '../publicApiService';
export default class AuditPage extends Component { export default class AuditPage extends Component {
constructor(props) { constructor(props) {
......
FormInsertDiy/AffairPage/AuditPage/List.js
浏览文件 @ c0f7cedf
...@@ -7,9 +7,9 @@ import * as services from '@/highOrderComponent/Service'; ...@@ -7,9 +7,9 @@ import * as services from '@/highOrderComponent/Service';
import StandardTable from '@/components/StandardTable'; import StandardTable from '@/components/StandardTable';
import PropTypes from 'prop-types'; import PropTypes from 'prop-types';
import { deepCopy } from '@/baseComponent/utils'; import { deepCopy } from '@/baseComponent/utils';
import { date, format, text } from '@/pages/App/FormInsertDiy/config'; import { date, format, text } from '../../config';
import moment from 'moment'; import moment from 'moment';
import { handleAudit } from '@/pages/App/FormInsertDiy/AffairPage/publicApiService'; import { handleAudit } from '../publicApiService';
import { Tooltip } from 'antd'; import { Tooltip } from 'antd';
export default class List extends Component { export default class List extends Component {
......
FormInsertDiy/AffairPage/AuditPage/index.js
浏览文件 @ c0f7cedf
...@@ -5,17 +5,18 @@ ...@@ -5,17 +5,18 @@
* *
* */ * */
import { Row, Col, message } from 'antd'; import { message } from 'antd';
import React, { Fragment } from 'react'; import React, { } from 'react';
import * as service from '../publicApiService'; import * as service from '../publicApiService';
import AuditPage from './AuditPage'; import AuditPage from './AuditPage';
import * as destructionFunc from '../destruction'; import * as destructionFunc from '../destruction';
import { Link ,hashHistory} from 'dva/router'; import { Link } from 'dva/router';
export default class Index extends React.Component { export default class Index extends React.Component {
constructor(props) { constructor(props) {
super(props); super(props);
// const idObj = service.getId(); let pathname = this.props.location.pathname;
const idObj = service.getId(pathname);
if (!idObj) { if (!idObj) {
message.error('没有配置数据id,无法使用该功能'); message.error('没有配置数据id,无法使用该功能');
} }
......
FormInsertDiy/AffairPage/ButtonListDom/ModalForm.js
浏览文件 @ c0f7cedf
...@@ -11,11 +11,10 @@ import ButtonDiy from '@/baseComponent/ButtonDiy'; ...@@ -11,11 +11,10 @@ import ButtonDiy from '@/baseComponent/ButtonDiy';
import ModalDiy from '@/baseComponent/ModalDiy'; import ModalDiy from '@/baseComponent/ModalDiy';
import React, { Component, Fragment } from 'react'; import React, { Component, Fragment } from 'react';
import { deepCopy, } from '@/baseComponent/utils'; import { deepCopy, } from '@/baseComponent/utils';
import { mustHaveValue } from '../../config/index'; import { mustHaveValue, transLateTimeTOUnix } from '../../config/index';
import { message } from 'antd'; import { message } from 'antd';
import PropTypes from 'prop-types'; import PropTypes from 'prop-types';
import { startProcess } from '../publicApiService'; import { startProcess } from '../publicApiService';
import { transLateTimeTOUnix } from '@/pages/App/FormInsertDiy/config';
import FormArray from '../component/FormArray'; import FormArray from '../component/FormArray';
export default class ModalForm extends Component { export default class ModalForm extends Component {
......
FormInsertDiy/AffairPage/ButtonListDom/index.js
浏览文件 @ c0f7cedf
import ButtonDiy from '@/baseComponent/ButtonDiy'; import ButtonDiy from '@/baseComponent/ButtonDiy';
import React, { Component, Fragment } from 'react'; import React, { Component, Fragment } from 'react';
/*
import ExportInfo from '@/components/App/ExportInfo';
import ImportUtil from '@/components/App/ImportUtil';
import ModalDelete from './ModalDelete';
import ModalConfirm from './ModalConfirm';
*/
import ModalBatch from './ModalBatch'; import ModalBatch from './ModalBatch';
import ModalForm from './ModalForm'; import ModalForm from './ModalForm';
...@@ -24,31 +18,6 @@ export default class ButtonListDom extends Component { ...@@ -24,31 +18,6 @@ export default class ButtonListDom extends Component {
getPage={getPage} getPage={getPage}
selectRows={selectRows} selectRows={selectRows}
/>; />;
/* case 'ModalDelete': // 删除按钮
return <ModalDelete {...item}
key={item.type}
getPage={getPage}
selectRows={selectRows}
/>;
case 'ImportUtil': // 导入
return <ImportUtil {...item.props}
key={item.type}
callback={() => getPage()}
/>;
case 'ExportInfo': // 导出
return <ExportInfo {...item.props}
key={item.type}
/>;
case 'ModalConfirm': // 一般按钮 点击后弹出是否确定的 Modal Info
return <ModalConfirm key={item.type}
{...item}
getPage={getPage}
listData={listData}
formValues={formValues}
search={search}
selectRows={selectRows}/>;
*/
case 'ModalBatch': // 一般按钮 点击后弹出 填写一些类似 审核理由 意见之类的信息 case 'ModalBatch': // 一般按钮 点击后弹出 填写一些类似 审核理由 意见之类的信息
return <ModalBatch key={item.type} return <ModalBatch key={item.type}
{...item} {...item}
......
FormInsertDiy/AffairPage/Detail.js
浏览文件 @ c0f7cedf
import React, { Fragment, Component } from 'react'; import React, { Fragment, Component } from 'react';
import PageHeaderWrapper from '@/components/PageHeaderWrapper'; import PageHeaderWrapper from '@/components/PageHeaderWrapper';
import Shell from '@/baseComponent/Shell'; import Shell from '@/baseComponent/Shell';
import BlockTitle from '@/baseComponent/BlockTitle';
import ButtonDiy from '@/baseComponent/ButtonDiy'; import ButtonDiy from '@/baseComponent/ButtonDiy';
import router from 'umi/router'; import router from 'umi/router';
import FormArray from './component/FormArray'; import { getToken } from '@/utils/authority';
import { getDetailInfo, handleAudit } from '@/pages/App/FormInsertDiy/AffairPage/publicApiService';
import { isJSON } from '@/baseComponent/utils';
import { Col, Row, Timeline, Icon, Tabs } from 'antd';
import ModalBatch from './ButtonListDom/ModalBatch';
import FlowImg from './component/FlowImg';
import { getHuanGeToken } from '@/utils/authority';
import config from '@/config/config'; import config from '@/config/config';
const { TabPane } = Tabs;
/*
export default class Detail extends Component {
/!**
* workId,dataBaseId,record,addFields
* *!/
constructor(props) {
super(props);
this.state = {
detailInfo: {
content: {},
taskInfo: [],
},
show: false,
};
}
componentDidMount() {
const { state } = this.props.location;
const { record } = state;
getDetailInfo(record.id).then((x) => {
if (x) {
if (isJSON(x.content)) {
x.content = JSON.parse(x.content);
}
if(typeof x.content === 'object' && x.content.defaultValues){
for(let z in x.content.defaultValues){
x.content = {
...x.content,
...x.content.defaultValues[z],
}
} }
this.setState({
detailInfo: x,
show: true,
});
}
});
}
buttonDom = () => {
const { detailInfo } = this.state;
const { btns } = detailInfo;
let res = [];
if(typeof btns !== 'undefined' && Array.isArray(btns)){
for(let z of btns){
res.push(
{
type: z.name,
name: z.name,
component: 'ModalBatch',
className: z.name !== '通过' ? 'defaultRed' : 'defaultBlue',
nameSpan: { big: 4, small: 5 },
fileSpan: { big: 1, small: 1 },
values: {
[z.key]: z.value,
},
fields: [
{
key: 'reason',
name: '审核意见',
type: 'textarea',
},
],
beforeSubmit: (props, formValues) => {
return {
taskForm : {},
examineMap: JSON.stringify(formValues),
};
},
sourceKey: 'taskId',
postKey: 'taskIds',
apiServiceApi: handleAudit,
}
)
}
return res;
}
return [];
};
render() {
const { state } = this.props.location;
const { record, addFields, workId } = state;
const { detailInfo, show } = this.state;
const Btns = this.buttonDom();
const dot1 = <Icon type={'check-circle'}
style={{ fontSize: '16px', color: 'rgb(82, 196, 26)' }}/>;
const dot2 = <Icon type={'clock-circle-o'}
style={{ fontSize: '16px', color: 'red' }}/>;
if(!show){
return null;
}
return (<PageHeaderWrapper title="">
<Shell>
<div style={{ height: '54px', padding: '12px 0 12px 12px' }}>
<ButtonDiy name="返回"
className="defaultBlue"
icon="arrow-left"
handleClick={() => {
router.goBack();
}}
/>
{
Btns.map((item)=>{
return <ModalBatch key={item.type}
{...item}
handleSelectRows={()=>{console.log('清空')}}
getPage={()=>{router.goBack()}}
selectRows={[record]}/>
})
}
</div>
</Shell>
<Shell>
<BlockTitle
isSmall={true}
title={'申请信息'}
/>
<Row>
<Col span={20}>
<FormArray config={addFields}
value={detailInfo.content}
changeValue={() => {
console.log(xxx);
}}
disabled={true}
readOnly={true}
fileSpan={{ big: 2, small: 2 }}
nameSpan={{ big: 6, small: 7 }}
/>
</Col>
</Row>
</Shell>
<Shell>
<Tabs>
<TabPane tab={'审批状态'} key={'1'}>
<Row>
<Col span={16} offset={2} style={{paddingTop: '30px', paddingBottom: '30px'}}>
<Timeline>
{
detailInfo.taskInfo.map((item) => {
let reason = item.respdesc;
if(item.taskVariable && item.taskVariable.reason){
reason = item.taskVariable.reason;
}
return (
<Timeline.Item dot={item.endTime ? dot1 : dot2}
key={item.id}
>
{item.assignee ? <p><b>{item.assignee}</b></p> : <p>&nbsp; </p>}
<p>审批流程： {item.name}</p>
<p>审批状态： {item.status}</p>
<p>审批原因： {reason}</p>
</Timeline.Item>
);
})
}
</Timeline>
</Col>
</Row>
</TabPane>
<TabPane tab={'流程图'} key={'2'}>
<FlowImg id={workId}/>
</TabPane>
</Tabs>
</Shell>
</PageHeaderWrapper>)
;
}
}*/
export default class Detail extends Component{ export default class Detail extends Component{
constructor(props){ constructor(props){
...@@ -221,7 +39,7 @@ export default class Detail extends Component{ ...@@ -221,7 +39,7 @@ export default class Detail extends Component{
render(){ render(){
const { id, showAll } = this.state; const { id, showAll } = this.state;
const url = config.onestopPC.split('/#/'); const url = config.onestopPC.split('/#/');
let iframeUrl = `${url[0]}/#/IframeForDetail?id=${id}&token=${getHuanGeToken()}`; let iframeUrl = `${url[0]}/#/IframeForDetail?id=${id}&token=${getToken()}`;
// iframeUrl = `http://localhost:8000/onestop/IframeForDetail?id=${id}&token=${getHuanGeToken()}`; // iframeUrl = `http://localhost:8000/onestop/IframeForDetail?id=${id}&token=${getHuanGeToken()}`;
return ( return (
<PageHeaderWrapper title=""> <PageHeaderWrapper title="">
......
FormInsertDiy/AffairPage/publicApiService.js
浏览文件 @ c0f7cedf
...@@ -9,7 +9,7 @@ import { apiRequest } from '../request'; ...@@ -9,7 +9,7 @@ import { apiRequest } from '../request';
import { getFormArrayConfig } from '../config/index'; import { getFormArrayConfig } from '../config/index';
import { setHuanGeToken } from '@/utils/authority'; import { setHuanGeToken } from '@/utils/authority';
import { isJSON } from '@/baseComponent/utils'; import { isJSON } from '@/baseComponent/utils';
import config from '@/config/config';
const giveValue = (x) => { const giveValue = (x) => {
if(x && x.rows){ if(x && x.rows){
...@@ -42,19 +42,15 @@ const getOtherToken = () => { ...@@ -42,19 +42,15 @@ const getOtherToken = () => {
} }
}; };
const getId = () => { // 获取流程引擎 事务workId 和表dataBaseId const getId = (pathname) => { // 获取流程引擎 事务workId 和表dataBaseId
let path = window.location.href; let idObj = config.twOneStopConfig[pathname]; // 路由 /tw/Pjpy/YXTYSBB/Apply
path = path.split('/');
// let idObj = config[path.pop()];
let idObj;
if (typeof idObj === 'undefined') { if (typeof idObj === 'undefined') {
console.error('没有找到对应的流程引擎id'); console.error('没有找到对应的流程引擎id');
return false; return false;
} else { } else {
const { dataBaseId, workId } = idObj;
return { return {
dataBaseId, dataBaseId: idObj.id,
workId, workId: idObj.id,
}; };
} }
}; };
......
FormInsertDiy/ApplyPage/index.js
浏览文件 @ c0f7cedf
...@@ -11,6 +11,10 @@ let ApplyPage = ({ id, form }) => { ...@@ -11,6 +11,10 @@ let ApplyPage = ({ id, form }) => {
function submitCb(res) { function submitCb(res) {
ModalInfo(`提交${res ? '成功' : '失败'}！`, {onOk: () => router.goBack()}); ModalInfo(`提交${res ? '成功' : '失败'}！`, {onOk: () => router.goBack()});
} }
function saveDraftCb(res) {
ModalInfo(`提交${res ? '成功' : '失败'}！`, {onOk: () => router.goBack()});
}
return ( return (
<Shell styleShell={{ marginTop: 0 }}> <Shell styleShell={{ marginTop: 0 }}>
<Entrance id={id} isCg="false" get="web" form={form} /> <Entrance id={id} isCg="false" get="web" form={form} />
...@@ -22,6 +26,7 @@ let ApplyPage = ({ id, form }) => { ...@@ -22,6 +26,7 @@ let ApplyPage = ({ id, form }) => {
openDraftButton openDraftButton
DraftButtonText="暂存" DraftButtonText="暂存"
callback={submitCb} callback={submitCb}
draftCallback={saveDraftCb}
/> />
</div> </div>
</Shell> </Shell>
......
FormInsertDiy/AuditButton/index.js
浏览文件 @ c0f7cedf
...@@ -82,7 +82,7 @@ function AuditButton(props) { ...@@ -82,7 +82,7 @@ function AuditButton(props) {
} }
function showModal(str, key, value) { function showModal(str, key, value) {
setModalContent(`确定审核${str}吗？`); setModalContent(`确定${str}吗？`);
setAffairParams({ oldKey: key, btnValue: value }); setAffairParams({ oldKey: key, btnValue: value });
setVisible(true); setVisible(true);
} }
......
FormInsertDiy/AuditPage/AuditForm.js
浏览文件 @ c0f7cedf
...@@ -5,7 +5,7 @@ import { ModalInfo } from '@/baseComponent/Modal'; ...@@ -5,7 +5,7 @@ import { ModalInfo } from '@/baseComponent/Modal';
import React, { useState, useEffect } from 'react'; import React, { useState, useEffect } from 'react';
import { getHistoryFormDetail } from '../../Services'; import { getHistoryFormDetail } from '../../Services';
import withGoBack from '@/highOrderComponent/withGoBack'; import withGoBack from '@/highOrderComponent/withGoBack';
import HistoryForm from '@/webPublic/one_stop_public/Entrance/historyForm'; import HistoryForm from '@/webPublic/FormInsertDiy/HistoryForm';
import AuditButton from '../AuditButton'; import AuditButton from '../AuditButton';
import styles from '../RenderForm/index.less'; import styles from '../RenderForm/index.less';
......
FormInsertDiy/Edit/index.js
浏览文件 @ c0f7cedf
import React, { Fragment } from 'react'; // import React, { Fragment } from 'react';
import { // import {
Button, // Button,
Card, Col, // Card, Col,
Form, message, Row, // Form, message, Row,
} from 'antd'; // } from 'antd';
import { connect } from 'dva'; // import { connect } from 'dva';
import PageHeaderWrapper from '@/components/PageHeaderWrapper'; // import PageHeaderWrapper from '@/components/PageHeaderWrapper';
import moment from 'moment'; // import moment from 'moment';
import router from 'umi/router'; // import router from 'umi/router';
import { text, number, date, getFormArrayConfig } from '../config/index'; // import { text, number, date, getFormArrayConfig } from '../config/index';
import FormArray from '../AffairPage/component/FormArray'; // import FormArray from '../AffairPage/component/FormArray';
import ButtonDiy from '@/baseComponent/ButtonDiy'; // import ButtonDiy from '@/baseComponent/ButtonDiy';
import Shell from '../Shell'; // import Shell from '../Shell';
//
//
@connect(({ formList, loading }) => ({ // @connect(({ formList, loading }) => ({
formList, // formList,
})) // }))
@Form.create() // @Form.create()
class Edit extends React.Component { // class Edit extends React.Component {
//
state = { // state = {
modalVisible: false, // modalVisible: false,
formData: {}, // formData: {},
formItem: [], // formItem: [],
isAdd: false, // isAdd: false,
objId: this.props.id, // objId: this.props.id,
recordId: this.props.recordId, // recordId: this.props.recordId,
recordKey: this.props.recordKey, // recordKey: this.props.recordKey,
}; // };
columns = []; // columns = [];
//
//渲染值 // //渲染值
componentDidMount() { // componentDidMount() {
const { dispatch } = this.props; // const { dispatch } = this.props;
const { objId, recordKey, recordId } = this.state; // const { objId, recordKey, recordId } = this.state;
dispatch({ // dispatch({
type: 'formList/getHead', // type: 'formList/getHead',
payload: { dataObjId: objId }, // payload: { dataObjId: objId },
callback: (dates) => { // callback: (dates) => {
if (dates) { // if (dates) {
this.setState({ // this.setState({
formItem: dates, // formItem: dates,
}); // });
} // }
}, // },
}); // });
//渲染表单字段 // //渲染表单字段
if (recordId != null) { // if (recordId != null) {
dispatch({ // dispatch({
type: 'formList/getDetail', // type: 'formList/getDetail',
payload: { // payload: {
dataObjId: objId, // dataObjId: objId,
key: recordKey, // key: recordKey,
value: recordId, // value: recordId,
}, // },
callback: (res) => { // callback: (res) => {
if (res) { // if (res) {
this.setState({ // this.setState({
formData: res, // formData: res,
}); // });
} // }
}, // },
}); // });
this.setState({ // this.setState({
isAdd: false, // isAdd: false,
}) // })
}else{ // }else{
this.setState({ // this.setState({
isAdd: true, // isAdd: true,
}) // })
} // }
} // }
//
onSubmit = () => { // onSubmit = () => {
//router.goBack(); // //router.goBack();
const { isAdd, objId, formData } = this.state; // const { isAdd, objId, formData } = this.state;
let payload = { // let payload = {
params: {...formData}, // params: {...formData},
objId, // objId,
isAdd, // isAdd,
}; // };
this.props.dispatch({ // this.props.dispatch({
type: 'formList/add', // type: 'formList/add',
payload, // payload,
callback: () => { // callback: () => {
message.success('操作成功'); // message.success('操作成功');
this.props.returnThis(); // this.props.returnThis();
}, // },
}); // });
}; // };
//
goBack = () => { // goBack = () => {
this.props.returnThis(); // this.props.returnThis();
}; // };
//
changeFormData = (value, key) => { // changeFormData = (value, key) => {
let oldValue = this.state.formData; // let oldValue = this.state.formData;
oldValue[key] = value; // oldValue[key] = value;
this.setState({ // this.setState({
formData: oldValue, // formData: oldValue,
}); // });
}; // };
//
render() { // render() {
let { formItem, formData } = this.state; // let { formItem, formData } = this.state;
let formConfig = getFormArrayConfig(formItem); // let formConfig = getFormArrayConfig(formItem);
return ( // return (
<Shell> // <Shell>
<Row> // <Row>
<FormArray // <FormArray
config={formConfig} // config={formConfig}
nameSpan={{ big: 10, small: 12 }} // nameSpan={{ big: 10, small: 12 }}
fileSpan={{ big: 4, small: 3 }} // fileSpan={{ big: 4, small: 3 }}
value={formData} // value={formData}
changeValue={this.changeFormData} // changeValue={this.changeFormData}
/> // />
<Col span={24} // <Col span={24}
style={{ textAlign: 'center', paddingTop: '200px', paddingBottom: '50px' }}> // style={{ textAlign: 'center', paddingTop: '200px', paddingBottom: '50px' }}>
//
<ButtonDiy // <ButtonDiy
className={'primaryBlue'} // className={'primaryBlue'}
handleClick={this.onSubmit} // handleClick={this.onSubmit}
name={'保存'} // name={'保存'}
/> // />
<ButtonDiy // <ButtonDiy
className={'defaultRed'} // className={'defaultRed'}
handleClick={this.goBack} // handleClick={this.goBack}
name={'返回'} // name={'返回'}
/> // />
</Col> // </Col>
</Row> // </Row>
</Shell> // </Shell>
); // );
} // }
} // }
//
export default Edit; // export default Edit;
FormInsertDiy/HistoryForm/index.js 0 → 100644
浏览文件 @ c0f7cedf
/* eslint-disable no-nested-ternary */
/**
* 历史表单+最新表单生成
* data 'affair/getIdFormDetail' 接口返回的详细参数
* form 表单控件
* isNewForm 是否展示最新表单
*/
import React from 'react';
import { Spin, Card } from 'antd';
import { isEmpty } from '@/webPublic/one_stop_public/copy';
import RenderForm from '../RenderForm';
import styles from './index.less';
export default function HistoryForm(props) {
const { data, isNewForm } = props;
return (
<div>
{data.hisTaskForm.formKeys && data.hisTaskForm.formKeys.length > 0
? data.hisTaskForm.formKeys.map((item, index) => {
return (
<Card
key={item.formKey}
title={item.taskName}
bordered={false}
style={{ width: 800, margin: 'auto' }}
>
{!data ? (
<div
style={{
width: '100%',
height: 200,
display: 'flex',
justifyContent: 'center',
alignItems: 'center',
}}
>
<Spin size="large" />
</div>
) : (
<RenderForm
get="web"
isCg="no"
postData={data}
obj={data.hisTaskForm.formData}
form={props.form}
formKey={item.formKey}
/>
)}
</Card>
);
})
: ''}
{isNewForm ? ( // 展示最新表单
data.isHandle && !!data.taskFormKey ? (
<Card
title="当前流程"
bordered={false}
style={{ width: 800, margin: 'auto' }}
>
{!isEmpty(data) && (
<RenderForm
postData={data}
get="web"
isCg="no"
obj={data.hisTaskForm.formData}
table="new"
form={props.form}
/>
)}
</Card>
) : null
) : null}
</div>
);
}
FormInsertDiy/HistoryForm/index.less 0 → 100644
浏览文件 @ c0f7cedf
.title {
font-size: 20px;
font-weight: bolder;
margin: 16px 0 8px 0;
padding-left: calc((100% - 800px) / 2);
}
FormInsertDiy/ImportUtil/ImportUtil.less
浏览文件 @ c0f7cedf
.nomal{ //.nomal{
background: #fff; // background: #fff;
padding: 10px; // padding: 10px;
} //}
.title{ //.title{
display: flex; // display: flex;
margin-bottom: 20px; // margin-bottom: 20px;
} //}
.info{ //.info{
text-align: center; // text-align: center;
font-weight: bold; // font-weight: bold;
font-size: 18px; // font-size: 18px;
} //}
.detail{ //.detail{
text-align: center; // text-align: center;
margin:30px auto; // margin:30px auto;
} //}
.detail img{ //.detail img{
margin: auto 10px; // margin: auto 10px;
} //}
.button{ //.button{
display: -webkit-box; /* 老版本语法: Safari, iOS, Android browser, older WebKit browsers. */ // display: -webkit-box; /* 老版本语法: Safari, iOS, Android browser, older WebKit browsers. */
display: -moz-box; /* 老版本语法: Firefox (buggy) */ // display: -moz-box; /* 老版本语法: Firefox (buggy) */
display: -ms-flexbox; /* 混合版本语法: IE 10 */ // display: -ms-flexbox; /* 混合版本语法: IE 10 */
display: -webkit-flex; /* 新版本语法: Chrome 21+ */ // display: -webkit-flex; /* 新版本语法: Chrome 21+ */
display: -moz-flex; // display: -moz-flex;
display: flex; // display: flex;
-moz-box-pack: center; /*Firefox*/ // -moz-box-pack: center; /*Firefox*/
-webkit-box-pack: center; /*Safari,Opera,Chrome*/ // -webkit-box-pack: center; /*Safari,Opera,Chrome*/
box-pack: center; // box-pack: center;
-moz-justify-content: center; // -moz-justify-content: center;
-webkit-justify-content: center; // -webkit-justify-content: center;
justify-content: center; // justify-content: center;
} //}
.operation{ //.operation{
display: -webkit-box; /* 老版本语法: Safari, iOS, Android browser, older WebKit browsers. */ // display: -webkit-box; /* 老版本语法: Safari, iOS, Android browser, older WebKit browsers. */
display: -moz-box; /* 老版本语法: Firefox (buggy) */ // display: -moz-box; /* 老版本语法: Firefox (buggy) */
display: -ms-flexbox; /* 混合版本语法: IE 10 */ // display: -ms-flexbox; /* 混合版本语法: IE 10 */
display: -webkit-flex; /* 新版本语法: Chrome 21+ */ // display: -webkit-flex; /* 新版本语法: Chrome 21+ */
display: -moz-flex; // display: -moz-flex;
display: flex; // display: flex;
-moz-box-pack: center; /*Firefox*/ // -moz-box-pack: center; /*Firefox*/
-webkit-box-pack: center; /*Safari,Opera,Chrome*/ // -webkit-box-pack: center; /*Safari,Opera,Chrome*/
box-pack: center; // box-pack: center;
-moz-justify-content: center; // -moz-justify-content: center;
-webkit-justify-content: center; // -webkit-justify-content: center;
justify-content: center; // justify-content: center;
} //}
.button Button{ //.button Button{
margin: auto 10px; // margin: auto 10px;
//
} //}
.titleInfo p span{ //.titleInfo p span{
font-weight: bold; // font-weight: bold;
} //}
.import{ //.import{
color: #6ca3c9; // color: #6ca3c9;
font-size: 16px; // font-size: 16px;
} //}
.button{ //.button{
// background: #eff3f8; // // background: #eff3f8;
text-align: center; // text-align: center;
padding:20px; // padding:20px;
margin-top: 20px; // margin-top: 20px;
} //}
.tip{ //.tip{
margin:20px auto; // margin:20px auto;
padding:10px; // padding:10px;
border-top: 1px solid #ccc; // border-top: 1px solid #ccc;
} //}
.tip span{ //.tip span{
display: block; // display: block;
margin:10px; // margin:10px;
font-size: 16px; // font-size: 16px;
} //}
.tip::after{ //.tip::after{
content: ''; // content: '';
position: absolute; // position: absolute;
width: 5px; // width: 5px;
height: 57px; // height: 57px;
background: #e5eaf1; // background: #e5eaf1;
margin-top: -141px; // margin-top: -141px;
margin-left: -13px; // margin-left: -13px;
} //}
.select button{ //.select button{
color: #fff; // color: #fff;
padding:10px; // padding:10px;
background: #abbac3; // background: #abbac3;
border: none; // border: none;
margin: 10px; // margin: 10px;
} //}
.attentionItem{ //.attentionItem{
background: #f4f5f4; // background: #f4f5f4;
padding: 10px; // padding: 10px;
box-shadow: 1px 1px 1px #ccc; // box-shadow: 1px 1px 1px #ccc;
} //}
.attentionItem p:nth-child(1){ //.attentionItem p:nth-child(1){
font-size: 16px; // font-size: 16px;
margin-left: 0; // margin-left: 0;
} //}
.attentionItem p{ //.attentionItem p{
font-size: 14px; // font-size: 14px;
margin-left: 45px; // margin-left: 45px;
} //}
.submitButtons{ //.submitButtons{
margin-left: 34px; // margin-left: 34px;
} //}
.contentTable{ //.contentTable{
display: -webkit-box; /* 老版本语法: Safari, iOS, Android browser, older WebKit browsers. */ // display: -webkit-box; /* 老版本语法: Safari, iOS, Android browser, older WebKit browsers. */
display: -moz-box; /* 老版本语法: Firefox (buggy) */ // display: -moz-box; /* 老版本语法: Firefox (buggy) */
display: -ms-flexbox; /* 混合版本语法: IE 10 */ // display: -ms-flexbox; /* 混合版本语法: IE 10 */
display: -webkit-flex; /* 新版本语法: Chrome 21+ */ // display: -webkit-flex; /* 新版本语法: Chrome 21+ */
display: -moz-flex; // display: -moz-flex;
display: flex; // display: flex;
-moz-box-pack: justify; /*Firefox*/ // -moz-box-pack: justify; /*Firefox*/
-webkit-box-pack:justify; /*Safari,Opera,Chrome*/ // -webkit-box-pack:justify; /*Safari,Opera,Chrome*/
box-pack: justify; // box-pack: justify;
-moz-justify-content: space-between; // -moz-justify-content: space-between;
-webkit-justify-content: space-between; // -webkit-justify-content: space-between;
justify-content: space-between; // justify-content: space-between;
margin-top: 20px; // margin-top: 20px;
} //}
.left{ //.left{
width: 50%; // width: 50%;
} //}
.right{ //.right{
width: 50%; // width: 50%;
border-left: 1px solid #317ecc; // border-left: 1px solid #317ecc;
} //}
.error p{ //.error p{
color: #fff; // color: #fff;
background: #317ecc; // background: #317ecc;
// margin: 10px auto; // // margin: 10px auto;
text-align: left; // text-align: left;
font-size: 18px; // font-size: 18px;
} //}
.download{ //.download{
background: #f5f5f5; // background: #f5f5f5;
padding: 5px; // padding: 5px;
margin-top: -16px; // margin-top: -16px;
} //}
.download img{ //.download img{
margin-top: -2px; // margin-top: -2px;
margin-right: 5px; // margin-right: 5px;
} //}
.download button{ //.download button{
border: none; // border: none;
background: #f5f5f5 // background: #f5f5f5
} //}
.download button:nth-child(1){ //.download button:nth-child(1){
border-right: 1px solid #ccc; // border-right: 1px solid #ccc;
} //}
.download button:nth-child(2){ //.download button:nth-child(2){
border-right: 1px solid #ccc; // border-right: 1px solid #ccc;
} //}
.buttonDown{ //.buttonDown{
display: -webkit-box; /* 老版本语法: Safari, iOS, Android browser, older WebKit browsers. */ // display: -webkit-box; /* 老版本语法: Safari, iOS, Android browser, older WebKit browsers. */
display: -moz-box; /* 老版本语法: Firefox (buggy) */ // display: -moz-box; /* 老版本语法: Firefox (buggy) */
display: -ms-flexbox; /* 混合版本语法: IE 10 */ // display: -ms-flexbox; /* 混合版本语法: IE 10 */
display: -webkit-flex; /* 新版本语法: Chrome 21+ */ // display: -webkit-flex; /* 新版本语法: Chrome 21+ */
display: -moz-flex; // display: -moz-flex;
display: flex; // display: flex;
-moz-box-pack: start; /*Firefox*/ // -moz-box-pack: start; /*Firefox*/
-webkit-box-pack: start; /*Safari,Opera,Chrome*/ // -webkit-box-pack: start; /*Safari,Opera,Chrome*/
box-pack: start; // box-pack: start;
-moz-justify-content: flex-start; // -moz-justify-content: flex-start;
-webkit-justify-content: flex-start; // -webkit-justify-content: flex-start;
justify-content: flex-start; // justify-content: flex-start;
margin-bottom: 20px; // margin-bottom: 20px;
} //}
.buttonDown>button{ //.buttonDown>button{
margin-left: 10px; // margin-left: 10px;
background: #abbac3; // background: #abbac3;
border: none; // border: none;
color: #fff; // color: #fff;
padding: 5px 12px; // padding: 5px 12px;
border-radius: 5px; // border-radius: 5px;
} //}
\ No newline at end of file
FormInsertDiy/List/index.js
浏览文件 @ c0f7cedf
...@@ -2,13 +2,13 @@ import React, { Fragment } from 'react'; ...@@ -2,13 +2,13 @@ import React, { Fragment } from 'react';
import { Divider, message, Modal, Popconfirm } from 'antd'; import { Divider, message, Modal, Popconfirm } from 'antd';
import moment from 'moment'; import moment from 'moment';
import router from 'umi/router'; import router from 'umi/router';
import ExportInfo from '../Export/index'; // import ExportInfo from '../Export/index';
import { text, number, date, getFormArrayConfig } from '../config/index'; import { text, number, date, getFormArrayConfig } from '../config/index';
import ButtonDiy from '@/baseComponent/ButtonDiy'; import ButtonDiy from '@/baseComponent/ButtonDiy';
import Shell from '../Shell'; import Shell from '../Shell';
import FormArray from '../AffairPage/component/FormArray'; import FormArray from '../AffairPage/component/FormArray';
import Edit from '../Edit/index'; import Edit from '../Edit/index';
import ImportUtil from '../ImportUtil/ImportUtil'; // import ImportUtil from '../ImportUtil/ImportUtil';
import SearchDom from '@/highOrderComponent/SearchDom'; import SearchDom from '@/highOrderComponent/SearchDom';
import StandardTable from '@/components/StandardTable'; import StandardTable from '@/components/StandardTable';
import { getHead, fetchData, deleteItem, add } from './services'; import { getHead, fetchData, deleteItem, add } from './services';
...@@ -344,8 +344,8 @@ class FormList extends React.Component { ...@@ -344,8 +344,8 @@ class FormList extends React.Component {
<Shell> <Shell>
<div style={{ paddingLeft: '10px', marginTop: '20px' }}> <div style={{ paddingLeft: '10px', marginTop: '20px' }}>
<ButtonDiy icon="plus" className="primaryBlue" handleClick={this.add} name="新建" /> <ButtonDiy icon="plus" className="primaryBlue" handleClick={this.add} name="新建" />
{hasImport && <ImportUtil objId={objId} />} {/* {hasImport && <ImportUtil objId={objId} />}
{hasExport && <ExportInfo objId={objId} />} {hasExport && <ExportInfo objId={objId} />}*/}
<ButtonDiy handleClick={this.batchDelete} name="批量删除" /> <ButtonDiy handleClick={this.batchDelete} name="批量删除" />
</div> </div>
<StandardTable <StandardTable
......
FormInsertDiy/ListWithAddEditTemplate/index.js
浏览文件 @ c0f7cedf
...@@ -75,11 +75,14 @@ class ListWithAddEditTemplate extends React.Component { ...@@ -75,11 +75,14 @@ class ListWithAddEditTemplate extends React.Component {
if (!headerList) return; if (!headerList) return;
this.setState({ headerList }); this.setState({ headerList });
this.columns = headerList.filter(i => !i.isHidden).slice(0, 10).map(item => ({ this.columns = headerList
title: item.title, .filter(i => !i.isHidden)
dataIndex: item.name, .slice(0, 10)
render: date.includes(item.type) && dateRender, .map(item => ({
})); title: item.title,
dataIndex: item.name,
render: date.includes(item.type) && dateRender,
}));
const operation = { const operation = {
title: '操作', title: '操作',
render: (_, record) => { render: (_, record) => {
...@@ -161,7 +164,10 @@ class ListWithAddEditTemplate extends React.Component { ...@@ -161,7 +164,10 @@ class ListWithAddEditTemplate extends React.Component {
getPage = () => { getPage = () => {
const { objId, filters = {} } = this.props; const { objId, filters = {} } = this.props;
const { formValues, pageData: pagination } = this.state; const {
formValues,
pageData: { pagination },
} = this.state;
const query = { ...formValues, ...filters }; const query = { ...formValues, ...filters };
const pageNo = pagination.current ? pagination.current : 1; const pageNo = pagination.current ? pagination.current : 1;
const pageSize = pagination.pageSize ? pagination.pageSize : 10; const pageSize = pagination.pageSize ? pagination.pageSize : 10;
...@@ -184,21 +190,12 @@ class ListWithAddEditTemplate extends React.Component { ...@@ -184,21 +190,12 @@ class ListWithAddEditTemplate extends React.Component {
}; };
handleStandardTableChange = (pagination, filtersArg, sorter) => { handleStandardTableChange = (pagination, filtersArg, sorter) => {
const filters = Object.keys(filtersArg).reduce((obj, key) => { this.setState(
const newObj = { ...obj }; ({ pageData }) => ({
newObj[key] = getValue(filtersArg[key]); pageData: { ...pageData, pagination },
return newObj; }),
}, {}); this.getPage
);
const params = {
pageNo: pagination.current,
pageSize: pagination.pageSize,
...filters,
};
if (sorter.field) {
params.sorter = `${sorter.field}_${sorter.order}`;
}
this.getPage(params);
}; };
handleAdd = () => { handleAdd = () => {
......
FormInsertDiy/MyApplyList/DetailPage.js
浏览文件 @ c0f7cedf
import React, { useState, useEffect } from 'react'; import React, { useState, useEffect } from 'react';
import { Form, Spin } from 'antd'; import { Form, Spin } from 'antd';
import Shell from '@/baseComponent/Shell'; import Shell from '@/baseComponent/Shell';
import HistoryForm from '@/webPublic/one_stop_public/Entrance/historyForm'; import HistoryForm from '@/webPublic/FormInsertDiy/HistoryForm';
import { getHistoryFormDetail } from '../../Services'; import { getHistoryFormDetail } from '../../Services';
import withGoBack from '@/highOrderComponent/withGoBack'; import withGoBack from '@/highOrderComponent/withGoBack';
......
FormInsertDiy/RenderForm/index.js
浏览文件 @ c0f7cedf
...@@ -3,10 +3,10 @@ import ZdyTable from '@/webPublic/one_stop_public/Table'; ...@@ -3,10 +3,10 @@ import ZdyTable from '@/webPublic/one_stop_public/Table';
import styles from './index.less'; import styles from './index.less';
import { fetchTemplateByCode, fetchTableItem } from '@/webPublic/Services'; import { fetchTemplateByCode, fetchTableItem } from '@/webPublic/Services';
export default function RenderForm({ get = 'web', isCg = 'yes', form, postData }) { export default function RenderForm({ get = 'web', isCg = 'yes', ...rest }) {
return ( return (
<div className={styles.zyd_onestop_style_class}> <div className={styles.zyd_onestop_style_class}>
<ZdyTable get={get} isCg={isCg} postData={postData} form={form} /> <ZdyTable get={get} isCg={isCg} {...rest} />
</div> </div>
); );
} }
...@@ -73,6 +73,12 @@ export function RenderFormByObjId({ ...@@ -73,6 +73,12 @@ export function RenderFormByObjId({
); );
return ( return (
<RenderFormByContent get={get} isCg={isCg} content={content} templateCode={templateCode} form={form} /> <RenderFormByContent
get={get}
isCg={isCg}
content={content}
templateCode={templateCode}
form={form}
/>
); );
} }
FormInsertDiy/RenderForm/index.less
浏览文件 @ c0f7cedf
.zyd_onestop_style_class{ .zyd_onestop_style_class{
padding: 20px;
table, td, div{ table, td, div{
overflow: unset !important; overflow: unset !important;
} }
} }
FormInsertDiy/models/DataObj.js deleted 100644 → 0
浏览文件 @ efc88f79
import { apiRequest } from '../request';
const api="/DataObjApi";
export default {
namespace: 'DataObj',
state: {
list: [],
data:{
list: [],
pagination: {},
},
code:{
list: [],
pagination: {},
}
},
effects: {
*getExportInfo({ payload, callback }, { call, put }) {
const response = yield call(apiRequest,api+"/getExportInfo" ,payload);
if(!response){yield put({type: 'nom'});return }
yield put({
type: 'nom',
payload: response,
});
if (callback) callback(response);
},
*changeCatalogue({ payload, callback }, { call, put }) {
const response = yield call(apiRequest,api+"/changeCatalogue" ,payload);
if(!response){yield put({type: 'nom'});return }
yield put({
type: 'nom',
payload: response,
});
if (callback) callback(response);
},
*find({ payload, callback }, { call, put }) {
const response = yield call(apiRequest,api+"/find" ,payload);
if(!response){yield put({type: 'nom'});return }
yield put({
type: 'nom',
payload: response,
});
if (callback) callback(response);
},
*add({ payload, callback }, { call, put }) {
const response = yield call(apiRequest,api+"/add" ,payload);
if(!response){yield put({type: 'nom'});return }
yield put({
type: 'nom',
payload: response,
});
if (callback) callback(response);
},*fetch({ payload, callback }, { call, put }) {
const response = yield call(apiRequest,api+"/getPage" ,payload);
if(!response){yield put({type: 'nom'});return }
yield put({
type: 'page',
payload: {...response,isMain:payload.isMain},
});
},*remove({ payload, callback }, { call, put }) {
const response = yield call(apiRequest,api+"/remove" ,payload);
if(!response){yield put({type: 'nom'});return }
yield put({
type: 'nom',
payload: response,
});
if(callback){
callback()
}
},*open({ payload, callback }, { call, put }) {
const response = yield call(apiRequest,api+"/open" ,payload);
if(!response){yield put({type: 'nom'});return }
yield put({
type: 'nom',
payload: response,
});
if(callback){
callback()
}
},
*createTabel({payload,callback},{call,put}){
const response = yield call(apiRequest,api+"/createTable",payload);
if(!response){yield put({type: 'nom'});return }
yield put({
type: 'nom',
payload: response,
});
if(callback){
callback()
}
}
},
reducers: {
list(state, action) {
return {
...state,
list: action.payload,
};
},
page(state, { payload }) {
if(payload.isMain){
return {
...state,
data:{
list: payload.rows,
pagination: {
current:payload.pageNo,
pageSize:payload.pageSize,
total:payload.total,
},
}
};
}else{
return {
...state,
code:{
list: payload.rows,
pagination: {
current:payload.pageNo,
pageSize:payload.pageSize,
total:payload.total,
},
}
};
}
},
nom(state, action) {
return {...state };
},
},
};
FormInsertDiy/models/FormList.js deleted 100644 → 0
浏览文件 @ efc88f79
import { uaaRequest } from '../../one_stop_public/utils/request';
const api = '/DataObjApi';
export default {
namespace: 'formList',
state: {
list: [],
data: {
list: [],
pagination: {},
},
},
effects: {
* clear({ payload, callback }, { call, put }) {
yield put({
type: 'clearAll',
payload: {},
});
},
* getHead({ payload, callback }, { call, put }) {
console.log('getHead',);
const response = yield call(uaaRequest, '/DataColumnApi/getHeaderList', payload);
console.log(' header response', response);
if (!response) {
yield put({ type: 'nom' });
return;
}
if (callback) callback(response);
},
* fetch({ payload, callback }, { call, put }) {
const response = yield call(uaaRequest, '/DataObjApi/getFormDataPage', payload);
if (!response) {
yield put({ type: 'nom' });
return;
}
/* yield put({
type: 'page',
payload: {
...response,
},
});*/
if (callback) callback(response);
},
* add({ payload, callback }, { call, put }) {
const response = yield call(apiRequest, api + '/addFormData',
{
data: JSON.stringify(payload.params),
isAdd: payload.isAdd,
objId: payload.objId,
});
if (!response) {
yield put({ type: 'nom' });
return;
}
if (callback) callback(response);
},
* delete({ payload, callback }, { call, put }) {
const response = yield call(apiRequest, api + '/deleteFormData', payload);
if (!response) {
yield put({ type: 'nom' });
return;
}
if (callback) callback(response);
},
* getDetail({ payload, callback }, { call, put }) {
const response = yield call(apiRequest, api + '/getFormData', payload);
if (!response) {
yield put({ type: 'nom' });
return;
}
if (callback) callback(response);
},
},
reducers: {
clearAll(state, action) {
return {
...state,
data: {
list: [],
pagination: {},
},
};
},
list(state, action) {
return {
...state,
list: action.payload,
};
},
page(state, { payload }) {
return {
...state,
data: {
list: payload.rows,
pagination: {
current: payload.pageNo,
pageSize: payload.pageSize,
total: Number(payload.total),
},
},
};
},
nom(state, action) {
return { ...state };
},
},
};
FormInsertDiy/request.js
浏览文件 @ c0f7cedf
...@@ -5,7 +5,7 @@ ...@@ -5,7 +5,7 @@
import {extend} from 'umi-request'; import {extend} from 'umi-request';
import {notification} from 'antd'; import {notification} from 'antd';
import FormdataWrapper from "@/utils/object-to-formdata-custom"; import FormdataWrapper from "@/utils/object-to-formdata-custom";
import { getHuanGeToken } from '@/utils/authority'; import { getToken } from '@/utils/authority';
import { offline } from './Toast'; import { offline } from './Toast';
import systemConfig from '@/config/config'; import systemConfig from '@/config/config';
...@@ -70,7 +70,7 @@ const umiRequest = extend({ ...@@ -70,7 +70,7 @@ const umiRequest = extend({
}); });
export const request = (url, data, options = {}) => { export const request = (url, data, options = {}) => {
const pp = {...data,token: getHuanGeToken()} const pp = {...data,token: getToken()}
const requestParams = FormdataWrapper(pp) const requestParams = FormdataWrapper(pp)
// 由于自动添加前缀 这里暂时修改getUrl(url) // 由于自动添加前缀 这里暂时修改getUrl(url)
......
one_stop_public/AffairButton/SumbitButton/index.jsx
浏览文件 @ c0f7cedf
...@@ -65,8 +65,6 @@ export default class idnex extends Component { ...@@ -65,8 +65,6 @@ export default class idnex extends Component {
if(this.props?.callback){ if(this.props?.callback){
this.props.callback(val) this.props.callback(val)
} }
} else {
openToast('error', '保存失败', '请尝试');
} }
}, },
}).then(()=>{ }).then(()=>{
...@@ -140,8 +138,9 @@ export default class idnex extends Component { ...@@ -140,8 +138,9 @@ export default class idnex extends Component {
openDraftButton? openDraftButton?
<Button <Button
style={{ style={{
marginRight:20 marginRight:24
}} }}
shape='round'
isLoading={isLoading} isLoading={isLoading}
onClick={this.handleDraft} onClick={this.handleDraft}
> >
...@@ -153,6 +152,8 @@ export default class idnex extends Component { ...@@ -153,6 +152,8 @@ export default class idnex extends Component {
onClick={this.showModal} onClick={this.showModal}
isLoading={isLoading} isLoading={isLoading}
type='primary' type='primary'
shape='round'
ghost
> >
{ {
text??'提交' text??'提交'
......
one_stop_public/tableCompon/index.jsx
浏览文件 @ c0f7cedf
...@@ -662,14 +662,68 @@ export default class tableCom extends Component { ...@@ -662,14 +662,68 @@ export default class tableCom extends Component {
if (json.funcs != null && json.funcs != "") { if (json.funcs != null && json.funcs != "") {
let enu; let enu;
try { try {
this.getFunctionValue(json.funcs, { base52: this.props.uuid }, json) ; this.getFunctionValue(json.funcs, { base52: this.props.uuid }, json,()=>{
if (init != null && Object.keys(init).length > 0) {
} catch (e) { let base52 = dataColumn.base52
message.error("公式选项配置存在问题") let vlu=this.props.form.getFieldValue(base52)
if(vlu instanceof Array){
}
for(var i=0;i<this.state.options.length;i++){
if(vlu.includes(this.state.options[i].value)){
labs.push(this.state.options[i].label)
}
}
}else{
for(var i=0;i<this.state.options.length;i++){
if(vlu==this.state.options[i].value){
labs.push(this.state.options[i].label)
break;
}
}
}
this.setState({labels:labs})
}else if (!this.props.isEdit && Object.keys(obj).length > 0) {
let base52 = dataColumn.base52
if (this.props.fatherCode) {
const x = base52.split(".")
base52 = x[x.length - 1]
}
const vlu=obj[base52]
const labs=[]
if(vlu instanceof Array){
for(var i=0;i<this.state.options.length;i++){
if(vlu.includes(this.state.options[i].value)){
labs.push(this.state.options[i].label)
}
}
}else{
for(var i=0;i<this.state.options.length;i++){
if(vlu==this.state.options[i].value){
labs.push(this.state.options[i].label)
break;
}
}
}
this.setState({labels:labs})
}
}) ;
} catch (e) {
message.error("公式选项配置存在问题")
}
} }
...@@ -688,7 +742,7 @@ export default class tableCom extends Component { ...@@ -688,7 +742,7 @@ export default class tableCom extends Component {
} }
} }
reqUtil = (base52, json, url, method, params, callback, options = {}) => { reqUtil = (base52, json,orgCallback, url, method, params, callback, options = {}) => {
//查缓存 //查缓存
var isChange = false; var isChange = false;
if(url.indexOf("http")===-1){ if(url.indexOf("http")===-1){
...@@ -731,7 +785,9 @@ export default class tableCom extends Component { ...@@ -731,7 +785,9 @@ export default class tableCom extends Component {
const res=callback(data) const res=callback(data)
if(res!=null&&!(typeof res === "function")){ if(res!=null&&!(typeof res === "function")){
this.setState({ options: res , selectDis: false }); this.setState({ options: res , selectDis: false },()=>{
if(orgCallback) orgCallback()
});
} }
}else if (json.comName == "Button") { }else if (json.comName == "Button") {
...@@ -808,7 +864,9 @@ export default class tableCom extends Component { ...@@ -808,7 +864,9 @@ export default class tableCom extends Component {
const res=callback(data) const res=callback(data)
if(res!=null&&!(typeof res === "function")){ if(res!=null&&!(typeof res === "function")){
this.setState({ options: res , selectDis: false }); this.setState({ options: res , selectDis: false },()=>{
if(orgCallback) orgCallback()
});
} }
}else if (json.comName == "Button") { }else if (json.comName == "Button") {
...@@ -864,7 +922,7 @@ export default class tableCom extends Component { ...@@ -864,7 +922,7 @@ export default class tableCom extends Component {
} }
sqlUtil = (base52, json, sqlKey, params, callback, options = {}) => { sqlUtil = (base52, json,orgCallback, sqlKey, params, callback, options = {}) => {
//查缓存 //查缓存
var isChange = false; var isChange = false;
...@@ -895,7 +953,9 @@ export default class tableCom extends Component { ...@@ -895,7 +953,9 @@ export default class tableCom extends Component {
if(json.optionType&&json.optionType=="func"){ if(json.optionType&&json.optionType=="func"){
const res=callback(data) const res=callback(data)
if(res!=null&&!(typeof res === "function")){ if(res!=null&&!(typeof res === "function")){
this.setState({ options: res , selectDis: false }); this.setState({ options: res , selectDis: false },()=>{
if(orgCallback)orgCallback()
});
} }
}else if (json.comName == "Button") { }else if (json.comName == "Button") {
try { try {
...@@ -974,7 +1034,9 @@ export default class tableCom extends Component { ...@@ -974,7 +1034,9 @@ export default class tableCom extends Component {
const res=callback(data) const res=callback(data)
if(res!=null&&!(typeof res === "function")){ if(res!=null&&!(typeof res === "function")){
this.setState({ options: res , selectDis: false }); this.setState({ options: res , selectDis: false },()=>{
if(orgCallback) orgCallback()
});
} }
}else if (json.comName == "Button") { }else if (json.comName == "Button") {
...@@ -1030,7 +1092,7 @@ export default class tableCom extends Component { ...@@ -1030,7 +1092,7 @@ export default class tableCom extends Component {
return "norefeshxxxxxxxxxxxxxxxxxxxx" return "norefeshxxxxxxxxxxxxxxxxxxxx"
} }
getFunctionValue = (fun, column, json) => { getFunctionValue = (fun, column, json,callback) => {
/* if (!this.props.isEdit) { /* if (!this.props.isEdit) {
return return
...@@ -1045,10 +1107,10 @@ export default class tableCom extends Component { ...@@ -1045,10 +1107,10 @@ export default class tableCom extends Component {
const value = fun1(obj,this.props.init, this.props.defaultValues, { clientType: this.props.get }, this.props.index, this.props.fatherCode, const value = fun1(obj,this.props.init, this.props.defaultValues, { clientType: this.props.get }, this.props.index, this.props.fatherCode,
{ {
moment: moment, moment: moment,
sql: this.sqlUtil.bind(this, base52, json), sql: this.sqlUtil.bind(this, base52, json,callback),
message: message,router:router, message: message,router:router,
setValues: this.setValues.bind(this, base52, json), setValues: this.setValues.bind(this, base52, json),
req: this.reqUtil.bind(this, base52, json), req: this.reqUtil.bind(this, base52, json,callback),
md5: md5, md5: md5,
render:this.getRender,base64:getBase64 render:this.getRender,base64:getBase64
}, },
...@@ -1072,7 +1134,9 @@ export default class tableCom extends Component { ...@@ -1072,7 +1134,9 @@ export default class tableCom extends Component {
if(value!=null&&!(typeof value === "function")){ if(value!=null&&!(typeof value === "function")){
this.setState({ options: value , selectDis: false }); this.setState({ options: value , selectDis: false },()=>{
if(callback) callback()
});
} }
} else if (json.comName == "Echart" || json.comName == "QRCode") { } else if (json.comName == "Echart" || json.comName == "QRCode") {
...@@ -1631,8 +1695,15 @@ export default class tableCom extends Component { ...@@ -1631,8 +1695,15 @@ export default class tableCom extends Component {
} }
} }
if (!isEdit) { if (!isEdit) {
if (this.props.fatherCode) { if (this.props.fatherCode) {
dataColumn.base52 = this.props.uuid if(bindObj!=null){
dataColumn.base52 = bindObj.base52
}else{
dataColumn.base52 = this.props.uuid
}
} }
......
Markdown 格式
0% 或
您添加了 0 人 到此讨论。请谨慎行事。
请先完成此评论的编辑！
请 注册 或者 后发表评论