diff --git a/jjb.config.js b/jjb.config.js
index f757efb..afb0aa2 100644
--- a/jjb.config.js
+++ b/jjb.config.js
@@ -20,7 +20,7 @@ module.exports = {
},
},
// 应用唯一标识符
- appIdentifier: "primeport",
+ appIdentifier: "primeport-h5",
// 应用上下文注入全局变量
contextInject: {
// 应用Key
diff --git a/src/api/temporaryPersonnel/index.js b/src/api/temporaryPersonnel/index.js
index ff58b90..10d39c4 100644
--- a/src/api/temporaryPersonnel/index.js
+++ b/src/api/temporaryPersonnel/index.js
@@ -2,7 +2,7 @@ import { declareRequest } from "@cqsjjb/jjb-dva-runtime";
export const temporaryPersonnelList = declareRequest(
"temporaryPersonnelLoading",
- `Post > @/primeport/personApply/xgfPersonAuditList`,
+ `Post > @/primeport/personApply/pendingApprovalList`,
);
export const temporaryPersonnelAdd = declareRequest(
"temporaryPersonnelLoading",
diff --git a/src/pages/Container/Supervision/FirstLevelDoor/PortEntryApproval/TemporaryVisitor/TemporaryPersonnel/List/index.js b/src/pages/Container/Supervision/FirstLevelDoor/PortEntryApproval/TemporaryVisitor/TemporaryPersonnel/List/index.js
index 3e16294..184e972 100644
--- a/src/pages/Container/Supervision/FirstLevelDoor/PortEntryApproval/TemporaryVisitor/TemporaryPersonnel/List/index.js
+++ b/src/pages/Container/Supervision/FirstLevelDoor/PortEntryApproval/TemporaryVisitor/TemporaryPersonnel/List/index.js
@@ -32,7 +32,9 @@ function List(props) {
const [form] = Search.useForm();
const { tableProps, getData } = useTable(props["temporaryPersonnelList"], {
form,
- params: { processOrRecord: !props.isRecords ? 1 : 2 },
+ params: {
+ personBelongType: 4,
+ processOrRecord: !props.isRecords ? 1 : 2 },
});
const getFirstLevelDoorInfoListAll = async () => {
@@ -49,12 +51,12 @@ function List(props) {
form={form}
onFinish={getData}
options={[
- { name: "todo1", label: "访问人姓名" },
- { name: "todo2", label: "访问开始时间" },
- { name: "todo3", label: "访问结束时间" },
+ { name: "employeePersonUserName", label: "访问人姓名" },
+ { name: "visitStartTime", label: "访问开始时间" },
+ { name: "visitEndTime", label: "访问结束时间" },
{ name: "auditFlag", label: "审批状态", render: FORM_ITEM_RENDER_ENUM.SELECT, items: STATUS_ENUM },
{
- name: "todo5",
+ name: "mkmjId",
label: "访问口门名称",
render: FORM_ITEM_RENDER_ENUM.SELECT,
items: firstLevelDoorInfoListAll,
@@ -90,9 +92,9 @@ function List(props) {
)}
columns={[
- { title: "访问人姓名", dataIndex: "todo1" },
- { title: "手机号", dataIndex: "todo2" },
- { title: "身份证号", dataIndex: "todo3" },
+ { title: "访问人姓名", dataIndex: "employeePersonUserName" },
+ { title: "手机号", dataIndex: "userPhone" },
+ { title: "身份证号", dataIndex: "userCard" },
{ title: "来访事由", dataIndex: "reasonVisit" },
{ title: "访问开始时间", dataIndex: "visitStartTime" },
{ title: "访问结束时间", dataIndex: "visitEndTime" },
@@ -117,17 +119,17 @@ function List(props) {
查看
)}
- {props.permission(props.auditInfoBtn || "jgd-entry-temp-personnel-audit-info") && (
-
- )}
+ {/*{props.permission(props.auditInfoBtn || "jgd-entry-temp-personnel-audit-info") && (*/}
+ {/* */}
+ {/*)}*/}
{(!props.isRecords && record.currentUserCanAudit === 1 && props.permission(props.auditBtn || "jgd-entry-temp-personnel-audit")) && (