Merge branch 'master' of http://47.92.113.182:3000/zcloud_gbs/zcloud-gbs-primeport-react
commit
73dfb213a0
|
|
@ -35,7 +35,7 @@ function Add(props) {
|
|||
const signatureUrl = useRef("");
|
||||
|
||||
const getXgfProjectListAll = async () => {
|
||||
const { data } = await props["xgfProjectListAll"]();
|
||||
const { data } = await props["xgfProjectListAll"]({betweenProjectTime :1 });
|
||||
setXgfProjectListAll(data);
|
||||
};
|
||||
|
||||
|
|
|
|||
|
|
@ -205,7 +205,7 @@ const ViewModalComponent = (props) => {
|
|||
label: "区域范围",
|
||||
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.personApplyList?.length },
|
||||
{ label: "申请时间", children: info.applyTime },
|
||||
{ label: "申请状态", children: getLabelName({ list: ENCLOSED_AREA_AUDIT_STATUS_ENUM, status: info.auditFlag }) },
|
||||
|
|
|
|||
|
|
@ -33,7 +33,7 @@ function Add(props) {
|
|||
const signatureUrl = useRef("");
|
||||
|
||||
const getXgfProjectListAll = async () => {
|
||||
const { data } = await props["xgfProjectListAll"]();
|
||||
const { data } = await props["xgfProjectListAll"]({betweenProjectTime :1 });
|
||||
setXgfProjectListAll(data);
|
||||
};
|
||||
|
||||
|
|
|
|||
|
|
@ -71,7 +71,7 @@ function List(props) {
|
|||
{
|
||||
title: "访问期限",
|
||||
dataIndex: "visitStartTime",
|
||||
render: (_, record) => `${record.visitStartTime}-${record.visitEndTime}`,
|
||||
render: (_, record) =>`${record.visitStartTime}至${record.visitEndTime}`,
|
||||
},
|
||||
{ title: "车辆类型", dataIndex: "vehicleTypeName" },
|
||||
{ title: "车牌类型", dataIndex: "licenceTypeName" },
|
||||
|
|
|
|||
|
|
@ -39,7 +39,7 @@ function Add(props) {
|
|||
};
|
||||
|
||||
const getXgfProjectListAll = async () => {
|
||||
const { data } = await props["xgfProjectListAll"]();
|
||||
const { data } = await props["xgfProjectListAll"]({betweenProjectTime :1 });
|
||||
setXgfProjectListAll(data);
|
||||
};
|
||||
|
||||
|
|
|
|||
|
|
@ -55,7 +55,7 @@ function Add(props) {
|
|||
};
|
||||
|
||||
const getXgfProjectListAll = async () => {
|
||||
const { data } = await props["xgfProjectListAll"]();
|
||||
const { data } = await props["xgfProjectListAll"]({betweenProjectTime :1 });
|
||||
setXgfProjectListAll(data);
|
||||
};
|
||||
|
||||
|
|
|
|||
|
|
@ -62,7 +62,7 @@ function List(props) {
|
|||
<Search
|
||||
labelCol={{ span: 4 }}
|
||||
options={[
|
||||
{ name: "name", label: "姓名" },
|
||||
{ name: "employeePersonUserName", label: "姓名" },
|
||||
{ name: "projectName", label: "项目名称" },
|
||||
]}
|
||||
onFinish={getData}
|
||||
|
|
|
|||
|
|
@ -51,7 +51,8 @@ function List(props) {
|
|||
// },
|
||||
// { name: "employeeVehicleUserName", label: "车辆所属人" },
|
||||
{ name: "licenceNo", label: "车牌号" },
|
||||
// { name: "vehicleType", label: "车辆类型", render: (<DictionarySelect dictValue="VEHICLE_TYPE" />) },
|
||||
{ name: "licenceType", label: "车牌类型", render: (<DictionarySelect dictValue="LICENCE_TYPE" />) },
|
||||
{ name: "vehicleType", label: "车辆类型", render: (<DictionarySelect dictValue="VEHICLE_TYPE" />) },
|
||||
]}
|
||||
form={form}
|
||||
onFinish={getData}
|
||||
|
|
|
|||
|
|
@ -50,7 +50,7 @@ function RelatedVehicles(props) {
|
|||
{
|
||||
dataIndex: "visitStartTime",
|
||||
title: "访问期限",
|
||||
render: (_, record) => record.visitStartTime + record.visitEndTime,
|
||||
render: (_, record) =>`${record.visitStartTime}至${record.visitEndTime}`,
|
||||
},
|
||||
{ dataIndex: "vehicleTypeName", title: "车辆类型" },
|
||||
{ dataIndex: "licenceTypeName", title: "车牌类型" },
|
||||
|
|
@ -154,6 +154,7 @@ const ReviewModalComponent = (props) => {
|
|||
const onSubmit = async (values) => {
|
||||
const { success } = await props["vehicleAuditApproval"]({
|
||||
id: props.id,
|
||||
vehicleApplyId: props.vehicleApplyId,
|
||||
...values,
|
||||
});
|
||||
if (success) {
|
||||
|
|
|
|||
Loading…
Reference in New Issue