wyw/mh_jy_safe_web
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Compare commits

base: wyw:6a70e6a1e2bf4354feb62f4b8c4dea1f525e61ad
Branches Tags
wyw:master
...
compare: wyw:c5643856c066853ee9e284235c979fbeb6455b65
Branches Tags
wyw:master

2 Commits
6a70e6a1e2 ... c5643856c0

Author SHA1 Message Date
wyw
c5643856c0 Merge branch 'master' of http://121.41.2.71:3000/wyw/mh_jy_safe_web 2025-10-24 11:44:27 +08:00
wyw
30a5fbcc50 1、审批页面 TASK_ORGID 传递 Parameter22 赋值 原有orgid 
2、initFilter  IgnoreOrgRule: true
 2025-10-24 11:44:10 +08:00
4 changed files with 17 additions and 13 deletions
Show Stats Expand all files Collapse all files

3
src/components/CustomPages/PF/PFCommonApprove.js
View File

@ -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',

1
src/components/CustomPages/PF/PFCommonApproveView.js
View File

@ -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,

7
src/components/CustomPages/SK/SK033ShowPrint.js
View File

@ -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({
@ -190,7 +189,7 @@ class SK033ShowPrint extends React.Component {
data.STATUS !== 0 ? showUserSign(data.Nav_ApplyUser, config.picServerHost) : null
}</Descriptions.Item>
</Descriptions>
</div>:null
</div> : null
}
<FormPage {...this.state.tmpData} />
</div>

3
src/utils/common.js
View File

@ -214,7 +214,8 @@ export function initFilter(OrgId, Keyword = "", Sort, Order, PageIndex = 1, Para
FilterGroup: { Rules: [], Groups: [] },
SelectField: [],
DataRule: [],
IgnoreDataRule: false
IgnoreDataRule: false,
IgnoreOrgRule: true
};
// let params = $("#search-form").elFilterParam();
// extend(json, params);