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 2026-03-27 10:26:50 +08:00
commit 1c32bbb9c6
3 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/components/CustomPages/PF/PFCommonApproveView.js
View File

@ -471,7 +471,7 @@ class PFCommonApproveView extends React.Component {
<tr>
<td colSpan={2} rowSpan={1} className={styles.fontBold}>审批详情</td>
<td colSpan={8} rowSpan={1}>{
this.state.data[0].Nav_ApproveDetails && this.state.data[0].Nav_ApproveDetails.map((item, i) => {
this.state.data[0].Nav_ApproveDetails && this.state.data[0].Nav_ApproveDetails.sort(this.compare).map((item, i) => {
if(item.NODE_APPROVE_STATUS == 20)
{
return <table style={{border:"0",width:'100%', textAlign: 'left'}}><tr><td style={{border:"0",color:"red"}}><b>{(item.NAME? item.NAME: "")}</b><br/>

7
src/components/CustomPages/SK/SK014ShowPrint.js
View File

@ -232,8 +232,13 @@ class SK014ShowPrint extends React.Component {
<Descriptions.Item label="整改责任人签名">{
data.Nav_ReportDetails?.map((item, i) => {
if (item && item.ISCHECK) {
showUserSign(item.Nav_RecitifyUser, config.picServerHost)
return <img style={{ margin: "0 0 0 8px", width: '150px' }} alt={item.Nav_RecitifyUser?.NAME} src={config.picServerHost + item.Nav_RecitifyUser?.FILE_PATH} />
}else
{
return <img style={{ margin: "0 0 0 8px", width: '150px' }} title={item.Nav_RecitifyUser?.NAME} />
}
})
}</Descriptions.Item>
</Descriptions>

5
src/components/MainPage/ModifyPassword.js
View File

@ -57,9 +57,10 @@ class ModifyPassword extends Component {
const { getFieldDecorator } = form
const { visible } = this.state
const isComplex = (rule, value, callBack) => {
let passwordReg =/^(?=.*[A-Za-z])(?=.*\d)[A-Za-z\d]{6,15}$/;
// let passwordReg =/^(?=.*[A-Za-z])(?=.*\d)[A-Za-z\d]{6,15}$/;
let passwordReg = /^(?=.*[a-z])(?=.*[A-Z])(?=.*\d)[A-Za-z\d]{8,15}$/;
if (!passwordReg.test(value)) {
callBack('请设置6-15位的密码,至少包含字母、数字')
callBack('请设置8-15位的密码,至少包含大写字母、小写字母、数字')
} else {
callBack()
}