From 6a70e6a1e2bf4354feb62f4b8c4dea1f525e61ad Mon Sep 17 00:00:00 2001
From: ccy <55274652@qq.com>
Date: Fri, 24 Oct 2025 09:45:14 +0800
Subject: [PATCH 1/2] =?UTF-8?q?filter=E8=AE=BE=E7=BD=AEIgnoreOrgRule?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/utils/common.js | 2 ++
1 file changed, 2 insertions(+)
diff --git a/src/utils/common.js b/src/utils/common.js
index f810dc8..6cba5a7 100644
--- a/src/utils/common.js
+++ b/src/utils/common.js
@@ -182,6 +182,7 @@ export function initQueryFilter(OrgId, PageIndex, Limit, Sort, Order) {
IncludeCount: 0,
OrderCount: 0,
FilterGroupCount: 0,
+ IgnoreOrgRule: true,
Include: [],
Orders: [],
FilterGroup: { Rules: [], Groups: [] }
@@ -200,6 +201,7 @@ export function initFilter(OrgId, Keyword = "", Sort, Order, PageIndex = 1, Para
OrgId,
PageIndex,
Limit: 10,
+ IgnoreOrgRule: true,
Start: (PageIndex - 1) * 10,
Sort,
Order: (Order === '' ? 0 : Order),
From 30a5fbcc501419ca89d233ba258fc647f044a02d Mon Sep 17 00:00:00 2001
From: wyw <571921741@qq.com>
Date: Fri, 24 Oct 2025 11:44:10 +0800
Subject: [PATCH 2/2] =?UTF-8?q?1=E3=80=81=E5=AE=A1=E6=89=B9=E9=A1=B5?=
=?UTF-8?q?=E9=9D=A2=20TASK=5FORGID=20=E4=BC=A0=E9=80=92=20=20Parameter22?=
=?UTF-8?q?=20=E8=B5=8B=E5=80=BC=20=E5=8E=9F=E6=9C=89orgid=202=E3=80=81ini?=
=?UTF-8?q?tFilter=20=20IgnoreOrgRule:=20true?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../CustomPages/PF/PFCommonApprove.js | 3 +++
.../CustomPages/PF/PFCommonApproveView.js | 1 +
.../CustomPages/SK/SK033ShowPrint.js | 23 +++++++++----------
src/utils/common.js | 3 ++-
4 files changed, 17 insertions(+), 13 deletions(-)
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 {
| 风险类别 |
管控措施 |
应急处置 |
- 状态 |
+ 状态 |
{
data?.Nav_Details && data.Nav_Details?.map((item, i) => {
@@ -183,14 +182,14 @@ class SK033ShowPrint extends React.Component {
}
{
- data ?
-
-
- {
- data.STATUS !== 0 ? showUserSign(data.Nav_ApplyUser, config.picServerHost) : null
- }
-
-
:null
+ data ?
+
+
+ {
+ data.STATUS !== 0 ? showUserSign(data.Nav_ApplyUser, config.picServerHost) : null
+ }
+
+
: null
}
diff --git a/src/utils/common.js b/src/utils/common.js
index f810dc8..11ada1f 100644
--- a/src/utils/common.js
+++ b/src/utils/common.js
@@ -212,7 +212,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);