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-27 16:09:59 +08:00
parent 78bfbee04b
commit a31d7e3115
5 changed files with 13 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/pages/Container/SafetyEvalBusiness/EvalProject/Create/index.js
View File

@ -277,14 +277,14 @@ const EvalProjectCreate = (props) => {
<Col span={12}>
<Form.Item
name="planStartDate"
label="项目开始时间"
label="合同开始时间"
rules={[
{ required: true, message: "请选择项目开始时间" },
{ required: true, message: "请选择合同开始时间" },
{
validator: (_, value) => {
const end = form.getFieldValue("planEndDate");
if (value && end && value.isAfter(end)) {
return Promise.reject("项目开始时间不能晚于项目完成时间");
return Promise.reject("合同开始时间不能晚于合同完成时间");
}
return Promise.resolve();
},
@ -302,14 +302,14 @@ const EvalProjectCreate = (props) => {
<Col span={12}>
<Form.Item
name="planEndDate"
label="项目完成时间"
label="合同完成时间"
rules={[
{ required: true, message: "请选择项目完成时间" },
{ required: true, message: "请选择合同完成时间" },
{
validator: (_, value) => {
const start = form.getFieldValue("planStartDate");
if (value && start && value.isBefore(start)) {
return Promise.reject("项目完成时间不能早于项目开始时间");
return Promise.reject("合同完成时间不能早于合同开始时间");
}
return Promise.resolve();
},

4
src/pages/Container/SafetyEvalBusiness/EvalProject/List/index.js
View File

@ -102,8 +102,8 @@ const EvalProject = (props) => {
},
{ title: "项目负责人", dataIndex: "projectLeaderName", width: 120 },
{ title: "客户负责人", dataIndex: "customerContactName", width: 120 },
{ title: "项目开始时间", dataIndex: "planStartDate", width: 120 },
{ title: "项目结束时间", dataIndex: "planEndDate", width: 120 },
{ title: "合同开始时间", dataIndex: "planStartDate", width: 120 },
{ title: "合同结束时间", dataIndex: "planEndDate", width: 120 },
{
title: "项目阶段",
dataIndex: "projectPhaseName",

4
src/pages/Container/SafetyEvalBusiness/MyProject/index.js
View File

@ -92,8 +92,8 @@ const MyProject = (props) => {
},
{ title: "项目负责人", dataIndex: "projectLeaderName", width: 100 },
{ title: "项目开始时间", dataIndex: "planStartDate", width: 120 },
{ title: "项目结束时间", dataIndex: "planEndDate", width: 120 },
{ title: "合同开始时间", dataIndex: "planStartDate", width: 120 },
{ title: "合同结束时间", dataIndex: "planEndDate", width: 120 },
{
title: "项目阶段", dataIndex: "projectPhaseName", width: 100,
render: (phase) => {

2
src/pages/Container/SafetyEvalBusiness/ProjectFlow/ContractContent.js
View File

@ -16,6 +16,7 @@ import {
} from "antd";
import dayjs from "dayjs";
import {PROJECT_TYPE_OPTIONS ,EVAL_TYPE_OPTIONS} from '~/enumerate/constant';
import {QUALIFICATION_INDUSTRY_OPTIONS_MAP} from '~/enumerate/enterpriseOptions';
import { Connect } from "@cqsjjb/jjb-dva-runtime";
import { NS_SAFETY_EVAL_BUSINESS } from "~/enumerate/namespace";
import { district } from "~/enumerate/constant";
@ -85,6 +86,7 @@ const ContractContent = ({ readOnly, ...props }) => {
legalPerson: customerRes.data.legalRepresentative,
contactName: customerRes.data.principalName,
contactPhone: customerRes.data.principalPhone,
businessScope: evalProjectDetailData.industryCode? evalProjectDetailData.industryCode.split(',').map(item=>QUALIFICATION_INDUSTRY_OPTIONS_MAP[item]).join(';'): ''
});
}
}

2
src/pages/Container/WpsEditor/index.js
View File

@ -59,7 +59,7 @@ const App = (props) => {
await sdkRef.current.save();
// 完成报告编制：将 REPORT_PREPARATION 节点置为已完成，提交内审
const res = await props.evalReportCompletePreparation({
data: { projectId: router.query.id },
projectId: router.query.id ,
});
if (res?.success !== false) {
message.success("报告编制已完成，已提交内审");