Merge branch 'master' of http://121.41.2.71:3000/wyw/mh_jy_safe_web

2、initFilter  IgnoreOrgRule: true

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

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,

src/components/CustomPages/SK/SK033ShowPrint.js

@@ -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({

src/utils/common.js

@@ -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);