bug:15678、15677、15674、15672
parent
304f69c30e
commit
9158eee6eb
|
|
@ -43,7 +43,7 @@ function HiddenList(props) {
|
||||||
options={[
|
options={[
|
||||||
{ name: "hiddenDesc", label: "隐患描述" },
|
{ name: "hiddenDesc", label: "隐患描述" },
|
||||||
{ name: "source", label: "隐患来源", render: FORM_ITEM_RENDER_ENUM.SELECT, items: HIDDEN_SOURCE_ENUM },
|
{ name: "source", label: "隐患来源", render: FORM_ITEM_RENDER_ENUM.SELECT, items: HIDDEN_SOURCE_ENUM },
|
||||||
{ name: "departmentId", label: "发现部门", render: (<DepartmentSelectTree />) },
|
{ name: "departmentId", label: "发现部门", render: (<DepartmentSelectTree params={{ eqCorpinfoId: query.corpinfoId }} />) },
|
||||||
{ name: "findUserName", label: "隐患发现人" },
|
{ name: "findUserName", label: "隐患发现人" },
|
||||||
{ name: "findTime", label: "隐患发现时间", render: FORM_ITEM_RENDER_ENUM.DATE_RANGE },
|
{ name: "findTime", label: "隐患发现时间", render: FORM_ITEM_RENDER_ENUM.DATE_RANGE },
|
||||||
{
|
{
|
||||||
|
|
|
||||||
|
|
@ -40,7 +40,7 @@ function HiddenExchangeList(props) {
|
||||||
<Search
|
<Search
|
||||||
options={[
|
options={[
|
||||||
{ name: "source", label: "隐患来源", render: FORM_ITEM_RENDER_ENUM.SELECT, items: HIDDEN_SOURCE_ENUM },
|
{ name: "source", label: "隐患来源", render: FORM_ITEM_RENDER_ENUM.SELECT, items: HIDDEN_SOURCE_ENUM },
|
||||||
{ name: "departmentId", label: "发现部门", render: (<DepartmentSelectTree />) },
|
{ name: "departmentId", label: "发现部门", render: (<DepartmentSelectTree params={{ eqCorpinfoId: query.corpinfoId }} />) },
|
||||||
{ name: "findUserName", label: "隐患发现人" },
|
{ name: "findUserName", label: "隐患发现人" },
|
||||||
{
|
{
|
||||||
name: "hiddenType",
|
name: "hiddenType",
|
||||||
|
|
|
||||||
|
|
@ -18,7 +18,7 @@ function List(props) {
|
||||||
<Page isShowAllAction={false}>
|
<Page isShowAllAction={false}>
|
||||||
<Search
|
<Search
|
||||||
options={[
|
options={[
|
||||||
{ name: "departmentId", label: "考评组部门", render: (<DepartmentSelectTree searchType="all" />) },
|
{ name: "departmentId", label: "考评组部门", render: (<DepartmentSelectTree searchType="inType" params={{ enterpriseType: [1, 2] }} />) },
|
||||||
{ name: "evaluationUserName", label: "考评组人员" },
|
{ name: "evaluationUserName", label: "考评组人员" },
|
||||||
]}
|
]}
|
||||||
form={form}
|
form={form}
|
||||||
|
|
|
||||||
|
|
@ -162,7 +162,7 @@ function UserExchangeList(props) {
|
||||||
<Button
|
<Button
|
||||||
type="link"
|
type="link"
|
||||||
onClick={() => {
|
onClick={() => {
|
||||||
props.history.push(`./userExchangeRecordList?userId=${record.userId}`);
|
props.history.push(`./userExchangeRecordList?userId=${record.userId}&corpinfoId=${query.corpinfoId}`);
|
||||||
}}
|
}}
|
||||||
>
|
>
|
||||||
兑换记录
|
兑换记录
|
||||||
|
|
@ -172,7 +172,7 @@ function UserExchangeList(props) {
|
||||||
<Button
|
<Button
|
||||||
type="link"
|
type="link"
|
||||||
onClick={() => {
|
onClick={() => {
|
||||||
props.history.push(`./hiddenEvaluationList?userId=${record.userId}`);
|
props.history.push(`./hiddenEvaluationList?userId=${record.userId}&corpinfoId=${query.corpinfoId}`);
|
||||||
}}
|
}}
|
||||||
>
|
>
|
||||||
考评详情
|
考评详情
|
||||||
|
|
@ -185,7 +185,7 @@ function UserExchangeList(props) {
|
||||||
<Button
|
<Button
|
||||||
type="link"
|
type="link"
|
||||||
onClick={() => {
|
onClick={() => {
|
||||||
props.history.push(`./userExchangeRecordList?userId=${record.userId}`);
|
props.history.push(`./userExchangeRecordList?userId=${record.userId}&corpinfoId=${query.corpinfoId}`);
|
||||||
}}
|
}}
|
||||||
>
|
>
|
||||||
兑换记录
|
兑换记录
|
||||||
|
|
@ -193,7 +193,7 @@ function UserExchangeList(props) {
|
||||||
<Button
|
<Button
|
||||||
type="link"
|
type="link"
|
||||||
onClick={() => {
|
onClick={() => {
|
||||||
props.history.push(`./hiddenEvaluationList?userId=${record.userId}`);
|
props.history.push(`./hiddenEvaluationList?userId=${record.userId}&corpinfoId=${query.corpinfoId}`);
|
||||||
}}
|
}}
|
||||||
>
|
>
|
||||||
考评详情
|
考评详情
|
||||||
|
|
|
||||||
|
|
@ -47,7 +47,7 @@ function UserExchangeRecordList(props) {
|
||||||
<Button
|
<Button
|
||||||
type="link"
|
type="link"
|
||||||
onClick={() => {
|
onClick={() => {
|
||||||
props.history.push(`./hiddenExchangeList?hiddenExchangeBathId=${record.hiddenExchangeBathId}`);
|
props.history.push(`./hiddenExchangeList?hiddenExchangeBathId=${record.hiddenExchangeBathId}&corpinfoId=${query.corpinfoId}`);
|
||||||
}}
|
}}
|
||||||
>
|
>
|
||||||
隐患详情
|
隐患详情
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue