diff --git a/src/components/CustomPages/PF/PFCommonApprove.js b/src/components/CustomPages/PF/PFCommonApprove.js index a5745fc..06d4a35 100644 --- a/src/components/CustomPages/PF/PFCommonApprove.js +++ b/src/components/CustomPages/PF/PFCommonApprove.js @@ -123,6 +123,9 @@ class PFCommonApprove extends React.Component { if (this.state.data.CALLBACK_INTERFACE && this.state.data.CALLBACK_INTERFACE.indexOf("New") > -1) { newUrl = this.state.data.CALLBACK_INTERFACE } + if (this.props.data && this.props.data.TASK_ORGID && this.props.data.TASK_ORGID.length > 0 && this.props.data.TASK_ORGID !== this.props.login.OrgId) { + this.state.data.Parameter22 = this.props.data.TASK_ORGID + } if (newUrl.length > 0) { this.props.dispatch({ type: 'app/getDataByPost', diff --git a/src/components/CustomPages/PF/PFCommonApproveView.js b/src/components/CustomPages/PF/PFCommonApproveView.js index ce8f689..3a77829 100644 --- a/src/components/CustomPages/PF/PFCommonApproveView.js +++ b/src/components/CustomPages/PF/PFCommonApproveView.js @@ -238,6 +238,7 @@ class PFCommonApproveView extends React.Component { appVisible:appVisibleTemp, BtnAgreeDisplay:this.props.data.BtnAgreeDisplay?this.props.data.BtnAgreeDisplay:'inline' }); + json.Parameter22=this.props.data?.TASK_ORGID this.props.dispatch({ type: 'app/getDataByPost', payload: json, diff --git a/src/components/CustomPages/SK/SK033ShowPrint.js b/src/components/CustomPages/SK/SK033ShowPrint.js index 3146406..b1dd206 100644 --- a/src/components/CustomPages/SK/SK033ShowPrint.js +++ b/src/components/CustomPages/SK/SK033ShowPrint.js @@ -1,7 +1,7 @@ import { message } from "antd/lib/index"; import { Button, Descriptions, Popconfirm, Row, Col, Form, Input, Select, Modal } from 'antd'; import React from 'react'; -import { initFilter, extendRule, extendInclude, extendIgnoreDataRule, setDataFieldValue, guid,showUserSign, showFiles, GetFileModel } from "../../../utils/common"; +import { initFilter, extendRule, extendInclude, extendIgnoreDataRule, setDataFieldValue, guid, showUserSign, showFiles, GetFileModel } from "../../../utils/common"; import ReactToPrint from "react-to-print"; import config from "../../../config"; import XLSX from 'xlsx'; @@ -12,7 +12,6 @@ import moment from 'moment'; import Item from "antd/lib/list/Item"; class SK033ShowPrint extends React.Component { constructor(props) { - debugger super(props); this.state = { data: null, @@ -86,7 +85,7 @@ class SK033ShowPrint extends React.Component { } onClickApprove = (appVisible) => { const newtmpData = { - data: { id: this.props.data.id, isShow: true, key: guid(), param: this.props.data.param, appVisible: appVisible, BtnAgreeDisplay: 'inline' }, + data: { id: this.props.data.id, isShow: true, key: guid(), param: this.props.data.param, appVisible: appVisible, BtnAgreeDisplay: 'inline', TASK_ORGID: this.props.data?.TASK_ORGID }, formCode: "PF123", } this.setState({ @@ -137,7 +136,7 @@ class SK033ShowPrint extends React.Component {