Merge branch 'master' of http://scjoyedu.eicp.net:9121/front-team/webPublic

FormInsertDiy/AffairPage/ApplyPage/List.js

@@ -88,7 +88,6 @@ export default class List extends Component {
       list: [],
       loading: true,
     });
-
     search.getPageService({ ...data, appId: workId }).then((response) => {
       this.setState({
         loading: false,

FormInsertDiy/AffairPage/ApplyPage/index.js

@@ -24,12 +24,12 @@ export default class AffairPage extends React.Component {
   constructor(props) {
     super(props);
     let pathname = this.props.location.pathname;
-
+    const { dataBaseId, workId } = this.props;
     this.state = {
       showIframe: false,
       columns: [],
       pathname,
-      workId: '',
+      workId: workId || '',
       searchCondition: [],
       dataBaseId: '',
       addFields: [], // 新增时填写的字段。
@@ -138,6 +138,15 @@ export default class AffairPage extends React.Component {
       return false;
     }
     const {  pathname } = this.state;
+    const { dataBaseId, workId } = this.props;
+    if(dataBaseId || workId){
+      this.setState({
+        workId,
+        dataBaseId,
+      },()=>{
+        this.getColumns();
+      });
+    }else{
       service.getId(pathname).then((x)=>{
         this.setState({
           workId: x.workId,
@@ -146,6 +155,8 @@ export default class AffairPage extends React.Component {
           this.getColumns();
         })
       });
+    }
+
 
     window.addEventListener('message', (event) => {
       if (event.data === 'returnList') {

FormInsertDiy/AffairPage/AuditPage/index.js

@@ -15,15 +15,16 @@ import { Link } from 'dva/router';
 export default class Index extends React.Component {
   constructor(props) {
     super(props);
+
     let pathname = this.props.location.pathname;
     this.state = {
       columns: [],
       dataList: [],
       headerInfo: [],
-      workId: '',
+      workId: this.props.workId || '',
       searchCondition: [],
       pathname,
-      dataBaseId: '',
+      dataBaseId: this.props.dataBaseId || '',
       addCondition: [],
       addFields: [], // 新增时填写的字段。
       tableInfo: {}, // 表格配置属性
@@ -94,6 +95,10 @@ export default class Index extends React.Component {
 
   componentDidMount() {
     const {  pathname } = this.state;
+    const { workId } = this.state;
+    if(workId){
+      this.getColumn();
+    }else{
       service.getId(pathname).then((x)=>{
         this.setState({
           workId: x.workId,
@@ -104,6 +109,8 @@ export default class Index extends React.Component {
       });
     }
 
+  }
+
   render() {
     const { workId, dataBaseId, columns, searchCondition, addFields, allConfigSetInfo, tableInfo } = this.state;
     return (