diff --git a/src/components/CustomPages/FM/UserEditPage.js b/src/components/CustomPages/FM/UserEditPage.js
index cb14934..06ed512 100644
--- a/src/components/CustomPages/FM/UserEditPage.js
+++ b/src/components/CustomPages/FM/UserEditPage.js
@@ -104,6 +104,7 @@ class UserEditPage extends React.Component {
extendInclude(userJson, 'Nav_UserPhotoFiles.Nav_ImgFile')
extendInclude(userJson, 'Nav_UserSignFiles.Nav_ImgFile')
extendInclude(userJson, 'Nav_ProdutionUnit.Nav_Enums')
+ extendInclude(userJson, 'Nav_ProdutionUnit.Nav_Unit')
this.props.dispatch({
type: 'FMUserEdit/getUser',
payload: userJson,
@@ -800,12 +801,12 @@ class UserEditPage extends React.Component {
{...formItemLayout}
>
{/* */}
-
{showFiles(data.Nav_Files, config.picServerHost, this)}
-
- {data.COMPLETED_CONDITION}
- {enums.FOYesOrNoEnum.enums[data.IS_FIRE]}
- {data.ACT_DATE}
- {showFiles(data.Nav_FireFiles, config.picServerHost, this)}
- {data.Nav_DispatchUser?.NAME}
- {
-
- data.USER_DEAL_STATUS == 1?
- showUserSign(data.Nav_FireUser, config.picServerHost)
- :null
-
- }
- {
-
- data.SAFE_DEAL_STATUS == 1?
- showUserSign(data.Nav_SafeUser, config.picServerHost)
- :null
+
- }
- {
-
- data.DISPATCH_DEAL_STATUS == 1?
- showUserSign(data.Nav_DispatchUser, config.picServerHost)
- :null
-
- }
- {
- data.COMPLETED_CONTENT
- }
- {
- enums.FOYesOrNoEnum.enums[data.IS_LEAVE]
- }
- {
- data.ACT_END_DATE
- }
- {
- data.LEAVE_DATE
- }
- {
- showFiles(data.Nav_MonitorFiles, config.picServerHost, this)
- }
- {
- data.USER_DEAL_FINISH_STATUS == 1?
- showUserSign(data.Nav_FireUser, config.picServerHost)
- :null
- }
- {
- data.SAFE_DEAL_FINISH_STATUS == 1?
- showUserSign(data.Nav_SafeUser, config.picServerHost)
- :null
- }
-
-
-
+
{
data && data.Nav_Users?
@@ -283,8 +231,65 @@ class FO043ShowPrint extends React.Component {
: null
}
-
+
+ {data.COMPLETED_CONDITION}
+ {enums.FOYesOrNoEnum.enums[data.IS_FIRE]}
+ {data.ACT_DATE}
+ {showFiles(data.Nav_FireFiles, config.picServerHost, this)}
+ {data.Nav_DispatchUser?.NAME}
+ {
+
+ data.USER_DEAL_STATUS == 1?
+ showUserSign(data.Nav_FireUser, config.picServerHost)
+ :null
+
+ }
+ {
+
+ data.SAFE_DEAL_STATUS == 1?
+ showUserSign(data.Nav_SafeUser, config.picServerHost)
+ :null
+
+ }
+ {
+
+ data.DISPATCH_DEAL_STATUS == 1?
+ showUserSign(data.Nav_DispatchUser, config.picServerHost)
+ :null
+
+ }
+
+
+ {
+ data.COMPLETED_CONTENT
+ }
+ {
+ enums.FOYesOrNoEnum.enums[data.IS_LEAVE]
+ }
+ {
+ data.ACT_END_DATE
+ }
+ {
+ data.LEAVE_DATE
+ }
+ {
+ showFiles(data.Nav_MonitorFiles, config.picServerHost, this)
+ }
+ {
+ data.USER_DEAL_FINISH_STATUS == 1?
+ showUserSign(data.Nav_FireUser, config.picServerHost)
+ :null
+ }
+ {
+ data.SAFE_DEAL_FINISH_STATUS == 1?
+ showUserSign(data.Nav_SafeUser, config.picServerHost)
+ :null
+ }
+
+
+
: null
+
}
diff --git a/src/components/CustomPages/FO/FO045ShowPrint.js b/src/components/CustomPages/FO/FO045ShowPrint.js
index 389c079..a71ac5f 100644
--- a/src/components/CustomPages/FO/FO045ShowPrint.js
+++ b/src/components/CustomPages/FO/FO045ShowPrint.js
@@ -150,52 +150,9 @@ class FO045ShowPrint extends React.Component {
return item.RISK_NAME + ' '
})}
{showFiles(data.Nav_Files, config.picServerHost, this)}
+
- {data.COMPLETED_CONDITION}
- {enums.FOYesOrNoEnum.enums[data.IS_FIRE]}
- {data.ACT_DATE}
- {showFiles(data.Nav_FireFiles, config.picServerHost, this)}
-
- {
- data.USER_DEAL_STATUS == 1 && data.Nav_FireUser[0] && data.Nav_FireUser[0].Nav_ImgFile?
-
- :null
- }
- {
-
- data.SAFE_DEAL_STATUS == 1 && data.Nav_SafeUser[0] && data.Nav_SafeUser[0].Nav_ImgFile?
-
- :null
-
- }
- {
- data.COMPLETED_CONTENT
- }
- {
- enums.FOYesOrNoEnum.enums[data.IS_LEAVE]
- }
- {
- data.ACT_END_DATE
- }
- {
- data.LEAVE_DATE
- }
- {
- showFiles(data.Nav_MonitorFiles, config.picServerHost, this)
- }
- {
- data.USER_DEAL_FINISH_STATUS == 1 && data.Nav_FireUser[0] && data.Nav_FireUser[0].Nav_ImgFile?
-
- :null
- }
- {
- data.SAFE_DEAL_FINISH_STATUS == 1 && data.Nav_SafeUser[0] && data.Nav_SafeUser[0].Nav_ImgFile?
-
- :null
- }
-
-
-
+
{
data && data.Nav_Users?
@@ -276,6 +233,61 @@ class FO045ShowPrint extends React.Component {
: null
}
+
+ {data.COMPLETED_CONDITION}
+ {enums.FOYesOrNoEnum.enums[data.IS_FIRE]}
+ {data.ACT_DATE}
+ {showFiles(data.Nav_FireFiles, config.picServerHost, this)}
+ {data.Nav_DispatchUser?.NAME}
+ {
+ data.USER_DEAL_STATUS == 1 && data.Nav_FireUser[0] && data.Nav_FireUser[0].Nav_ImgFile?
+
+ :null
+ }
+ {
+
+ data.SAFE_DEAL_STATUS == 1 && data.Nav_SafeUser[0] && data.Nav_SafeUser[0].Nav_ImgFile?
+
+ :null
+
+ }
+ {
+
+ data.DISPATCH_DEAL_STATUS == 1?
+ showUserSign(data.Nav_DispatchUser, config.picServerHost)
+ :null
+
+ }
+
+
+ {
+ data.COMPLETED_CONTENT
+ }
+ {
+ enums.FOYesOrNoEnum.enums[data.IS_LEAVE]
+ }
+ {
+ data.ACT_END_DATE
+ }
+ {
+ data.LEAVE_DATE
+ }
+ {
+ showFiles(data.Nav_MonitorFiles, config.picServerHost, this)
+ }
+ {
+ data.USER_DEAL_FINISH_STATUS == 1 && data.Nav_FireUser[0] && data.Nav_FireUser[0].Nav_ImgFile?
+
+ :null
+ }
+ {
+ data.SAFE_DEAL_FINISH_STATUS == 1 && data.Nav_SafeUser[0] && data.Nav_SafeUser[0].Nav_ImgFile?
+
+ :null
+ }
+
+
+
: null
}
diff --git a/src/components/CustomPages/SK/SK004CheckPost.js b/src/components/CustomPages/SK/SK004CheckPost.js
index 98d8700..9e6a4d9 100644
--- a/src/components/CustomPages/SK/SK004CheckPost.js
+++ b/src/components/CustomPages/SK/SK004CheckPost.js
@@ -102,14 +102,14 @@ class SK004CheckPost extends React.Component {
return
}
},
- {
- title: '操作',
- dataIndex: '',
- key: '',
- render: (text, record, index) => {
- return