diff --git a/src/components/CustomPages/BI/BI064FormRunAnalysis.js b/src/components/CustomPages/BI/BI064FormRunAnalysis.js index d73da14..2e2f744 100644 --- a/src/components/CustomPages/BI/BI064FormRunAnalysis.js +++ b/src/components/CustomPages/BI/BI064FormRunAnalysis.js @@ -1,12 +1,14 @@ import React from 'react'; import { connect } from 'dva'; import { initFilter } from '../../../utils/common'; -import { Table, Row, Spin, Card, Modal } from 'antd'; - +import { Table, Row, Spin, Card, Modal,Col ,Button,Form} from 'antd'; +import DropDownPagination from '../../common/DropDownPaginationEx' class BI064FormRunAnalysis extends React.Component { constructor(props) { super(props); this.state = { + depart: {}, + inputText:'', retData: [], // 表单运行数据 companyData: [], // 公司数据 loading: true, @@ -71,21 +73,37 @@ class BI064FormRunAnalysis extends React.Component { // 加载数据 loadData = () => { this.getBaseData(); - this.getrealData(); + + }; + handleSearch = ({data, record}) => { + this.setState({ + depart: { + ...this.state.depart, + ID: data[0], + NAME:record?.NAME, + }, + inputText:record? record?.NAME:this.state.inputText, + }) }; - // 获取公司数据 getBaseData = () => { const json = initFilter(this.props.login.OrgId); + // let json = initFilter("00300000-0000-0000-0000-000000000000"); this.props.dispatch({ type: 'app/getDataByPost', - url: 'FM/Organization/OrderPaged', + url: 'FM/Organization/OrderEntities', payload: json, onlyData: false, onComplete: (ret) => { if (ret && ret.Data) { - this.setState({ companyData: ret.Data }, () => { - this.processData(); + let keyword = ret.Data[0]?.NAME + if(this.props.login.OrgId ==="00300000-0000-0000-0000-000000000000") + { + keyword = ret.Data.filter(t=>t.ID == this.props.login.OrgId)[0]?.NAME + } + this.setState({ companyData: ret.Data,inputText:keyword}, () => { + this.getrealData(); + // this.processData(); }); } }, @@ -94,7 +112,8 @@ class BI064FormRunAnalysis extends React.Component { // 获取表单运行数据 getrealData = () => { - const json = initFilter(this.props.login.OrgId); + // const json = initFilter(this.props.login.OrgId); + let json = initFilter("00300000-0000-0000-0000-000000000000",this.state.inputText); this.props.dispatch({ type: 'app/getDataByPost', url: 'BI/BIStatiscialAnalysisController/GetTaskViewInfo', @@ -114,10 +133,9 @@ class BI064FormRunAnalysis extends React.Component { // 处理数据，生成表格所需格式 processData = () => { - const { retData, companyData } = this.state; - + const { retData, companyData ,inputText} = this.state; if (!retData.length || !companyData.length) return; - + let companyDataTemp=companyData.filter(t=>t.NAME === inputText) // 获取所有模块和表单的列表 const modules = [...new Set(retData.map((item) => item.MOULD_NAME))]; const forms = []; @@ -147,7 +165,7 @@ class BI064FormRunAnalysis extends React.Component { }; // 为每个公司添加数据 - companyData.forEach((company) => { + companyDataTemp.forEach((company) => { const companyName = company.NAME; const companyDataKey = companyName.replace(/\s+/g, ''); @@ -242,13 +260,13 @@ class BI064FormRunAnalysis extends React.Component { }); // 生成表格列 - const columns = this.generateColumns(companyData, tableDataWithRowSpan); + const columns = this.generateColumns(companyDataTemp, tableDataWithRowSpan); this.setState({ tableData: tableDataWithRowSpan, columns }); }; // 动态生成表格列 - generateColumns = (companyData) => { + generateColumns = (companyData) => {debugger const baseColumns = [ { width: '150px', @@ -426,7 +444,10 @@ class BI064FormRunAnalysis extends React.Component { render() { const { tableData, columns, loading } = this.state; - + const formItemLayout = { + labelCol: { span: 8 }, + wrapperCol: { span: 16 }, + } return (
系统运行情况统计分析 - + + + + + { + params.OrderType = 1 + params.OrgId = this.props.login.OrgId + }} /> + + + + {/* */} diff --git a/src/components/CustomPages/SK/SK002CheckListJT.js b/src/components/CustomPages/SK/SK002CheckListJT.js new file mode 100644 index 0000000..3835e01 --- /dev/null +++ b/src/components/CustomPages/SK/SK002CheckListJT.js @@ -0,0 +1,312 @@ +import { Button, Descriptions,Popconfirm, Row, Col, Form,Modal, Input, Select, Table } from 'antd'; +import React , { useState }from 'react'; +import { initFilter, extendRule, extendInclude, extendIgnoreDataRule,setDataFieldValue, guid, initQueryFilter,ShowPrintClose } from "../../../utils/common"; +import ReactToPrint from "react-to-print"; +import stylesStep from '../HI/StepForm.css'; +import config from "../../../config"; +import XLSX from 'xlsx'; +import { connect } from 'dva'; +import moment from 'moment'; +import { message } from "antd/lib/index"; +import FormPage from '../../FormPage' +import DropDownPagination from '../../common/DropDownPaginationEx' +class SK002CheckListJT extends React.Component { + constructor(props) { + super(props); + this.state = { + inputText:"", + productionId:null, + depart: {}, + selectedRowKeys:[], + taskSelects: [], + dataList: [], + data:[], + BtnAgreeDisplay: 'none', + showDetail:false, + Details:[], + columns : [ + { + title: '序号', + dataIndex: 'NUM', + key: "NUM", + render: (text, record, index) => { + return + } + }, + { + title: "生产单元", + dataIndex: "Nav_ProductionUnit.NAME", + key: "Nav_ProductionUnit.NAME", + }, + { + title: "风险名称", + dataIndex: "RISK_NAME", + key: "RISK_NAME", + }, + { + title: "风险描述", + dataIndex: "RISK_DESCRIPTION", + key: "RISK_DESCRIPTION", + }, + { + title: "风险类别", + dataIndex: "Nav_Type.NAME", + key: "Nav_Type.NAME", + }, + { + title: "管控措施", + dataIndex: "MINE_NAME", + key: "MINE_NAME", + }, + { + title: "应急处置", + dataIndex: "EMERGENCY", + key: "EMERGENCY", + }, + { + title: "风险等级", + dataIndex: "EVALUATE_LEVEL", + key: "EVALUATE_LEVEL", + render: (text, record, index) => { + return + } + }, + { + title: "管控层级", + dataIndex: "DEPARTMENT_TYPE", + key: "DEPARTMENT_TYPE", + render: (text, record, index) => { + if(record.DEPARTMENT_TYPE.includes('_')) + { + let departTypeLists=[] + let departTypes=record.DEPARTMENT_TYPE.split('_') + if(departTypes.length>0) + { + for(let i=0;i{departTypeLists} + } + else + { + return + } + } + }, + ], + }; + }; + + componentDidMount() { + if (this.props.data?.clickKey) + {this.loadData();} + } + + componentWillReceiveProps(NextProps) { + if (NextProps.data?.clickKey && this.props.data?.clickKey != NextProps.data?.clickKey) + {this.loadData();} + } + BtnClose = () => { + if (typeof this.props.data.onCancel != "undefined"&&typeof this.props.data.onCancel == 'function') + this.props.data.onCancel(); + } + + loadData = () => { + let json = initFilter("00300000-0000-0000-0000-000000000000"); + json.Parameter22 = this.props.data.ORG_ID_HV; + extendInclude(json, 'Nav_Details'); + extendInclude(json, 'Nav_ProductionUnit'); + extendInclude(json, 'Nav_Details.Nav_DetailContents.Nav_Contents'); + extendInclude(json, 'Nav_Details.Nav_DetailContents.Nav_DetailHiddens.Nav_Question'); + extendInclude(json, 'Nav_Details.Nav_DetailContents.Nav_DetailBasics.Nav_Law'); + extendInclude(json, 'Nav_Type'); + extendInclude(json, 'Nav_SCOREL'); + extendInclude(json, 'Nav_SCOREE'); + extendInclude(json, 'Nav_SCOREC'); + extendIgnoreDataRule(json) + this.props.dispatch({ + type: 'app/getDataByPost', + payload: json, + url: 'SK/SKBasicLibrary/JTOrderEntities', + onComplete: (ret) => { + if (ret) { + this.setState({ dataList: ret,data:ret }); + } + } + }); + } + loadData2() + { + let temp=this.state.data + if(this.state.inputText2) + { + temp=temp.filter(t=>t.Nav_ProductionUnit != null && t.Nav_ProductionUnit.NAME.includes(this.state.inputText2)); + } + // if(this.state.productionId) + // { + // temp=temp.filter(t=>t.PRODUCTION_UNIT_ID ==this.state.productionId); + // } + if(this.state.inputText2) + { + temp=temp.filter(t=>t.RISK_NAME.includes(this.state.inputText2)); + } + this.setState({dataList :temp}) + } + // onTableBtnExport() { + // const enums=this.props.data.enums ? this.props.data.enums :this.props.app.enums ; + // let TableWrap = document.getElementById('tableId' + this.props.data.id); + // let Table = TableWrap.getElementsByTagName('table')[0]; + // const wb = XLSX.utils.table_to_book(Table); + // XLSX.writeFile(wb, "基础库.xlsx") + // } + handleCancel = () => { + this.setState({ + showDetail: false, + }); + }; + closeModal = () => { + this.setState({ + showDetail: false, + }); + }; + + closeTasks() { + let temps = []; + if (this.state.taskSelects && this.state.taskSelects.length > 0) + { + if(this.state.taskSelects.length >1) + { + message.error('只能勾选一条进行导入'); + return; + } + else + { + this.props.login.tempAddData=this.state.taskSelects[0] + this.state.taskSelects = []; + this.state.selectedRowKeys = []; + // this.closeModalContent() + // this.closeModal() + ShowPrintClose(this.props) + } + }else + { + message.error('请选择要导入的内容'); + return; + + } + }; + onSelectChange = (selectedRowKeys,selectedRows) => { // 选择菜单行 + this.setState({selectedRowKeys:selectedRowKeys, + taskSelects:selectedRows + }); + }; + // handleSearch=(value)=>{ + // this.setState({ + // inputText: value + // }) + // } + handleSearch = ({data, record}) => { + this.setState({ + depart: { + ...this.state.depart, + PRODUCTION_UNIT_ID: data[0], + Nav_ProductionUnit: { NAME: record?.NAME }, + }, + inputText: record?.NAME, + productionId: record?.ID + }) + }; + handleSearch1=(e)=>{ + this.setState({ + inputText1: e.target.value + }) + } + handleSearch2=(e)=>{ + this.setState({ + inputText2: e.target.value + }) + } + render() { + const formItemLayout = { + labelCol: { span: 8 }, + wrapperCol: { span: 16 }, + } + const {selectedRowKeys} =this.state; + const rowSelection = { + selectedRowKeys:selectedRowKeys, + fixed: false, + columnWidth: 20, + hideDefaultSelections:false, + onChange: this.onSelectChange + }; + const enums=this.props.data.enums ? this.props.data.enums :this.props.app.enums ; + // let aaa = Math.random(); + return
+
+

基础库

+

+ + + + + + {/* + { + params.OrderType = 1 + params.OrgId = this.props.login.OrgId + }} /> + */} + + + + + + + + + +

+
+ +
+

+ {this.state.dataList? + + :[]} + + + } + +} + +export default connect(({ login,app }) => ({ login,app }))(SK002CheckListJT) \ No newline at end of file diff --git a/src/files/edit/SK002.js b/src/files/edit/SK002.js index a45315f..6e285ff 100644 --- a/src/files/edit/SK002.js +++ b/src/files/edit/SK002.js @@ -153,6 +153,267 @@ export default { } }, + btnAdd: ({ record,data, parentRecord, stateData,setState, close, loadData, login, btn, dispatch }) => { + + // if(login.tempAddData) + // { + // stateData.MineType = login.tempAddData.MineType + // stateData.RISK_NAME = login.tempAddData.RISK_NAME + // stateData.RISK_DESCRIPTION = login.tempAddData.RISK_DESCRIPTION + // stateData.Nav_Type = login.tempAddData.Nav_Type + // stateData.Nav_SCOREL = login.tempAddData.Nav_SCOREL + // stateData.Nav_SCOREE = login.tempAddData.Nav_SCOREE + // stateData.Nav_SCOREC = login.tempAddData.Nav_SCOREC + // stateData.EVALUATE_SCORE = login.tempAddData.EVALUATE_SCORE + // stateData.EVALUATE_LEVEL = login.tempAddData.EVALUATE_LEVEL + // stateData.EMERGENCY = login.tempAddData.EMERGENCY + // let departs=[] + // if(login.tempAddData.EVALUATE_LEVEL) + // { + // if(login.tempAddData.EVALUATE_LEVEL ==10) + // { + // let temp3={ + // DEPARTMENT_TYPE:3, + // } + // let temp={ + // DEPARTMENT_TYPE:0, + // } + // let temp1={ + // DEPARTMENT_TYPE:1, + // } + // let temp2={ + // DEPARTMENT_TYPE:2, + // } + // departs.push(temp3); + // departs.push(temp); + // departs.push(temp1); + // departs.push(temp2); + // } + // if(login.tempAddData.EVALUATE_LEVEL ==20) + // { + // let temp={ + // DEPARTMENT_TYPE:0, + // } + // let temp1={ + // DEPARTMENT_TYPE:1, + // } + // let temp2={ + // DEPARTMENT_TYPE:2, + // } + // departs.push(temp); + // departs.push(temp1); + // departs.push(temp2); + // } + // if(login.tempAddData.EVALUATE_LEVEL ==30) + // { + // let temp1={ + // DEPARTMENT_TYPE:1, + // } + // let temp2={ + // DEPARTMENT_TYPE:2, + // } + // departs.push(temp1); + // departs.push(temp2); + // } + // if(login.tempAddData.EVALUATE_LEVEL ==40) + // { + // let temp={ + // DEPARTMENT_TYPE:2, + // } + // departs.push(temp); + // } + // } + // stateData.Nav_Departs = departs + // if(login.tempAddData.Nav_Details) + // { + // let details=[] + // login.tempAddData.Nav_Details.map(item=>{ + // let contents=[] + // item.Nav_DetailContents && item.Nav_DetailContents.map(x=>{ + // let hiddens=[] + // x.Nav_DetailHiddens && x.Nav_DetailHiddens.map(y=>{ + // let hidden={ + // RECTIFICATION_MEASURES :y.RECTIFICATION_MEASURES, + // HIDDEN_LEVEL :y.HIDDEN_LEVEL, + // HIDDEN_DESCRIPTION :y.HIDDEN_DESCRIPTION, + // CHECK_QUESTION_ID:y.CHECK_QUESTION_ID, + // Nav_Question:y.Nav_Question + // } + // hiddens.push(hidden) + // }) + // let basics=[] + // x.Nav_DetailBasics && x.Nav_DetailBasics.map(y=>{ + // let basic={ + // LAW_ID:y.LAW_ID, + // Nav_Law:y.Nav_Law + // } + // basics.push(basic) + // }) + // let content={ + // CHECK_STANDARD :x.CHECK_STANDARD, + // CHECK_CONTENTS_ID:x.CHECK_CONTENTS_ID, + // Nav_Contents:x.Nav_Contents, + // Nav_DetailHiddens:hiddens, + // Nav_DetailBasics:basics + // } + // contents.push(content) + // }) + // let detail={ + // MEASURES_NAME:item.MEASURES_NAME, + // Nav_DetailContents:contents + // } + // details.push(detail); + // }) + // stateData.Nav_Details = details; + // // setState(stateData); + // // login.tempAddData =null; + // // loadData(); + // // close(); + // } + // } + }, + btnFresh: ({ record,data, parentRecord, setStateData,stateData,setState, close, loadData, login, dispatch }) => { + + if(login.tempAddData) + { + stateData.MineType = login.tempAddData.MineType + stateData.PRODUCTION_UNIT_ID = login.tempAddData.PRODUCTION_UNIT_ID + stateData.Nav_ProductionUnit = login.tempAddData.Nav_ProductionUnit + stateData.RISK_NAME = login.tempAddData.RISK_NAME + stateData.RISK_DESCRIPTION = login.tempAddData.RISK_DESCRIPTION + stateData.TYPE_ID = login.tempAddData.TYPE_ID + stateData.Nav_Type = login.tempAddData.Nav_Type + stateData.SCOREL_ID = login.tempAddData.SCOREL_ID + stateData.Nav_SCOREL = login.tempAddData.Nav_SCOREL + stateData.SCOREE_ID = login.tempAddData.SCOREE_ID + stateData.Nav_SCOREE = login.tempAddData.Nav_SCOREE + stateData.SCOREC_ID = login.tempAddData.SCOREC_ID + stateData.Nav_SCOREC = login.tempAddData.Nav_SCOREC + stateData.EVALUATE_SCORE = login.tempAddData.EVALUATE_SCORE + stateData.EVALUATE_LEVEL = login.tempAddData.EVALUATE_LEVEL + stateData.EMERGENCY = login.tempAddData.EMERGENCY + let departs=[] + if(login.tempAddData.EVALUATE_LEVEL) + { + if(login.tempAddData.EVALUATE_LEVEL ==10) + { + let temp3={ + ID: guid(), + DEPARTMENT_TYPE:5, + } + let temp={ + ID: guid(), + DEPARTMENT_TYPE:10, + } + let temp1={ + ID: guid(), + DEPARTMENT_TYPE:15, + } + let temp2={ + ID: guid(), + DEPARTMENT_TYPE:20, + } + departs.push(temp3); + departs.push(temp); + departs.push(temp1); + departs.push(temp2); + } + if(login.tempAddData.EVALUATE_LEVEL ==20) + { + let temp={ + ID: guid(), + DEPARTMENT_TYPE:10, + } + let temp1={ + ID: guid(), + DEPARTMENT_TYPE:15, + } + let temp2={ + ID: guid(), + DEPARTMENT_TYPE:20, + } + departs.push(temp); + departs.push(temp1); + departs.push(temp2); + } + if(login.tempAddData.EVALUATE_LEVEL ==30) + { + let temp1={ + ID: guid(), + DEPARTMENT_TYPE:15, + } + let temp2={ + ID: guid(), + DEPARTMENT_TYPE:20, + } + departs.push(temp1); + departs.push(temp2); + } + if(login.tempAddData.EVALUATE_LEVEL ==40) + { + let temp={ + ID: guid(), + DEPARTMENT_TYPE:20, + } + departs.push(temp); + } + } + // stateData.Nav_Departs = departs + if(login.tempAddData.Nav_Details) + { + let details=[] + login.tempAddData.Nav_Details.sort((m, n) => (m.NUM > n.NUM ? 1 : -1)).map((item,k)=>{ + let contents=[] + item.Nav_DetailContents && item.Nav_DetailContents.sort((m, n) => (m.NUM > n.NUM ? 1 : -1)).map((x,j)=>{ + let hiddens=[] + x.Nav_DetailHiddens && x.Nav_DetailHiddens.sort((m, n) => (m.NUM > n.NUM ? 1 : -1)).map((y,i)=>{ + let hidden={ + ID: guid(), + NUM:y.NUM, + RECTIFICATION_MEASURES :y.RECTIFICATION_MEASURES, + HIDDEN_LEVEL :y.HIDDEN_LEVEL, + HIDDEN_DESCRIPTION :y.HIDDEN_DESCRIPTION, + CHECK_QUESTION_ID:y.CHECK_QUESTION_ID, + Nav_Question:y.Nav_Question + } + hiddens.push(hidden) + }) + let basics=[] + x.Nav_DetailBasics && x.Nav_DetailBasics.map((y,i)=>{ + let basic={ + ID: guid(), + LAW_ID:y.LAW_ID, + Nav_Law:y.Nav_Law + } + basics.push(basic) + }) + let content={ + ID: guid(), + NUM:x.NUM, + CHECK_STANDARD :x.CHECK_STANDARD, + CHECK_CONTENTS_ID:x.CHECK_CONTENTS_ID, + Nav_Contents:x.Nav_Contents, + Nav_DetailHiddens:hiddens, + Nav_DetailBasics:basics + } + contents.push(content) + }) + let detail={ + ID: guid(), + NUM:item.NUM, + MEASURES_NAME:item.MEASURES_NAME, + Nav_DetailContents:contents + } + details.push(detail); + }) + stateData.Nav_Details = details; + setState(stateData); + // login.tempAddData =null; + // loadData(); + // close(); + } + } + }, // updateMeasure: ({ row, pageCode, record,dispatch, colInfo, stateData, login, saveRowRecord, setState, emptyEditSelectedKeys }) => { // if(stateData) diff --git a/src/utils/customConfig.js b/src/utils/customConfig.js index 0a32162..21693f0 100644 --- a/src/utils/customConfig.js +++ b/src/utils/customConfig.js @@ -233,6 +233,7 @@ const FM202ShowPrint = createLoadableComponent(() => import('../components/Custo const PFApproveRole = createLoadableComponent(() => import('../components/CustomPages/PF/PFApproveRole')); const SK002ShowPrint = createLoadableComponent(() => import('../components/CustomPages/SK/SK002ShowPrint')); const SK002CheckList = createLoadableComponent(() => import('../components/CustomPages/SK/SK002CheckList')); +const SK002CheckListJT = createLoadableComponent(() => import('../components/CustomPages/SK/SK002CheckListJT')); const SK002ShowSummary = createLoadableComponent(() => import('../components/CustomPages/SK/SK002ShowSummary')); const SK004ShowPrint = createLoadableComponent(() => import('../components/CustomPages/SK/SK004ShowPrint')); const SK004CheckList = createLoadableComponent(() => import('../components/CustomPages/SK/SK004CheckList')); @@ -483,6 +484,7 @@ export default function (componentName, formId, formParam, data, formCode, formD PFApproveRole: , SK002ShowPrint: , SK002CheckList: , + SK002CheckListJT: , SK002ShowSummary: , SK004ShowPrint: , SK004CheckList: ,