diff --git a/jjb.config.js b/jjb.config.js
index 986ebec..40d3b13 100644
--- a/jjb.config.js
+++ b/jjb.config.js
@@ -12,8 +12,8 @@ module.exports = {
// 可通过环境变量覆盖: SAFETY_EVAL_API_HOST=http://192.168.x.x:8095
//API_HOST: "https://gbs-gateway.qhdsafety.com",
- API_HOST: "http://192.168.0.152",
- //API_HOST: "http://192.168.0.150", //太浅
+ //API_HOST: "http://192.168.0.152",
+ API_HOST: "http://192.168.0.150", //太浅
// API_HOST: "http://192.168.0.152",
//API_HOST: "http://192.168.0.103", //huwei
},
diff --git a/src/pages/Container/SafetyEvalBusiness/ProjectDocLibrary/index.js b/src/pages/Container/SafetyEvalBusiness/ProjectDocLibrary/index.js
index 7e31ad5..d843617 100644
--- a/src/pages/Container/SafetyEvalBusiness/ProjectDocLibrary/index.js
+++ b/src/pages/Container/SafetyEvalBusiness/ProjectDocLibrary/index.js
@@ -22,6 +22,7 @@ import { Connect } from "@cqsjjb/jjb-dva-runtime";
import { tools } from "@cqsjjb/jjb-common-lib";
import AttachmentUpload from "~/components/AttachmentUpload";
+import PreviewUrlButton from "~/components/PreviewUrlButton";
const { router } = tools;
@@ -265,13 +266,7 @@ const ProjectDocLibrary = (props) => {
title: "操作",
width: 100,
render: (_, record) => (
-
+
),
},
]}
diff --git a/src/pages/Container/SafetyEvalBusiness/ProjectFlow/ControlContent.js b/src/pages/Container/SafetyEvalBusiness/ProjectFlow/ControlContent.js
index 5bf38d8..31b2b0c 100644
--- a/src/pages/Container/SafetyEvalBusiness/ProjectFlow/ControlContent.js
+++ b/src/pages/Container/SafetyEvalBusiness/ProjectFlow/ControlContent.js
@@ -22,7 +22,7 @@ const ControlContent = (props) => {
// 过程控制审核
const [rows, setRows] = useState([]);
- const [opinionContent, setOpinionContent] = useState("");
+
// 项目归档
const [files, setFiles] = useState([]);
@@ -34,7 +34,7 @@ const ControlContent = (props) => {
const fetchDetail = () => {
props.evalProcessControlDetail({ projectId }).then((res) => {
if (res?.success) {
- setOpinionContent(res?.data?.opinionContent);
+
if (res?.data?.signTaskPersonCo) {
setSelectPeople({
value: res?.data?.signTaskPersonCo?.signerPersonnelId,
@@ -65,8 +65,10 @@ const ControlContent = (props) => {
})),
);
}
+
if (processControl?.opinionContent) {
- setOpinionContent(processControl.opinionContent);
+ setApprovalOpinion(processControl.opinionContent);
+
}
}, [processControlDetail]);
@@ -93,11 +95,15 @@ const ControlContent = (props) => {
// 过程控制签字提交(confirm)
const handleConfirm = async (resultCode) => {
if (!projectId) return;
+ if(!rows.every((r) => r.reviewConclusion)){
+ message.error("请填写所有核查项的结果");
+ return;
+ }
const payload = {
id: processControl?.id,
projectId,
resultCode,
- opinionContent,
+ opinionContent: approvalOpinion,
reviewItems: rows.map((r) => ({
bizType: "eval_process_control",
bizId: processControl?.id,
@@ -151,12 +157,14 @@ const ControlContent = (props) => {
{
title: "结果",
dataIndex: "reviewConclusion",
- width: 120,
+ width: 150,
render: (val, _, idx) => (