diff --git a/src/api/evaluationTeamConfig/index.js b/src/api/evaluationTeamConfig/index.js index 1dd6b75..d98276d 100644 --- a/src/api/evaluationTeamConfig/index.js +++ b/src/api/evaluationTeamConfig/index.js @@ -21,5 +21,5 @@ export const evaluationTeamConfigChangeLog = declareRequest( `Post > @/hiddenEvaluation/evaluationConfigLog/list`, ); export const corpInfoList = declareRequest( - `Post > @/basicInfo/corpInfo/list`, + `Get > /basicInfo/corpInfo/listAll`, ); diff --git a/src/pages/Container/Supervision/EvaluationTeamConfig/List/index.js b/src/pages/Container/Supervision/EvaluationTeamConfig/List/index.js index fb9394e..4907d5f 100644 --- a/src/pages/Container/Supervision/EvaluationTeamConfig/List/index.js +++ b/src/pages/Container/Supervision/EvaluationTeamConfig/List/index.js @@ -42,7 +42,7 @@ function List(props) { )} columns={[ - { title: "分公司名称", dataIndex: "corpinfoName" }, + { title: "公司名称", dataIndex: "corpinfoName" }, { title: "安全类隐患考评组分配状态", dataIndex: "safeEvaluationConfigStatus", width: 220 }, { title: "考评组成员", dataIndex: "safeEvaluationMember" }, { title: "环保类隐患考评组分配状态", dataIndex: "envEvaluationConfigStatus", width: 220 }, @@ -289,7 +289,7 @@ const AddModalComponent = (props) => { const [corpInfoList, setCorpInfoList] = useState([]); const getCorpInfoList = async () => { - const { data } = await props["corpInfoList"]({ pageIndex: 1, pageSize: 1000 }); + const { data } = await props["corpInfoList"]({ inType: [0, 1, 2, 6] }); setCorpInfoList(data); }; @@ -328,7 +328,7 @@ const AddModalComponent = (props) => { options={[ { name: "corpinfoId", - label: "分公司", + label: "公司名称", render: FORM_ITEM_RENDER_ENUM.SELECT, items: corpInfoList, itemsField: { valueKey: "id", labelKey: "corpName" }, diff --git a/src/pages/Container/Supervision/HiddenEvaluation/HiddenList/index.js b/src/pages/Container/Supervision/HiddenEvaluation/HiddenList/index.js index 01b62f3..8311714 100644 --- a/src/pages/Container/Supervision/HiddenEvaluation/HiddenList/index.js +++ b/src/pages/Container/Supervision/HiddenEvaluation/HiddenList/index.js @@ -114,7 +114,7 @@ function HiddenList(props) { > 考评详情 - {!record.currentEvaluationFlag && ( + {record.currentEvaluationFlag && (