This commit is contained in:
yunkexin 2025-10-31 11:00:28 +08:00
commit 9dd7a13ffc
30 changed files with 745 additions and 411 deletions

View File

@ -346,6 +346,25 @@ class FO021ShowPrint extends React.Component {
: data.Nav_JobNameOut?.Nav_MonitorUser?.NAME
}</td>
</tr>
<tr>
<td colSpan={2} className={styles.fontBold}>完工验收人签字</td>
<td colSpan={8} className={styles.fontBold}>{
data.Nav_AcceptUsers && data.Nav_AcceptUsers.map((item, i) => {
if (item.DEAL_STATUS == 1) {
if (item.Nav_User != null && item.Nav_User.FILE_PATH != null)
return <img style={{ margin: "0 0 0 8px", width: '150px' }} alt={item.Nav_User.NAME} src={config.picServerHost + item.Nav_User.FILE_PATH} />
else
return <img style={{ margin: "0 0 0 8px", width: '150px' }} title={item.Nav_User.NAME} />
}
else if (item.DEAL_STATUS == 0)
{
if (item.Nav_User != null && item.Nav_User.FILE_PATH != null)
return <label style={{ color: 'red' }} title='未签到'> {item.Nav_User.NAME}</label>
else
return item.Nav_User.NAME
}
})}</td>
</tr>
</tbody>
</table> : null
}

View File

@ -94,7 +94,7 @@ class PFCommonApprove extends React.Component {
}
onsubmit = () => {
this.props.form.validateFields((err, values) => {
console.log(this.state.data)
// console.log(this.state.data)
//console.log('Received values of form: ', values);
if (err) {
return;
@ -123,6 +123,9 @@ class PFCommonApprove extends React.Component {
if (this.state.data.CALLBACK_INTERFACE && this.state.data.CALLBACK_INTERFACE.indexOf("New") > -1) {
newUrl = this.state.data.CALLBACK_INTERFACE
}
if (this.props.data && this.props.data.TASK_ORGID && this.props.data.TASK_ORGID.length > 0 && this.props.data.TASK_ORGID !== this.props.login.OrgId) {
this.state.data.Parameter22 = this.props.data.TASK_ORGID
}
if (newUrl.length > 0) {
this.props.dispatch({
type: 'app/getDataByPost',
@ -152,12 +155,10 @@ 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"
}
//回调函数
@ -373,6 +374,9 @@ class PFCommonApprove extends React.Component {
}
const json = initFilter(that.props.login.OrgId)
extendRule(json, 'ID', 1, dataId);
json.Parameter22 = that.props.data.TASK_ORGID
json.Parameter2 = that.props.data.TaskID
extendInclude(json, "Nav_ApproveDetails")
extendInclude(json, "Nav_ApproveDetails.Nav_ApproveUser")
that.props.dispatch({
@ -386,6 +390,7 @@ class PFCommonApprove extends React.Component {
data: {
id: re.Data.DATA_ID, isShow: true,
enums: that.props.app.enums,
TASK_ORGID: that.props.data?.TASK_ORGID
// loadDataDeal: this.loadDataDeal,
// btnDisplay : 'none'
},

View File

@ -238,6 +238,7 @@ class PFCommonApproveView extends React.Component {
appVisible:appVisibleTemp,
BtnAgreeDisplay:this.props.data.BtnAgreeDisplay?this.props.data.BtnAgreeDisplay:'inline'
});
json.Parameter22=this.props.data?.TASK_ORGID
this.props.dispatch({
type: 'app/getDataByPost',
payload: json,

View File

@ -44,24 +44,24 @@ class SK002ShowPrint extends React.Component {
dataIndex: "Nav_Contents.CHECKCONTENT",
key: "Nav_Contents.CHECKCONTENT",
},
{
title: "检查依据",
dataIndex: "Nav_DetailBasics",
key: "Nav_DetailBasics",
render: (text, record) =>
{
return <label>{
record.Nav_DetailBasics && record.Nav_DetailBasics.map((item, i) => {
return item?.Nav_Law?.NAME+' '
})
}</label>
}
},
{
title: "判定标准",
dataIndex: "CHECK_STANDARD",
key: "CHECK_STANDARD",
},
// {
// title: "检查依据",
// dataIndex: "Nav_DetailBasics",
// key: "Nav_DetailBasics",
// render: (text, record) =>
// {
// return <label>{
// record.Nav_DetailBasics && record.Nav_DetailBasics.map((item, i) => {
// return item?.Nav_Law?.NAME+' '
// })
// }</label>
// }
// },
// {
// title: "判定标准",
// dataIndex: "CHECK_STANDARD",
// key: "CHECK_STANDARD",
// },
{
title: '操作',
dataIndex: '',

View File

@ -94,8 +94,8 @@ class SK002ShowSummary extends React.Component {
<td className={stylesStep.fontBold}>管控层级</td>
<td className={stylesStep.fontBold}>管控措施</td>
<td className={stylesStep.fontBold}>检查内容</td>
<td className={stylesStep.fontBold}>检查依据</td>
<td className={stylesStep.fontBold}>判定标准</td>
{/* <td className={stylesStep.fontBold}></td>
<td className={stylesStep.fontBold}>判定标准</td> */}
<td className={stylesStep.fontBold}>隐患描述</td>
<td className={stylesStep.fontBold}>隐患等级</td>
<td className={stylesStep.fontBold}>整改措施</td>
@ -157,12 +157,12 @@ class SK002ShowSummary extends React.Component {
<td>
{ item.CHECKCONTENTS}
</td>
<td>
{/* <td>
{item.CHECKBASICS }
</td>
<td>
{ item.CHECKSTANDARDS }
</td>
</td> */}
<td>
{ item.HIDDENSCRIPTION }
</td>

View File

@ -53,24 +53,24 @@ class SK004CheckList extends React.Component {
dataIndex: "Nav_Contents.CHECKCONTENT",
key: "Nav_Contents.CHECKCONTENT",
},
{
title: "检查依据",
dataIndex: "Nav_DetailBasics",
key: "Nav_DetailBasics",
render: (text, record) =>
{
return <label>{
record.Nav_DetailBasics && record.Nav_DetailBasics.map((item, i) => {
return item?.Nav_Law?.NAME+' '
})
}</label>
}
},
{
title: "判定标准",
dataIndex: "CHECK_STANDARD",
key: "CHECK_STANDARD",
},
// {
// title: "检查依据",
// dataIndex: "Nav_DetailBasics",
// key: "Nav_DetailBasics",
// render: (text, record) =>
// {
// return <label>{
// record.Nav_DetailBasics && record.Nav_DetailBasics.map((item, i) => {
// return item?.Nav_Law?.NAME+' '
// })
// }</label>
// }
// },
// {
// title: "判定标准",
// dataIndex: "CHECK_STANDARD",
// key: "CHECK_STANDARD",
// },
],
columns : [

View File

@ -18,7 +18,11 @@ class SK004CheckListNew extends React.Component {
inputText2:"",
inputText3:"",
inputText4:"",
inputText5:"",
inputText6:"",
depart: {},
production: {},
productionId:null,
checkType:{},
data: {},
dataList: [],
@ -55,16 +59,16 @@ class SK004CheckListNew extends React.Component {
dataIndex: "CHECK_CONTENTS_NAME",
key: "CHECK_CONTENTS_NAME",
},
{
title: "检查依据",
dataIndex: "CHECKPROOF",
key: "CHECKPROOF",
},
{
title: "判定标准",
dataIndex: "CHECKSTANDARD",
key: "CHECKSTANDARD",
},
// {
// title: "检查依据",
// dataIndex: "CHECKPROOF",
// key: "CHECKPROOF",
// },
// {
// title: "判定标准",
// dataIndex: "CHECKSTANDARD",
// key: "CHECKSTANDARD",
// },
],
@ -151,35 +155,35 @@ class SK004CheckListNew extends React.Component {
loadData2()
{
let temp=this.state.data
if(this.state.inputText)
if(this.state.productionId)
{
let minetype="全公司"
if(this.state.inputText === "10")
{
minetype="选矿厂"
}
if(this.state.inputText === "20")
{
minetype="尾矿库"
}
if(this.state.inputText === "30")
{
minetype="露天矿"
}
if(this.state.inputText === "31")
{
minetype="职能口"
}
if(this.state.inputText === "32")
{
minetype="非金属"
}
if(this.state.inputText === "40")
{
minetype="地下矿"
}
// let minetype="全公司"
// if(this.state.inputText === "10")
// {
// minetype="选矿厂"
// }
// if(this.state.inputText === "20")
// {
// minetype="尾矿库"
// }
// if(this.state.inputText === "30")
// {
// minetype="露天矿"
// }
// if(this.state.inputText === "31")
// {
// minetype="职能口"
// }
// if(this.state.inputText === "32")
// {
// minetype="非金属"
// }
// if(this.state.inputText === "40")
// {
// minetype="地下矿"
// }
temp=temp.filter(t=>t.MineType ==minetype);
temp=temp.filter(t=>t.PRODUCTION_UNIT_ID ==this.state.productionId);
}
if(this.state.inputText2)
{
@ -202,6 +206,10 @@ class SK004CheckListNew extends React.Component {
// }
temp=temp.filter(t=>t.CheckLevel==this.state.inputText2);
}
if(this.state.inputText6)
{
temp=temp.filter(t=>t.CheckCycle==this.state.inputText6);
}
if(this.state.inputText3)
{
temp=temp.filter(t=>t.CheckType == this.state.inputText3);
@ -210,6 +218,10 @@ class SK004CheckListNew extends React.Component {
{
temp=temp.filter(t=>t.CheckDepart.includes(this.state.inputText4));
}
if(this.state.inputText5)
{
temp=temp.filter(t=>t.CheckPost!=null &&t.CheckPost.includes(this.state.inputText5));
}
this.setState({dataList :temp})
}
onTableBtnExport() {
@ -295,15 +307,22 @@ class SK004CheckListNew extends React.Component {
DetailContents:[]
});
};
// handleSearch = (evt) => {
// const { value } = evt.target;
// this.setState({ inputText: value ? value : "" });
// };
handleSearch=(value)=>{
handleSearch = ({data, record}) => {
this.setState({
inputText: value
production: {
...this.state.production,
PRODUCTION_UNIT_ID: data[0],
Nav_ProductionUnit: { NAME: record?.NAME },
},
inputText: record?.NAME,
productionId: record?.ID
})
}
};
// handleSearch=(value)=>{
// this.setState({
// inputText: value
// })
// }
// handleSearch2 = (evt) => {
// const { value } = evt.target;
// this.setState({ inputText2: value ? value : "" });
@ -313,6 +332,11 @@ class SK004CheckListNew extends React.Component {
inputText2: value
})
}
handleSearch6=(value)=>{
this.setState({
inputText6: value
})
}
handleSearch3 = ({data, record}) => {
// const { value } = evt.target;
// this.setState({ inputText3: value ? value : "" });
@ -330,6 +354,11 @@ class SK004CheckListNew extends React.Component {
inputText4: e.target.value
})
}
handleSearch5=(e)=>{
this.setState({
inputText5: e.target.value
})
}
// handleSearch4 = ({data, record}) => {
// this.setState({
// depart: {
@ -386,8 +415,7 @@ class SK004CheckListNew extends React.Component {
label={'生产单元'}
{...formItemLayout}
>
<Select
// defaultValue="风险管理"
{/* <Select
style={{width:'180px'}}
allowClear
onChange={this.handleSearch}
@ -399,11 +427,13 @@ class SK004CheckListNew extends React.Component {
<Option value="32">非金属</Option>
<Option value="31">职能口</Option>
<Option value="40">地下矿</Option>
</Select>
{/* <Input
onChange={this.handleSearch}
style={{ width: "150px" }}
></Input> */}
</Select> */}
<DropDownPagination inputDataApi={'FM/UserProductionUnitSet/OrderPaged'} fieldName={'Nav_ProductionUnit.NAME'}
data={this.state.production} onSelect={this.handleSearch} onFilter={({ params }) => {
params.OrderType = 1
// params.Keyword = this.state.inputText3
params.OrgId = this.props.login.OrgId
}} />
</Form.Item>
</Col>
@ -449,6 +479,25 @@ class SK004CheckListNew extends React.Component {
</Form.Item>
</Col>
<Col span={5} style={{ marginLeft: "10px" }}>
<Form.Item
label={'检查周期'}
{...formItemLayout}
>
<Select
allowClear
style={{width:'180px'}}
onChange={this.handleSearch6}
>
<Option value="每天">每天</Option>
<Option value="每周">每周</Option>
<Option value="每月">每月</Option>
<Option value="每季度">每季度</Option>
<Option value="每半年">每半年</Option>
<Option value="每年">每年</Option>
</Select>
</Form.Item>
</Col>
<Col span={5} style={{ marginLeft: "10px" }}>
<Form.Item
label={'检查部门'}
@ -465,6 +514,17 @@ class SK004CheckListNew extends React.Component {
params.OrgId = this.props.login.OrgId
}} /> */}
</Form.Item>
</Col>
<Col span={5} style={{ marginLeft: "10px" }}>
<Form.Item
label={'检查对象'}
{...formItemLayout}
>
<Input
onChange={this.handleSearch5}
style={{ width: "150px" }}
></Input>
</Form.Item>
</Col>
<Col span={1} style={{ marginLeft: "20px" }}><Button type='primary' onClick={() => this.loadData2()}>查询</Button></Col>

View File

@ -46,24 +46,24 @@ class SK004ShowPrint extends React.Component {
dataIndex: "Nav_Contents.CHECKCONTENT",
key: "Nav_Contents.CHECKCONTENT",
},
{
title: "检查依据",
dataIndex: "Nav_DetailBasics",
key: "Nav_DetailBasics",
render: (text, record) =>
{
return <label>{
record.Nav_DetailBasics && record.Nav_DetailBasics.map((item, i) => {
return item?.Nav_Law?.NAME+' '
})
}</label>
}
},
{
title: "判定标准",
dataIndex: "CHECK_STANDARD",
key: "CHECK_STANDARD",
},
// {
// title: "检查依据",
// dataIndex: "Nav_DetailBasics",
// key: "Nav_DetailBasics",
// render: (text, record) =>
// {
// return <label>{
// record.Nav_DetailBasics && record.Nav_DetailBasics.map((item, i) => {
// return item?.Nav_Law?.NAME+' '
// })
// }</label>
// }
// },
// {
// title: "判定标准",
// dataIndex: "CHECK_STANDARD",
// key: "CHECK_STANDARD",
// },
{
title: '操作',
dataIndex: '',

View File

@ -44,24 +44,24 @@ class SK010CheckList extends React.Component {
dataIndex: "Nav_Contents.CHECKCONTENT",
key: "Nav_Contents.CHECKCONTENT",
},
{
title: "检查依据",
dataIndex: "Nav_DetailBasics",
key: "Nav_DetailBasics",
render: (text, record) =>
{
return <label>{
record.Nav_DetailBasics && record.Nav_DetailBasics.map((item, i) => {
return item?.Nav_Law?.NAME+' '
})
}</label>
}
},
{
title: "判定标准",
dataIndex: "CHECK_STANDARD",
key: "CHECK_STANDARD",
},
// {
// title: "检查依据",
// dataIndex: "Nav_DetailBasics",
// key: "Nav_DetailBasics",
// render: (text, record) =>
// {
// return <label>{
// record.Nav_DetailBasics && record.Nav_DetailBasics.map((item, i) => {
// return item?.Nav_Law?.NAME+' '
// })
// }</label>
// }
// },
// {
// title: "判定标准",
// dataIndex: "CHECK_STANDARD",
// key: "CHECK_STANDARD",
// },
],
columns : [

View File

@ -158,6 +158,7 @@ class SK010ShowPrint extends React.Component {
<td className={stylesStep.fontBold}>隐患描述</td>
<td width='10%' className={stylesStep.fontBold}>隐患等级</td>
<td width='10%' className={stylesStep.fontBold}>隐患地点</td>
<td className={stylesStep.fontBold}>隐患原因</td>
<td className={stylesStep.fontBold}>隐患照片</td>
</tr>
{
@ -224,6 +225,16 @@ class SK010ShowPrint extends React.Component {
item.HIDDEN_PLACE
}
</td>
<td>
{
item?.Nav_CheckRecordDetailReasons && item?.Nav_CheckRecordDetailReasons.map((item2, i) => {
return <a>{(i > 0 ? "," : "") + item2.Nav_Reason.NAME}</a>
// return <tr><label> {item2.Nav_User?.NAME}</label></tr>
})
}
</td>
<td>
{
showFiles(item?.Nav_CheckRecordDetailFiles, config.picServerHost, this)

View File

@ -15,6 +15,7 @@ class SK012ShowPrint extends React.Component {
this.state = {
data: null,
enumData: null,
detailUsers:[],
BtnAgreeDisplay: 'none',
fileForm: {
title: "",
@ -83,7 +84,27 @@ class SK012ShowPrint extends React.Component {
if (this.props.data && this.props.data.loadDataDeal) {
this.props.data.loadDataDeal(1);
}
this.setState({ data: ret })
let users=[]
let uniqueUsers =[]
if(ret.Nav_CheckRecordDetails)
{
ret.Nav_CheckRecordDetails.forEach(item => {
item.Nav_CheckRecordDetailUsers.forEach(item2=>{
users.push(item2)
})
})
}
if(users)
{
uniqueUsers= users.reduce((acc, user) => {
// 如果累积数组中还没有这个 user_id则添加
if (!acc.some(item => item.USER_ID === user.USER_ID)) {
acc.push(user);
}
return acc;
}, []);
}
this.setState({ data: ret,detailUsers:uniqueUsers })
if (this.props.data.tableKey == "2" || this.props.data.tableKey == undefined) {
this.setState({ BtnAgreeDisplay: 'none' })
} else {
@ -158,6 +179,7 @@ class SK012ShowPrint extends React.Component {
<td className={stylesStep.fontBold}>隐患描述</td>
<td width='10%' className={stylesStep.fontBold}>隐患等级</td>
<td width='10%' className={stylesStep.fontBold}>隐患地点</td>
<td className={stylesStep.fontBold}>隐患原因</td>
<td className={stylesStep.fontBold}>隐患照片</td>
</tr>
{
@ -224,6 +246,16 @@ class SK012ShowPrint extends React.Component {
item.HIDDEN_PLACE
}
</td>
<td>
{
item?.Nav_CheckRecordDetailReasons && item?.Nav_CheckRecordDetailReasons.map((item2, i) => {
return <a>{(i > 0 ? "," : "") + item2.Nav_Reason.NAME}</a>
// return <tr><label> {item2.Nav_User?.NAME}</label></tr>
})
}
</td>
<td>
{
showFiles(item?.Nav_CheckRecordDetailFiles, config.picServerHost, this)
@ -234,17 +266,12 @@ class SK012ShowPrint extends React.Component {
}
</table>
{
data && data.Nav_CheckRecordDetails ?
this.state.detailUsers ?
<div>
<Descriptions size="middle" bordered>
<Descriptions.Item label="检查人签名">{
data.Nav_CheckRecordDetails?.map((item, i) => {
item? item?.Nav_CheckRecordDetailUsers && item?.Nav_CheckRecordDetailUsers.map((item2, i) => {
if (item2 && item2.ISCHECK) {
showUserSign(item2.Nav_User, config.picServerHost)
}
}):null
this.state.detailUsers?.filter(it => it.ISCHECK).map((item, i) => {
return showUserSign(item.Nav_User, config.picServerHost)
})
}</Descriptions.Item>
</Descriptions>

View File

@ -154,6 +154,7 @@ class SK014ShowPrint extends React.Component {
<td className={stylesStep.fontBold}>隐患描述</td>
<td width='10%' className={stylesStep.fontBold}>隐患等级</td>
<td width='10%' className={stylesStep.fontBold}>隐患地点</td>
<td className={stylesStep.fontBold}>隐患原因</td>
<td width='10%' className={stylesStep.fontBold}>整改责任人</td>
<td width='10%' className={stylesStep.fontBold}>整改期限</td>
<td className={stylesStep.fontBold}>隐患照片</td>
@ -189,6 +190,16 @@ class SK014ShowPrint extends React.Component {
{
item.HIDDEN_PLACE
}
</td>
<td>
{
item?.Nav_ReportDetailReasons && item?.Nav_ReportDetailReasons.map((item2, i) => {
return <a>{(i > 0 ? "," : "") + item2.Nav_Reason.NAME}</a>
// return <tr><label> {item2.Nav_User?.NAME}</label></tr>
})
}
</td>
<td>
{

View File

@ -38,7 +38,23 @@ class SK018ShowPrint extends React.Component {
if (typeof this.props.data.onCancel != "undefined" && typeof this.props.data.onCancel == 'function')
this.props.data.onCancel();
}
onTableBtnAgree() {
this.props.dispatch({
type: 'app/getDataByPost',
url: 'SK/SKHiddenDangerConfirm/IdentityUpdate',
payload: {
ID: this.props.data.id,
TaskID: this.props.data.TaskID,
},
onComplete: (ret) => {
if (ret) {
message.success('确认成功!');
this.setState({ BtnAgreeDisplay: 'none' })
this.BtnClose();
}
}
})
}
loadData = (dataId, taskID) => {
let json = initFilter(this.props.login.OrgId);
extendRule(json, 'ID', 1, dataId);
@ -117,6 +133,7 @@ class SK018ShowPrint extends React.Component {
pageStyle=".printDIV { padding:0 40px;} img{width :120px}"
/>
<Button style={{ marginLeft: '8px', display: data && data.STATUS === 30 ? "inline" : "none" }} onClick={() => this.onTableBtnExport()} icon="export" >导出</Button>
<Button type="primary" style={{ marginLeft: '8px', display: this.state.BtnAgreeDisplay }} onClick={() => this.onTableBtnAgree()} icon="check" >确认</Button>
</div>
<div ref={el => (this.componentRef = el)} style={{ padding: '20px' }} id={'tableId' + this.props.data.id}>
<h1 style={{ textAlign: 'center', margin: '15px' }}>隐患确认单</h1>
@ -147,10 +164,20 @@ class SK018ShowPrint extends React.Component {
<Descriptions.Item label="系统隐患描述">{data.Nav_Question?.DESCREPTION}</Descriptions.Item>
<Descriptions.Item label="隐患等级">{enums.SKHiddenLevel.enums[data.HIDDEN_LEVEL]}</Descriptions.Item>
<Descriptions.Item label="整改措施">{data.RECTIFICATION_MEASURES}</Descriptions.Item>
<Descriptions.Item label="隐患原因">{
data?.Nav_Reasons && data?.Nav_Reasons.map((item2, i) => {
return <a>{(i > 0 ? "," : "") + item2.Nav_Reason.NAME}</a>
// return <tr><label> {item2.Nav_User?.NAME}</label></tr>
})
}</Descriptions.Item>
{/* <Descriptions.Item label="">{enums.FMDepartmentType.enums[data.DEPARTMENT_TYPE]}</Descriptions.Item>
<Descriptions.Item label="检查类型">{data.Nav_CheckType ? data.Nav_CheckType.NAME : ''}</Descriptions.Item>
<Descriptions.Item label="检查周期">{enums.BSPLANCHECKFREQUENCYEnum.enums[data.PLANCHECKFREQUENCY]}</Descriptions.Item> */}
<Descriptions.Item label="整改责任人">{data.Nav_RecitifyUser ? data.Nav_RecitifyUser.NAME : ''}</Descriptions.Item>
<Descriptions.Item label="整改责任人">{ data.STATUS == 30 && data.Nav_RecitifyUser && data.Nav_RecitifyUser.FILE_PATH ?
showUserSign(data.Nav_RecitifyUser, config.picServerHost)
: data.Nav_RecitifyUser ? data.Nav_RecitifyUser.NAME : ''}</Descriptions.Item>
<Descriptions.Item label="整改期限">{moment(data.RECITIFY_TIME).format('YYYY-MM-DD')}</Descriptions.Item>
<Descriptions.Item label="附件">{
showFiles(data?.Nav_Files, config.picServerHost, this)

View File

@ -154,6 +154,7 @@ class SK020ShowPrint extends React.Component {
<td className={stylesStep.fontBold}>隐患描述</td>
<td width='10%' className={stylesStep.fontBold}>隐患等级</td>
<td width='10%' className={stylesStep.fontBold}>隐患地点</td>
<td className={stylesStep.fontBold}>隐患原因</td>
<td width='10%' className={stylesStep.fontBold}>整改措施</td>
<td width='10%' className={stylesStep.fontBold}>整改期限</td>
<td width='10%' className={stylesStep.fontBold}>整改落实人</td>
@ -191,6 +192,16 @@ class SK020ShowPrint extends React.Component {
item.HIDDEN_PLACE
}
</td>
<td>
{
item?.Nav_RectifyDetailReasons && item?.Nav_RectifyDetailReasons.map((item2, i) => {
return <a>{(i > 0 ? "," : "") + item2.Nav_Reason.NAME}</a>
// return <tr><label> {item2.Nav_User?.NAME}</label></tr>
})
}
</td>
<td>
{
item.RECTIFICATION_MEASURES

View File

@ -122,6 +122,14 @@ class SK022ShowPrint extends React.Component {
<Descriptions.Item label="生产单元">{data.Nav_ProductionUnit?.NAME}</Descriptions.Item>
<Descriptions.Item label="检查区域">{data.Nav_RiskArea ? data.Nav_RiskArea.NAME : ''}</Descriptions.Item>
<Descriptions.Item label="隐患地点">{data.HIDDEN_PLACE}</Descriptions.Item>
<Descriptions.Item label="隐患原因">{
data?.Nav_RectifyReasons && data?.Nav_RectifyReasons.map((item2, i) => {
return <a>{(i > 0 ? "," : "") + item2.Nav_Reason.NAME}</a>
// return <tr><label> {item2.Nav_User?.NAME}</label></tr>
})
}</Descriptions.Item>
<Descriptions.Item label="隐患描述">{data.Nav_Question?.DESCREPTION?data.Nav_Question.DESCREPTION:data.HIDDEN_DESCRIPTION}</Descriptions.Item>
<Descriptions.Item label="隐患等级">{enums.SKHiddenLevel.enums[data.HIDDEN_LEVEL]}</Descriptions.Item>
<Descriptions.Item label="整改措施">{data.RECTIFICATION_MEASURES}</Descriptions.Item>
@ -129,7 +137,7 @@ class SK022ShowPrint extends React.Component {
<Descriptions.Item label="整改部门">{data.Nav_RecitifyUser && data.Nav_RecitifyUser.Nav_Department ? data.Nav_RecitifyUser.Nav_Department.NAME : ''}</Descriptions.Item>
<Descriptions.Item label="整改责任人">{data.Nav_RecitifyUser ? data.Nav_RecitifyUser.NAME : ''}</Descriptions.Item>
<Descriptions.Item label="整改落实人">{data.Nav_ImplementUser ? data.Nav_ImplementUser.NAME : ''}</Descriptions.Item>
<Descriptions.Item label="整改落实人">{data.Nav_AcceptUser ? data.Nav_AcceptUser.NAME : ''}</Descriptions.Item>
<Descriptions.Item label="整改验收人">{data.Nav_AcceptUser ? data.Nav_AcceptUser.NAME : ''}</Descriptions.Item>
<Descriptions.Item label="整改情况描述">{data.RECTIFICATION_DESCRIPTION}</Descriptions.Item>
<Descriptions.Item label="整改资金(元)">{data.RECTIFICATION_MONEY}</Descriptions.Item>
<Descriptions.Item label="整改完成时间">{data.COMPLETE_DATE?moment(data.COMPLETE_DATE).format('YYYY-MM-DD'):null}</Descriptions.Item>
@ -146,12 +154,14 @@ class SK022ShowPrint extends React.Component {
<Descriptions.Item label="验收结论">{enums.SKAcceptResultEnum.enums[data.ACCEPT_RESULTE]}</Descriptions.Item>
<Descriptions.Item label="验收意见">{data.ACCEPT_OPINION}</Descriptions.Item>
<Descriptions.Item label="整改责任人签名">{
data.STATUS == 20 && data.Nav_RecitifyUser && data.Nav_RecitifyUser.FILE_PATH ?
<img width={'100px'} src={config.picServerHost + data.Nav_RecitifyUser?.FILE_PATH} /> : data.Nav_RecitifyUser ? data.Nav_RecitifyUser.NAME : ''
data.Nav_RecitifyUser && data.Nav_RecitifyUser.FILE_PATH ?
showUserSign(data.Nav_RecitifyUser, config.picServerHost)
: data.Nav_RecitifyUser ? data.Nav_RecitifyUser.NAME : ''
}</Descriptions.Item>
<Descriptions.Item label="验收人签名">{
data.STATUS == 20 && data.Nav_AcceptUser && data.Nav_AcceptUser.FILE_PATH ?
<img width={'100px'} src={config.picServerHost + data.Nav_AcceptUser?.FILE_PATH} /> : data.Nav_AcceptUser ? data.Nav_AcceptUser.NAME : ''
(data.STATUS == 20 ||data.STATUS == 30) && data.Nav_AcceptUser && data.Nav_AcceptUser.FILE_PATH ?
showUserSign(data.Nav_RecitifyUser, config.picServerHost)
: data.Nav_AcceptUser ? data.Nav_AcceptUser.NAME : ''
}</Descriptions.Item>
</Descriptions>
</div> : null

View File

@ -72,23 +72,23 @@ class SK026ShowPrint extends React.Component {
dataIndex: "Nav_Contents.CHECKCONTENT",
key: "Nav_Contents.CHECKCONTENT",
},
{
title: "检查依据",
dataIndex: "Nav_DetailMeasureContentBasics",
key: "Nav_DetailMeasureContentBasics",
render: (text, record) => {
return <label>{
record.Nav_DetailMeasureContentBasics && record.Nav_DetailMeasureContentBasics.map((item, i) => {
return item?.Nav_Law?.NAME + ' '
})
}</label>
}
},
{
title: "判定标准",
dataIndex: "CHECK_STANDARD",
key: "CHECK_STANDARD",
},
// {
// title: "检查依据",
// dataIndex: "Nav_DetailMeasureContentBasics",
// key: "Nav_DetailMeasureContentBasics",
// render: (text, record) => {
// return <label>{
// record.Nav_DetailMeasureContentBasics && record.Nav_DetailMeasureContentBasics.map((item, i) => {
// return item?.Nav_Law?.NAME + ' '
// })
// }</label>
// }
// },
// {
// title: "判定标准",
// dataIndex: "CHECK_STANDARD",
// key: "CHECK_STANDARD",
// },
{
title: '操作',

View File

@ -1,7 +1,7 @@
import { message } from "antd/lib/index";
import { Button, Descriptions, Popconfirm, Row, Col, Form, Input, Select, Modal } from 'antd';
import React from 'react';
import { initFilter, extendRule, extendInclude, extendIgnoreDataRule, setDataFieldValue, guid,showUserSign, showFiles, GetFileModel } from "../../../utils/common";
import { initFilter, extendRule, extendInclude, extendIgnoreDataRule, setDataFieldValue, guid, showUserSign, showFiles, GetFileModel } from "../../../utils/common";
import ReactToPrint from "react-to-print";
import config from "../../../config";
import XLSX from 'xlsx';
@ -42,6 +42,7 @@ class SK033ShowPrint extends React.Component {
loadData = (dataId, taskID) => {
let json = initFilter(this.props.login.OrgId);
json.Parameter22 = this.props.data?.TASK_ORGID
extendRule(json, 'ID', 1, dataId);
// extendRule(json, 'TASK_ID', 1, taskID);
// extendInclude(json, 'Nav_ApplyUser');
@ -69,7 +70,7 @@ class SK033ShowPrint extends React.Component {
} else {
this.setState({ BtnAgreeDisplay: 'inline' })
}
this.onClickApprove(false);
this.onClickApprove(true);
}
else { message.error('请先尝试刷新,若仍然加载失败,请联系管理员排查!'); }
}
@ -84,7 +85,7 @@ class SK033ShowPrint extends React.Component {
}
onClickApprove = (appVisible) => {
const newtmpData = {
data: { id: this.props.data.id, isShow: true, key: guid(), param: this.props.data.param, appVisible: appVisible, BtnAgreeDisplay: 'inline' },
data: { id: this.props.data.id, isShow: true, key: guid(), param: this.props.data.param, appVisible: appVisible, BtnAgreeDisplay: 'inline', TASK_ORGID: this.props.data?.TASK_ORGID },
formCode: "PF123",
}
this.setState({
@ -127,15 +128,15 @@ class SK033ShowPrint extends React.Component {
}
<table style={{ tableLayout: 'fixed', width: '100%' }} className={stylesStep.PrintForm1}>
<tr>
<td className={stylesStep.fontBold}>序号</td>
<td className={stylesStep.fontBold}>生产单元</td>
<td className={stylesStep.fontBold}>辨识区域</td>
<td className={stylesStep.fontBold}>风险名称</td>
<td style={{ width: "50px" }} className={stylesStep.fontBold}>序号</td>
<td style={{ width: "80px" }} className={stylesStep.fontBold}>生产单元</td>
<td style={{ width: "80px" }} className={stylesStep.fontBold}>辨识区域</td>
<td style={{ width: "80px" }} className={stylesStep.fontBold}>风险名称</td>
<td className={stylesStep.fontBold}>风险描述</td>
<td className={stylesStep.fontBold}>风险类别</td>
<td style={{ width: "200px" }} className={stylesStep.fontBold}>管控措施</td>
<td style={{ width: "200px" }} className={stylesStep.fontBold}>应急处置</td>
<td className={stylesStep.fontBold}>状态</td>
<td style={{ width: "80px" }} className={stylesStep.fontBold}>风险类别</td>
<td className={stylesStep.fontBold}>管控措施</td>
<td className={stylesStep.fontBold}>应急处置</td>
<td style={{ width: "50px" }} className={stylesStep.fontBold}>状态</td>
</tr>
{
data?.Nav_Details && data.Nav_Details?.map((item, i) => {
@ -181,14 +182,14 @@ class SK033ShowPrint extends React.Component {
}
</table>
{
data ?
<div>
<Descriptions size="middle" bordered>
<Descriptions.Item label="辨识人签名">{
data.STATUS === 30 ? showUserSign(data.Nav_ApplyUser, config.picServerHost) : null
}</Descriptions.Item>
</Descriptions>
</div>:null
data ?
<div>
<Descriptions size="middle" bordered>
<Descriptions.Item label="辨识人签名">{
data.STATUS !== 0 ? showUserSign(data.Nav_ApplyUser, config.picServerHost) : null
}</Descriptions.Item>
</Descriptions>
</div> : null
}
<FormPage {...this.state.tmpData} />
</div>

View File

@ -185,7 +185,7 @@ class SK039ShowPrint extends React.Component {
{
//item.MEASURE
item?.Nav_DetailMeasures && item?.Nav_DetailMeasures.map((item2, i) => {
return <tr> {item2?.MEASURES_NAME}</tr>
return <tr> {item2?.NUM + item2?.MEASURES_NAME}</tr>
})
}
</td>

View File

@ -185,7 +185,7 @@ class SK041ShowPrint extends React.Component {
{
//item.MEASURE
item?.Nav_DetailMeasures && item?.Nav_DetailMeasures.map((item2, i) => {
return <tr> {item2?.MEASURES_NAME}</tr>
return <tr> {item2?.NUM +item2?.MEASURES_NAME}</tr>
})
}
</td>

View File

@ -1,5 +1,5 @@
import { message } from "antd/lib/index";
import { getPropertyData, extendInclude, extendRule, getDataFieldValue, setDataFieldValue, initFilter, guid } from "../../utils/common";
import { getPropertyData, extendInclude,extendIgnoreDataRule, extendRule, getDataFieldValue, setDataFieldValue, initFilter, guid } from "../../utils/common";
import moment from 'moment';
import { Button, Row, Col, Form, Input, Select, Upload, Icon, Modal, Spin,Table } from 'antd';
/**
@ -17,6 +17,23 @@ export default {
if (isNew) {
setFieldValue('MineType', login.currentMineType);
let json = initFilter(login.OrgId);
extendRule(json, 'ID', 1, login.user.DEPARTMENT_ID);
extendInclude(json, 'Nav_Unit')
extendIgnoreDataRule(json)
dispatch({
type: 'app/getDataByPost',
url: 'FM/Department/Get',
payload: json,
onlyData: false,
onComplete: (re) => {
if (re && re.IsSuccessful && re.Data) {
setFieldValue('Nav_ProdutionUnit.NAME', re.Data?.Nav_Unit?.NAME);
setFieldValue('PRODUCTION_UNIT_ID', re.Data.PRODUCTION_UNIT_ID);
setFieldValue('DEPARTMENT_TYPE', re.Data.DEPARTMENT_TYPE);
}
}
})
}
},
@ -108,15 +125,13 @@ export default {
}
},
onChange: ({ colInfo, getFieldValue, setFieldValueByBatch, dispatch,login,updateSubTableData }) => {
if (colInfo.FIELD_NAME === 'MineType' || colInfo.FIELD_NAME === 'Nav_CheckType.NAME' ||colInfo.FIELD_NAME === 'DEPARTMENT_TYPE')
if (colInfo.FIELD_NAME === 'Nav_ProdutionUnit.NAME' || colInfo.FIELD_NAME === 'Nav_CheckType.NAME' ||colInfo.FIELD_NAME === 'DEPARTMENT_TYPE'||colInfo.FIELD_NAME === 'PLANCHECKFREQUENCY')
{
let Parameter1 = getFieldValue('MineType')
let Parameter2 = getFieldValue('CHECK_TYPE_ID')
let Parameter3 = getFieldValue('DEPARTMENT_TYPE')
let json = initFilter(login.OrgId);
json.Parameter1 = Parameter1;
json.Parameter2 = Parameter2;
json.Parameter3 = Parameter3;
json.Parameter1 = getFieldValue('PRODUCTION_UNIT_ID');
json.Parameter2 = getFieldValue('CHECK_TYPE_ID');
json.Parameter3 = getFieldValue('DEPARTMENT_TYPE') ;
json.Parameter4 = getFieldValue('PLANCHECKFREQUENCY') ;
dispatch({
type: 'app/getDataByPost',
url: 'SK/SKSecurityInspectionNotice/GetCheckContentPCs',
@ -138,51 +153,38 @@ export default {
}
},
btnSubAdd: ({row, srcRecord,getSelectedRecords,record,saveRowRecord,colInfo,parentRecord,pageCode, stateData,setState, close, loadData, login, btn, dispatch,props }) => {
let DetailCheck = getSelectedRecords();
if(login.tempContents && login.tempContents.length>0)
{
if(DetailCheck && DetailCheck.length > 0)
if(login.tempContents && login.tempContents.length>0)
{
let tmpDatas=[]
login.tempContents.map((item,i)=>{
let tmpData = {
ID: guid(),
CHECK_CONTENTS_ID:item.ID,
Nav_Contents:item,
CHECKCONTENT:item.CHECKCONTENT,
// NUM:i+1
}
tmpDatas.push(tmpData);
});
if (tmpDatas && tmpDatas.length > 0) {
//更新行数据
if(stateData.Nav_CheckNoticeDetails && stateData.Nav_CheckNoticeDetails.length>0)
{
let tmpDatas=[]
login.tempContents.map((item,i)=>{
let tmpData = {
ID: guid(),
CHECK_CONTENTS_ID:item.ID,
Nav_Contents:item,
CHECKCONTENT:item.CHECKCONTENT,
NUM:i+1
}
tmpDatas.push(tmpData);
});
if (tmpDatas && tmpDatas.length > 0) {
//更新行数据
for (let i = 0; i < DetailCheck.length; i++) {
let iRow = { ...DetailCheck[i] };
if(iRow.Nav_CheckNoticeDetails && iRow.Nav_CheckNoticeDetails.length>0)
for (let j = 0; j < tmpDatas.length; j++)
{
for (let j = 0; j < tmpDatas.length; j++)
{
iRow.Nav_CheckNoticeDetails.push(tmpDatas[j])
}
}
else
{
iRow.Nav_CheckNoticeDetails = tmpDatas;
}
saveRowRecord({ record: iRow, editCode: "T_SK_SECURITY_INSPECTION_NOTICE_DETAIL" })
}
stateData.Nav_CheckNoticeDetails.push(tmpDatas[j])
}
}
else
{
login.tempContents =[];
message.error("请先勾选管控措施!");
return;
stateData.Nav_CheckNoticeDetails = tmpDatas;
}
login.tempContents =[];
close();
}
},
saveRowRecord({ record: stateData, editCode: "T_SK_SECURITY_INSPECTION_NOTICE_DETAIL" })
}
login.tempContents =[];
close();
}
},
}

40
src/files/edit/SK016.js Normal file
View File

@ -0,0 +1,40 @@
import { message } from "antd/lib/index";
import { getPropertyData, extendInclude,extendIgnoreDataRule, extendRule, getDataFieldValue, setDataFieldValue, initFilter, guid } from "../../utils/common";
import moment from 'moment';
import { Button, Row, Col, Form, Input, Select, Upload, Icon, Modal, Spin,Table } from 'antd';
/**
* @return {string}
*/
// 编辑
export default {
onBeforeSaveHandleRecord(params) {
params.record.TaskID = params.data.TaskID //TaskID传递消息表ID
params.record.PUBLISH = params.customParams;
// params.record.FORM_CODE = params.data.reloadKey.substring(0,params.data.reloadKey.indexOf("_"));
},
onBeforeEdit(params){
const { isNew, isCopy, dispatch, login, setFieldValue,data, stateData ,getFieldValue} = params ? params : {};
if (isNew) {
setFieldValue('MineType', login.currentMineType);
let json = initFilter(login.OrgId);
extendRule(json, 'ID', 1, login.user.DEPARTMENT_ID);
extendInclude(json, 'Nav_Unit')
extendIgnoreDataRule(json)
dispatch({
type: 'app/getDataByPost',
url: 'FM/Department/Get',
payload: json,
onlyData: false,
onComplete: (re) => {
if (re && re.IsSuccessful && re.Data) {
setFieldValue('Nav_ProdutionUnit.NAME', re.Data?.Nav_Unit?.NAME);
setFieldValue('PRODUCTION_UNIT_ID', re.Data.PRODUCTION_UNIT_ID);
}
}
})
}
},
}

37
src/files/edit/SK020.js Normal file
View File

@ -0,0 +1,37 @@
import { message } from "antd/lib/index";
import { getPropertyData, extendInclude, extendRule, getDataFieldValue, setDataFieldValue, initFilter, guid } from "../../utils/common";
import moment from 'moment';
import config from "../../config.js"
import storage from '../../utils/storage'
import { Button, Row, Col, Form, Input, Select, Upload, Icon, Modal, Spin,Table } from 'antd';
/**
* @return {string}
*/
// 编辑
export default {
onBeforeSaveHandleRecord(params) {
params.record.TaskID = params.data.TaskID //TaskID传递消息表ID
params.record.PUBLISH = params.customParams;
// params.record.FORM_CODE = params.data.reloadKey.substring(0,params.data.reloadKey.indexOf("_"));
},
onBeforeEdit(params) {
const { isNew, dispatch, login, setFieldValueByBatch, setFieldEditable, setFieldVisible,stateData } = params ? params : {};
if (isNew) {
}
else
{
if(stateData.HIDDEN_DANGER_CONFIRM_ID && stateData.HIDDEN_DANGER_CONFIRM_ID!==null)
{
setFieldVisible("Nav_CheckType.NAME", false);
setFieldVisible("PLANCHECKFREQUENCY", false);
setFieldVisible("DEPARTMENT_TYPE", false);
}
else
{setFieldVisible("Nav_CheckType.NAME", true);
setFieldVisible("PLANCHECKFREQUENCY", true);
setFieldVisible("DEPARTMENT_TYPE", true);
}
}
},
}

32
src/files/edit/SK024.js Normal file
View File

@ -0,0 +1,32 @@
import { message } from "antd/lib/index";
import { getPropertyData, extendInclude, extendRule, getDataFieldValue, setDataFieldValue, initFilter, guid } from "../../utils/common";
import moment from 'moment';
import config from "../../config.js"
import storage from '../../utils/storage'
import { Button, Row, Col, Form, Input, Select, Upload, Icon, Modal, Spin,Table } from 'antd';
/**
* @return {string}
*/
// 编辑
export default {
onBeforeSaveHandleRecord(params) {
params.record.TaskID = params.data.TaskID //TaskID传递消息表ID
params.record.PUBLISH = params.customParams;
// params.record.FORM_CODE = params.data.reloadKey.substring(0,params.data.reloadKey.indexOf("_"));
},
onBeforeEdit(params) {
const { isNew, dispatch, login, setFieldValueByBatch, setFieldEditable, setFieldVisible,stateData } = params ? params : {};
if (isNew) {
setFieldVisible("CONTEXT", false);
}
else
{
if(stateData.STATUS === 40)
{
setFieldVisible("CONTEXT", true);
}
else
{setFieldVisible("CONTEXT", false);}
}
},
}

View File

@ -75,19 +75,33 @@ export default {
ID:guid(),
MineType: item.MineType,
AREA_ID: item.AREA_ID,
PRODUCTION_UNIT_ID: item.PRODUCTION_UNIT_ID,
TYPE_ID: item.TYPE_ID,
RISK_NAME_ID: item.RISK_NAME_ID,
RISK_NAME: item.RISK_NAME,
RISK_DESCRIPTION: item.RISK_DESCRIPTION,
MEASURE: item.MEASURE,
MEASURE: item.MINE_NAME,
EMERGENCY: item.EMERGENCY,
Nav_Area: item.Nav_Area,
Nav_Type: item.Nav_Type,
Nav_RiskName: item.Nav_RiskName,
EVALUATE_LEVEL:item.EVALUATE_LEVEL,
MARK:0,
ENABLE_STATUS:0,
Nav_ProductionUnit: item.Nav_ProductionUnit,
}
if(stateData && stateData.Nav_Details)
{
stateData.Nav_Details.push(tmpData);
let temp=stateData.Nav_Details.filter(m=>m.AREA_ID == item.AREA_ID && m.PRODUCTION_UNIT_ID == item.PRODUCTION_UNIT_ID && m.RISK_NAME == item.RISK_NAME);
if(temp.length === 0)
{
stateData.Nav_Details.push(tmpData)
}
else
{
message.error('生产单元、辨识区域、风险名称已存在,请勿重复导入');
return;
}
}
else
{
@ -96,15 +110,15 @@ export default {
});
if(temps && temps.length>0)
{
temps.map(t=>{
let temp=stateData.Nav_Details.filter(m=>m.AREA_ID == t.AREA_ID && m.MineType == t.MineType && m.RISK_NAME == t.RISK_NAME && m.RISK_DESCRIPTION == t.RISK_DESCRIPTION);
if(temp)
{
message.error('导入内容已存在,请核对');
return;
}
})
stateData.Nav_Details = temps;
let tempOlds=[]
temps.map(t=>{
let temp = tempOlds.filter(m=>m.AREA_ID == t.AREA_ID && m.PRODUCTION_UNIT_ID == t.PRODUCTION_UNIT_ID && m.RISK_NAME == t.RISK_NAME);
if(temp.length === 0)
{
tempOlds.push(t)
}
})
stateData.Nav_Details = tempOlds;
}
login.tempDatas =null;
close();

View File

@ -18,6 +18,7 @@ export default {
MineType: item.MineType,
AREA_ID: item.AREA_ID,
TYPE_ID: item.TYPE_ID,
PRODUCTION_UNIT_ID: item.PRODUCTION_UNIT_ID,
RISK_NAME_ID: item.RISK_NAME_ID,
RISK_NAME: item.RISK_NAME,
RISK_DESCRIPTION: item.RISK_DESCRIPTION,
@ -25,6 +26,7 @@ export default {
CHECKDEPT: item.CHECKDEPT,
CHECKPOST: item.CHECKPOST,
MEASURE: item.MEASURE,
MINE_NAME:item.MINE_NAME,
EMERGENCY: item.EMERGENCY,
Nav_Area: item.Nav_Area,
Nav_Type: item.Nav_Type,
@ -36,6 +38,10 @@ export default {
Nav_SCOREL:item.Nav_SCOREL,
Nav_SCOREE:item.Nav_SCOREE,
Nav_SCOREC:item.Nav_SCOREC,
EVALUATE_LEVEL:item.EVALUATE_LEVEL,
MARK:0,
ENABLE_STATUS:0,
Nav_ProductionUnit:item.Nav_ProductionUnit
}
temps.push(tmpData);
});

View File

@ -240,6 +240,7 @@ class GroupHome extends React.Component {
<a
onClick={() =>
this.showEditModal(
record.ORG_ID,
record.SOURCE_DATA_ID,
record.SOURCE_FORMCODE,
record.ID,
@ -638,14 +639,14 @@ class GroupHome extends React.Component {
url: "PF/HomeTitle/OrderPaged",
onComplete: (ret) => {
if (this._isMounted && ret) {
const safetySlogan = ret[0].TITLE;
const safetySlogan = ret[0].TITLE;
// 计算文本长度中文按1个字符英文/数字按0.5个字符计算)
const charCount = safetySlogan.replace(/[a-zA-Z0-9]/g, 'aa').length;
const charCount = safetySlogan.replace(/[a-zA-Z0-9]/g, 'aa').length;
// 设置基础速率每4个字符需要1秒
const baseSpeed = 4;
// 计算动画时间最低5秒最高60秒
const duration = Math.max(5, Math.min(60, charCount / baseSpeed));
// 设置基础速率每4个字符需要1秒
const baseSpeed = 4;
// 计算动画时间最低5秒最高60秒
const duration = Math.max(5, Math.min(60, charCount / baseSpeed));
this.setState({
safetySloganOne: safetySlogan,
// safetySloganOne: "1.安全方针:以人为本、关注健康、依法治企、安全发展。 2.安全理念一切风险皆可控一切事故皆可防3.安全方针以人为本、关注健康、依法治企、安全发展。4.安全方针以人为本、关注健康、依法治企、安全发展。5.安全方针:以人为本、关注健康、依法治企、安全发展。 6.安全理念一切风险皆可控一切事故皆可防7.安全方针以人为本、关注健康、依法治企、安全发展。8.安全方针:以人为本、关注健康、依法治企、安全发展。",
@ -906,7 +907,7 @@ class GroupHome extends React.Component {
this.clearData();
};
showEditModal = (dataId, formCode, TaskID, title, taskCode) => {
showEditModal = (TASK_ORGID, dataId, formCode, TaskID, title, taskCode) => {
// this.props.dispatch({
// type: "app/getDataByPost",
// url: "BI/BIController/getVersion",
@ -927,6 +928,7 @@ class GroupHome extends React.Component {
taskCode: taskCode,
tableKey: this.state.tableKey,
homeReload: true,
TASK_ORGID: TASK_ORGID,
},
formCode: formCode,
};
@ -1000,6 +1002,7 @@ class GroupHome extends React.Component {
<a
onClick={() =>
this.showEditModal(
record.ORG_ID,
record.SOURCE_DATA_ID,
record.SOURCE_FORMCODE,
record.ID,
@ -1081,6 +1084,7 @@ class GroupHome extends React.Component {
<a
onClick={() =>
this.showEditModal(
record.ORG_ID,
record.SOURCE_DATA_ID,
record.SOURCE_FORMCODE,
record.ID,
@ -1143,6 +1147,7 @@ class GroupHome extends React.Component {
<a
onClick={() =>
this.showEditModal(
record.ORG_ID,
record.SOURCE_DATA_ID,
record.SOURCE_FORMCODE,
record.ID,
@ -1233,6 +1238,7 @@ class GroupHome extends React.Component {
<a
onClick={() =>
this.showEditModal(
record.ORG_ID,
record.SOURCE_DATA_ID,
record.SOURCE_FORMCODE,
record.ID,
@ -2127,7 +2133,7 @@ class GroupHome extends React.Component {
) : null}
</div>
{/* 公告栏 */}
{/* <div style={{ width: "100%", height: "100%" }}>
<div className="notice-board-container">

View File

@ -182,6 +182,7 @@ export function initQueryFilter(OrgId, PageIndex, Limit, Sort, Order) {
IncludeCount: 0,
OrderCount: 0,
FilterGroupCount: 0,
IgnoreOrgRule: true,
Include: [],
Orders: [],
FilterGroup: { Rules: [], Groups: [] }
@ -200,6 +201,7 @@ export function initFilter(OrgId, Keyword = "", Sort, Order, PageIndex = 1, Para
OrgId,
PageIndex,
Limit: 10,
IgnoreOrgRule: true,
Start: (PageIndex - 1) * 10,
Sort,
Order: (Order === '' ? 0 : Order),

View File

@ -20,6 +20,7 @@ const createLoadableComponent = (importFunc) => Loadable({
timeout: 10000 // 10秒超<E7A792>?
})
const SC022Import = createLoadableComponent(() => import('../components/CustomPages/SC/SC022Import'))
const FMUserEditPage = createLoadableComponent(() => import('../components/CustomPages/FM/UserEditPage'))
const FMUserEditPageAuth = createLoadableComponent(() => import('../components/CustomPages/FM/UserEditPageAuth'))
const FMUserGroupEditPage = createLoadableComponent(() => import('../components/CustomPages/FM/UserGroupEditPage'))
@ -102,69 +103,91 @@ const PreOperSchTask = createLoadableComponent(() => import('../components/Custo
const PF132ShowPrint = createLoadableComponent(() => import('../components/CustomPages/PF/PF132ShowPrint'))
const RiskSubmit = createLoadableComponent(() => import('../components/CustomPages/Mobile/RiskSubmit'))
const CrucialLicenseJob = createLoadableComponent(() => import('../components/CustomPages/Mobile/CrucialLicenseJob'))
const SE001EditPage = createLoadableComponent(() => import('../components/CustomPages/SE/SE001EditPage'))
const SEConfigPage = createLoadableComponent(() => import('../components/CustomPages/SE/SEConfigPage'))
const SE005ShowPrint = createLoadableComponent(() => import('../components/CustomPages/SE/SE005ShowPrint'))
const SESafeSurveyTest = createLoadableComponent(() => import('../components/CustomPages/SE/SESafeSurveyTest'))
const SE005ReportEdit = createLoadableComponent(() => import('../components/CustomPages/SE/SE005ReportEdit'))
const SE007AllView = createLoadableComponent(() => import('../components/CustomPages/SE/SE007AllView'))
const SE009ShowPrint = createLoadableComponent(() => import('../components/CustomPages/SE/SE009ShowPrint'))
const SE011ShowPrint = createLoadableComponent(() => import('../components/CustomPages/SE/SE011ShowPrint'))
const SE013ShowPrint = createLoadableComponent(() => import('../components/CustomPages/SE/SE013ShowPrint'))
const SE015ShowPrint = createLoadableComponent(() => import('../components/CustomPages/SE/SE015ShowPrint'))
const SE018EditPage = createLoadableComponent(() => import('../components/CustomPages/SE/SE018EditPage'))
const SE018PaperPage = createLoadableComponent(() => import('../components/CustomPages/SE/SE018PaperPage'))
const SE019ShowPrint = createLoadableComponent(() => import('../components/CustomPages/SE/SE019ShowPrint'))
const SE021ShowPrint = createLoadableComponent(() => import('../components/CustomPages/SE/SE021ShowPrint'))
const SE061ShowPrint = createLoadableComponent(() => import('../components/CustomPages/SE/SE061ShowPrint'))
const SE061PaperPage = createLoadableComponent(() => import('../components/CustomPages/SE/SE061PaperPage'))
const SE062ShowPrint = createLoadableComponent(() => import('../components/CustomPages/SE/SE062ShowPrint'))
const SE063ShowPrint = createLoadableComponent(() => import('../components/CustomPages/SE/SE063ShowPrint'))
const SE051ShowPrint = createLoadableComponent(() => import('../components/CustomPages/SE/SE051ShowPrint'))
const SCShowPrint = createLoadableComponent(() => import('../components/CustomPages/SC/SCShowPrint'))
const SC046ShowPrint = createLoadableComponent(() => import('../components/CustomPages/SC/SC046ShowPrint'))
const SC052ShowPrint = createLoadableComponent(() => import('../components/CustomPages/SC/SC052ShowPrint'))
const CM018ShowPrint = createLoadableComponent(() => import('../components/CustomPages/CM/CM018ShowPrint'))
const CM002ShowPrint = createLoadableComponent(() => import('../components/CustomPages/CM/CM002ShowPrint'))
const CM026Edit = createLoadableComponent(() => import('../components/CustomPages/CM/CM026Edit'))
const CM023ShowPrint = createLoadableComponent(() => import('../components/CustomPages/CM/CM023ShowPrint'))
const CM026ShowPrint = createLoadableComponent(() => import('../components/CustomPages/CM/CM026ShowPrint'))
const CM030ShowPrint = createLoadableComponent(() => import('../components/CustomPages/CM/CM030ShowPrint'))
const CM032ShowPrint = createLoadableComponent(() => import('../components/CustomPages/CM/CM032ShowPrint'))
const CM031ShowPrint = createLoadableComponent(() => import('../components/CustomPages/CM/CM031ShowPrint'))
const CM034ShowPrint = createLoadableComponent(() => import('../components/CustomPages/CM/CM034ShowPrint'))
const CM036Edit = createLoadableComponent(() => import('../components/CustomPages/CM/CM036Edit'))
const CM036ShowPrint = createLoadableComponent(() => import('../components/CustomPages/CM/CM036ShowPrint'))
const CM041LibShow = createLoadableComponent(() => import('../components/CustomPages/CM/CM041LibShow'))
const CM043ShowPrint = createLoadableComponent(() => import('../components/CustomPages/CM/CM043ShowPrint'))
const CM045ShowPrint = createLoadableComponent(() => import('../components/CustomPages/CM/CM045ShowPrint'))
// const CM018ShowPrint = createLoadableComponent(() => import('../components/CustomPages/CM/CM018ShowPrint'))
// const CM002ShowPrint = createLoadableComponent(() => import('../components/CustomPages/CM/CM002ShowPrint'))
// const CM026Edit = createLoadableComponent(() => import('../components/CustomPages/CM/CM026Edit'))
// const CM023ShowPrint = createLoadableComponent(() => import('../components/CustomPages/CM/CM023ShowPrint'))
// const CM026ShowPrint = createLoadableComponent(() => import('../components/CustomPages/CM/CM026ShowPrint'))
// const CM030ShowPrint = createLoadableComponent(() => import('../components/CustomPages/CM/CM030ShowPrint'))
// const CM032ShowPrint = createLoadableComponent(() => import('../components/CustomPages/CM/CM032ShowPrint'))
// const CM031ShowPrint = createLoadableComponent(() => import('../components/CustomPages/CM/CM031ShowPrint'))
// const CM034ShowPrint = createLoadableComponent(() => import('../components/CustomPages/CM/CM034ShowPrint'))
// const CM036Edit = createLoadableComponent(() => import('../components/CustomPages/CM/CM036Edit'))
// const CM036ShowPrint = createLoadableComponent(() => import('../components/CustomPages/CM/CM036ShowPrint'))
// const CM041LibShow = createLoadableComponent(() => import('../components/CustomPages/CM/CM041LibShow'))
// const CM043ShowPrint = createLoadableComponent(() => import('../components/CustomPages/CM/CM043ShowPrint'))
// const CM045ShowPrint = createLoadableComponent(() => import('../components/CustomPages/CM/CM045ShowPrint'))
const BI001HomeDetail = createLoadableComponent(() => import('../components/CustomPages/BI/BI001HomeDetail'))
const BI002HomeDetail = createLoadableComponent(() => import('../components/CustomPages/BI/BI002HomeDetail'))
const BI004FormRunAnalysis = createLoadableComponent(() => import('../components/CustomPages/BI/BI004FormRunAnalysis'))
const BI005LoginRecord = createLoadableComponent(() => import('../components/CustomPages/BI/BI005LoginRecord'))
const BI006FormRunAnalysis = createLoadableComponent(() => import('../components/CustomPages/BI/BI006FormRunAnalysis'))
const BI006FormRunAnalysisNew = createLoadableComponent(() => import('../components/CustomPages/BI/BI006FormRunAnalysisNew'))
const BI007FormRunAnalysis = createLoadableComponent(() => import('../components/CustomPages/BI/BI007FormRunAnalysis'))
const BI007FormRunAnalysisNew = createLoadableComponent(() => import('../components/CustomPages/BI/BI007FormRunAnalysisNew'))
const BI008FormRunAnalysis = createLoadableComponent(() => import('../components/CustomPages/BI/BI008FormRunAnalysis'))
const BI009RiskAnalysis = createLoadableComponent(() => import('../components/CustomPages/BI/BI009RiskAnalysis'))
const BI010FormRunAnalysis = createLoadableComponent(() => import('../components/CustomPages/BI/BI010FormRunAnalysis'))
const BI011FormRunAnalysis = createLoadableComponent(() => import('../components/CustomPages/BI/BI011FormRunAnalysis'))
const BI011TrainSafeAnalysis = createLoadableComponent(() => import('../components/CustomPages/BI/BI011TrainSafeAnalysis'))
const BI012NotificationTaskAnalysis = createLoadableComponent(() => import('../components/CustomPages/BI/BI012NotificationTaskAnalysis'))
const BI013RiskAnalysisModel = createLoadableComponent(() => import('../components/CustomPages/BI/BI013RiskAnalysisModel'))
const BI030FormRunAnalysis = createLoadableComponent(() => import('../components/CustomPages/BI/BI030FormRunAnalysis'))
// const SE001EditPage = createLoadableComponent(() => import('../components/CustomPages/SE/SE001EditPage'))
// const SEConfigPage = createLoadableComponent(() => import('../components/CustomPages/SE/SEConfigPage'))
// const SE005ShowPrint = createLoadableComponent(() => import('../components/CustomPages/SE/SE005ShowPrint'))
// const SESafeSurveyTest = createLoadableComponent(() => import('../components/CustomPages/SE/SESafeSurveyTest'))
// const SE005ReportEdit = createLoadableComponent(() => import('../components/CustomPages/SE/SE005ReportEdit'))
// const SE007AllView = createLoadableComponent(() => import('../components/CustomPages/SE/SE007AllView'))
// const SE009ShowPrint = createLoadableComponent(() => import('../components/CustomPages/SE/SE009ShowPrint'))
// const SE011ShowPrint = createLoadableComponent(() => import('../components/CustomPages/SE/SE011ShowPrint'))
// const SE013ShowPrint = createLoadableComponent(() => import('../components/CustomPages/SE/SE013ShowPrint'))
// const SE015ShowPrint = createLoadableComponent(() => import('../components/CustomPages/SE/SE015ShowPrint'))
// const SE018EditPage = createLoadableComponent(() => import('../components/CustomPages/SE/SE018EditPage'))
// const SE018PaperPage = createLoadableComponent(() => import('../components/CustomPages/SE/SE018PaperPage'))
// const SE019ShowPrint = createLoadableComponent(() => import('../components/CustomPages/SE/SE019ShowPrint'))
// const SE021ShowPrint = createLoadableComponent(() => import('../components/CustomPages/SE/SE021ShowPrint'))
// const SE061ShowPrint = createLoadableComponent(() => import('../components/CustomPages/SE/SE061ShowPrint'))
// const SE061PaperPage = createLoadableComponent(() => import('../components/CustomPages/SE/SE061PaperPage'))
// const SE062ShowPrint = createLoadableComponent(() => import('../components/CustomPages/SE/SE062ShowPrint'))
// const SE063ShowPrint = createLoadableComponent(() => import('../components/CustomPages/SE/SE063ShowPrint'))
// const SE051ShowPrint = createLoadableComponent(() => import('../components/CustomPages/SE/SE051ShowPrint'))
// const SE007ShowPrint = createLoadableComponent(() => import('../components/CustomPages/SE/SE007ShowPrint'))
// const BI001HomeDetail = createLoadableComponent(() => import('../components/CustomPages/BI/BI001HomeDetail'))
// const BI002HomeDetail = createLoadableComponent(() => import('../components/CustomPages/BI/BI002HomeDetail'))
// const BI054HomeDetail = createLoadableComponent(() => import('../components/CustomPages/BI/BI054HomeDetail'))
// const BI055HomeDetail = createLoadableComponent(() => import('../components/CustomPages/BI/BI055HomeDetail'))
// const BI004FormRunAnalysis = createLoadableComponent(() => import('../components/CustomPages/BI/BI004FormRunAnalysis'))
// const BI005LoginRecord = createLoadableComponent(() => import('../components/CustomPages/BI/BI005LoginRecord'))
// const BI006FormRunAnalysis = createLoadableComponent(() => import('../components/CustomPages/BI/BI006FormRunAnalysis'))
// const BI006FormRunAnalysisNew = createLoadableComponent(() => import('../components/CustomPages/BI/BI006FormRunAnalysisNew'))
// const BI007FormRunAnalysis = createLoadableComponent(() => import('../components/CustomPages/BI/BI007FormRunAnalysis'))
// const BI007FormRunAnalysisNew = createLoadableComponent(() => import('../components/CustomPages/BI/BI007FormRunAnalysisNew'))
// const BI008FormRunAnalysis = createLoadableComponent(() => import('../components/CustomPages/BI/BI008FormRunAnalysis'))
// const BI009RiskAnalysis = createLoadableComponent(() => import('../components/CustomPages/BI/BI009RiskAnalysis'))
// const BI010FormRunAnalysis = createLoadableComponent(() => import('../components/CustomPages/BI/BI010FormRunAnalysis'))
// const BI011FormRunAnalysis = createLoadableComponent(() => import('../components/CustomPages/BI/BI011FormRunAnalysis'))
// const BI011TrainSafeAnalysis = createLoadableComponent(() => import('../components/CustomPages/BI/BI011TrainSafeAnalysis'))
// const BI012NotificationTaskAnalysis = createLoadableComponent(() => import('../components/CustomPages/BI/BI012NotificationTaskAnalysis'))
// const BI013RiskAnalysisModel = createLoadableComponent(() => import('../components/CustomPages/BI/BI013RiskAnalysisModel'))
// const BI030FormRunAnalysis = createLoadableComponent(() => import('../components/CustomPages/BI/BI030FormRunAnalysis'))
// const BI060MapeShow = createLoadableComponent(() => import('../components/CustomPages/BI/BI060MapeShow'))
// const BI060MapePoint = createLoadableComponent(() => import('../components/CustomPages/BI/BI060MapePoint'))
// const BI061MapeGISShow = createLoadableComponent(() => import('../components/CustomPages/BI/BI061MapeGISShow'))
// const BI009FormRunAnalysis = createLoadableComponent(() => import('../components/CustomPages/BI/BI009FormRunAnalysis'))
// const BIView = createLoadableComponent(() => import('../components/CustomPages/BI/BIView'))
// const BI001 = createLoadableComponent(() => import('../components/CustomPages/BI/BI001'))
// const BI050BSSafeCheck = createLoadableComponent(() => import('../components/CustomPages/BI/BI050BSSafeCheck'))
// const BI051BSCompanyYear = createLoadableComponent(() => import('../components/CustomPages/BI/BI051BSCompanyYearOne'))
// const BI052BSSafeCheckYear = createLoadableComponent(() => import('../components/CustomPages/BI/BI052BSSafeCheckYearOne'))
// const BI053BSSafeCheckYear = createLoadableComponent(() => import('../components/CustomPages/BI/BI053BSSafeCheckYearOne'))
// const BI056Performance = createLoadableComponent(() => import('../components/CustomPages/BI/BI056Performance'))
// const BI056Dilg1_1 = createLoadableComponent(() => import('../components/CustomPages/BI/BI056Dilg1_1'))
// const BI056Dilg1_2 = createLoadableComponent(() => import('../components/CustomPages/BI/BI056Dilg1_2'))
// const BI056Dilg2_1 = createLoadableComponent(() => import('../components/CustomPages/BI/BI056Dilg2_1'))
// const BI056Dilg2_2 = createLoadableComponent(() => import('../components/CustomPages/BI/BI056Dilg2_2'))
// const BI056Dilg3_1 = createLoadableComponent(() => import('../components/CustomPages/BI/BI056Dilg3_1'))
// const BI056Dilg3_2 = createLoadableComponent(() => import('../components/CustomPages/BI/BI056Dilg3_2'))
// const BI003StatiscialAnalysis = createLoadableComponent(() => import('../components/CustomPages/BI/BI003StatiscialAnalysis'))
// const BI020ApproveAnalysis = createLoadableComponent(() => import('../components/CustomPages/BI/BI020ApproveAnalysis'))
// const BI014RiskPerformanceModel = createLoadableComponent(() => import('../components/CustomPages/BI/BI014RiskPerformanceModel'))
// const BI012FormRunAnalysis = createLoadableComponent(() => import('../components/CustomPages/BI/BI012FormRunAnalysis'))
const BI060MapeShow = createLoadableComponent(() => import('../components/CustomPages/BI/BI060MapeShow'))
const BI060MapePoint = createLoadableComponent(() => import('../components/CustomPages/BI/BI060MapePoint'))
const BI061MapeGISShow = createLoadableComponent(() => import('../components/CustomPages/BI/BI061MapeGISShow'))
const PF136FormRunAnalysis = createLoadableComponent(() => import('../components/CustomPages/PF/PF136FormRunAnalysis'))
const PF139FormRunAnalysis = createLoadableComponent(() => import('../components/CustomPages/PF/PF139FormRunAnalysis'))
const BI009FormRunAnalysis = createLoadableComponent(() => import('../components/CustomPages/BI/BI009FormRunAnalysis'))
const FO025ShowPrint = createLoadableComponent(() => import('../components/CustomPages/FO/FO025ShowPrint'))
@ -186,30 +209,10 @@ const HM107ShowPrint = createLoadableComponent(() => import('../components/Custo
const HM111ShowPrint = createLoadableComponent(() => import('../components/CustomPages/HM/HM111ShowPrint'))
const HMTasks = createLoadableComponent(() => import('../components/CustomPages/HM/HMTasks'))
const SE007ShowPrint = createLoadableComponent(() => import('../components/CustomPages/SE/SE007ShowPrint'))
const BIView = createLoadableComponent(() => import('../components/CustomPages/BI/BIView'))
const CloseTasks = createLoadableComponent(() => import('../components/CustomPages/BI/CloseTasks'))
const BI001 = createLoadableComponent(() => import('../components/CustomPages/BI/BI001'))
const BI050BSSafeCheck = createLoadableComponent(() => import('../components/CustomPages/BI/BI050BSSafeCheck'))
const BI051BSCompanyYear = createLoadableComponent(() => import('../components/CustomPages/BI/BI051BSCompanyYearOne'))
const BI052BSSafeCheckYear = createLoadableComponent(() => import('../components/CustomPages/BI/BI052BSSafeCheckYearOne'))
const BI053BSSafeCheckYear = createLoadableComponent(() => import('../components/CustomPages/BI/BI053BSSafeCheckYearOne'))
const BI054HomeDetail = createLoadableComponent(() => import('../components/CustomPages/BI/BI054HomeDetail'))
const BI055HomeDetail = createLoadableComponent(() => import('../components/CustomPages/BI/BI055HomeDetail'))
const BI056Performance = createLoadableComponent(() => import('../components/CustomPages/BI/BI056Performance'))
const BI056Dilg1_1 = createLoadableComponent(() => import('../components/CustomPages/BI/BI056Dilg1_1'))
const BI056Dilg1_2 = createLoadableComponent(() => import('../components/CustomPages/BI/BI056Dilg1_2'))
const BI056Dilg2_1 = createLoadableComponent(() => import('../components/CustomPages/BI/BI056Dilg2_1'))
const BI056Dilg2_2 = createLoadableComponent(() => import('../components/CustomPages/BI/BI056Dilg2_2'))
const BI056Dilg3_1 = createLoadableComponent(() => import('../components/CustomPages/BI/BI056Dilg3_1'))
const BI056Dilg3_2 = createLoadableComponent(() => import('../components/CustomPages/BI/BI056Dilg3_2'))
const BI003StatiscialAnalysis = createLoadableComponent(() => import('../components/CustomPages/BI/BI003StatiscialAnalysis'))
const BI020ApproveAnalysis = createLoadableComponent(() => import('../components/CustomPages/BI/BI020ApproveAnalysis'))
const BI014RiskPerformanceModel = createLoadableComponent(() => import('../components/CustomPages/BI/BI014RiskPerformanceModel'))
const BI012FormRunAnalysis = createLoadableComponent(() => import('../components/CustomPages/BI/BI012FormRunAnalysis'))
const FM202ShowPrint = createLoadableComponent(() => import('../components/CustomPages/FM/FM202ShowPrint'))
const PFApproveRole = createLoadableComponent(() => import('../components/CustomPages/PF/PFApproveRole'))
const SK002ShowPrint = createLoadableComponent(() => import('../components/CustomPages/SK/SK002ShowPrint'))
@ -247,6 +250,7 @@ const SK045ShowPrint = createLoadableComponent(() => import('../components/Custo
export default function (componentName, formId, formParam, data, formCode, formData) {
return {
SC022Import: <SC022Import formId={formId} formParam={formParam} data={data} formCode={formCode} formData={formData} />,
FMUserEditPage: <FMUserEditPage formId={formId} formParam={formParam} data={data} formCode={formCode} formData={formData} />,
FMUserEditPageAuth: <FMUserEditPageAuth formId={formId} formParam={formParam} data={data} formCode={formCode} formData={formData} />,
FMUserGroupEditPage: <FMUserGroupEditPage formId={formId} formParam={formParam} data={data} formCode={formCode} formData={formData} />,
@ -318,83 +322,87 @@ export default function (componentName, formId, formParam, data, formCode, formD
PF132ShowPrint: <PF132ShowPrint formId={formId} formParam={formParam} data={data} formCode={formCode} />,
RiskSubmit: <RiskSubmit formId={formId} formParam={formParam} data={data} formCode={formCode} />,
CrucialLicenseJob: <CrucialLicenseJob formId={formId} formParam={formParam} data={data} formCode={formCode} />,
SE001EditPage: <SE001EditPage formId={formId} formParam={formParam} data={data} formCode={formCode} />,
SEConfigPage: <SEConfigPage formId={formId} formParam={formParam} data={data} formCode={formCode} />,
SE005ShowPrint: <SE005ShowPrint formId={formId} formParam={formParam} data={data} formCode={formCode} />,
SESafeSurveyTest: <SESafeSurveyTest formId={formId} formParam={formParam} data={data} formCode={formCode} />,
SE005ReportEdit: <SE005ReportEdit formId={formId} formParam={formParam} data={data} formCode={formCode} />,
SE007ShowPrint: <SE007ShowPrint formId={formId} formParam={formParam} data={data} formCode={formCode} />,
SE007AllView: <SE007AllView formId={formId} formParam={formParam} data={data} formCode={formCode} />,
SE009ShowPrint: <SE009ShowPrint formId={formId} formParam={formParam} data={data} formCode={formCode} />,
SE011ShowPrint: <SE011ShowPrint formId={formId} formParam={formParam} data={data} formCode={formCode} />,
SE013ShowPrint: <SE013ShowPrint formId={formId} formParam={formParam} data={data} formCode={formCode} />,
SE015ShowPrint: <SE015ShowPrint formId={formId} formParam={formParam} data={data} formCode={formCode} />,
SE018EditPage: <SE018EditPage formId={formId} formParam={formParam} data={data} formCode={formCode} />,
SE018PaperPage: <SE018PaperPage formId={formId} formParam={formParam} data={data} formCode={formCode} />,
SE019ShowPrint: <SE019ShowPrint formId={formId} formParam={formParam} data={data} formCode={formCode} />,
SE021ShowPrint: <SE021ShowPrint formId={formId} formParam={formParam} data={data} formCode={formCode} />,
SE061PaperPage: <SE061PaperPage formId={formId} formParam={formParam} data={data} formCode={formCode} />,
SE061ShowPrint: <SE061ShowPrint formId={formId} formParam={formParam} data={data} formCode={formCode} />,
SE062ShowPrint: <SE062ShowPrint formId={formId} formParam={formParam} data={data} formCode={formCode} />,
SE063ShowPrint: <SE063ShowPrint formId={formId} formParam={formParam} data={data} formCode={formCode} />,
SE051ShowPrint: <SE051ShowPrint formId={formId} formParam={formParam} data={data} formCode={formCode} />,
// SE001EditPage: <SE001EditPage formId={formId} formParam={formParam} data={data} formCode={formCode} />,
// SEConfigPage: <SEConfigPage formId={formId} formParam={formParam} data={data} formCode={formCode} />,
// SE005ShowPrint: <SE005ShowPrint formId={formId} formParam={formParam} data={data} formCode={formCode} />,
// SESafeSurveyTest: <SESafeSurveyTest formId={formId} formParam={formParam} data={data} formCode={formCode} />,
// SE005ReportEdit: <SE005ReportEdit formId={formId} formParam={formParam} data={data} formCode={formCode} />,
// SE007ShowPrint: <SE007ShowPrint formId={formId} formParam={formParam} data={data} formCode={formCode} />,
// SE007AllView: <SE007AllView formId={formId} formParam={formParam} data={data} formCode={formCode} />,
// SE009ShowPrint: <SE009ShowPrint formId={formId} formParam={formParam} data={data} formCode={formCode} />,
// SE011ShowPrint: <SE011ShowPrint formId={formId} formParam={formParam} data={data} formCode={formCode} />,
// SE013ShowPrint: <SE013ShowPrint formId={formId} formParam={formParam} data={data} formCode={formCode} />,
// SE015ShowPrint: <SE015ShowPrint formId={formId} formParam={formParam} data={data} formCode={formCode} />,
// SE018EditPage: <SE018EditPage formId={formId} formParam={formParam} data={data} formCode={formCode} />,
// SE018PaperPage: <SE018PaperPage formId={formId} formParam={formParam} data={data} formCode={formCode} />,
// SE019ShowPrint: <SE019ShowPrint formId={formId} formParam={formParam} data={data} formCode={formCode} />,
// SE021ShowPrint: <SE021ShowPrint formId={formId} formParam={formParam} data={data} formCode={formCode} />,
// SE061PaperPage: <SE061PaperPage formId={formId} formParam={formParam} data={data} formCode={formCode} />,
// SE061ShowPrint: <SE061ShowPrint formId={formId} formParam={formParam} data={data} formCode={formCode} />,
// SE062ShowPrint: <SE062ShowPrint formId={formId} formParam={formParam} data={data} formCode={formCode} />,
// SE063ShowPrint: <SE063ShowPrint formId={formId} formParam={formParam} data={data} formCode={formCode} />,
// SE051ShowPrint: <SE051ShowPrint formId={formId} formParam={formParam} data={data} formCode={formCode} />,
SCShowPrint: <SCShowPrint formId={formId} formParam={formParam} data={data} formCode={formCode} />,
CM018ShowPrint: <CM018ShowPrint formId={formId} formParam={formParam} data={data} formCode={formCode} />,
CM023ShowPrint: <CM023ShowPrint formId={formId} formParam={formParam} data={data} formCode={formCode} />,
CM026ShowPrint: <CM026ShowPrint formId={formId} formParam={formParam} data={data} formCode={formCode} />,
CM026Edit: <CM026Edit formId={formId} formParam={formParam} data={data} formCode={formCode} />,
CM030ShowPrint: <CM030ShowPrint formId={formId} formParam={formParam} data={data} formCode={formCode} />,
CM032ShowPrint: <CM032ShowPrint formId={formId} formParam={formParam} data={data} formCode={formCode} />,
CM031ShowPrint: <CM031ShowPrint formId={formId} formParam={formParam} data={data} formCode={formCode} />,
CM002ShowPrint: <CM002ShowPrint formId={formId} formParam={formParam} data={data} formCode={formCode} />,
CM034ShowPrint: <CM034ShowPrint formId={formId} formParam={formParam} data={data} formCode={formCode} />,
CM036Edit: <CM036Edit formId={formId} formParam={formParam} data={data} formCode={formCode} />,
CM036ShowPrint: <CM036ShowPrint formId={formId} formParam={formParam} data={data} formCode={formCode} />,
CM041LibShow: <CM041LibShow formId={formId} formParam={formParam} data={data} formCode={formCode} />,
CM043ShowPrint: <CM043ShowPrint formId={formId} formParam={formParam} data={data} formCode={formCode} />,
CM045ShowPrint: <CM045ShowPrint formId={formId} formParam={formParam} data={data} formCode={formCode} />,
BIView: <BIView formId={formId} formParam={formParam} data={data} formCode={formCode} />,
BI001: <BI001 formId={formId} formParam={formParam} data={data} formCode={formCode} />,
BI050BSSafeCheck: <BI050BSSafeCheck formId={formId} formParam={formParam} data={data} formCode={formCode} />,
BI051BSCompanyYear: <BI051BSCompanyYear formId={formId} formParam={formParam} data={data} formCode={formCode} />,
BI052BSSafeCheckYear: <BI052BSSafeCheckYear formId={formId} formParam={formParam} data={data} formCode={formCode} />,
BI053BSSafeCheckYear: <BI053BSSafeCheckYear formId={formId} formParam={formParam} data={data} formCode={formCode} />,
BI054HomeDetail: <BI054HomeDetail formId={formId} formParam={formParam} data={data} formCode={formCode} />,
BI055HomeDetail: <BI055HomeDetail formId={formId} formParam={formParam} data={data} formCode={formCode} />,
BI056Performance: <BI056Performance formId={formId} formParam={formParam} data={data} formCode={formCode} />,
BI056Dilg1_1: <BI056Dilg1_1 formId={formId} formParam={formParam} data={data} formCode={formCode} />,
BI056Dilg1_2: <BI056Dilg1_2 formId={formId} formParam={formParam} data={data} formCode={formCode} />,
BI056Dilg2_1: <BI056Dilg2_1 formId={formId} formParam={formParam} data={data} formCode={formCode} />,
BI056Dilg2_2: <BI056Dilg2_2 formId={formId} formParam={formParam} data={data} formCode={formCode} />,
BI056Dilg3_1: <BI056Dilg3_1 formId={formId} formParam={formParam} data={data} formCode={formCode} />,
BI056Dilg3_2: <BI056Dilg3_2 formId={formId} formParam={formParam} data={data} formCode={formCode} />,
BI003StatiscialAnalysis: <BI003StatiscialAnalysis formId={formId} formParam={formParam} data={data} formCode={formCode} />,
BI001HomeDetail: <BI001HomeDetail formId={formId} formParam={formParam} data={data} formCode={formCode} />,
BI002HomeDetail: <BI002HomeDetail formId={formId} formParam={formParam} data={data} formCode={formCode} />,
BI004FormRunAnalysis: <BI004FormRunAnalysis formId={formId} formParam={formParam} data={data} formCode={formCode} />,
BI005LoginRecord: <BI005LoginRecord formId={formId} formParam={formParam} data={data} formCode={formCode} />,
BI006FormRunAnalysis: <BI006FormRunAnalysis formId={formId} formParam={formParam} data={data} formCode={formCode} />,
BI006FormRunAnalysisNew: <BI006FormRunAnalysisNew formId={formId} formParam={formParam} data={data} formCode={formCode} />,
BI007FormRunAnalysis: <BI007FormRunAnalysis formId={formId} formParam={formParam} data={data} formCode={formCode} />,
BI007FormRunAnalysisNew: <BI007FormRunAnalysisNew formId={formId} formParam={formParam} data={data} formCode={formCode} />,
BI008FormRunAnalysis: <BI008FormRunAnalysis formId={formId} formParam={formParam} data={data} formCode={formCode} />,
BI009RiskAnalysis: <BI009RiskAnalysis formId={formId} formParam={formParam} data={data} formCode={formCode} />,
BI010FormRunAnalysis: <BI010FormRunAnalysis formId={formId} formParam={formParam} data={data} formCode={formCode} />,
BI011FormRunAnalysis: <BI011FormRunAnalysis formId={formId} formParam={formParam} data={data} formCode={formCode} />,
BI011TrainSafeAnalysis: <BI011TrainSafeAnalysis formId={formId} formParam={formParam} data={data} formCode={formCode} />,
BI012NotificationTaskAnalysis: <BI012NotificationTaskAnalysis formId={formId} formParam={formParam} data={data} formCode={formCode} />,
BI013RiskAnalysisModel: <BI013RiskAnalysisModel formId={formId} formParam={formParam} data={data} formCode={formCode} />,
BI014RiskPerformanceModel: <BI014RiskPerformanceModel formId={formId} formParam={formParam} data={data} formCode={formCode} />,
BI030FormRunAnalysis: <BI030FormRunAnalysis formId={formId} formParam={formParam} data={data} formCode={formCode} />,
BI060MapeShow: <BI060MapeShow formId={formId} formParam={formParam} data={data} formCode={formCode} />,
BI060MapePoint: <BI060MapePoint formId={formId} formParam={formParam} data={data} formCode={formCode} />,
BI061MapeGISShow: <BI061MapeGISShow formId={formId} formParam={formParam} data={data} formCode={formCode} />,
// CM018ShowPrint: <CM018ShowPrint formId={formId} formParam={formParam} data={data} formCode={formCode} />,
// CM023ShowPrint: <CM023ShowPrint formId={formId} formParam={formParam} data={data} formCode={formCode} />,
// CM026ShowPrint: <CM026ShowPrint formId={formId} formParam={formParam} data={data} formCode={formCode} />,
// CM026Edit: <CM026Edit formId={formId} formParam={formParam} data={data} formCode={formCode} />,
// CM030ShowPrint: <CM030ShowPrint formId={formId} formParam={formParam} data={data} formCode={formCode} />,
// CM032ShowPrint: <CM032ShowPrint formId={formId} formParam={formParam} data={data} formCode={formCode} />,
// CM031ShowPrint: <CM031ShowPrint formId={formId} formParam={formParam} data={data} formCode={formCode} />,
// CM002ShowPrint: <CM002ShowPrint formId={formId} formParam={formParam} data={data} formCode={formCode} />,
// CM034ShowPrint: <CM034ShowPrint formId={formId} formParam={formParam} data={data} formCode={formCode} />,
// CM036Edit: <CM036Edit formId={formId} formParam={formParam} data={data} formCode={formCode} />,
// CM036ShowPrint: <CM036ShowPrint formId={formId} formParam={formParam} data={data} formCode={formCode} />,
// CM041LibShow: <CM041LibShow formId={formId} formParam={formParam} data={data} formCode={formCode} />,
// CM043ShowPrint: <CM043ShowPrint formId={formId} formParam={formParam} data={data} formCode={formCode} />,
// CM045ShowPrint: <CM045ShowPrint formId={formId} formParam={formParam} data={data} formCode={formCode} />,
// BIView: <BIView formId={formId} formParam={formParam} data={data} formCode={formCode} />,
// BI001: <BI001 formId={formId} formParam={formParam} data={data} formCode={formCode} />,
// BI050BSSafeCheck: <BI050BSSafeCheck formId={formId} formParam={formParam} data={data} formCode={formCode} />,
// BI051BSCompanyYear: <BI051BSCompanyYear formId={formId} formParam={formParam} data={data} formCode={formCode} />,
// BI052BSSafeCheckYear: <BI052BSSafeCheckYear formId={formId} formParam={formParam} data={data} formCode={formCode} />,
// BI053BSSafeCheckYear: <BI053BSSafeCheckYear formId={formId} formParam={formParam} data={data} formCode={formCode} />,
// BI054HomeDetail: <BI054HomeDetail formId={formId} formParam={formParam} data={data} formCode={formCode} />,
// BI055HomeDetail: <BI055HomeDetail formId={formId} formParam={formParam} data={data} formCode={formCode} />,
// BI056Performance: <BI056Performance formId={formId} formParam={formParam} data={data} formCode={formCode} />,
// BI056Dilg1_1: <BI056Dilg1_1 formId={formId} formParam={formParam} data={data} formCode={formCode} />,
// BI056Dilg1_2: <BI056Dilg1_2 formId={formId} formParam={formParam} data={data} formCode={formCode} />,
// BI056Dilg2_1: <BI056Dilg2_1 formId={formId} formParam={formParam} data={data} formCode={formCode} />,
// BI056Dilg2_2: <BI056Dilg2_2 formId={formId} formParam={formParam} data={data} formCode={formCode} />,
// BI056Dilg3_1: <BI056Dilg3_1 formId={formId} formParam={formParam} data={data} formCode={formCode} />,
// BI056Dilg3_2: <BI056Dilg3_2 formId={formId} formParam={formParam} data={data} formCode={formCode} />,
// BI003StatiscialAnalysis: <BI003StatiscialAnalysis formId={formId} formParam={formParam} data={data} formCode={formCode} />,
// BI001HomeDetail: <BI001HomeDetail formId={formId} formParam={formParam} data={data} formCode={formCode} />,
// BI002HomeDetail: <BI002HomeDetail formId={formId} formParam={formParam} data={data} formCode={formCode} />,
// BI004FormRunAnalysis: <BI004FormRunAnalysis formId={formId} formParam={formParam} data={data} formCode={formCode} />,
// BI005LoginRecord: <BI005LoginRecord formId={formId} formParam={formParam} data={data} formCode={formCode} />,
// BI006FormRunAnalysis: <BI006FormRunAnalysis formId={formId} formParam={formParam} data={data} formCode={formCode} />,
// BI006FormRunAnalysisNew: <BI006FormRunAnalysisNew formId={formId} formParam={formParam} data={data} formCode={formCode} />,
// BI007FormRunAnalysis: <BI007FormRunAnalysis formId={formId} formParam={formParam} data={data} formCode={formCode} />,
// BI007FormRunAnalysisNew: <BI007FormRunAnalysisNew formId={formId} formParam={formParam} data={data} formCode={formCode} />,
// BI008FormRunAnalysis: <BI008FormRunAnalysis formId={formId} formParam={formParam} data={data} formCode={formCode} />,
// BI009RiskAnalysis: <BI009RiskAnalysis formId={formId} formParam={formParam} data={data} formCode={formCode} />,
// BI010FormRunAnalysis: <BI010FormRunAnalysis formId={formId} formParam={formParam} data={data} formCode={formCode} />,
// BI011FormRunAnalysis: <BI011FormRunAnalysis formId={formId} formParam={formParam} data={data} formCode={formCode} />,
// BI011TrainSafeAnalysis: <BI011TrainSafeAnalysis formId={formId} formParam={formParam} data={data} formCode={formCode} />,
// BI012NotificationTaskAnalysis: <BI012NotificationTaskAnalysis formId={formId} formParam={formParam} data={data} formCode={formCode} />,
// BI013RiskAnalysisModel: <BI013RiskAnalysisModel formId={formId} formParam={formParam} data={data} formCode={formCode} />,
// BI014RiskPerformanceModel: <BI014RiskPerformanceModel formId={formId} formParam={formParam} data={data} formCode={formCode} />,
// BI030FormRunAnalysis: <BI030FormRunAnalysis formId={formId} formParam={formParam} data={data} formCode={formCode} />,
// BI060MapeShow: <BI060MapeShow formId={formId} formParam={formParam} data={data} formCode={formCode} />,
// BI060MapePoint: <BI060MapePoint formId={formId} formParam={formParam} data={data} formCode={formCode} />,
// BI061MapeGISShow: <BI061MapeGISShow formId={formId} formParam={formParam} data={data} formCode={formCode} />,
// BI009FormRunAnalysis: <BI009FormRunAnalysis formId={formId} formParam={formParam} data={data} formCode={formCode} />,
// BI020ApproveAnalysis: <BI020ApproveAnalysis formId={formId} formParam={formParam} data={data} formCode={formCode} />,
// BI012FormRunAnalysis: <BI012FormRunAnalysis formId={formId} formParam={formParam} data={data} formCode={formCode} />,
PF136FormRunAnalysis: <PF136FormRunAnalysis formId={formId} formParam={formParam} data={data} formCode={formCode} />,
PF139FormRunAnalysis: <PF139FormRunAnalysis formId={formId} formParam={formParam} data={data} formCode={formCode} />,
BI009FormRunAnalysis: <BI009FormRunAnalysis formId={formId} formParam={formParam} data={data} formCode={formCode} />,
FO025ShowPrint: <FO025ShowPrint formId={formId} formParam={formParam} data={data} formCode={formCode} />,
BI020ApproveAnalysis: <BI020ApproveAnalysis formId={formId} formParam={formParam} data={data} formCode={formCode} />,
BI012FormRunAnalysis: <BI012FormRunAnalysis formId={formId} formParam={formParam} data={data} formCode={formCode} />,
FM202ShowPrint: <FM202ShowPrint formId={formId} formParam={formParam} data={data} formCode={formCode} />,
PFApproveRole: <PFApproveRole formId={formId} formParam={formParam} data={data} formCode={formCode} />,
SK002ShowPrint: <SK002ShowPrint formId={formId} formParam={formParam} data={data} formCode={formCode} />,

View File

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

View File

@ -26,7 +26,7 @@ export function request(url, options, onlyData, requestKey, onException) {
data.IsSuccessful !== undefined && !data.IsSuccessful && message.error(data.ErrorMessage)
return onlyData ? data.Data : data
}).catch(err => {
requestKey && window.localStorage.removeItem(requestKey)
onException instanceof Function && onException(err)
throw err; // 重新抛出错误,确保错误被正确传播
@ -40,7 +40,7 @@ export function request(url, options, onlyData, requestKey, onException) {
* @param {*} isIgnoreTenant
* @returns
*/
export function getRequestHeaders(url, type = 'post', isIgnoreTenant) {
export function getRequestHeaders(url, type = 'post', data, isIgnoreTenant) {
// 请求参数
const addHeader = 'Bearer ' + storage('lacal').getItem('accessToken').val
const userId = storage('lacal').getItem('userid').val
@ -72,9 +72,6 @@ export function getRequestHeaders(url, type = 'post', isIgnoreTenant) {
const latestOrgid = storage('lacal').getItem('Orgid').val
const latestUserid = storage('lacal').getItem('Userid').val
const latestUsername = storage('lacal').getItem('Username').val
if (latestTenant) {
headers.Tenant = latestTenant
}
@ -93,6 +90,13 @@ export function getRequestHeaders(url, type = 'post', isIgnoreTenant) {
} else if (url.indexOf('OP') != 0 && !isIgnoreTenant) {
headers.Tenant = Tenant
}
//wyw
if (Tenant && Tenant == '003' && data && data.Parameter22 && data.Parameter22.length > 20) {
//总公司 Parameter22 存入子公司的ORG_ID 自动切换数据库链接
headers.Tenant = data.Parameter22.substring(0, 3)
}
return headers
}
@ -122,7 +126,7 @@ export function httpPost(url, data, onlyData = true, ignoreThrottle, onException
// 发起请求
return request(url, {
method: 'POST',
headers: getRequestHeaders(url, 'post', isIgnoreTenant),
headers: getRequestHeaders(url, 'post', data, isIgnoreTenant),
body: dataStr,
}, onlyData, requestKey, onException)
}
@ -142,6 +146,6 @@ export function httpGet(url, data, onlyData = true, onException) {
url = formParams ? formUrl : url
return request(url, {
method: 'GET',
headers: getRequestHeaders(url, 'get'),
headers: getRequestHeaders(url, 'get', data),
}, onlyData, null, onException)
}