cq_anquan
/
safety-eval-service-frontend
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix

dev-tmp1
tangjie 2026-08-18 18:42:55 +08:00
parent 58d0253691
commit 616be6c8d8
4 changed files with 338 additions and 328 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
jjb.config.js
View File

@ -12,9 +12,9 @@ module.exports = {
// 可通过环境变量覆盖: SAFETY_EVAL_API_HOST=http://192.168.x.x:8095 // 可通过环境变量覆盖: SAFETY_EVAL_API_HOST=http://192.168.x.x:8095
//API_HOST: "http://localhost:80", //API_HOST: "http://localhost:80",
API_HOST: "http://192.168.0.134", // API_HOST: "http://192.168.0.134",
// API_HOST: "http://192.168.0.150", //太浅 // API_HOST: "http://192.168.0.150", //太浅
// API_HOST: "https://gbs-gateway.qhdsafety.com", API_HOST: "https://gbs-gateway.qhdsafety.com",
//API_HOST: "http://192.168.0.103", //huwei //API_HOST: "http://192.168.0.103", //huwei
}, },
production: { production: {

33
src/pages/Container/EnterpriseInfo/PersonnelInfo/List/index.js
View File

@ -16,6 +16,7 @@ import {
TreeSelect, TreeSelect,
Upload, Upload,
Tag, Tag,
Divider
} from "antd"; } from "antd";
import { InboxOutlined } from "@ant-design/icons"; import { InboxOutlined } from "@ant-design/icons";
import { Get } from "@cqsjjb/jjb-common-lib/http"; import { Get } from "@cqsjjb/jjb-common-lib/http";
@ -1075,14 +1076,10 @@ function StaffFormModal({
)} )}
</Form.List> </Form.List>
</Form.Item> </Form.Item>
</div>
</Col>
</Row>
<Row gutter={16}> <Row gutter={16}>
<Col span={24}> <Col span={24}>
<div className="register-engineer-section"> <Divider plain >学历信息</Divider>
<div className="register-engineer-section-title">学历信息</div>
<Row gutter={16}> <Row gutter={16}>
<Col span={12}> <Col span={12}>
<Form.Item name="educationTypeCode" label="学历类型"> <Form.Item name="educationTypeCode" label="学历类型">
@ -1162,13 +1159,12 @@ function StaffFormModal({
/> />
</Col> </Col>
</Row> </Row>
</div>
</Col> </Col>
</Row> </Row>
<Row gutter={16}> <Row gutter={16}>
<Col span={24}> <Col span={24}>
<div className="register-engineer-section"> <Divider plain >注安信息</Divider>
<div className="register-engineer-section-title">注安信息</div>
<Row gutter={16}> <Row gutter={16}>
<Col span={12}> <Col span={12}>
<Form.Item <Form.Item
@ -1287,13 +1283,13 @@ function StaffFormModal({
</> </>
)} )}
</Row> </Row>
</div>
</Col> </Col>
</Row> </Row>
<Row gutter={16}> <Row gutter={16}>
<Col span={24}> <Col span={24}>
<div className="register-engineer-section"> <Divider plain >评价师信息</Divider>
<div className="register-engineer-section-title">评价师信息</div>
<Row gutter={16}> <Row gutter={16}>
<Col span={12}> <Col span={12}>
<Form.Item <Form.Item
@ -1352,14 +1348,14 @@ function StaffFormModal({
</> </>
)} )}
</Row> </Row>
</div>
</Col> </Col>
</Row> </Row>
<Row gutter={16}> <Row gutter={16}>
<Col span={24}> <Col span={24}>
<div className="register-engineer-section"> <Divider plain >职称信息</Divider>
<div className="register-engineer-section-title">职称信息</div>
<Row gutter={16}> <Row gutter={16}>
<Col span={12}> <Col span={12}>
<Form.Item <Form.Item
@ -1398,9 +1394,14 @@ function StaffFormModal({
/> />
</Col> </Col>
</Row> </Row>
</div>
</Col> </Col>
</Row> </Row>
</div>
</Col>
</Row>
</Form> </Form>
</Modal> </Modal>
); );

4
src/pages/Container/EnterpriseInfo/QualificationCert/index.js
View File

@ -318,8 +318,8 @@ function CertFormModal({
const handleSubmit = async (values) => { const handleSubmit = async (values) => {
try { try {
setSubmitting(true); setSubmitting(true);
values.validStartDate = values.validDate?.[0]; values.validStartDate = values.validDate?.[0]?.format("YYYY-MM-DD");
values.validEndDate = values.validDate?.[1]; values.validEndDate = values.validDate?.[1]?.format("YYYY-MM-DD");
values.certImageUrl = Array.isArray(values.certImageUrl) ? values.certImageUrl.map((item) => item.url).join(",") : values.certImageUrl; values.certImageUrl = Array.isArray(values.certImageUrl) ? values.certImageUrl.map((item) => item.url).join(",") : values.certImageUrl;
if (currentId) values.id = currentId; if (currentId) values.id = currentId;

23
src/pages/Container/SafetyEvalBusiness/ProjectFlow/ControlContent.js
View File

@ -7,6 +7,7 @@ import {
Input, Input,
Flex, Flex,
Typography, Typography,
Image,
message, message,
Collapse, Collapse,
} from "antd"; } from "antd";
@ -229,6 +230,12 @@ const ControlContent = ({ readOnly, ...props }) => {
pagination={false} pagination={false}
size="small" size="small"
/> />
{processControl?.reviewerSignatureUrl && <div style={{ marginTop: 12 }}>
<div style={{ marginBottom: 4, fontSize: 14, color: "#475569" }}>
签字图片
</div>
<Image src={processControl?.reviewerSignatureUrl} width={120} height={80} />
</div>}
<Collapse <Collapse
style={{ marginTop: 12 }} style={{ marginTop: 12 }}
items={[ items={[
@ -323,12 +330,8 @@ const ControlContent = ({ readOnly, ...props }) => {
/> />
</div> </div>
<Flex
justify="space-between" <Flex gap={8} align="flex-end" style={{ marginBottom: 16 }}>
align="center"
style={{ paddingBottom: 16 }}
>
<Flex gap={8} align="center">
<Typography.Text type="secondary"> <Typography.Text type="secondary">
评价机构负责人 评价机构负责人
</Typography.Text> </Typography.Text>
@ -357,8 +360,14 @@ const ControlContent = ({ readOnly, ...props }) => {
> >
{isDispatched ? "过程控制审核暂未完成" : OrgHeadSignatureTaskStatusMap[processControl?.orgHeadSignatureTaskStatus]} {isDispatched ? "过程控制审核暂未完成" : OrgHeadSignatureTaskStatusMap[processControl?.orgHeadSignatureTaskStatus]}
</Button> </Button>
{processControl?.orgHeadSignatureUrl&& <Flex align="flex-end" gap={3}>
<span >
签字图片
</span>
<Image src={processControl?.orgHeadSignatureUrl} width={120} height={80} />
</Flex>}
</Flex> </Flex>
</Flex>
</div> </div>
</Card> </Card>
)} )}