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

src/components/CustomPages/FO/FO003ShowPrint.js

@@ -66,6 +66,7 @@ class FO003ShowPrint extends React.Component {
 
     loadData = (dataId) => {
         let json = initFilter(this.props.login.OrgId);
+        json.Parameter22 = this.props.data.ORG_ID_HV;
         extendRule(json, 'ID', 1, dataId);
         extendInclude(json, 'Nav_Team');
         extendInclude(json, 'Nav_Class');

src/components/CustomPages/FO/FO005ShowPrint.js

@@ -53,6 +53,7 @@ class FO005ShowPrint extends React.Component {
     }
     loadData = (dataId) => {
         let json = initFilter(this.props.login.OrgId);
+        json.Parameter22 = this.props.data.ORG_ID_HV;
         extendRule(json, 'ID', 1, dataId);
         extendInclude(json, 'Nav_Users.Nav_User');
         extendInclude(json, 'Nav_Team');

src/components/CustomPages/FO/FO008ShowPrint.js

@@ -60,6 +60,7 @@ class FO008ShowPrint extends React.Component {
 
     loadData = (dataId) => {
         let json = initFilter(this.props.login.OrgId);
+        json.Parameter22 = this.props.data.ORG_ID_HV;
         extendRule(json, 'ID', 1, dataId);
         extendInclude(json, 'Nav_User');
         extendInclude(json, 'Nav_Department');

src/components/CustomPages/FO/FO015ShowPrint.js

@@ -60,6 +60,7 @@ class FO015ShowPrint extends React.Component {
 
     loadData = (dataId) => {
         let json = initFilter(this.props.login.OrgId);
+        json.Parameter22 = this.props.data.ORG_ID_HV;
         extendRule(json, 'ID', 1, dataId);
         // extendInclude(json, 'Nav_Meeting');
         // extendInclude(json, 'Nav_CreateUser');

src/components/CustomPages/FO/FO017ShowPrint.js

@@ -58,6 +58,7 @@ class FO017ShowPrint extends React.Component {
     loadData = () => {
         let that = this;
         let json = initFilter(that.props.login.OrgId);
+        json.Parameter22 = this.props.data.ORG_ID_HV;
         extendRule(json, 'ID', 1, that.props.data.id);
         extendIgnoreDataRule(json)
         // extendInclude(json, 'Nav_CrucialLicensePerson');

src/components/CustomPages/FO/FO019ShowPrint.js

@@ -60,6 +60,7 @@ class FO019ShowPrint extends React.Component {
 
     loadData = (dataId) => {
         let json = initFilter(this.props.login.OrgId);
+        json.Parameter22 = this.props.data.ORG_ID_HV;
         extendRule(json, 'ID', 1, dataId);
         extendIgnoreDataRule(json)
         // extendRule(json, 'ID', 1, dataId);
@@ -79,8 +80,7 @@ class FO019ShowPrint extends React.Component {
             url: 'FO/FOTechDisclosureFrom/GetEdit',
             onComplete: (ret) => {
                 if (ret) {
-                    if(this.props.data && this.props.data.loadDataDeal)
+                    if (this.props.data && this.props.data.loadDataDeal) {
-                    {
                         this.props.data.loadDataDeal(1);
                     }
                     this.setState({ data: ret })

src/components/CustomPages/FO/FO021ShowPrint.js

@@ -60,6 +60,7 @@ class FO021ShowPrint extends React.Component {
 
     loadData = (dataId) => {
         let json = initFilter(this.props.login.OrgId);
+        json.Parameter22 = this.props.data.ORG_ID_HV;
         extendRule(json, 'ID', 1, dataId);
         // extendInclude(json, 'Nav_JobName.Nav_MonitorUser');
         // extendInclude(json, 'Nav_JobNameOut.Nav_MonitorUser');
@@ -355,8 +356,7 @@ class FO021ShowPrint extends React.Component {
                                                 else
                                                     return <img style={{ margin: "0 0 0 8px", width: '150px' }} title={item.Nav_User.NAME} />
                                             }
-                                            else if (item.DEAL_STATUS == 0)
+                                            else if (item.DEAL_STATUS == 0) {
-                                            {
                                                 if (item.Nav_User != null && item.Nav_User.FILE_PATH != null)
                                                     return <label style={{ color: 'red' }} title='未签到'> {item.Nav_User.NAME}</label>
                                                 else

src/components/CustomPages/FO/FO022ShowPrint.js

@@ -76,6 +76,7 @@ class FO022ShowPrint extends React.Component {
 
     loadData = (dataId) => {
         let json = initFilter(this.props.login.OrgId);
+        json.Parameter22 = this.props.data.ORG_ID_HV;
         extendRule(json, 'ID', 1, dataId);
         // extendInclude(json, 'Nav_JobName.Nav_MonitorUser');
         // extendInclude(json, 'Nav_JobNameOut.Nav_MonitorUser');

src/components/CustomPages/FO/FO025ShowPrint.js

@@ -58,6 +58,7 @@ class FO025ShowPrint extends React.Component {
     loadData = () => {
         let that = this;
         let json = initFilter(that.props.login.OrgId);
+        json.Parameter22 = this.props.data.ORG_ID_HV;
         extendRule(json, 'ID', 1, that.props.data.id);
         extendIgnoreDataRule(json)
         // extendInclude(json, 'Nav_CrucialLicensePerson');

src/components/CustomPages/FO/FO035ShowPrint.js

@@ -60,6 +60,7 @@ class FO035ShowPrint extends React.Component {
 
     loadData = (dataId) => {
         let json = initFilter(this.props.login.OrgId);
+        json.Parameter22 = this.props.data.ORG_ID_HV;
         extendRule(json, 'ID', 1, dataId);
         extendIgnoreDataRule(json)
         this.props.dispatch({
@@ -68,8 +69,7 @@ class FO035ShowPrint extends React.Component {
             url: 'FO/FOTechDisclosureFromTech/GetEdit',
             onComplete: (ret) => {
                 if (ret) {
-                    if(this.props.data && this.props.data.loadDataDeal)
+                    if (this.props.data && this.props.data.loadDataDeal) {
-                    {
                         this.props.data.loadDataDeal(1);
                     }
                     this.setState({ data: ret })

src/components/CustomPages/FO/FO037ShowPrint.js

@@ -60,6 +60,7 @@ class FO037ShowPrint extends React.Component {
 
     loadData = (dataId) => {
         let json = initFilter(this.props.login.OrgId);
+        json.Parameter22 = this.props.data.ORG_ID_HV;
         extendRule(json, 'ID', 1, dataId);
         extendIgnoreDataRule(json)
         this.props.dispatch({
@@ -68,8 +69,7 @@ class FO037ShowPrint extends React.Component {
             url: 'FO/FOTechDisclosureFromSafe/GetEdit',
             onComplete: (ret) => {
                 if (ret) {
-                    if(this.props.data && this.props.data.loadDataDeal)
+                    if (this.props.data && this.props.data.loadDataDeal) {
-                    {
                         this.props.data.loadDataDeal(1);
                     }
                     this.setState({ data: ret })

src/components/CustomPages/FO/FO041ShowPrint.js

@@ -59,6 +59,7 @@ class FO041ShowPrint extends React.Component {
 
     loadData = (dataId) => {
         let json = initFilter(this.props.login.OrgId);
+        json.Parameter22 = this.props.data.ORG_ID_HV;
         extendRule(json, 'ID', 1, dataId);
         extendIgnoreDataRule(json)
         this.props.dispatch({
@@ -67,8 +68,7 @@ class FO041ShowPrint extends React.Component {
             url: 'FO/FOLeaderWellRecord/GetEdit',
             onComplete: (ret) => {
                 if (ret) {
-                    if(this.props.data && this.props.data.loadDataDeal)
+                    if (this.props.data && this.props.data.loadDataDeal) {
-                    {
                         this.props.data.loadDataDeal(1);
                     }
                     this.setState({ data: ret })

src/components/CustomPages/FO/FO043ShowPrint.js

@@ -60,6 +60,7 @@ class FO043ShowPrint extends React.Component {
 
     loadData = (dataId) => {
         let json = initFilter(this.props.login.OrgId);
+        json.Parameter22 = this.props.data.ORG_ID_HV;
         extendRule(json, 'ID', 1, dataId);
         extendIgnoreDataRule(json)
         this.props.dispatch({
@@ -68,8 +69,7 @@ class FO043ShowPrint extends React.Component {
             url: 'FO/FOFireJob/GetEdit',
             onComplete: (ret) => {
                 if (ret) {
-                    if(this.props.data && this.props.data.loadDataDeal)
+                    if (this.props.data && this.props.data.loadDataDeal) {
-                    {
                         this.props.data.loadDataDeal(1);
                     }
                     this.setState({ data: ret })

src/components/CustomPages/FO/FO045ShowPrint.js

@@ -60,6 +60,7 @@ class FO045ShowPrint extends React.Component {
 
     loadData = (dataId) => {
         let json = initFilter(this.props.login.OrgId);
+        json.Parameter22 = this.props.data.ORG_ID_HV;
         extendRule(json, 'ID', 1, dataId);
         extendIgnoreDataRule(json)
         this.props.dispatch({
@@ -68,8 +69,7 @@ class FO045ShowPrint extends React.Component {
             url: 'FO/FOFireJobWb/GetEdit',
             onComplete: (ret) => {
                 if (ret) {
-                    if(this.props.data && this.props.data.loadDataDeal)
+                    if (this.props.data && this.props.data.loadDataDeal) {
-                    {
                         this.props.data.loadDataDeal(1);
                     }
                     this.setState({ data: ret })

src/components/CustomPages/FO/FOChangeShfitRecord.js

@@ -63,6 +63,7 @@ class FOChangeShfitRecord extends React.Component {
 
     loadData = (dataId) => {
         let json = initFilter(this.props.login.OrgId);
+        json.Parameter22 = this.props.data.ORG_ID_HV;
         extendRule(json, 'ID', 1, dataId);
         extendInclude(json, 'Nav_Class');
         extendInclude(json, 'Nav_Team');

src/components/CustomPages/FO/FoTeamActivityShowPrint.js

@@ -99,6 +99,7 @@ class FoTeamActivityShowPrint extends React.Component {
     var orgId = this.props.login ? this.props.login.OrgId : '';   //登录后有存储登录信息
 
     let json = initFilter(orgId);
+    json.Parameter22 = this.props.data.ORG_ID_HV;
     extendRule(json, 'ID', 1, id);    //ID=‘’，字段，等于，条件值， 1代表=，2代表不等于，3小于，4小于等于，5大于，6大于等于，7以开始的Like,8以结束的Like，9包含 
     extendInclude(json, 'Nav_Taem');
     extendInclude(json, 'Nav_User');

src/components/CustomPages/HM/HM040ShowPrint.js

@@ -36,6 +36,7 @@ class HM040ShowPrint extends React.Component {
   loadData = (id) => {
     var orgId = this.props.login ? this.props.login.OrgId : '';   //登录后有存储登录信息
     let json = initFilter(orgId);
+    json.Parameter22 = this.props.data.ORG_ID_HV;
     extendRule(json, 'ID', 1, id);    //ID=‘’，字段，等于，条件值， 1代表=，2代表不等于，3小于，4小于等于，5大于，6大于等于，7以开始的Like,8以结束的Like，9包含 
     // extendInclude(json, 'Nav_OperationStep');
     // extendInclude(json, 'Nav_EvaluateRisk.Nav_EvaluateRiskWorkduty.Nav_Post');

src/components/CustomPages/HM/HM104ShowPrint.js

@@ -60,6 +60,7 @@ class HM104ShowPrint extends React.Component {
     loadData = (dataId) => {
         let that = this;
         let json = initFilter(that.props.login.OrgId);
+        json.Parameter22 = this.props.data.ORG_ID_HV;
         extendRule(json, 'ID', 1, dataId);
         extendIgnoreDataRule(json)
         that.props.dispatch({

src/components/CustomPages/HM/HM107ShowPrint.js

@@ -59,6 +59,7 @@ class HM107ShowPrint extends React.Component {
 
     loadData = (dataId) => {
         let json = initFilter(this.props.login.OrgId);
+        json.Parameter22 = this.props.data.ORG_ID_HV;
         extendRule(json, 'ID', 1, dataId);
         extendIgnoreDataRule(json)
         this.props.dispatch({

src/components/CustomPages/HM/HM109ShowPrint.js

@@ -59,6 +59,7 @@ class HM109ShowPrint extends React.Component {
 
     loadData = (dataId) => {
         let json = initFilter(this.props.login.OrgId);
+        json.Parameter22 = this.props.data.ORG_ID_HV;
         extendRule(json, 'ID', 1, dataId);
         extendIgnoreDataRule(json)
         this.props.dispatch({

src/components/CustomPages/HM/HM111ShowPrint.js

@@ -59,6 +59,7 @@ class HM111ShowPrint extends React.Component {
 
     loadData = (dataId) => {
         let json = initFilter(this.props.login.OrgId);
+        json.Parameter22 = this.props.data.ORG_ID_HV;
         extendRule(json, 'ID', 1, dataId);
         extendIgnoreDataRule(json)
         this.props.dispatch({

src/components/CustomPages/HM/HM123ShowPrint.js

@@ -57,6 +57,7 @@ class HM123ShowPrint extends React.Component {
     loadData = (dataId) => {
         let that = this;
         let json = initFilter(that.props.login.OrgId);
+        json.Parameter22 = this.props.data.ORG_ID_HV;
         extendRule(json, 'ID', 1, dataId);
         extendIgnoreDataRule(json)
         that.props.dispatch({

src/components/CustomPages/SK/SK002ShowSummary.js

@@ -29,6 +29,7 @@ class SK002ShowSummary extends React.Component {
 
     loadData = () => {
         let json = initFilter(this.props.login.OrgId, "", "", 1, 1);
+        json.Parameter22 = this.props.data.ORG_ID_HV;
         extendInclude(json, 'Nav_Type');
         extendInclude(json, 'Nav_Area');
         extendInclude(json, 'Nav_Details');

src/components/CustomPages/SK/SK004CheckList.js

@@ -152,13 +152,11 @@ class SK004CheckList extends React.Component {
   };
 
   componentDidMount() {
-      if (this.props.data?.btnConfig?.id)
+    if (this.props.data?.btnConfig?.id) { this.loadData(); }
-        {this.loadData();}
   }
 
   componentWillReceiveProps(NextProps) {
-      if (NextProps.data?.btnConfig?.id && this.props.data?.btnConfig?.id != NextProps.data?.btnConfig?.id)
+    if (NextProps.data?.btnConfig?.id && this.props.data?.btnConfig?.id != NextProps.data?.btnConfig?.id) { this.loadData(); }
-      {this.loadData();}
   }
   BtnClose = () => {
     if (typeof this.props.data.onCancel != "undefined" && typeof this.props.data.onCancel == 'function')
@@ -167,6 +165,7 @@ class SK004CheckList extends React.Component {
 
   loadData = () => {
     let json = initFilter(this.props.login.OrgId);
+    json.Parameter22 = this.props.data.ORG_ID_HV;
     extendIgnoreDataRule(json)
     this.props.dispatch({
       type: 'app/getDataByPost',
@@ -179,11 +178,9 @@ class SK004CheckList extends React.Component {
       }
     });
   }
-    loadData2()
+  loadData2() {
-    {
     let temp = this.state.data
-      if(this.state.inputText)
+    if (this.state.inputText) {
-      {
       // let minetype=0
       // if(this.state.inputText.includes("露天"))
       // {
@@ -211,8 +208,7 @@ class SK004CheckList extends React.Component {
       // }
       temp = temp.filter(t => t.MineType == this.state.inputText);
     }
-      if(this.state.inputText2)
+    if (this.state.inputText2) {
-      {
       // let checktype=3
       // if(this.state.inputText2.includes("部门"))
       // {
@@ -232,8 +228,7 @@ class SK004CheckList extends React.Component {
       // }
       temp = temp.filter(t => t.CHECK_TYPE == this.state.inputText2);
     }
-      if(this.state.inputText3)
+    if (this.state.inputText3) {
-      {
       temp = temp.filter(t => t.Nav_CheckType?.NAME.includes(this.state.inputText3));
     }
     this.setState({ dataList: temp })
@@ -279,11 +274,13 @@ class SK004CheckList extends React.Component {
         url: 'SK/SKEnterpriseLibrary/GetCheckDetailList',
         onComplete: (ret) => {
           if (ret) {
-                  this.setState({ Details: ret,
+            this.setState({
+              Details: ret,
               MineType: item.MineType,
               CHECK_CYCLE: item.CHECK_CYCLE,
               CHECK_TYPE: item.CHECK_TYPE,
-                    CHECK_TYPE_ID:item.CHECK_TYPE_ID, });
+              CHECK_TYPE_ID: item.CHECK_TYPE_ID,
+            });
           }
         }
       });

src/components/CustomPages/SK/SK004CheckListNew.js

@@ -125,13 +125,11 @@ class SK004CheckListNew extends React.Component {
     };
   };
   componentDidMount() {
-      if (this.props.data?.btnConfig?.id)
+    if (this.props.data?.btnConfig?.id) { this.loadData(); }
-        {this.loadData();}
   }
 
   componentWillReceiveProps(NextProps) {
-      if (NextProps.data?.btnConfig?.id && this.props.data?.btnConfig?.id != NextProps.data?.btnConfig?.id)
+    if (NextProps.data?.btnConfig?.id && this.props.data?.btnConfig?.id != NextProps.data?.btnConfig?.id) { this.loadData(); }
-      {this.loadData();}
   }
   BtnClose = () => {
     if (typeof this.props.data.onCancel != "undefined" && typeof this.props.data.onCancel == 'function')
@@ -140,6 +138,7 @@ class SK004CheckListNew extends React.Component {
 
   loadData = () => {
     let json = initFilter(this.props.login.OrgId);
+    json.Parameter22 = this.props.data.ORG_ID_HV;
     extendIgnoreDataRule(json)
     this.props.dispatch({
       type: 'app/getDataByPost',
@@ -152,11 +151,9 @@ class SK004CheckListNew extends React.Component {
       }
     });
   }
-    loadData2()
+  loadData2() {
-    {
     let temp = this.state.data
-      if(this.state.productionId)
+    if (this.state.productionId) {
-      {
       // let minetype="全公司"
       // if(this.state.inputText === "10")
       // {
@@ -185,8 +182,7 @@ class SK004CheckListNew extends React.Component {
 
       temp = temp.filter(t => t.PRODUCTION_UNIT_ID == this.state.productionId);
     }
-      if(this.state.inputText2)
+    if (this.state.inputText2) {
-      {
       // let checktype=3
       // if(this.state.inputText2.includes("部门"))
       // {
@@ -206,20 +202,16 @@ class SK004CheckListNew extends React.Component {
       // }
       temp = temp.filter(t => t.CheckLevel == this.state.inputText2);
     }
-      if(this.state.inputText6)
+    if (this.state.inputText6) {
-      {
       temp = temp.filter(t => t.CheckCycle == this.state.inputText6);
     }
-      if(this.state.inputText3)
+    if (this.state.inputText3) {
-      {
       temp = temp.filter(t => t.CheckType == this.state.inputText3);
     }
-      if(this.state.inputText4)
+    if (this.state.inputText4) {
-      {
       temp = temp.filter(t => t.CheckDepart.includes(this.state.inputText4));
     }
-      if(this.state.inputText5)
+    if (this.state.inputText5) {
-      {
       temp = temp.filter(t => t.CheckPost != null && t.CheckPost.includes(this.state.inputText5));
     }
     this.setState({ dataList: temp })
@@ -265,11 +257,13 @@ class SK004CheckListNew extends React.Component {
         url: 'SK/SKEnterpriseLibrary/GetCheckDetailList',
         onComplete: (ret) => {
           if (ret) {
-                  this.setState({ Details: ret,
+            this.setState({
+              Details: ret,
               MineType: item.MineType,
               CHECK_CYCLE: item.CHECK_CYCLE,
               CHECK_TYPE: item.CHECK_TYPE,
-                    CHECK_TYPE_ID:item.CHECK_TYPE_ID, });
+              CHECK_TYPE_ID: item.CHECK_TYPE_ID,
+            });
           }
         }
       });

src/components/CustomPages/SK/SK004CheckPost.js

@@ -151,13 +151,11 @@ class SK004CheckPost extends React.Component {
   };
 
   componentDidMount() {
-      if (this.props.data?.btnConfig?.id)
+    if (this.props.data?.btnConfig?.id) { this.loadData(); }
-        {this.loadData();}
   }
 
   componentWillReceiveProps(NextProps) {
-      if (NextProps.data?.btnConfig?.id && this.props.data?.btnConfig?.id != NextProps.data?.btnConfig?.id)
+    if (NextProps.data?.btnConfig?.id && this.props.data?.btnConfig?.id != NextProps.data?.btnConfig?.id) { this.loadData(); }
-      {this.loadData();}
   }
   BtnClose = () => {
     if (typeof this.props.data.onCancel != "undefined" && typeof this.props.data.onCancel == 'function')
@@ -166,6 +164,7 @@ class SK004CheckPost extends React.Component {
 
   loadData = () => {
     let json = initFilter(this.props.login.OrgId);
+    json.Parameter22 = this.props.data.ORG_ID_HV;
     extendIgnoreDataRule(json)
     this.props.dispatch({
       type: 'app/getDataByPost',
@@ -178,19 +177,15 @@ class SK004CheckPost extends React.Component {
       }
     });
   }
-    loadData2()
+  loadData2() {
-    {
     let temp = this.state.data
-      if(this.state.inputText)
+    if (this.state.inputText) {
-      {
       temp = temp.filter(t => t.Nav_Department?.NAME.includes(this.state.inputText));
     }
-      if(this.state.inputText2)
+    if (this.state.inputText2) {
-      {
       temp = temp.filter(t => t.POST_NAME.includes(this.state.inputText2));
     }
-      if(this.state.inputText3)
+    if (this.state.inputText3) {
-      {
       temp = temp.filter(t => t.Nav_Library?.Nav_ProductionUnit?.NAME.includes(this.state.inputText3));
     }
     this.setState({ dataList: temp })
@@ -239,10 +234,8 @@ class SK004CheckPost extends React.Component {
       showCard: true,
     }, () => {
       let tmpData = [];
-          if(record.Nav_Details)
+      if (record.Nav_Details) {
-          {
+        for (var i = 0; i < record.Nav_Details.length; i++) {
-            for(var i = 0; i <record.Nav_Details.length ; i++)
-            {
           tmpData = tmpData + "\r\n" + (i + 1) + "、" + record.Nav_Details[i].MEASURES_NAME
         }
       }

src/components/CustomPages/SK/SK004ShowPrint.js

@@ -78,8 +78,7 @@ class SK004ShowPrint extends React.Component {
         title: "检查层级",
         dataIndex: "CHECK_TYPE",
         key: "CHECK_TYPE",
-                    render: (text, record) =>
+        render: (text, record) => {
-                    {
           return <label>{this.props.app.enums.SKDepartmentTypeEnum.enums[record.CHECK_TYPE]}</label>
         }
       },
@@ -92,8 +91,7 @@ class SK004ShowPrint extends React.Component {
         title: "检查岗位",
         dataIndex: "Nav_DetailPosts",
         key: "Nav_DetailPosts",
-                  render: (text, record) =>
+        render: (text, record) => {
-                  {
           return <label>{
             record.Nav_DetailPosts && record.Nav_DetailPosts.map((item, i) => {
               return item.Nav_Post.NAME + ' '
@@ -110,8 +108,7 @@ class SK004ShowPrint extends React.Component {
         title: "检查周期",
         dataIndex: "CHECK_CYCLE",
         key: "CHECK_CYCLE",
-                    render: (text, record) =>
+        render: (text, record) => {
-                    {
           return <label>{this.props.app.enums.SKPLANCHECKFREQUENCYEnum.enums[record.CHECK_CYCLE]}</label>
         }
       },
@@ -161,6 +158,7 @@ class SK004ShowPrint extends React.Component {
   loadData = (dataId) => {
     let that = this;
     let json = initFilter(that.props.login.OrgId);
+    json.Parameter22 = this.props.data.ORG_ID_HV;
     extendRule(json, 'ID', 1, dataId);
     // extendInclude(json, 'Nav_Type');
     // extendInclude(json, 'Nav_Area');
@@ -187,8 +185,7 @@ class SK004ShowPrint extends React.Component {
       url: 'SK/SKEnterpriseLibrary/SKGet',
       onComplete: (ret) => {
         if (ret) {
-                    if(that.props.data && that.props.data.loadDataDeal)
+          if (that.props.data && that.props.data.loadDataDeal) {
-                    {
             that.props.data.loadDataDeal(1);
           }
           that.setState({ data: ret });

src/components/CustomPages/SK/SK004ShowSummary.js

@@ -29,6 +29,7 @@ class SK004ShowSummary extends React.Component {
 
     loadData = () => {
         let json = initFilter(this.props.login.OrgId, "", "", 1, 1);
+        json.Parameter22 = this.props.data.ORG_ID_HV;
         extendInclude(json, 'Nav_Type');
         extendInclude(json, 'Nav_Area');
         extendInclude(json, 'Nav_Details');

src/components/CustomPages/SK/SK006ShowOperateLog.js

@@ -63,6 +63,7 @@ class SK006ShowOperateLog extends React.Component {
   loadData = (id) => {
     var orgId = this.props.login ? this.props.login.OrgId : '';
     let json = initFilter(orgId, id);
+    json.Parameter22 = this.props.data.ORG_ID_HV;
     this.props.dispatch({
       type: 'app/getDataByPost',
       payload: json,

src/components/CustomPages/SK/SK006ShowPrint.js

@@ -59,6 +59,7 @@ class SK006ShowPrint extends React.Component {
     }
     loadData = (dataId, taskID) => {
         let json = initFilter(this.props.login.OrgId);
+        json.Parameter22 = this.props.data.ORG_ID_HV;
         extendRule(json, 'ID', 1, dataId);
         extendRule(json, 'TASK_ID', 1, taskID);
         extendIgnoreDataRule(json)
@@ -85,6 +86,7 @@ class SK006ShowPrint extends React.Component {
     }
     loadDataTask = (dataId) => {
         let json = initFilter(this.props.login.OrgId);
+        json.Parameter22 = this.props.data.ORG_ID_HV;
         extendRule(json, 'ID', 1, dataId);
         extendIgnoreDataRule(json)
         // extendRule(json, 'ID', 1, dataId);

src/components/CustomPages/SK/SK010CheckList.js

@@ -143,13 +143,11 @@ class SK010CheckList extends React.Component {
   };
 
   componentDidMount() {
-      if (this.props.data?.clickKey)
+    if (this.props.data?.clickKey) { this.loadData(); }
-        {this.loadData();}
   }
 
   componentWillReceiveProps(NextProps) {
-      if (NextProps.data?.clickKey && this.props.data?.clickKey != NextProps.data?.clickKey)
+    if (NextProps.data?.clickKey && this.props.data?.clickKey != NextProps.data?.clickKey) { this.loadData(); }
-      {this.loadData();}
   }
   BtnClose = () => {
     if (typeof this.props.data.onCancel != "undefined" && typeof this.props.data.onCancel == 'function')
@@ -158,6 +156,7 @@ class SK010CheckList extends React.Component {
 
   loadData = () => {
     let json = initFilter(this.props.login.OrgId);
+    json.Parameter22 = this.props.data.ORG_ID_HV;
     extendIgnoreDataRule(json)
     this.props.dispatch({
       type: 'app/getDataByPost',
@@ -212,11 +211,13 @@ class SK010CheckList extends React.Component {
         url: 'SK/SKEnterpriseLibrary/GetCheckDetailList',
         onComplete: (ret) => {
           if (ret) {
-                  this.setState({ Details: ret,
+            this.setState({
+              Details: ret,
               PRODUCTION_UNIT_ID: item.PRODUCTION_UNIT_ID,
               CHECK_CYCLE: item.CHECK_CYCLE,
               CHECK_TYPE: item.CHECK_TYPE,
-                    CHECK_TYPE_ID:item.CHECK_TYPE_ID, });
+              CHECK_TYPE_ID: item.CHECK_TYPE_ID,
+            });
           }
         }
       });
@@ -257,8 +258,7 @@ class SK010CheckList extends React.Component {
     });
     if (!temps || temps.length == 0) {
       message.error('请选择要导入的内容');
-        }else
+    } else {
-        {
       this.props.login.tempDatas = temps
       this.state.taskSelects = [];
       this.state.selectedRowKeys = [];
@@ -269,7 +269,8 @@ class SK010CheckList extends React.Component {
     }
   };
   onSelectChange = (selectedRowKeys, selectedRows) => {  // 选择菜单行
-        this.setState({selectedRowKeys:selectedRowKeys,
+    this.setState({
+      selectedRowKeys: selectedRowKeys,
       taskSelects: selectedRows
     });
   };

src/components/CustomPages/SK/SK010ShowPrint.js

@@ -60,6 +60,7 @@ class SK010ShowPrint extends React.Component {
 
     loadData = (dataId, taskID) => {
         let json = initFilter(this.props.login.OrgId);
+        json.Parameter22 = this.props.data.ORG_ID_HV;
         extendRule(json, 'ID', 1, dataId);
         extendRule(json, 'TASK_ID', 1, taskID);
         extendIgnoreDataRule(json)

src/components/CustomPages/SK/SK012ShowPrint.js

@@ -61,6 +61,7 @@ class SK012ShowPrint extends React.Component {
 
     loadData = (dataId, taskID) => {
         let json = initFilter(this.props.login.OrgId);
+        json.Parameter22 = this.props.data.ORG_ID_HV;
         extendRule(json, 'ID', 1, dataId);
         extendRule(json, 'TASK_ID', 1, taskID);
         extendIgnoreDataRule(json)
@@ -86,16 +87,14 @@ class SK012ShowPrint extends React.Component {
                     }
                     let users = []
                     let uniqueUsers = []
-                    if(ret.Nav_CheckRecordDetails)
+                    if (ret.Nav_CheckRecordDetails) {
-                    {
                         ret.Nav_CheckRecordDetails.forEach(item => {
                             item.Nav_CheckRecordDetailUsers.forEach(item2 => {
                                 users.push(item2)
                             })
                         })
                     }
-                    if(users)
+                    if (users) {
-                    {
                         uniqueUsers = users.reduce((acc, user) => {
                             // 如果累积数组中还没有这个 user_id，则添加
                             if (!acc.some(item => item.USER_ID === user.USER_ID)) {

src/components/CustomPages/SK/SK014ShowPrint.js

@@ -60,6 +60,7 @@ class SK014ShowPrint extends React.Component {
 
     loadData = (dataId, taskID) => {
         let json = initFilter(this.props.login.OrgId);
+        json.Parameter22 = this.props.data.ORG_ID_HV;
         extendRule(json, 'ID', 1, dataId);
         extendRule(json, 'TASK_ID', 1, taskID);
         extendIgnoreDataRule(json)

src/components/CustomPages/SK/SK016ShowPrint.js

@@ -41,6 +41,7 @@ class SK016ShowPrint extends React.Component {
 
     loadData = (dataId, taskID) => {
         let json = initFilter(this.props.login.OrgId);
+        json.Parameter22 = this.props.data.ORG_ID_HV;
         extendRule(json, 'ID', 1, dataId);
         // extendRule(json, 'TASK_ID', 1, taskID);
         extendInclude(json, 'Nav_ApplyUser');

src/components/CustomPages/SK/SK018ShowPrint.js

@@ -57,6 +57,7 @@ class SK018ShowPrint extends React.Component {
     }
     loadData = (dataId, taskID) => {
         let json = initFilter(this.props.login.OrgId);
+        json.Parameter22 = this.props.data.ORG_ID_HV;
         extendRule(json, 'ID', 1, dataId);
         // extendRule(json, 'TASK_ID', 1, taskID);
         extendInclude(json, 'Nav_Report');

src/components/CustomPages/SK/SK020ShowPrint.js

@@ -60,6 +60,7 @@ class SK020ShowPrint extends React.Component {
 
     loadData = (dataId, taskID) => {
         let json = initFilter(this.props.login.OrgId);
+        json.Parameter22 = this.props.data.ORG_ID_HV;
         extendRule(json, 'ID', 1, dataId);
         extendRule(json, 'TASK_ID', 1, taskID);
         extendIgnoreDataRule(json)

src/components/CustomPages/SK/SK022ShowPrint.js

@@ -57,6 +57,7 @@ class SK022ShowPrint extends React.Component {
     }
     loadData = (dataId, taskID) => {
         let json = initFilter(this.props.login.OrgId);
+        json.Parameter22 = this.props.data.ORG_ID_HV;
         extendRule(json, 'ID', 1, dataId);
         // extendRule(json, 'TASK_ID', 1, taskID);
         // extendInclude(json, 'Nav_ApplyUser');

src/components/CustomPages/SK/SK024ShowPrint.js

@@ -57,6 +57,7 @@ class SK024ShowPrint extends React.Component {
 
     loadData = (dataId, taskID) => {
         let json = initFilter(this.props.login.OrgId);
+        json.Parameter22 = this.props.data.ORG_ID_HV;
         extendRule(json, 'ID', 1, dataId);
         // extendRule(json, 'TASK_ID', 1, taskID);
         extendInclude(json, 'Nav_ApplyUser');

src/components/CustomPages/SK/SK026ShowPrint.js

@@ -228,6 +228,7 @@ class SK026ShowPrint extends React.Component {
   loadData = (dataId) => {
     let that = this;
     let json = initFilter(that.props.login.OrgId);
+    json.Parameter22 = this.props.data.ORG_ID_HV;
     extendRule(json, 'ID', 1, dataId);
     // extendInclude(json, 'Nav_ApplyUser');
     // extendInclude(json, 'Nav_ApplyDepartment');

src/components/CustomPages/SK/SK027ShowPrint.js

@@ -47,6 +47,7 @@ class SK027ShowPrint extends React.Component {
 
   loadData = (dataId) => {
     let json = initFilter(this.props.login.OrgId);
+    json.Parameter22 = this.props.data.ORG_ID_HV;
     extendRule(json, 'ID', 1, dataId);
     extendIgnoreDataRule(json)
     // extendRule(json, 'ID', 1, dataId);

src/components/CustomPages/SK/SK031ShowPrint.js

@@ -41,6 +41,7 @@ class SK031ShowPrint extends React.Component {
 
     loadData = (dataId, taskID) => {
         let json = initFilter(this.props.login.OrgId);
+        json.Parameter22 = this.props.data.ORG_ID_HV;
         extendRule(json, 'ID', 1, dataId);
         // extendRule(json, 'TASK_ID', 1, taskID);
         // extendInclude(json, 'Nav_ApplyUser');

src/components/CustomPages/SK/SK033ShowPrint.js

@@ -42,7 +42,15 @@ class SK033ShowPrint extends React.Component {
 
     loadData = (dataId, taskID) => {
         let json = initFilter(this.props.login.OrgId);
+        if (this.props.data.ORG_ID_HV) {
+            json.Parameter22 = this.props.data.ORG_ID_HV;
+        }
+        else if (this.props.data?.TASK_ORGID) {
             json.Parameter22 = this.props.data?.TASK_ORGID
+        }
+        else {
+            json.Parameter22 = this.props.data.ORG_ID_HV;
+        }
         extendRule(json, 'ID', 1, dataId);
         // extendRule(json, 'TASK_ID', 1, taskID);
         // extendInclude(json, 'Nav_ApplyUser');

src/components/CustomPages/SK/SK035CheckLibrary.js

@@ -70,8 +70,7 @@ class SK035CheckLibrary extends React.Component {
         title: "检查层级",
         dataIndex: "CHECK_TYPE",
         key: "CHECK_TYPE",
-                    render: (text, record) =>
+        render: (text, record) => {
-                    {
           return <label>{this.props.app.enums.SKDepartmentTypeEnum.enums[record.CHECK_TYPE]}</label>
         }
       },
@@ -102,8 +101,7 @@ class SK035CheckLibrary extends React.Component {
         title: "检查周期",
         dataIndex: "CHECK_CYCLE",
         key: "CHECK_CYCLE",
-                    render: (text, record) =>
+        render: (text, record) => {
-                    {
           return <label>{this.props.app.enums.SKPLANCHECKFREQUENCYEnum.enums[record.CHECK_CYCLE]}</label>
         }
       },
@@ -153,6 +151,7 @@ class SK035CheckLibrary extends React.Component {
   loadData = (dataId) => {
     let that = this;
     let jsonTemp = initFilter(that.props.login.OrgId);
+    json.Parameter22 = this.props.data.ORG_ID_HV;
     extendRule(jsonTemp, 'ID', 1, dataId);
     that.props.dispatch({
       type: 'app/getDataByPost',
@@ -189,8 +188,7 @@ class SK035CheckLibrary extends React.Component {
             url: 'SK/SKEnterpriseLibrary/SKGet',
             onComplete: (ret) => {
               if (ret) {
-                    if(that.props.data && that.props.data.loadDataDeal)
+                if (that.props.data && that.props.data.loadDataDeal) {
-                    {
                   that.props.data.loadDataDeal(1);
                 }
                 that.setState({ data: ret });
@@ -205,8 +203,7 @@ class SK035CheckLibrary extends React.Component {
                 //     this.setState({ isFinished: 'inline' })
                 // }
               }
-                else
+              else { message.error('企业库无对应风险!'); }
-                { message.error('企业库无对应风险!');}
             }
           });
         }

src/components/CustomPages/SK/SK035ShowPrint.js

@@ -41,6 +41,7 @@ class SK035ShowPrint extends React.Component {
 
     loadData = (dataId, taskID) => {
         let json = initFilter(this.props.login.OrgId);
+        json.Parameter22 = this.props.data.ORG_ID_HV;
         extendRule(json, 'ID', 1, dataId);
         // extendRule(json, 'TASK_ID', 1, taskID);
         // extendInclude(json, 'Nav_ApplyUser');

src/components/CustomPages/SK/SK037ShowPrint.js

@@ -42,6 +42,7 @@ class SK037ShowPrint extends React.Component {
 
     loadData = (dataId, taskID) => {
         let json = initFilter(this.props.login.OrgId);
+        json.Parameter22 = this.props.data.ORG_ID_HV;
         extendRule(json, 'ID', 1, dataId);
         // extendRule(json, 'TASK_ID', 1, taskID);
         // extendInclude(json, 'Nav_ApplyUser');

src/components/CustomPages/SK/SK039ShowPrint.js

@@ -41,6 +41,7 @@ class SK039ShowPrint extends React.Component {
 
     loadData = (dataId, taskID) => {
         let json = initFilter(this.props.login.OrgId);
+        json.Parameter22 = this.props.data.ORG_ID_HV;
         extendRule(json, 'ID', 1, dataId);
         // extendRule(json, 'TASK_ID', 1, taskID);
         // extendInclude(json, 'Nav_ApplyUser');

src/components/CustomPages/SK/SK041ShowPrint.js

@@ -41,6 +41,7 @@ class SK041ShowPrint extends React.Component {
 
     loadData = (dataId, taskID) => {
         let json = initFilter(this.props.login.OrgId);
+        json.Parameter22 = this.props.data.ORG_ID_HV;
         extendRule(json, 'ID', 1, dataId);
         // extendRule(json, 'TASK_ID', 1, taskID);
         // extendInclude(json, 'Nav_ApplyUser');

src/components/CustomPages/SK/SK043ShowPrint.js

@@ -38,6 +38,7 @@ class SK043ShowPrint extends React.Component {
     loadData = (dataId) => {
         let that = this;
         let json = initFilter(that.props.login.OrgId);
+        json.Parameter22 = this.props.data.ORG_ID_HV;
         extendRule(json, 'ID', 1, dataId);
         extendInclude(json, 'Nav_Type');
         extendInclude(json, 'Nav_Area');
@@ -51,8 +52,7 @@ class SK043ShowPrint extends React.Component {
             url: 'SK/BasicLibraryTemp/Get',
             onComplete: (ret) => {
                 if (ret) {
-                    if(that.props.data && that.props.data.loadDataDeal)
+                    if (that.props.data && that.props.data.loadDataDeal) {
-                    {
                         that.props.data.loadDataDeal(1);
                     }
                     that.setState({ data: ret });

src/components/CustomPages/SK/SK045ShowPrint.js

@@ -38,6 +38,7 @@ class SK045ShowPrint extends React.Component {
     loadData = (dataId) => {
         let that = this;
         let json = initFilter(that.props.login.OrgId);
+        json.Parameter22 = this.props.data.ORG_ID_HV;
         extendRule(json, 'ID', 1, dataId);
         // extendInclude(json, 'Nav_Type');
         // extendInclude(json, 'Nav_Area');
@@ -55,8 +56,7 @@ class SK045ShowPrint extends React.Component {
             url: 'SK/SKEnterpriseLibraryTemp/FullGet',
             onComplete: (ret) => {
                 if (ret) {
-                    if(that.props.data && that.props.data.loadDataDeal)
+                    if (that.props.data && that.props.data.loadDataDeal) {
-                    {
                         that.props.data.loadDataDeal(1);
                     }
                     that.setState({ data: ret });

src/files/edit/FO043.js

@@ -125,6 +125,44 @@ export default {
    }
    
   },
+  onSubChange: ({ row, pageCode, record, colInfo, dispatch, stateData, props, saveRowRecord }) => {
+    if (colInfo.FIELD_NAME == 'Nav_Train.CERTIFICATE_NAME') {
+      let trainId = getDataFieldValue(record, 'TRAIN_ID');
+      if (trainId) {
+        const json = initFilter();
+        extendRule(json, 'ID', 1, trainId);
+        extendInclude(json, 'Nav_Files.Nav_ImgFile.Nav_File')
+        dispatch({
+          type: 'app/getDataByPost',
+          url: 'SE/RenewalTrain/OrderPaged',
+          payload: json,
+          onComplete: (ret) => {
+            if (ret) {
+              //record["Nav_Posts"] = [];
+              let copyRecord={...record};
+              if (ret && ret.length > 0) {
+                 let identifyings= ret[0].Nav_Files.map(item => {
+                  return {
+                    FIRE_JOB_USER_ID: record.ID,
+                    ID: guid(),
+                    IMG_FILE_ID: item.IMG_FILE_ID,
+                    Nav_ImgFile:  item.Nav_ImgFile,
+                    ORG_ID: record.ORG_ID,
+                  };
+                });
+                copyRecord["Nav_UserFiles"]=[...identifyings]
+              }
+              console.log(copyRecord)
+              saveRowRecord(copyRecord)
+            }
+          }
+        })
+      } else {
+        record.Nav_Posts = [];
+        saveRowRecord(record)
+      }
+    }
+  },
   //  handleRenderRowControl(params) {
   //   // setRowFieldVisible('Nav_Details.IS_CONFIRM_NEW', false)
   //   // setRowFieldVisible('Nav_Details.Nav_DetailFiles', false)

src/files/edit/SK018.js

@@ -1,6 +1,7 @@
 import { message } from "antd/lib/index";
 import { getPropertyData, extendInclude, extendRule, getDataFieldValue, setDataFieldValue, initFilter, guid } from "../../utils/common";
 import moment from 'moment';
+import FormPage from '../../components/FormPage';
 import { Button, Row, Col, Form, Input, Select, Upload, Icon, Modal, Spin, Table } from 'antd';
 /**
  * @return {string}
@@ -19,29 +20,24 @@ export default {
       setFieldValue('MineType', login.currentMineType);
       setFieldVisible("CONTEXT", false);
     }
-      else
+    else {
-      {
+      if (stateData.STATUS === 40) {
-        if(stateData.STATUS === 40)
-        {
         setFieldVisible("CONTEXT", true);
       }
-        else
+      else { setFieldVisible("CONTEXT", false); }
-        {setFieldVisible("CONTEXT", false);}
     }
   },
   onChange: ({ value, colInfo, record, stateData, data, getFieldValue, setFieldVisible, setFieldRequired, setFieldValue }) => {
     if (colInfo != null && colInfo.FIELD_NAME == "IS_STORE") {
       var isStore = getFieldValue("IS_STORE");
-        if(isStore && isStore === 10 )
+      if (isStore && isStore === 10) {
-        {
         setFieldVisible("DEPARTMENT_TYPE", true);
         setFieldVisible("Nav_CheckType.NAME", true);
         setFieldVisible("PLANCHECKFREQUENCY", true);
         setFieldRequired("DEPARTMENT_TYPE", true);
         setFieldRequired("Nav_CheckType.NAME", true);
         setFieldRequired("PLANCHECKFREQUENCY", true);
-        }else
+      } else {
-        {
         setFieldVisible("DEPARTMENT_TYPE", false);
         setFieldVisible("Nav_CheckType.NAME", false);
         setFieldVisible("PLANCHECKFREQUENCY", false);
@@ -51,4 +47,30 @@ export default {
       }
     }
   },
+  btnAddContent: ({ record, close, loadData, custom, login, dispatch, btn }) => {
+    // const rrecord= {record};
+    const regClick = async function () {
+      await dispatch({
+        type: 'custom/save',
+        payload: {
+          ['engineeringPlanEditClick' +(record ? record.CHECK_CONTENTS_ID : "") ]: true
+        },
+      });
+    };
+
+    const data = {
+      id: (record ? record.CHECK_CONTENTS_ID : ""),
+      clickKey: 'engineeringPlanEditClick',
+      close: () => {
+      },
+      onCancel: () => {
+      },
+    }
+
+    return {
+      content: <FormPage formCode={'SK059'} data={data} />,
+      click: regClick
+    }
+
+  },
 }