feat:发起人发起时间完事
parent
8a87323f9e
commit
a728820d11
|
|
@ -10,7 +10,7 @@ export const temporaryPersonnelAdd = declareRequest(
|
||||||
);
|
);
|
||||||
export const temporaryPersonnelInfo = declareRequest(
|
export const temporaryPersonnelInfo = declareRequest(
|
||||||
"temporaryPersonnelLoading",
|
"temporaryPersonnelLoading",
|
||||||
`Post > @/primeport/personApply/xgfPersonApplyInfoById`,
|
`GET > /primeport/personApply/xgfPersonApplyInfoById/{id}`,
|
||||||
);
|
);
|
||||||
export const temporaryPersonnelReview = declareRequest(
|
export const temporaryPersonnelReview = declareRequest(
|
||||||
"temporaryPersonnelLoading",
|
"temporaryPersonnelLoading",
|
||||||
|
|
|
||||||
|
|
@ -210,7 +210,7 @@ function Add(props) {
|
||||||
{ title: "姓名", dataIndex: "name" },
|
{ title: "姓名", dataIndex: "name" },
|
||||||
{ title: "部门", dataIndex: "deptName" },
|
{ title: "部门", dataIndex: "deptName" },
|
||||||
{ title: "是否培训", dataIndex: "todo3" },
|
{ title: "是否培训", dataIndex: "todo3" },
|
||||||
{ title: "现口门权限范围", dataIndex: "todo4" },
|
// { title: "现口门权限范围", dataIndex: "todo4" },
|
||||||
{
|
{
|
||||||
title: "操作",
|
title: "操作",
|
||||||
width: 80,
|
width: 80,
|
||||||
|
|
@ -345,7 +345,7 @@ const AddPersonnelModalComponent = (props) => {
|
||||||
{ title: "姓名", dataIndex: "userName" },
|
{ title: "姓名", dataIndex: "userName" },
|
||||||
{ title: "部门", dataIndex: "deptName" },
|
{ title: "部门", dataIndex: "deptName" },
|
||||||
{ title: "是否培训", dataIndex: "todo3" },
|
{ title: "是否培训", dataIndex: "todo3" },
|
||||||
{ title: "现口门权限范围", dataIndex: "todo4" },
|
// { title: "现口门权限范围", dataIndex: "todo4" },
|
||||||
]}
|
]}
|
||||||
dataSource={props.xgfProjectUser}
|
dataSource={props.xgfProjectUser}
|
||||||
pagination={false}
|
pagination={false}
|
||||||
|
|
|
||||||
|
|
@ -73,7 +73,7 @@ function List(props) {
|
||||||
render: (_, record) => `${record.visitStartTime}-${record.visitEndTime}`,
|
render: (_, record) => `${record.visitStartTime}-${record.visitEndTime}`,
|
||||||
},
|
},
|
||||||
{ title: "项目人员数", dataIndex: "personApplyCount" },
|
{ title: "项目人员数", dataIndex: "personApplyCount" },
|
||||||
{ title: "申请时间", dataIndex: "todo5" },
|
{ title: "申请时间", dataIndex: "applyTime" },
|
||||||
{
|
{
|
||||||
title: "审核状态",
|
title: "审核状态",
|
||||||
dataIndex: "auditFlag",
|
dataIndex: "auditFlag",
|
||||||
|
|
@ -204,7 +204,7 @@ const ViewModalComponent = (props) => {
|
||||||
},
|
},
|
||||||
{ label: "访问期限", children: `${info.visitStartTime}-${info.visitEndTime}` },
|
{ label: "访问期限", children: `${info.visitStartTime}-${info.visitEndTime}` },
|
||||||
{ label: "项目人员数", children: info.personApplyList?.length },
|
{ label: "项目人员数", children: info.personApplyList?.length },
|
||||||
{ label: "申请时间", children: info.todo6 },
|
{ label: "申请时间", children: info.applyTime },
|
||||||
{ label: "申请状态", children: getLabelName({ list: ENCLOSED_AREA_AUDIT_STATUS_ENUM, status: info.auditFlag }) },
|
{ label: "申请状态", children: getLabelName({ list: ENCLOSED_AREA_AUDIT_STATUS_ENUM, status: info.auditFlag }) },
|
||||||
{ label: "申请人签字", children: (<PreviewImg files={info.informSignFile} />) },
|
{ label: "申请人签字", children: (<PreviewImg files={info.informSignFile} />) },
|
||||||
]}
|
]}
|
||||||
|
|
@ -217,7 +217,7 @@ const ViewModalComponent = (props) => {
|
||||||
{ title: "姓名", dataIndex: "employeePersonUserName" },
|
{ title: "姓名", dataIndex: "employeePersonUserName" },
|
||||||
{ title: "部门", dataIndex: "personDepartmentName" },
|
{ title: "部门", dataIndex: "personDepartmentName" },
|
||||||
{ title: "是否培训", dataIndex: "todo3" },
|
{ title: "是否培训", dataIndex: "todo3" },
|
||||||
{ title: "现口门权限范围", dataIndex: "todo4" },
|
// { title: "现口门权限范围", dataIndex: "todo4" },
|
||||||
]}
|
]}
|
||||||
dataSource={info.personApplyList}
|
dataSource={info.personApplyList}
|
||||||
pagination={false}
|
pagination={false}
|
||||||
|
|
|
||||||
|
|
@ -25,7 +25,7 @@ function ApprovalRecords(props) {
|
||||||
<Page headerTitle="审批记录">
|
<Page headerTitle="审批记录">
|
||||||
<Table
|
<Table
|
||||||
columns={[
|
columns={[
|
||||||
{ title: "发起人", dataIndex: "employeeVehicleUserName" },
|
{ title: "发起人", dataIndex: "applyUserName" },
|
||||||
{ title: "发起时间", dataIndex: "applyTime" },
|
{ title: "发起时间", dataIndex: "applyTime" },
|
||||||
{ title: "审批人", dataIndex: "auditUserName" },
|
{ title: "审批人", dataIndex: "auditUserName" },
|
||||||
{ title: "审批时间", dataIndex: "auditTime" },
|
{ title: "审批时间", dataIndex: "auditTime" },
|
||||||
|
|
|
||||||
|
|
@ -44,7 +44,7 @@ function RelatedPersonnel(props) {
|
||||||
/>
|
/>
|
||||||
<Table
|
<Table
|
||||||
columns={[
|
columns={[
|
||||||
{ title: "相关方名称", dataIndex: "todo1" },
|
{ title: "相关方名称", dataIndex: "applyCorpName" },
|
||||||
{ title: "项目名称", dataIndex: "projectName" },
|
{ title: "项目名称", dataIndex: "projectName" },
|
||||||
{
|
{
|
||||||
title: "区域范围",
|
title: "区域范围",
|
||||||
|
|
@ -56,8 +56,8 @@ function RelatedPersonnel(props) {
|
||||||
dataIndex: "visitStartTime",
|
dataIndex: "visitStartTime",
|
||||||
render: (_, record) => `${record.visitStartTime}至${record.visitEndTime}`,
|
render: (_, record) => `${record.visitStartTime}至${record.visitEndTime}`,
|
||||||
},
|
},
|
||||||
{ title: "项目人员数", dataIndex: "todo5" },
|
{ title: "项目人员数", dataIndex: "personApplyCount" },
|
||||||
{ title: "申请时间", dataIndex: "todo6" },
|
{ title: "申请时间", dataIndex: "applyTime" },
|
||||||
{
|
{
|
||||||
title: "审批状态",
|
title: "审批状态",
|
||||||
dataIndex: "auditFlag",
|
dataIndex: "auditFlag",
|
||||||
|
|
@ -186,7 +186,7 @@ const ReviewModalComponent = (props) => {
|
||||||
items: [{ bianma: "2", name: "通过" }, { bianma: "3", name: "不通过" }],
|
items: [{ bianma: "2", name: "通过" }, { bianma: "3", name: "不通过" }],
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
name: "todo2",
|
name: "reasonsRefusal",
|
||||||
label: "驳回原因",
|
label: "驳回原因",
|
||||||
render: FORM_ITEM_RENDER_ENUM.TEXTAREA,
|
render: FORM_ITEM_RENDER_ENUM.TEXTAREA,
|
||||||
dependencies: ["auditFlag"],
|
dependencies: ["auditFlag"],
|
||||||
|
|
@ -231,16 +231,16 @@ const InfoModalComponent = (props) => {
|
||||||
bordered
|
bordered
|
||||||
styles={{ label: { width: 200 } }}
|
styles={{ label: { width: 200 } }}
|
||||||
items={[
|
items={[
|
||||||
{ label: "相关方名称", children: info.todo1 },
|
{ label: "相关方名称", children: info.applyCorpName },
|
||||||
{ label: "项目名称", children: info.projectName },
|
{ label: "项目名称", children: info.projectName },
|
||||||
{
|
{
|
||||||
label: "区域范围",
|
label: "区域范围",
|
||||||
children: info.gateLevelAuthArea && JSON.parse(info.gateLevelAuthArea).area.map(item => item.value).join("、"),
|
children: info.gateLevelAuthArea && JSON.parse(info.gateLevelAuthArea).area.map(item => item.value).join("、"),
|
||||||
},
|
},
|
||||||
{ label: "访问期限", children: `${info.visitStartTime}至${info.visitEndTime}` },
|
{ label: "访问期限", children: `${info.visitStartTime}至${info.visitEndTime}` },
|
||||||
{ label: "项目人员数", children: info.todo5 },
|
{ label: "项目人员数", children: info.personApplyCount },
|
||||||
{ label: "申请时间", children: info.todo6 },
|
{ label: "申请时间", children: info.applyTime },
|
||||||
{ label: "申请状态", children: info.todo7 },
|
{ label: "申请状态", children: getLabelName({ list: STATUS_ENUM, status: info.auditFlag })},
|
||||||
{ label: "申请人签字", children: (<PreviewImg files={info.informSignFile} />) },
|
{ label: "申请人签字", children: (<PreviewImg files={info.informSignFile} />) },
|
||||||
]}
|
]}
|
||||||
/>
|
/>
|
||||||
|
|
@ -249,9 +249,9 @@ const InfoModalComponent = (props) => {
|
||||||
options={false}
|
options={false}
|
||||||
disabledResizer={true}
|
disabledResizer={true}
|
||||||
columns={[
|
columns={[
|
||||||
{ title: "姓名", dataIndex: "todo1" },
|
{ title: "姓名", dataIndex: "employeePersonUserName" },
|
||||||
{ title: "部门", dataIndex: "todo2" },
|
{ title: "部门", dataIndex: "personDepartmentName" },
|
||||||
{ title: "是否培训", dataIndex: "todo3" },
|
// { title: "是否培训", dataIndex: "todo3" },
|
||||||
]}
|
]}
|
||||||
{...tableProps}
|
{...tableProps}
|
||||||
/>
|
/>
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue