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

src/components/CustomPages/PF/PFCommonApprove.js

@@ -152,12 +152,10 @@ class PFCommonApprove extends React.Component {
                     onComplete: (re) => {
                         if (re && re.IsSuccessful) {
                             if (re.Data) {
-                                if(re.Data ==="FO/FOCrucialLicenseJob/BackUpdateNew")
+                                if (re.Data === "FO/FOCrucialLicenseJob/BackUpdateNew") {
-                                {
                                     re.Data = "FO/FOCrucialLicenseJob/BackUpdate"
                                 }
-                                if(re.Data ==="FO/FOJobEventRecord/BackUpdateNew")
+                                if (re.Data === "FO/FOJobEventRecord/BackUpdateNew") {
-                                {
                                     re.Data = "FO/FOJobEventRecord/BackUpdate"
                                 }
                                 //回调函数
@@ -371,8 +369,12 @@ class PFCommonApprove extends React.Component {
                 stepDisplay: 'block'
             });
         }
+        debugger
         const json = initFilter(that.props.login.OrgId)
         extendRule(json, 'ID', 1, dataId);
+        json.Parameter1 = that.props.data.TASK_ORGID
+        json.Parameter2 = that.props.data.TaskID
+
         extendInclude(json, "Nav_ApproveDetails")
         extendInclude(json, "Nav_ApproveDetails.Nav_ApproveUser")
         that.props.dispatch({

src/routes/GroupHome.js

@@ -240,6 +240,7 @@ class GroupHome extends React.Component {
               <a
                 onClick={() =>
                   this.showEditModal(
+                    record.ORG_ID,
                     record.SOURCE_DATA_ID,
                     record.SOURCE_FORMCODE,
                     record.ID,
@@ -638,14 +639,14 @@ class GroupHome extends React.Component {
       url: "PF/HomeTitle/OrderPaged",
       onComplete: (ret) => {
         if (this._isMounted && ret) {
-           const safetySlogan = ret[0].TITLE;
+          const safetySlogan = ret[0].TITLE;
           // 计算文本长度（中文按1个字符，英文/数字按0.5个字符计算）
-        const charCount = safetySlogan.replace(/[a-zA-Z0-9]/g, 'aa').length;
+          const charCount = safetySlogan.replace(/[a-zA-Z0-9]/g, 'aa').length;
 
-        // 设置基础速率：每4个字符需要1秒
+          // 设置基础速率：每4个字符需要1秒
-        const baseSpeed = 4; 
+          const baseSpeed = 4;
-        // 计算动画时间（最低5秒，最高60秒）
+          // 计算动画时间（最低5秒，最高60秒）
-        const duration = Math.max(5, Math.min(60, charCount / baseSpeed));
+          const duration = Math.max(5, Math.min(60, charCount / baseSpeed));
           this.setState({
             safetySloganOne: safetySlogan,
             // safetySloganOne: "1.安全方针：以人为本、关注健康、依法治企、安全发展。   2.安全理念：一切风险皆可控，一切事故皆可防！3.安全方针：以人为本、关注健康、依法治企、安全发展。4.安全方针：以人为本、关注健康、依法治企、安全发展。5.安全方针：以人为本、关注健康、依法治企、安全发展。   6.安全理念：一切风险皆可控，一切事故皆可防！7.安全方针：以人为本、关注健康、依法治企、安全发展。8.安全方针：以人为本、关注健康、依法治企、安全发展。",
@@ -906,7 +907,7 @@ class GroupHome extends React.Component {
     this.clearData();
   };
 
-  showEditModal = (dataId, formCode, TaskID, title, taskCode) => {
+  showEditModal = (TASK_ORGID, dataId, formCode, TaskID, title, taskCode) => {
     // this.props.dispatch({
     //   type: "app/getDataByPost",
     //   url: "BI/BIController/getVersion",
@@ -927,6 +928,7 @@ class GroupHome extends React.Component {
         taskCode: taskCode,
         tableKey: this.state.tableKey,
         homeReload: true,
+        TASK_ORGID: TASK_ORGID,
       },
       formCode: formCode,
     };
@@ -1000,6 +1002,7 @@ class GroupHome extends React.Component {
                   <a
                     onClick={() =>
                       this.showEditModal(
+                        record.ORG_ID,
                         record.SOURCE_DATA_ID,
                         record.SOURCE_FORMCODE,
                         record.ID,
@@ -1081,6 +1084,7 @@ class GroupHome extends React.Component {
                   <a
                     onClick={() =>
                       this.showEditModal(
+                        record.ORG_ID,
                         record.SOURCE_DATA_ID,
                         record.SOURCE_FORMCODE,
                         record.ID,
@@ -1143,6 +1147,7 @@ class GroupHome extends React.Component {
                   <a
                     onClick={() =>
                       this.showEditModal(
+                        record.ORG_ID,
                         record.SOURCE_DATA_ID,
                         record.SOURCE_FORMCODE,
                         record.ID,
@@ -1233,6 +1238,7 @@ class GroupHome extends React.Component {
                   <a
                     onClick={() =>
                       this.showEditModal(
+                        record.ORG_ID,
                         record.SOURCE_DATA_ID,
                         record.SOURCE_FORMCODE,
                         record.ID,
@@ -2127,7 +2133,7 @@ class GroupHome extends React.Component {
                 ) : null}
               </div>
               {/* 公告栏 */}
-              
+
               {/* <div style={{ width: "100%", height: "100%" }}>
               
                 <div className="notice-board-container">

src/utils/customConfig.original.js

@@ -1157,6 +1157,10 @@ const FO019ShowPrint = Loadable({
   loader: () => import('../components/CustomPages/FO/FO019ShowPrint'),
   loading: () => <div />
 })
+const SC022Import = Loadable({
+  loader: () => import('../components/CustomPages/SC/SC022Import'),
+  loading: () => <div />
+})
 // const BS034View = Loadable({
 //   loader: () => import('../components/CustomPages/BS/BS034View'),
 //   loading: () => <div />
@@ -1165,10 +1169,6 @@ const FO019ShowPrint = Loadable({
 //   loader: () => import('../components/CustomPages/SC/SC028ShowPrint'),
 //   loading: () => <div />
 // })
-// const SC022Import = Loadable({
-//   loader: () => import('../components/CustomPages/SC/SC022Import'),
-//   loading: () => <div />
-// })
 // const PT027Import = Loadable({
 //   loader: () => import('../components/CustomPages/PT/PT027Import'),
 //   loading: () => <div />
@@ -2500,6 +2500,7 @@ export default function (componentName, formId, formParam, data, formCode, formD
     SE063ShowPrint: <SE063ShowPrint formId={formId} formParam={formParam} data={data} formCode={formCode} />,
     SE051ShowPrint: <SE051ShowPrint formId={formId} formParam={formParam} data={data} formCode={formCode} />,
 
+    SC022Import: <SC022Import formId={formId} formParam={formParam} data={data} formCode={formCode} />,
     // LR001ShowPrint: <LR001ShowPrint formId={formId} formParam={formParam} data={data} formCode={formCode} />,
     // LR007Edit: <LR007Edit formId={formId} formParam={formParam} data={data} formCode={formCode} />,
     // LR003ShowPrint: <LR003ShowPrint formId={formId} formParam={formParam} data={data} formCode={formCode} />,
@@ -2509,7 +2510,6 @@ export default function (componentName, formId, formParam, data, formCode, formD
     // SC046ShowPrint: <SC046ShowPrint formId={formId} formParam={formParam} data={data} formCode={formCode} />,
     // SC052ShowPrint: <SC052ShowPrint formId={formId} formParam={formParam} data={data} formCode={formCode} />,
     // SC028ShowPrint: <SC028ShowPrint formId={formId} formParam={formParam} data={data} formCode={formCode} />,
-    // SC022Import: <SC022Import formId={formId} formParam={formParam} data={data} formCode={formCode} />,
     // SC030ShowPrint: <SC030ShowPrint formId={formId} formParam={formParam} data={data} formCode={formCode} />,
     // SC030View: <SC030View formId={formId} formParam={formParam} data={data} formCode={formCode} />,
     // SC030ShowPrintPer: <SC030ShowPrintPer formId={formId} formParam={formParam} data={data} formCode={formCode} />,