bug
parent
0e31e8b0a8
commit
877c9d1b78
|
|
@ -21,5 +21,5 @@ export const evaluationTeamConfigChangeLog = declareRequest(
|
||||||
`Post > @/hiddenEvaluation/evaluationConfigLog/list`,
|
`Post > @/hiddenEvaluation/evaluationConfigLog/list`,
|
||||||
);
|
);
|
||||||
export const corpInfoList = declareRequest(
|
export const corpInfoList = declareRequest(
|
||||||
`Post > @/basicInfo/corpInfo/list`,
|
`Get > /basicInfo/corpInfo/listAll`,
|
||||||
);
|
);
|
||||||
|
|
|
||||||
|
|
@ -42,7 +42,7 @@ function List(props) {
|
||||||
<Page isShowAllAction={false}>
|
<Page isShowAllAction={false}>
|
||||||
<Search
|
<Search
|
||||||
options={[
|
options={[
|
||||||
{ name: "corpinfoName", label: "分公司名称" },
|
{ name: "corpinfoName", label: "公司名称" },
|
||||||
{ name: "status", label: "考评组状态", render: FORM_ITEM_RENDER_ENUM.SELECT, items: STATE_ENUM },
|
{ name: "status", label: "考评组状态", render: FORM_ITEM_RENDER_ENUM.SELECT, items: STATE_ENUM },
|
||||||
]}
|
]}
|
||||||
form={form}
|
form={form}
|
||||||
|
|
@ -65,7 +65,7 @@ function List(props) {
|
||||||
</Space>
|
</Space>
|
||||||
)}
|
)}
|
||||||
columns={[
|
columns={[
|
||||||
{ title: "分公司名称", dataIndex: "corpinfoName" },
|
{ title: "公司名称", dataIndex: "corpinfoName" },
|
||||||
{ title: "安全类隐患考评组分配状态", dataIndex: "safeEvaluationConfigStatus", width: 220 },
|
{ title: "安全类隐患考评组分配状态", dataIndex: "safeEvaluationConfigStatus", width: 220 },
|
||||||
{ title: "考评组成员", dataIndex: "safeEvaluationMember" },
|
{ title: "考评组成员", dataIndex: "safeEvaluationMember" },
|
||||||
{ title: "环保类隐患考评组分配状态", dataIndex: "envEvaluationConfigStatus", width: 220 },
|
{ title: "环保类隐患考评组分配状态", dataIndex: "envEvaluationConfigStatus", width: 220 },
|
||||||
|
|
@ -289,7 +289,7 @@ const AddModalComponent = (props) => {
|
||||||
const [corpInfoList, setCorpInfoList] = useState([]);
|
const [corpInfoList, setCorpInfoList] = useState([]);
|
||||||
|
|
||||||
const getCorpInfoList = async () => {
|
const getCorpInfoList = async () => {
|
||||||
const { data } = await props["corpInfoList"]({ pageIndex: 1, pageSize: 1000 });
|
const { data } = await props["corpInfoList"]({ inType: [0, 1, 2, 6] });
|
||||||
setCorpInfoList(data);
|
setCorpInfoList(data);
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
@ -328,7 +328,7 @@ const AddModalComponent = (props) => {
|
||||||
options={[
|
options={[
|
||||||
{
|
{
|
||||||
name: "corpinfoId",
|
name: "corpinfoId",
|
||||||
label: "分公司",
|
label: "公司名称",
|
||||||
render: FORM_ITEM_RENDER_ENUM.SELECT,
|
render: FORM_ITEM_RENDER_ENUM.SELECT,
|
||||||
items: corpInfoList,
|
items: corpInfoList,
|
||||||
itemsField: { valueKey: "id", labelKey: "corpName" },
|
itemsField: { valueKey: "id", labelKey: "corpName" },
|
||||||
|
|
|
||||||
|
|
@ -114,7 +114,7 @@ function HiddenList(props) {
|
||||||
>
|
>
|
||||||
考评详情
|
考评详情
|
||||||
</Button>
|
</Button>
|
||||||
{!record.currentEvaluationFlag && (
|
{record.currentEvaluationFlag && (
|
||||||
<Button
|
<Button
|
||||||
disabled={record.finalResult === 2 || record.finalResult === 3}
|
disabled={record.finalResult === 2 || record.finalResult === 3}
|
||||||
type="link"
|
type="link"
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue