diff --git a/src/utils/customConfig.original.js b/src/utils/customConfig.original.js
index eb04ead..bf060c9 100644
--- a/src/utils/customConfig.original.js
+++ b/src/utils/customConfig.original.js
@@ -1157,6 +1157,10 @@ const FO019ShowPrint = Loadable({
loader: () => import('../components/CustomPages/FO/FO019ShowPrint'),
loading: () =>
})
+const SC022Import = Loadable({
+ loader: () => import('../components/CustomPages/SC/SC022Import'),
+ loading: () =>
+})
// const BS034View = Loadable({
// loader: () => import('../components/CustomPages/BS/BS034View'),
// loading: () =>
@@ -1165,10 +1169,6 @@ const FO019ShowPrint = Loadable({
// loader: () => import('../components/CustomPages/SC/SC028ShowPrint'),
// loading: () =>
// })
-// const SC022Import = Loadable({
-// loader: () => import('../components/CustomPages/SC/SC022Import'),
-// loading: () =>
-// })
// const PT027Import = Loadable({
// loader: () => import('../components/CustomPages/PT/PT027Import'),
// loading: () =>
@@ -2500,6 +2500,7 @@ export default function (componentName, formId, formParam, data, formCode, formD
SE063ShowPrint:
,
SE051ShowPrint:
,
+ SC022Import:
,
// LR001ShowPrint:
,
// LR007Edit:
,
// LR003ShowPrint:
,
@@ -2509,7 +2510,6 @@ export default function (componentName, formId, formParam, data, formCode, formD
// SC046ShowPrint:
,
// SC052ShowPrint:
,
// SC028ShowPrint:
,
- // SC022Import:
,
// SC030ShowPrint:
,
// SC030View:
,
// SC030ShowPrintPer:
,
From 3cc89f5861da4e16b16a1075f3ac190df561b560 Mon Sep 17 00:00:00 2001
From: wyw <571921741@qq.com>
Date: Thu, 23 Oct 2025 15:47:34 +0800
Subject: [PATCH 04/10] =?UTF-8?q?=E5=BE=85=E5=8A=9E=E5=BC=B9=E7=AA=97?=
=?UTF-8?q?=E4=BF=AE=E6=94=B9=20=E8=AF=B7=E6=B1=82=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../CustomPages/PF/PFCommonApprove.js | 6 +++---
.../CustomPages/SK/SK033ShowPrint.js | 2 ++
src/utils/request.js | 18 +++++++++++-------
3 files changed, 16 insertions(+), 10 deletions(-)
diff --git a/src/components/CustomPages/PF/PFCommonApprove.js b/src/components/CustomPages/PF/PFCommonApprove.js
index 6e5e223..a5745fc 100644
--- a/src/components/CustomPages/PF/PFCommonApprove.js
+++ b/src/components/CustomPages/PF/PFCommonApprove.js
@@ -94,7 +94,7 @@ class PFCommonApprove extends React.Component {
}
onsubmit = () => {
this.props.form.validateFields((err, values) => {
- console.log(this.state.data)
+ // console.log(this.state.data)
//console.log('Received values of form: ', values);
if (err) {
return;
@@ -369,10 +369,9 @@ 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.Parameter22 = that.props.data.TASK_ORGID
json.Parameter2 = that.props.data.TaskID
extendInclude(json, "Nav_ApproveDetails")
@@ -388,6 +387,7 @@ class PFCommonApprove extends React.Component {
data: {
id: re.Data.DATA_ID, isShow: true,
enums: that.props.app.enums,
+ TASK_ORGID: that.props.data?.TASK_ORGID
// loadDataDeal: this.loadDataDeal,
// btnDisplay : 'none'
},
diff --git a/src/components/CustomPages/SK/SK033ShowPrint.js b/src/components/CustomPages/SK/SK033ShowPrint.js
index 8082092..3146406 100644
--- a/src/components/CustomPages/SK/SK033ShowPrint.js
+++ b/src/components/CustomPages/SK/SK033ShowPrint.js
@@ -12,6 +12,7 @@ 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,
@@ -42,6 +43,7 @@ class SK033ShowPrint extends React.Component {
loadData = (dataId, taskID) => {
let json = initFilter(this.props.login.OrgId);
+ json.Parameter22 = this.props.data?.TASK_ORGID
extendRule(json, 'ID', 1, dataId);
// extendRule(json, 'TASK_ID', 1, taskID);
// extendInclude(json, 'Nav_ApplyUser');
diff --git a/src/utils/request.js b/src/utils/request.js
index e87fb03..e338579 100644
--- a/src/utils/request.js
+++ b/src/utils/request.js
@@ -26,7 +26,7 @@ export function request(url, options, onlyData, requestKey, onException) {
data.IsSuccessful !== undefined && !data.IsSuccessful && message.error(data.ErrorMessage)
return onlyData ? data.Data : data
}).catch(err => {
-
+
requestKey && window.localStorage.removeItem(requestKey)
onException instanceof Function && onException(err)
throw err; // 重新抛出错误，确保错误被正确传播
@@ -40,7 +40,7 @@ export function request(url, options, onlyData, requestKey, onException) {
* @param {*} isIgnoreTenant
* @returns
*/
-export function getRequestHeaders(url, type = 'post', isIgnoreTenant) {
+export function getRequestHeaders(url, type = 'post', data, isIgnoreTenant) {
// 请求参数
const addHeader = 'Bearer ' + storage('lacal').getItem('accessToken').val
const userId = storage('lacal').getItem('userid').val
@@ -72,9 +72,6 @@ export function getRequestHeaders(url, type = 'post', isIgnoreTenant) {
const latestOrgid = storage('lacal').getItem('Orgid').val
const latestUserid = storage('lacal').getItem('Userid').val
const latestUsername = storage('lacal').getItem('Username').val
-
-
-
if (latestTenant) {
headers.Tenant = latestTenant
}
@@ -93,6 +90,13 @@ export function getRequestHeaders(url, type = 'post', isIgnoreTenant) {
} else if (url.indexOf('OP') != 0 && !isIgnoreTenant) {
headers.Tenant = Tenant
}
+
+ //wyw
+ if (Tenant && Tenant == '003' && data && data.Parameter22 && data.Parameter22.length > 20) {
+ //总公司 Parameter22 存入子公司的ORG_ID 自动切换数据库链接
+ headers.Tenant = data.Parameter22.substring(0, 3)
+ }
+
return headers
}
@@ -122,7 +126,7 @@ export function httpPost(url, data, onlyData = true, ignoreThrottle, onException
// 发起请求
return request(url, {
method: 'POST',
- headers: getRequestHeaders(url, 'post', isIgnoreTenant),
+ headers: getRequestHeaders(url, 'post', data, isIgnoreTenant),
body: dataStr,
}, onlyData, requestKey, onException)
}
@@ -142,6 +146,6 @@ export function httpGet(url, data, onlyData = true, onException) {
url = formParams ? formUrl : url
return request(url, {
method: 'GET',
- headers: getRequestHeaders(url, 'get'),
+ headers: getRequestHeaders(url, 'get', data),
}, onlyData, null, onException)
}
From e117369c36f4a4f425120384a2ecbf17e888558c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E4=BD=95=E7=BE=8E=E8=8D=A3?=
<10755671+mei-rong-he@user.noreply.gitee.com>
Date: Thu, 23 Oct 2025 18:44:40 +0800
Subject: [PATCH 05/10] =?UTF-8?q?=E6=A3=80=E6=9F=A5=E9=80=9A=E7=9F=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/files/edit/SK006.js | 100 ++++++++++++++++++++--------------------
1 file changed, 51 insertions(+), 49 deletions(-)
diff --git a/src/files/edit/SK006.js b/src/files/edit/SK006.js
index 845f052..d85f244 100644
--- a/src/files/edit/SK006.js
+++ b/src/files/edit/SK006.js
@@ -1,5 +1,5 @@
import { message } from "antd/lib/index";
-import { getPropertyData, extendInclude, extendRule, getDataFieldValue, setDataFieldValue, initFilter, guid } from "../../utils/common";
+import { getPropertyData, extendInclude,extendIgnoreDataRule, extendRule, getDataFieldValue, setDataFieldValue, initFilter, guid } from "../../utils/common";
import moment from 'moment';
import { Button, Row, Col, Form, Input, Select, Upload, Icon, Modal, Spin,Table } from 'antd';
/**
@@ -15,8 +15,25 @@ export default {
onBeforeEdit(params){
const { isNew, isCopy, dispatch, login, setFieldValue,data, stateData ,getFieldValue} = params ? params : {};
- if (isNew) {
+ if (isNew) {debugger
setFieldValue('MineType', login.currentMineType);
+ let json = initFilter(login.OrgId);
+ extendRule(json, 'ID', 1, login.user.DEPARTMENT_ID);
+ extendInclude(json, 'Nav_Unit')
+ extendIgnoreDataRule(json)
+ dispatch({
+ type: 'app/getDataByPost',
+ url: 'FM/Department/Get',
+ payload: json,
+ onlyData: false,
+ onComplete: (re) => {
+ if (re && re.IsSuccessful && re.Data) {
+ setFieldValue('Nav_ProdutionUnit.NAME', re.Data?.Nav_Unit?.NAME);
+ setFieldValue('PRODUCTION_UNIT_ID', re.Data.PRODUCTION_UNIT_ID);
+ setFieldValue('DEPARTMENT_TYPE', re.Data.DEPARTMENT_TYPE);
+ }
+ }
+ })
}
},
@@ -108,15 +125,13 @@ export default {
}
},
onChange: ({ colInfo, getFieldValue, setFieldValueByBatch, dispatch,login,updateSubTableData }) => {
- if (colInfo.FIELD_NAME === 'MineType' || colInfo.FIELD_NAME === 'Nav_CheckType.NAME' ||colInfo.FIELD_NAME === 'DEPARTMENT_TYPE')
+ if (colInfo.FIELD_NAME === 'Nav_ProdutionUnit.NAME' || colInfo.FIELD_NAME === 'Nav_CheckType.NAME' ||colInfo.FIELD_NAME === 'DEPARTMENT_TYPE'||colInfo.FIELD_NAME === 'PLANCHECKFREQUENCY')
{
- let Parameter1 = getFieldValue('MineType')
- let Parameter2 = getFieldValue('CHECK_TYPE_ID')
- let Parameter3 = getFieldValue('DEPARTMENT_TYPE')
let json = initFilter(login.OrgId);
- json.Parameter1 = Parameter1;
- json.Parameter2 = Parameter2;
- json.Parameter3 = Parameter3;
+ json.Parameter1 = getFieldValue('PRODUCTION_UNIT_ID');
+ json.Parameter2 = getFieldValue('CHECK_TYPE_ID');
+ json.Parameter3 = getFieldValue('DEPARTMENT_TYPE') ;
+ json.Parameter4 = getFieldValue('PLANCHECKFREQUENCY') ;
dispatch({
type: 'app/getDataByPost',
url: 'SK/SKSecurityInspectionNotice/GetCheckContentPCs',
@@ -138,51 +153,38 @@ export default {
}
},
btnSubAdd: ({row, srcRecord,getSelectedRecords,record,saveRowRecord,colInfo,parentRecord,pageCode, stateData,setState, close, loadData, login, btn, dispatch,props }) => {
- let DetailCheck = getSelectedRecords();
- if(login.tempContents && login.tempContents.length>0)
- {
- if(DetailCheck && DetailCheck.length > 0)
+
+ if(login.tempContents && login.tempContents.length>0)
+ {
+ let tmpDatas=[]
+ login.tempContents.map((item,i)=>{
+ let tmpData = {
+ ID: guid(),
+ CHECK_CONTENTS_ID:item.ID,
+ Nav_Contents:item,
+ CHECKCONTENT:item.CHECKCONTENT,
+ // NUM:i+1
+ }
+ tmpDatas.push(tmpData);
+ });
+ if (tmpDatas && tmpDatas.length > 0) {
+ //更新行数据
+ if(stateData.Nav_CheckNoticeDetails && stateData.Nav_CheckNoticeDetails.length>0)
{
- let tmpDatas=[]
- login.tempContents.map((item,i)=>{
- let tmpData = {
- ID: guid(),
- CHECK_CONTENTS_ID:item.ID,
- Nav_Contents:item,
- CHECKCONTENT:item.CHECKCONTENT,
- NUM:i+1
- }
- tmpDatas.push(tmpData);
- });
- if (tmpDatas && tmpDatas.length > 0) {
- //更新行数据
- for (let i = 0; i < DetailCheck.length; i++) {
- let iRow = { ...DetailCheck[i] };
- if(iRow.Nav_CheckNoticeDetails && iRow.Nav_CheckNoticeDetails.length>0)
+ for (let j = 0; j < tmpDatas.length; j++)
{
- for (let j = 0; j < tmpDatas.length; j++)
- {
- iRow.Nav_CheckNoticeDetails.push(tmpDatas[j])
- }
- }
- else
- {
- iRow.Nav_CheckNoticeDetails = tmpDatas;
- }
- saveRowRecord({ record: iRow, editCode: "T_SK_SECURITY_INSPECTION_NOTICE_DETAIL" })
- }
+ stateData.Nav_CheckNoticeDetails.push(tmpDatas[j])
}
}
else
{
- login.tempContents =[];
- message.error("请先勾选管控措施！");
- return;
+ stateData.Nav_CheckNoticeDetails = tmpDatas;
}
-
- login.tempContents =[];
- close();
- }
-
- },
+ saveRowRecord({ record: stateData, editCode: "T_SK_SECURITY_INSPECTION_NOTICE_DETAIL" })
+ }
+ login.tempContents =[];
+ close();
+ }
+
+},
}
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 06/10] =?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 07/10] =?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 {
}