wyw/mh_jy_safe_web
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Compare commits

base: wyw:0401f7e0b45de70ef165c6740e035700a4e8c0fb
Branches Tags
wyw:master
..
compare: wyw:6838f111ce5c70bc0f0e6c53db94a887c4619921
Branches Tags
wyw:master

No commits in common. "0401f7e0b45de70ef165c6740e035700a4e8c0fb" and "6838f111ce5c70bc0f0e6c53db94a887c4619921" have entirely different histories.
0401f7e0b4 ... 6838f111ce

3 changed files with 17 additions and 25 deletions
Show Stats Expand all files Collapse all files

10
src/components/CustomPages/PF/PFCommonApprove.js
View File

@ -152,10 +152,12 @@ 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"
}
//回调函数
@ -369,12 +371,8 @@ 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({

8
src/routes/GroupHome.js
View File

@ -240,7 +240,6 @@ class GroupHome extends React.Component {
<a
onClick={() =>
this.showEditModal(
record.ORG_ID,
record.SOURCE_DATA_ID,
record.SOURCE_FORMCODE,
record.ID,
@ -907,7 +906,7 @@ class GroupHome extends React.Component {
this.clearData();
};
showEditModal = (TASK_ORGID, dataId, formCode, TaskID, title, taskCode) => {
showEditModal = (dataId, formCode, TaskID, title, taskCode) => {
// this.props.dispatch({
// type: "app/getDataByPost",
// url: "BI/BIController/getVersion",
@ -928,7 +927,6 @@ class GroupHome extends React.Component {
taskCode: taskCode,
tableKey: this.state.tableKey,
homeReload: true,
TASK_ORGID: TASK_ORGID,
},
formCode: formCode,
};
@ -1002,7 +1000,6 @@ class GroupHome extends React.Component {
<a
onClick={() =>
this.showEditModal(
record.ORG_ID,
record.SOURCE_DATA_ID,
record.SOURCE_FORMCODE,
record.ID,
@ -1084,7 +1081,6 @@ class GroupHome extends React.Component {
<a
onClick={() =>
this.showEditModal(
record.ORG_ID,
record.SOURCE_DATA_ID,
record.SOURCE_FORMCODE,
record.ID,
@ -1147,7 +1143,6 @@ class GroupHome extends React.Component {
<a
onClick={() =>
this.showEditModal(
record.ORG_ID,
record.SOURCE_DATA_ID,
record.SOURCE_FORMCODE,
record.ID,
@ -1238,7 +1233,6 @@ class GroupHome extends React.Component {
<a
onClick={() =>
this.showEditModal(
record.ORG_ID,
record.SOURCE_DATA_ID,
record.SOURCE_FORMCODE,
record.ID,

10
src/utils/customConfig.original.js
View File

@ -1157,10 +1157,6 @@ 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 />
@ -1169,6 +1165,10 @@ const SC022Import = 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,7 +2500,6 @@ 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} />,
@ -2510,6 +2509,7 @@ 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} />,