fix
parent
b573b0947f
commit
2c4344b69a
|
|
@ -1,11 +1,2 @@
|
||||||
export {};
|
export {};
|
||||||
|
|
||||||
// export const riskList = declareRequest(
|
|
||||||
// "loading",
|
|
||||||
// "Post > @/xxx",
|
|
||||||
// "dataSource: [] | res.data || [] & total: 0 | res.totalCount || 0 & pageIndex: 1 | res.pageIndex || 1 & pageSize: 10 | res.pageSize || 10",
|
|
||||||
// );
|
|
||||||
// export const riskDelete = declareRequest(
|
|
||||||
// "loading",
|
|
||||||
// "Delete > @/xxx/{id}",
|
|
||||||
// );
|
|
||||||
|
|
|
||||||
|
|
@ -41,8 +41,8 @@ export const REGISTERED_ORG_FILING_TYPE_SEARCH_OPTIONS = [
|
||||||
/** 监管端已备案机构 - 备案状态搜索(1=已备案,2=未备案) */
|
/** 监管端已备案机构 - 备案状态搜索(1=已备案,2=未备案) */
|
||||||
export const REGISTERED_ORG_FILING_RECORD_STATUS_OPTIONS = [
|
export const REGISTERED_ORG_FILING_RECORD_STATUS_OPTIONS = [
|
||||||
|
|
||||||
{ label: "已备案", value: "1" },
|
{ label: "已备案", value: 1 },
|
||||||
{ label: "未备案", value: "2" },
|
{ label: "未备案", value: 2 },
|
||||||
];
|
];
|
||||||
|
|
||||||
/** 备案状态(机构信息) */
|
/** 备案状态(机构信息) */
|
||||||
|
|
|
||||||
|
|
@ -21,11 +21,11 @@ import {
|
||||||
CHONGQING_DISTRICTS,
|
CHONGQING_DISTRICTS,
|
||||||
ENTERPRISE_SCALE_OPTIONS,
|
ENTERPRISE_SCALE_OPTIONS,
|
||||||
ENTERPRISE_STATUS_OPTIONS,
|
ENTERPRISE_STATUS_OPTIONS,
|
||||||
FILING_RECORD_STATUS_OPTIONS,
|
REGISTERED_ORG_FILING_RECORD_STATUS_OPTIONS,
|
||||||
REGISTERED_ORG_FILING_TYPE_SEARCH_OPTIONS,
|
REGISTERED_ORG_FILING_TYPE_SEARCH_OPTIONS,
|
||||||
} from "~/enumerate/enterpriseOptions";
|
} from "~/enumerate/enterpriseOptions";
|
||||||
import { NS_ORG_INFO } from "~/enumerate/namespace";
|
import { NS_ORG_INFO } from "~/enumerate/namespace";
|
||||||
import { mockUploadFileList } from "~/utils/mockUpload";
|
|
||||||
import {
|
import {
|
||||||
coordinatePairRule,
|
coordinatePairRule,
|
||||||
creditCodeRule,
|
creditCodeRule,
|
||||||
|
|
@ -57,7 +57,9 @@ function OrgInfoPage(props) {
|
||||||
productionDate: res.data.productionDate
|
productionDate: res.data.productionDate
|
||||||
? dayjs(res.data.productionDate)
|
? dayjs(res.data.productionDate)
|
||||||
: undefined,
|
: undefined,
|
||||||
attachmentUrls: res.data.attachmentUrls? JSON.parse(res.data.attachmentUrls) :null,
|
attachmentUrls: res.data.attachmentUrls
|
||||||
|
? JSON.parse(res.data.attachmentUrls)
|
||||||
|
: null,
|
||||||
});
|
});
|
||||||
setHasExistingData(true);
|
setHasExistingData(true);
|
||||||
setEditing(false);
|
setEditing(false);
|
||||||
|
|
@ -79,7 +81,7 @@ function OrgInfoPage(props) {
|
||||||
}, []);
|
}, []);
|
||||||
|
|
||||||
const handleCancelEdit = () => {
|
const handleCancelEdit = () => {
|
||||||
setEditing(false);
|
setEditing(false);
|
||||||
};
|
};
|
||||||
|
|
||||||
const handleSave = async (submitType) => {
|
const handleSave = async (submitType) => {
|
||||||
|
|
@ -90,7 +92,9 @@ function OrgInfoPage(props) {
|
||||||
productionDate: formValues.productionDate
|
productionDate: formValues.productionDate
|
||||||
? dayjs(formValues.productionDate).format("YYYY-MM-DD")
|
? dayjs(formValues.productionDate).format("YYYY-MM-DD")
|
||||||
: undefined,
|
: undefined,
|
||||||
attachmentUrls: formValues.attachmentUrls? JSON.stringify(formValues.attachmentUrls) :null,
|
attachmentUrls: formValues.attachmentUrls
|
||||||
|
? JSON.stringify(formValues.attachmentUrls)
|
||||||
|
: null,
|
||||||
infoDisclosureUrl: formValues.infoDisclosureUrl
|
infoDisclosureUrl: formValues.infoDisclosureUrl
|
||||||
? normalizeUrl(formValues.infoDisclosureUrl)
|
? normalizeUrl(formValues.infoDisclosureUrl)
|
||||||
: undefined,
|
: undefined,
|
||||||
|
|
@ -120,7 +124,7 @@ function OrgInfoPage(props) {
|
||||||
setEditing(false);
|
setEditing(false);
|
||||||
loadDetail();
|
loadDetail();
|
||||||
}
|
}
|
||||||
} finally {
|
} finally {
|
||||||
setSubmitting(false);
|
setSubmitting(false);
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
|
|
@ -289,7 +293,9 @@ function OrgInfoPage(props) {
|
||||||
name="legalRepresentativePhone"
|
name="legalRepresentativePhone"
|
||||||
label="法定代表人联系电话"
|
label="法定代表人联系电话"
|
||||||
rules={[phoneRule("法定代表人联系电话", false)]}
|
rules={[phoneRule("法定代表人联系电话", false)]}
|
||||||
normalize={(value) => (typeof value === "string" ? value.trim() : value)}
|
normalize={(value) =>
|
||||||
|
typeof value === "string" ? value.trim() : value
|
||||||
|
}
|
||||||
>
|
>
|
||||||
<Input placeholder="请输入法定代表人联系电话" allowClear />
|
<Input placeholder="请输入法定代表人联系电话" allowClear />
|
||||||
</Form.Item>
|
</Form.Item>
|
||||||
|
|
@ -308,7 +314,9 @@ function OrgInfoPage(props) {
|
||||||
name="principalPhone"
|
name="principalPhone"
|
||||||
label="主要负责人联系电话"
|
label="主要负责人联系电话"
|
||||||
rules={[phoneRule("主要负责人联系电话", true)]}
|
rules={[phoneRule("主要负责人联系电话", true)]}
|
||||||
normalize={(value) => (typeof value === "string" ? value.trim() : value)}
|
normalize={(value) =>
|
||||||
|
typeof value === "string" ? value.trim() : value
|
||||||
|
}
|
||||||
>
|
>
|
||||||
<Input placeholder="请输入主要负责人联系电话" allowClear />
|
<Input placeholder="请输入主要负责人联系电话" allowClear />
|
||||||
</Form.Item>
|
</Form.Item>
|
||||||
|
|
@ -323,7 +331,9 @@ function OrgInfoPage(props) {
|
||||||
name="safetyDeptManagerPhone"
|
name="safetyDeptManagerPhone"
|
||||||
label="安全管理部门负责人联系电话"
|
label="安全管理部门负责人联系电话"
|
||||||
rules={[phoneRule("安全管理部门负责人联系电话", false)]}
|
rules={[phoneRule("安全管理部门负责人联系电话", false)]}
|
||||||
normalize={(value) => (typeof value === "string" ? value.trim() : value)}
|
normalize={(value) =>
|
||||||
|
typeof value === "string" ? value.trim() : value
|
||||||
|
}
|
||||||
>
|
>
|
||||||
<Input
|
<Input
|
||||||
placeholder="请输入安全管理部门负责人联系电话"
|
placeholder="请输入安全管理部门负责人联系电话"
|
||||||
|
|
@ -341,7 +351,9 @@ function OrgInfoPage(props) {
|
||||||
name="safetyDeputyPhone"
|
name="safetyDeputyPhone"
|
||||||
label="主管安全副总联系电话"
|
label="主管安全副总联系电话"
|
||||||
rules={[phoneRule("主管安全副总联系电话", false)]}
|
rules={[phoneRule("主管安全副总联系电话", false)]}
|
||||||
normalize={(value) => (typeof value === "string" ? value.trim() : value)}
|
normalize={(value) =>
|
||||||
|
typeof value === "string" ? value.trim() : value
|
||||||
|
}
|
||||||
>
|
>
|
||||||
<Input placeholder="请输入主管安全副总联系电话" allowClear />
|
<Input placeholder="请输入主管安全副总联系电话" allowClear />
|
||||||
</Form.Item>
|
</Form.Item>
|
||||||
|
|
@ -364,7 +376,9 @@ function OrgInfoPage(props) {
|
||||||
name="infoDisclosureUrl"
|
name="infoDisclosureUrl"
|
||||||
label="信息公开网址"
|
label="信息公开网址"
|
||||||
rules={[urlRule("信息公开网址", false)]}
|
rules={[urlRule("信息公开网址", false)]}
|
||||||
normalize={(value) => (typeof value === "string" ? value.trim() : value)}
|
normalize={(value) =>
|
||||||
|
typeof value === "string" ? value.trim() : value
|
||||||
|
}
|
||||||
>
|
>
|
||||||
<Input placeholder="请输入信息公开网址" allowClear />
|
<Input placeholder="请输入信息公开网址" allowClear />
|
||||||
</Form.Item>
|
</Form.Item>
|
||||||
|
|
@ -444,22 +458,30 @@ function OrgInfoPage(props) {
|
||||||
</Form.Item>
|
</Form.Item>
|
||||||
</Col>
|
</Col>
|
||||||
<Col span={12}>
|
<Col span={12}>
|
||||||
<Form.Item name="filingTypeName" label="备案类型">
|
<Form.Item name="filingTypeCode" label="备案类型">
|
||||||
<Select
|
<Select
|
||||||
options={REGISTERED_ORG_FILING_TYPE_SEARCH_OPTIONS}
|
options={REGISTERED_ORG_FILING_TYPE_SEARCH_OPTIONS}
|
||||||
placeholder="请选择备案类型"
|
placeholder="请选择备案类型"
|
||||||
allowClear
|
allowClear
|
||||||
|
onChange={(value, option)=>{
|
||||||
|
form.setFieldValue("filingTypeName", option?.label);
|
||||||
|
}}
|
||||||
/>
|
/>
|
||||||
</Form.Item>
|
</Form.Item>
|
||||||
|
<Form.Item name="filingTypeName" noStyle />
|
||||||
</Col>
|
</Col>
|
||||||
<Col span={12}>
|
<Col span={12}>
|
||||||
<Form.Item name="filingRecordStatusName" label="备案状态">
|
<Form.Item name="filingRecordStatusCode" label="备案状态">
|
||||||
<Select
|
<Select
|
||||||
options={FILING_RECORD_STATUS_OPTIONS}
|
options={REGISTERED_ORG_FILING_RECORD_STATUS_OPTIONS}
|
||||||
placeholder="请选择备案状态"
|
placeholder="请选择备案状态"
|
||||||
allowClear
|
allowClear
|
||||||
|
onChange={(value, option)=>{
|
||||||
|
form.setFieldValue("filingRecordStatusName", option?.label || "");
|
||||||
|
}}
|
||||||
/>
|
/>
|
||||||
</Form.Item>
|
</Form.Item>
|
||||||
|
<Form.Item name="filingRecordStatusName" noStyle />
|
||||||
</Col>
|
</Col>
|
||||||
<Col span={12}>
|
<Col span={12}>
|
||||||
<AttachmentUpload name="attachmentUrls" label="上传附件" />
|
<AttachmentUpload name="attachmentUrls" label="上传附件" />
|
||||||
|
|
|
||||||
|
|
@ -17,8 +17,8 @@ function OrgEquipmentSelectModalInner(props) {
|
||||||
const values = searchForm.getFieldsValue();
|
const values = searchForm.getFieldsValue();
|
||||||
const res = await props.equipInfoList({
|
const res = await props.equipInfoList({
|
||||||
current: page,
|
current: page,
|
||||||
pageSize,
|
size: pageSize,
|
||||||
likeDeviceName: values.deviceName || undefined,
|
deviceName: values.deviceName || undefined,
|
||||||
});
|
});
|
||||||
if (res?.success !== false) {
|
if (res?.success !== false) {
|
||||||
setDataSource(res?.data || []);
|
setDataSource(res?.data || []);
|
||||||
|
|
@ -76,6 +76,7 @@ function OrgEquipmentSelectModalInner(props) {
|
||||||
rowKey="id"
|
rowKey="id"
|
||||||
loading={loading}
|
loading={loading}
|
||||||
dataSource={dataSource}
|
dataSource={dataSource}
|
||||||
|
scroll={ { y: 400 }}
|
||||||
rowSelection={{
|
rowSelection={{
|
||||||
selectedRowKeys,
|
selectedRowKeys,
|
||||||
onChange: setSelectedRowKeys,
|
onChange: setSelectedRowKeys,
|
||||||
|
|
|
||||||
|
|
@ -19,8 +19,8 @@ function OrgPersonnelSelectModalInner(props) {
|
||||||
const values = searchForm.getFieldsValue();
|
const values = searchForm.getFieldsValue();
|
||||||
const res = await props.staffInfoList({
|
const res = await props.staffInfoList({
|
||||||
current: page,
|
current: page,
|
||||||
pageSize,
|
size: pageSize,
|
||||||
likeStaffName: values.staffName || undefined,
|
userName: values.staffName || undefined,
|
||||||
});
|
});
|
||||||
if (res?.success !== false) {
|
if (res?.success !== false) {
|
||||||
setDataSource(res?.data || []);
|
setDataSource(res?.data || []);
|
||||||
|
|
@ -68,7 +68,7 @@ function OrgPersonnelSelectModalInner(props) {
|
||||||
>
|
>
|
||||||
<Form form={searchForm} layout="inline" style={{ marginBottom: 16 }}>
|
<Form form={searchForm} layout="inline" style={{ marginBottom: 16 }}>
|
||||||
<Form.Item name="staffName">
|
<Form.Item name="staffName">
|
||||||
<Input placeholder="关键字搜索" allowClear />
|
<Input placeholder="人员姓名搜索" allowClear />
|
||||||
</Form.Item>
|
</Form.Item>
|
||||||
<Form.Item>
|
<Form.Item>
|
||||||
<Button type="primary" onClick={handleSearch}>搜索</Button>
|
<Button type="primary" onClick={handleSearch}>搜索</Button>
|
||||||
|
|
@ -92,6 +92,7 @@ function OrgPersonnelSelectModalInner(props) {
|
||||||
showTotal: (t) => `共 ${t} 条`,
|
showTotal: (t) => `共 ${t} 条`,
|
||||||
onChange: (page, pageSize) => getData(page, pageSize),
|
onChange: (page, pageSize) => getData(page, pageSize),
|
||||||
}}
|
}}
|
||||||
|
scroll={ { y: 400 }}
|
||||||
columns={[
|
columns={[
|
||||||
{ title: "人员姓名", dataIndex: "userName" },
|
{ title: "人员姓名", dataIndex: "userName" },
|
||||||
{ title: "类型", dataIndex: "personTypeName" },
|
{ title: "类型", dataIndex: "personTypeName" },
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue