ccy/mh-lcmk-sms-web
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

驳回信息 加粗 变红

Browse Source 
检查项目分类 删除
This commit is contained in:
wyw 2024-07-16 15:24:15 +08:00
parent 320eb1e0b5
commit 7a6b1a7804
9 changed files with 46 additions and 52 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/baseComponents/EditBaseComponent/index.js
View File

@ -748,7 +748,9 @@ params【字段属性】=值
<Form.Item <Form.Item
label={ label={
<span> <span>
<span>{label}</span> {
(col.code&&col.code === 'warm') ? (<span style={{ color: 'red',fontWeight:'bold',fontSize: 'large' }} >{label}</span>):(<span >{label}</span>)
}
{ {
remark remark
? ( ? (

2
src/baseComponents/EditComponent/index.js
View File

@ -1788,7 +1788,7 @@ class EditComponent extends EditBaseComponent {
const tempCols = []; const tempCols = [];
if (columns && columns.length) { if (columns && columns.length) {
columns.forEach(t => { columns.forEach(t => {
if (code && t.code === code || !code & !t.code) { if ((code && t.code === code || !code & !t.code) || (t.code && t.code === 'warm')) {
tempCols.push(t); tempCols.push(t);
} }
if (isTree) t.span = { sm: 24, md: 12 } if (isTree) t.span = { sm: 24, md: 12 }

2
src/components/CustomPages/BS/BS026ShowPrint.js
View File

@ -136,7 +136,7 @@ class BS026ShowPrint extends React.Component {
<Descriptions.Item label="检查层级">{data.Nav_CheckTypeLevel?.Nav_Enums.NAME}</Descriptions.Item> <Descriptions.Item label="检查层级">{data.Nav_CheckTypeLevel?.Nav_Enums.NAME}</Descriptions.Item>
<Descriptions.Item label="检查区域">{data.Nav_RiskArea?.NAME}</Descriptions.Item> <Descriptions.Item label="检查区域">{data.Nav_RiskArea?.NAME}</Descriptions.Item>
<Descriptions.Item label="检查项目">{data.Nav_CheckProject?.NAME}</Descriptions.Item> <Descriptions.Item label="检查项目">{data.Nav_CheckProject?.NAME}</Descriptions.Item>
<Descriptions.Item label="检查项目分类">{data.Nav_CheckProjectCategory?.NAME}</Descriptions.Item> {/* <Descriptions.Item label="检查项目分类">{data.Nav_CheckProjectCategory?.NAME}</Descriptions.Item> */}
<Descriptions.Item label="检查内容">{data.CHECKCONTENT}</Descriptions.Item> <Descriptions.Item label="检查内容">{data.CHECKCONTENT}</Descriptions.Item>
{/* <Descriptions.Item label="检查依据">{data.CHECKPROOF}</Descriptions.Item> */} {/* <Descriptions.Item label="检查依据">{data.CHECKPROOF}</Descriptions.Item> */}
<Descriptions.Item label="检查问题描述">{data.Nav_CheckQuestion?.DESCREPTION}</Descriptions.Item> <Descriptions.Item label="检查问题描述">{data.Nav_CheckQuestion?.DESCREPTION}</Descriptions.Item>

7
src/components/CustomPages/BS/BS032ShowPrint.js
View File

@ -74,7 +74,7 @@ class BS032ShowPrint extends React.Component {
extendInclude(json, 'Nav_CheckTypeLevel.Nav_Enums'); extendInclude(json, 'Nav_CheckTypeLevel.Nav_Enums');
extendInclude(json, 'Nav_ListCheckRiskArea.Nav_RiskArea'); extendInclude(json, 'Nav_ListCheckRiskArea.Nav_RiskArea');
extendInclude(json, 'Nav_ListCheckProject.Nav_CheckProject'); extendInclude(json, 'Nav_ListCheckProject.Nav_CheckProject');
extendInclude(json, 'Nav_ListCheckProjectCategory.Nav_CheckProjectCategory'); // extendInclude(json, 'Nav_ListCheckProjectCategory.Nav_CheckProjectCategory');
// extendInclude(json, 'Nav_ListSafeCheckDetail.Nav_CheckProject'); // extendInclude(json, 'Nav_ListSafeCheckDetail.Nav_CheckProject');
// extendInclude(json, 'Nav_ListSafeCheckDetail.Nav_ListCheckDetailUser.Nav_User'); // extendInclude(json, 'Nav_ListSafeCheckDetail.Nav_ListCheckDetailUser.Nav_User');
extendInclude(json, 'Nav_Files.Nav_ImgFile.Nav_File'); extendInclude(json, 'Nav_Files.Nav_ImgFile.Nav_File');
@ -215,12 +215,11 @@ class BS032ShowPrint extends React.Component {
}</Descriptions.Item> }</Descriptions.Item>
{/* ret.Nav_ListCheckProjectCategory[i].Nav_CheckProjectCategory.NAME */} {/* ret.Nav_ListCheckProjectCategory[i].Nav_CheckProjectCategory.NAME */}
<Descriptions.Item span={2} label="检查项目分类">{ {/* <Descriptions.Item span={2} label="检查项目分类">{
data.Nav_ListCheckProjectCategory && data.Nav_ListCheckProjectCategory.map((item, i) => { data.Nav_ListCheckProjectCategory && data.Nav_ListCheckProjectCategory.map((item, i) => {
// return (i > 0 ? "," : "") + item.Nav_CheckProjectCategory.NAME
return <p className={styles.pLin}> {item.Nav_CheckProjectCategory.NAME}</p> return <p className={styles.pLin}> {item.Nav_CheckProjectCategory.NAME}</p>
}) })
}</Descriptions.Item> }</Descriptions.Item> */}
<Descriptions.Item span={2} label="检查人员">{data.CheckUsers}</Descriptions.Item> <Descriptions.Item span={2} label="检查人员">{data.CheckUsers}</Descriptions.Item>
<Descriptions.Item span={2} label="附件">{ <Descriptions.Item span={2} label="附件">{
data.Nav_Files && data.Nav_Files.map((item, i) => { data.Nav_Files && data.Nav_Files.map((item, i) => {

23
src/components/CustomPages/BS/BS034ShowPrint.js
View File

@ -43,17 +43,11 @@ class BS034ShowPrint extends React.Component {
let json = initFilter(this.props.login.OrgId); let json = initFilter(this.props.login.OrgId);
extendRule(json, 'ID', 1, this.props.data.id); extendRule(json, 'ID', 1, this.props.data.id);
// extendInclude(json, 'Nav_ListSafeCheckDetail.Nav_CheckMain');
// extendInclude(json, 'Nav_ListSafeCheckDetail.Nav_CheckMain.Nav_CheckProject');
// extendInclude(json, 'Nav_ListSafeCheckDetail.Nav_CheckMain.Nav_CheckQuestion');
// extendInclude(json, 'Nav_ListCheckUserSign.Nav_ImgFile.Nav_File');
//extendInclude(json, 'Nav_ListSafeCheckDetail.Nav_ListCheckDetailUser.Nav_User.Nav_UserSignFiles.Nav_ImgFile.Nav_File');
extendInclude(json, 'Nav_CheckType'); extendInclude(json, 'Nav_CheckType');
extendInclude(json, 'Nav_CheckTypeLevel.Nav_Enums'); extendInclude(json, 'Nav_CheckTypeLevel.Nav_Enums');
extendInclude(json, 'Nav_ListCheckRiskArea.Nav_RiskArea'); extendInclude(json, 'Nav_ListCheckRiskArea.Nav_RiskArea');
extendInclude(json, 'Nav_ListCheckProject.Nav_CheckProject'); extendInclude(json, 'Nav_ListCheckProject.Nav_CheckProject');
extendInclude(json, 'Nav_ListCheckProjectCategory.Nav_CheckProjectCategory'); // extendInclude(json, 'Nav_ListCheckProjectCategory.Nav_CheckProjectCategory');
extendInclude(json, 'Nav_Files.Nav_ImgFile.Nav_File'); extendInclude(json, 'Nav_Files.Nav_ImgFile.Nav_File');
extendInclude(json, 'Nav_ListCheckUserSign.Nav_User.Nav_UserSignFiles.Nav_ImgFile.Nav_File'); extendInclude(json, 'Nav_ListCheckUserSign.Nav_User.Nav_UserSignFiles.Nav_ImgFile.Nav_File');
extendInclude(json, 'Nav_ApproveCheckAudit.Nav_ApproveDetails.Nav_ApproveUser.Nav_UserSignFiles.Nav_ImgFile.Nav_File'); extendInclude(json, 'Nav_ApproveCheckAudit.Nav_ApproveDetails.Nav_ApproveUser.Nav_UserSignFiles.Nav_ImgFile.Nav_File');
@ -80,11 +74,11 @@ class BS034ShowPrint extends React.Component {
} }
let strProjectCategoryNAME = '' let strProjectCategoryNAME = ''
if (ret.Nav_ListCheckProjectCategory && ret.Nav_ListCheckProjectCategory.length > 0) { // if (ret.Nav_ListCheckProjectCategory && ret.Nav_ListCheckProjectCategory.length > 0) {
for (let i = 0; i < ret.Nav_ListCheckProjectCategory.length; i++) { // for (let i = 0; i < ret.Nav_ListCheckProjectCategory.length; i++) {
strProjectCategoryNAME += (strProjectCategoryNAME.length > 0 ? "," : "") + ret.Nav_ListCheckProjectCategory[i].Nav_CheckProjectCategory.NAME; // strProjectCategoryNAME += (strProjectCategoryNAME.length > 0 ? "," : "") + ret.Nav_ListCheckProjectCategory[i].Nav_CheckProjectCategory.NAME;
} // }
} // }
ret.RiskAreaNAME = strRiskAreaNAME ret.RiskAreaNAME = strRiskAreaNAME
ret.CheckProjectNAME = strCheckProjectNAME ret.CheckProjectNAME = strCheckProjectNAME
@ -158,12 +152,11 @@ class BS034ShowPrint extends React.Component {
<Descriptions.Item label="检查区域">{data.RiskAreaNAME}</Descriptions.Item> <Descriptions.Item label="检查区域">{data.RiskAreaNAME}</Descriptions.Item>
<Descriptions.Item label="检查项目">{data.CheckProjectNAME}</Descriptions.Item> <Descriptions.Item label="检查项目">{data.CheckProjectNAME}</Descriptions.Item>
{/* ret.Nav_ListCheckProjectCategory[i].Nav_CheckProjectCategory.NAME */} {/* ret.Nav_ListCheckProjectCategory[i].Nav_CheckProjectCategory.NAME */}
<Descriptions.Item label="检查项目分类">{ {/* <Descriptions.Item label="检查项目分类">{
// data.ProjectCategoryNAME
data.Nav_ListCheckProjectCategory && data.Nav_ListCheckProjectCategory.map((item, i) => { data.Nav_ListCheckProjectCategory && data.Nav_ListCheckProjectCategory.map((item, i) => {
return (i > 0 ? "," : "") + item.Nav_CheckProjectCategory.NAME return (i > 0 ? "," : "") + item.Nav_CheckProjectCategory.NAME
}) })
}</Descriptions.Item> }</Descriptions.Item> */}
<Descriptions.Item label="检查人员">{data.CheckUsers}</Descriptions.Item> <Descriptions.Item label="检查人员">{data.CheckUsers}</Descriptions.Item>
<Descriptions.Item label="附件">{ <Descriptions.Item label="附件">{
showFiles(data.Nav_Files, config.picServerHost) showFiles(data.Nav_Files, config.picServerHost)

7
src/components/CustomPages/BS/BS034View.js
View File

@ -47,7 +47,7 @@ class BS034View extends React.Component {
extendInclude(json, 'Nav_CheckTypeLevel.Nav_Enums'); extendInclude(json, 'Nav_CheckTypeLevel.Nav_Enums');
extendInclude(json, 'Nav_ListCheckRiskArea.Nav_RiskArea'); extendInclude(json, 'Nav_ListCheckRiskArea.Nav_RiskArea');
extendInclude(json, 'Nav_ListCheckProject.Nav_CheckProject'); extendInclude(json, 'Nav_ListCheckProject.Nav_CheckProject');
extendInclude(json, 'Nav_ListCheckProjectCategory.Nav_CheckProjectCategory'); // extendInclude(json, 'Nav_ListCheckProjectCategory.Nav_CheckProjectCategory');
extendInclude(json, 'Nav_Files.Nav_ImgFile.Nav_File'); extendInclude(json, 'Nav_Files.Nav_ImgFile.Nav_File');
extendInclude(json, 'Nav_ListCheckUserSign.Nav_ImgFile.Nav_File'); extendInclude(json, 'Nav_ListCheckUserSign.Nav_ImgFile.Nav_File');
extendInclude(json, 'Nav_ListSafeCheckDetail.Nav_Files.Nav_ImgFile.Nav_File'); extendInclude(json, 'Nav_ListSafeCheckDetail.Nav_Files.Nav_ImgFile.Nav_File');
@ -199,12 +199,11 @@ class BS034View extends React.Component {
return <p className={styles.pLin}> {item.Nav_CheckProject.NAME}</p> return <p className={styles.pLin}> {item.Nav_CheckProject.NAME}</p>
}) })
}</Descriptions.Item> }</Descriptions.Item>
<Descriptions.Item span={2} label="检查项目分类">{ {/* <Descriptions.Item span={2} label="检查项目分类">{
data?.Nav_ListCheckProjectCategory?.map((item, i) => { data?.Nav_ListCheckProjectCategory?.map((item, i) => {
// return (i > 0 ? "," : "") + item.Nav_CheckProjectCategory.NAME
return <p className={styles.pLin}> {item.Nav_CheckProjectCategory.NAME}</p> return <p className={styles.pLin}> {item.Nav_CheckProjectCategory.NAME}</p>
}) })
}</Descriptions.Item> }</Descriptions.Item> */}
<Descriptions.Item span={2} label="检查人员">{data.CheckUsers}</Descriptions.Item> <Descriptions.Item span={2} label="检查人员">{data.CheckUsers}</Descriptions.Item>
<Descriptions.Item span={2} label="附件">{ <Descriptions.Item span={2} label="附件">{
showFiles(data.Nav_Files, config.picServerHost) showFiles(data.Nav_Files, config.picServerHost)

4
src/components/CustomPages/BS/BS073ShowPrint.js
View File

@ -49,7 +49,7 @@ class BS073ShowPrint extends React.Component {
extendInclude(json, 'Nav_Submit'); extendInclude(json, 'Nav_Submit');
extendInclude(json, 'Nav_Files.Nav_ImgFile.Nav_File'); extendInclude(json, 'Nav_Files.Nav_ImgFile.Nav_File');
extendInclude(json, 'Nav_CheckProject'); extendInclude(json, 'Nav_CheckProject');
extendInclude(json, 'Nav_CheckProjectCategory'); // extendInclude(json, 'Nav_CheckProjectCategory');
extendInclude(json, 'Nav_RiskArea'); extendInclude(json, 'Nav_RiskArea');
extendInclude(json, 'Nav_ListRiskQuestionReason.Nav_RiskReason'); extendInclude(json, 'Nav_ListRiskQuestionReason.Nav_RiskReason');
extendInclude(json, 'Nav_ListRiskQuestionReason'); extendInclude(json, 'Nav_ListRiskQuestionReason');
@ -129,7 +129,7 @@ class BS073ShowPrint extends React.Component {
showFiles(data?.Nav_Files, config.picServerHost) showFiles(data?.Nav_Files, config.picServerHost)
}</Descriptions.Item> }</Descriptions.Item>
<Descriptions.Item label="检查项目">{data.Nav_CheckProject?.NAME}</Descriptions.Item> <Descriptions.Item label="检查项目">{data.Nav_CheckProject?.NAME}</Descriptions.Item>
<Descriptions.Item label="检查项目分类">{data.Nav_CheckProjectCategory?.NAME}</Descriptions.Item> {/* <Descriptions.Item label="检查项目分类">{data.Nav_CheckProjectCategory?.NAME}</Descriptions.Item> */}
<Descriptions.Item label="检查区域">{data.Nav_RiskArea?.NAME}</Descriptions.Item> <Descriptions.Item label="检查区域">{data.Nav_RiskArea?.NAME}</Descriptions.Item>
<Descriptions.Item label="隐患地点">{data.ADDRESS}</Descriptions.Item> <Descriptions.Item label="隐患地点">{data.ADDRESS}</Descriptions.Item>
<Descriptions.Item label="检查内容">{data.CHECKCONTENT}</Descriptions.Item> <Descriptions.Item label="检查内容">{data.CHECKCONTENT}</Descriptions.Item>

32
src/components/CustomPages/BS/BS076ShowOperateLog.js
View File

@ -1,6 +1,6 @@
import { Button, Descriptions, Badge, Popconfirm, Row, Col, Form, Input, Select, Table } from 'antd'; import { Button, Descriptions, Badge, Popconfirm, Row, Col, Form, Input, Select, Table } from 'antd';
import React from 'react'; import React from 'react';
import { initFilter, extendRule, extendInclude, setDataFieldValue, showApprove, guid, initQueryFilter, ShowDateTime, ShowPrintClose, showFiles } from '../../../utils/common'; import { initFilter, extendRule, extendInclude, setDataFieldValue, showApprove, guid, ShowDateTime } from '../../../utils/common';
import ReactToPrint from 'react-to-print'; import ReactToPrint from 'react-to-print';
import { ExportToExcel } from '@woowalker/feui' import { ExportToExcel } from '@woowalker/feui'
import XLSX from 'xlsx'; import XLSX from 'xlsx';
@ -119,7 +119,7 @@ class BS076ShowOperateLog extends React.Component {
<div className={styles.stepx} id="step01">{enums.OPERATEPOINT_Enums.enums[item.OPERATEPOINT]}</div> <div className={styles.stepx} id="step01">{enums.OPERATEPOINT_Enums.enums[item.OPERATEPOINT]}</div>
<div id="step02" className={styles.discribeSpan}> <div id="step02" className={styles.discribeSpan}>
<span className={styles.discribeSpanUser}> 用户：{item.USRTNAME}</span> <span className={styles.discribeSpanUser}> 用户：{item.USRTNAME}</span>
<span className={styles.discribeSpanTime}> 时间：{item.CREATE_TIME.split(' ')[0]}</span> <span className={styles.discribeSpanTime}> 时间：{ShowDateTime(item.OPERTETIME, "MM-dd HH:mm")}</span>
</div> </div>
</div> </div>
) )
@ -129,7 +129,7 @@ class BS076ShowOperateLog extends React.Component {
<div className={styles.stepxOutTime} id="step01">{enums.OPERATEPOINT_Enums.enums[item.OPERATEPOINT]}</div> <div className={styles.stepxOutTime} id="step01">{enums.OPERATEPOINT_Enums.enums[item.OPERATEPOINT]}</div>
<div id="step02" className={styles.discribeSpan}> <div id="step02" className={styles.discribeSpan}>
<span className={styles.discribeSpanUser}> 用户：{item.USRTNAME}</span> <span className={styles.discribeSpanUser}> 用户：{item.USRTNAME}</span>
<span className={styles.discribeSpanTime}> 时间：{item.CREATE_TIME.split(' ')[0]}</span> <span className={styles.discribeSpanTime}> 时间：{ShowDateTime(item.OPERTETIME, "MM-dd HH:mm")}</span>
</div> </div>
</div>) </div>)
) )
@ -190,7 +190,7 @@ class BS076ShowOperateLog extends React.Component {
<div className={styles.stepx} id="step20">{enums.OPERATEPOINT_Enums.enums[item.OPERATEPOINT]}</div> <div className={styles.stepx} id="step20">{enums.OPERATEPOINT_Enums.enums[item.OPERATEPOINT]}</div>
<div id="step21" className={styles.discribeSpan}> <div id="step21" className={styles.discribeSpan}>
<span className={styles.discribeSpanUser}> 用户：{item.USRTNAME}</span> <span className={styles.discribeSpanUser}> 用户：{item.USRTNAME}</span>
<span className={styles.discribeSpanTime}> 时间：{item.CREATE_TIME.split(' ')[0]}</span> <span className={styles.discribeSpanTime}> 时间：{ShowDateTime(item.OPERTETIME, "MM-dd HH:mm")}</span>
</div> </div>
</div> </div>
) )
@ -200,7 +200,7 @@ class BS076ShowOperateLog extends React.Component {
<div className={styles.stepxOutTime} id="step20">{enums.OPERATEPOINT_Enums.enums[item.OPERATEPOINT]}</div> <div className={styles.stepxOutTime} id="step20">{enums.OPERATEPOINT_Enums.enums[item.OPERATEPOINT]}</div>
<div id="step21" className={styles.discribeSpan}> <div id="step21" className={styles.discribeSpan}>
<span className={styles.discribeSpanUser}> 用户：{item.USRTNAME}</span> <span className={styles.discribeSpanUser}> 用户：{item.USRTNAME}</span>
<span className={styles.discribeSpanTime}> 时间：{item.CREATE_TIME.split(' ')[0]}</span> <span className={styles.discribeSpanTime}> 时间：{ShowDateTime(item.OPERTETIME, "MM-dd HH:mm")}</span>
</div> </div>
</div>) </div>)
) )
@ -261,7 +261,7 @@ class BS076ShowOperateLog extends React.Component {
<div className={styles.stepx} id="step30">{enums.OPERATEPOINT_Enums.enums[item.OPERATEPOINT]}</div> <div className={styles.stepx} id="step30">{enums.OPERATEPOINT_Enums.enums[item.OPERATEPOINT]}</div>
<div id="step31" className={styles.discribeSpan}> <div id="step31" className={styles.discribeSpan}>
<span className={styles.discribeSpanUser}> 用户：{item.USRTNAME}</span> <span className={styles.discribeSpanUser}> 用户：{item.USRTNAME}</span>
<span className={styles.discribeSpanTime}> 时间：{item.CREATE_TIME.split(' ')[0]}</span> <span className={styles.discribeSpanTime}> 时间：{ShowDateTime(item.OPERTETIME, "MM-dd HH:mm")}</span>
</div> </div>
</div> </div>
) )
@ -271,7 +271,7 @@ class BS076ShowOperateLog extends React.Component {
<div className={styles.stepxOutTime} id="step30">{enums.OPERATEPOINT_Enums.enums[item.OPERATEPOINT]}</div> <div className={styles.stepxOutTime} id="step30">{enums.OPERATEPOINT_Enums.enums[item.OPERATEPOINT]}</div>
<div id="step31" className={styles.discribeSpan}> <div id="step31" className={styles.discribeSpan}>
<span className={styles.discribeSpanUser}> 用户：{item.USRTNAME}</span> <span className={styles.discribeSpanUser}> 用户：{item.USRTNAME}</span>
<span className={styles.discribeSpanTime}> 时间：{item.CREATE_TIME.split(' ')[0]}</span> <span className={styles.discribeSpanTime}> 时间：{ShowDateTime(item.OPERTETIME, "MM-dd HH:mm")}</span>
</div> </div>
</div>) </div>)
) )
@ -319,7 +319,7 @@ class BS076ShowOperateLog extends React.Component {
} }
</td> </td>
<td colSpan={10} <td colSpan={10}
style={{ padding:"0 30px 0 30px", border: "1px dashed #D9D9D9" }}> style={{ padding: "0 30px 0 30px", border: "1px dashed #D9D9D9" }}>
<div className={styles.flowchartx} > <div className={styles.flowchartx} >
{ {
data && data[3]?.map((item, index) => { data && data[3]?.map((item, index) => {
@ -336,7 +336,7 @@ class BS076ShowOperateLog extends React.Component {
<div className={styles.stepx} id="step40">{enums.OPERATEPOINT_Enums.enums[item.OPERATEPOINT]}</div> <div className={styles.stepx} id="step40">{enums.OPERATEPOINT_Enums.enums[item.OPERATEPOINT]}</div>
<div id="step41" className={styles.discribeSpan}> <div id="step41" className={styles.discribeSpan}>
<span className={styles.discribeSpanUser}> 用户：{item.USRTNAME}</span> <span className={styles.discribeSpanUser}> 用户：{item.USRTNAME}</span>
<span className={styles.discribeSpanTime}> 时间：{item.CREATE_TIME.split(' ')[0]}</span> <span className={styles.discribeSpanTime}> 时间：{ShowDateTime(item.OPERTETIME, "MM-dd HH:mm")}</span>
</div> </div>
</div> </div>
) )
@ -346,7 +346,7 @@ class BS076ShowOperateLog extends React.Component {
<div className={styles.stepxOutTime} id="step40">{enums.OPERATEPOINT_Enums.enums[item.OPERATEPOINT]}</div> <div className={styles.stepxOutTime} id="step40">{enums.OPERATEPOINT_Enums.enums[item.OPERATEPOINT]}</div>
<div id="step41" className={styles.discribeSpan}> <div id="step41" className={styles.discribeSpan}>
<span className={styles.discribeSpanUser}> 用户：{item.USRTNAME}</span> <span className={styles.discribeSpanUser}> 用户：{item.USRTNAME}</span>
<span className={styles.discribeSpanTime}> 时间：{item.CREATE_TIME.split(' ')[0]}</span> <span className={styles.discribeSpanTime}> 时间：{ShowDateTime(item.OPERTETIME, "MM-dd HH:mm")}</span>
</div> </div>
</div>) </div>)
) )
@ -385,7 +385,7 @@ class BS076ShowOperateLog extends React.Component {
{ {
dataRiskMore?.map(itemR => { dataRiskMore?.map(itemR => {
return <tr> return <tr>
<td colSpan={10} style={{ padding:"0 30px 0 30px", border: "1px dashed #D9D9D9" }}> <td colSpan={10} style={{ padding: "0 30px 0 30px", border: "1px dashed #D9D9D9" }}>
<div className={styles.flowchartx} > <div className={styles.flowchartx} >
{ {
itemR.map((item, index) => { itemR.map((item, index) => {
@ -402,7 +402,7 @@ class BS076ShowOperateLog extends React.Component {
<div className={styles.stepx} id={"step50" + index}>{enums.OPERATEPOINT_Enums.enums[item.OPERATEPOINT]}</div> <div className={styles.stepx} id={"step50" + index}>{enums.OPERATEPOINT_Enums.enums[item.OPERATEPOINT]}</div>
<div id={"step51" + index} className={styles.discribeSpan}> <div id={"step51" + index} className={styles.discribeSpan}>
<span className={styles.discribeSpanUser}> 用户：{item.USRTNAME}</span> <span className={styles.discribeSpanUser}> 用户：{item.USRTNAME}</span>
<span className={styles.discribeSpanTime}> 时间：{item.CREATE_TIME.split(' ')[0]}</span> <span className={styles.discribeSpanTime}> 时间：{ShowDateTime(item.OPERTETIME, "MM-dd HH:mm")}</span>
</div> </div>
</div> </div>
) )
@ -412,7 +412,7 @@ class BS076ShowOperateLog extends React.Component {
<div className={styles.stepxOutTime} id={"step50" + index}>{enums.OPERATEPOINT_Enums.enums[item.OPERATEPOINT]}</div> <div className={styles.stepxOutTime} id={"step50" + index}>{enums.OPERATEPOINT_Enums.enums[item.OPERATEPOINT]}</div>
<div id={"step51" + index} className={styles.discribeSpan}> <div id={"step51" + index} className={styles.discribeSpan}>
<span className={styles.discribeSpanUser}> 用户：{item.USRTNAME}</span> <span className={styles.discribeSpanUser}> 用户：{item.USRTNAME}</span>
<span className={styles.discribeSpanTime}> 时间：{item.CREATE_TIME.split(' ')[0]}</span> <span className={styles.discribeSpanTime}> 时间：{ShowDateTime(item.OPERTETIME, "MM-dd HH:mm")}</span>
</div> </div>
</div>) </div>)
) )
@ -465,7 +465,7 @@ class BS076ShowOperateLog extends React.Component {
<div className={styles.stepx} id="step60">{enums.OPERATEPOINT_Enums.enums[opEnd.OPERATEPOINT]}</div> <div className={styles.stepx} id="step60">{enums.OPERATEPOINT_Enums.enums[opEnd.OPERATEPOINT]}</div>
<div id="step61" className={styles.discribeSpan}> <div id="step61" className={styles.discribeSpan}>
<span className={styles.discribeSpanUser}> 用户：{opEnd.USRTNAME}</span> <span className={styles.discribeSpanUser}> 用户：{opEnd.USRTNAME}</span>
<span className={styles.discribeSpanTime}> 时间：{opEnd.CREATE_TIME.split(' ')[0]}</span> <span className={styles.discribeSpanTime}> 时间：{ShowDateTime(opEnd.OPERTETIME, "MM-dd HH:mm")}</span>
</div> </div>
</div> </div>
) )
@ -476,7 +476,7 @@ class BS076ShowOperateLog extends React.Component {
<div className={styles.stepxOutTime} id="step60">{enums.OPERATEPOINT_Enums.enums[opEnd.OPERATEPOINT]}</div> <div className={styles.stepxOutTime} id="step60">{enums.OPERATEPOINT_Enums.enums[opEnd.OPERATEPOINT]}</div>
<div id="step61" className={styles.discribeSpan}> <div id="step61" className={styles.discribeSpan}>
<span className={styles.discribeSpanUser}> 用户：{opEnd.USRTNAME}</span> <span className={styles.discribeSpanUser}> 用户：{opEnd.USRTNAME}</span>
<span className={styles.discribeSpanTime}> 时间：{opEnd.CREATE_TIME.split(' ')[0]}</span> <span className={styles.discribeSpanTime}> 时间：{ShowDateTime(opEnd.OPERTETIME, "MM-dd HH:mm")}</span>
</div> </div>
</div> </div>
: :
@ -557,7 +557,7 @@ class BS076ShowOperateLog extends React.Component {
return <tr> return <tr>
<td>{item.USRTNAME} </td> <td>{item.USRTNAME} </td>
<td>{enums.OPERATEPOINT_Enums.enums[item.OPERATEPOINT]} </td> <td>{enums.OPERATEPOINT_Enums.enums[item.OPERATEPOINT]} </td>
<td>{item.CREATE_TIME} </td> <td>{item.OPERTETIME?} </td>
<td>{item.OPERTETIME} </td> <td>{item.OPERTETIME} </td>
<td>{item.ISINTTIME != null ? (item.ISINTTIME ? '是' : '否') : ""} </td> <td>{item.ISINTTIME != null ? (item.ISINTTIME ? '是' : '否') : ""} </td>
</tr> </tr>

17
src/files/edit/BS032.js
View File

@ -73,17 +73,18 @@ export default {
} }
} }
extendRule(json, 'Parameter6', 1, ProjectIDs); extendRule(json, 'Parameter6', 1, ProjectIDs);
let valCategory = getFieldValue('Nav_ListCheckProjectCategory'); // let valCategory = getFieldValue('Nav_ListCheckProjectCategory');
let ProjectCategoryIDs = "" let ProjectCategoryIDs = ""
if (valCategory != undefined && valCategory.length > 0) { // if (valCategory != undefined && valCategory.length > 0) {
for (let i = 0; i < valCategory.length; i++) { // for (let i = 0; i < valCategory.length; i++) {
if (valCategory[i].IS_DELETED == undefined || valCategory[i].IS_DELETED == null || valCategory[i].IS_DELETED == false) // if (valCategory[i].IS_DELETED == undefined || valCategory[i].IS_DELETED == null || valCategory[i].IS_DELETED == false)
ProjectCategoryIDs += (ProjectCategoryIDs.length > 0 ? "," : "") + valCategory[i].CHECK_PROJECT_CATEGORY_ID // ProjectCategoryIDs += (ProjectCategoryIDs.length > 0 ? "," : "") + valCategory[i].CHECK_PROJECT_CATEGORY_ID
} // }
} // }
extendRule(json, 'Parameter1', 1, ProjectCategoryIDs); extendRule(json, 'Parameter1', 1, ProjectCategoryIDs);
extendRule(json, 'Keyword', 1, getFieldValue("ID")); extendRule(json, 'Keyword', 1, getFieldValue("ID"));
if (areaIDs.length > 0 && ProjectIDs.length > 0 && ProjectCategoryIDs.length > 0 && CHECK_TYPE_ID != undefined && CHECK_TYPE_ID.length > 0 && CHECK_TYPE_LEVEL_ID != undefined && CHECK_TYPE_LEVEL_ID.length > 0) { // && ProjectCategoryIDs.length > 0
if (areaIDs.length > 0 && ProjectIDs.length > 0 && CHECK_TYPE_ID != undefined && CHECK_TYPE_ID.length > 0 && CHECK_TYPE_LEVEL_ID != undefined && CHECK_TYPE_LEVEL_ID.length > 0) {
dispatch({ dispatch({
type: 'app/getDataByPost', type: 'app/getDataByPost',
url: 'BS/BSSafeCheck/OrderPagedSafeCheckDetail', url: 'BS/BSSafeCheck/OrderPagedSafeCheckDetail',