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

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

Browse Source
This commit is contained in:
wyw 2025-11-29 21:05:10 +08:00
commit 10fa812281
4 changed files with 27 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/components/CustomPages/FO/FO035ShowPrint.js
View File

@ -137,11 +137,11 @@ class FO035ShowPrint extends React.Component {
<Descriptions.Item label="被交底人签字">{
data.Nav_Person && data.Nav_Person.map((item, i) => {
if (item.DEAL_STATUS == 1) {
showUserSign(item.Nav_User, config.picServerHost)
// if (item.Nav_User != null && item.Nav_User.FILE_PATH != null)
// return <img style={{ margin: "0 0 0 15px",width:'150px' }} alt={item.Nav_User?.NAME} src={config.picServerHost + item.Nav_User.FILE_PATH} />
// else
// return <img style={{ margin: "0 0 0 15px",width:'150px' }} title={item.Nav_User?.NAME} />
// showUserSign(item.Nav_User, config.picServerHost)
if (item.Nav_User != null && item.Nav_User.FILE_PATH != null)
return <img style={{ margin: "0 0 0 15px",width:'150px' }} alt={item.Nav_User?.NAME} src={config.picServerHost + item.Nav_User.FILE_PATH} />
else
return <img style={{ margin: "0 0 0 15px",width:'150px' }} title={item.Nav_User?.NAME} />
}
})
}</Descriptions.Item>

10
src/components/CustomPages/FO/FO037ShowPrint.js
View File

@ -138,11 +138,11 @@ class FO037ShowPrint extends React.Component {
<Descriptions.Item label="被交底人签字">{
data.Nav_Person && data.Nav_Person.map((item, i) => {
if (item.DEAL_STATUS == 1) {
showUserSign(item.Nav_User, config.picServerHost)
// if (item.Nav_User != null && item.Nav_User.FILE_PATH != null)
// return <img style={{ margin: "0 0 0 15px",width:'150px' }} alt={item.Nav_User?.NAME} src={config.picServerHost + item.Nav_User.FILE_PATH} />
// else
// return <img style={{ margin: "0 0 0 15px",width:'150px' }} title={item.Nav_User?.NAME} />
// showUserSign(item.Nav_User, config.picServerHost)
if (item.Nav_User != null && item.Nav_User.FILE_PATH != null)
return <img style={{ margin: "0 0 0 15px",width:'150px' }} alt={item.Nav_User?.NAME} src={config.picServerHost + item.Nav_User.FILE_PATH} />
else
return <img style={{ margin: "0 0 0 15px",width:'150px' }} title={item.Nav_User?.NAME} />
}
})
}</Descriptions.Item>

4
src/components/CustomPages/FO/FO041ShowPrint.js
View File

@ -148,7 +148,7 @@ class FO041ShowPrint extends React.Component {
<Descriptions.Item label="交班人签字">{
data.Nav_Users && data.Nav_Users.map((item, i) => {
if (item.DEAL_STATUS == 1) {
showUserSign(item.Nav_User, config.picServerHost)
return <img width={'150px'} style={{ margin: "0 0 0 5px" }} src={config.picServerHost + item.Nav_User?.FILE_PATH} title={item.Nav_User?.NAME} alt={item.Nav_User?.NAME} />
}
})
@ -157,7 +157,7 @@ class FO041ShowPrint extends React.Component {
<Descriptions.Item label="接班人签字">{
data.Nav_AfterUsers && data.Nav_AfterUsers.map((item, i) => {
if (item.AFTER_USER_DEAL_STATUS == 1) {
showUserSign(item.Nav_AfterUser, config.picServerHost)
return <img width={'150px'} style={{ margin: "0 0 0 5px" }} src={config.picServerHost + item.Nav_AfterUser?.FILE_PATH} title={item.Nav_AfterUser?.NAME} alt={item.Nav_AfterUser?.NAME} />
}
})
}</Descriptions.Item>

15
src/models/login.js
View File

@ -252,6 +252,7 @@ export default {
storage("lacal").setItem("loginUserVerify", { username, password }); // 登录凭证存入localStorage
}
storage("lacal").setItem("webOrgId", ret.User.ORG_ID);
storage("lacal").setItem("webUserInfo", ret.User);
storage("lacal").setItem("DataRule", ret.DataRule || []);
storage("lacal").setItem("OrgRule", ret.OrgRule || []);
storage("lacal").setItem("departmentId", ret.User.DEPARTMENT_ID);
@ -342,10 +343,22 @@ export default {
return ret;
},
// 验证登录状态
*checkLoginStatus({ onSuccess, onFail }, { select }) {
*checkLoginStatus({ onSuccess, onFail }, { select, put }) {
const { OrgId } = yield select((state) => state.login);
if (!OrgId) {
const webOrgId = storage("lacal").getItem("webOrgId").val || storage("lacal").getItem("Orgid").val;
const userInfo = storage("lacal").getItem("webUserInfo").val;
if (webOrgId) {
const payload = { OrgId: webOrgId };
if (userInfo) {
payload.user = userInfo;
payload.userId = userInfo.ID;
}
yield put({ type: "save", payload });
onSuccess instanceof Function && onSuccess();
} else {
onFail instanceof Function && onFail();
}
} else {
onSuccess instanceof Function && onSuccess();
}