流程保存时评审结论必填

src/view/Manage/Model/Component/EditModel.jsx

@@ -351,7 +351,7 @@ const EditModel = (props) => {
   const onExportCancel = (val) => {
     setExportParams({ visible: false })
 
-    let _id = (approvalId) ? currentApprovalModelId : modelerData?.id
+    let _id = modelerData?.id
 
     if (val === 'ddl') {
       setExportDDLParams({ visible: true })
@@ -701,7 +701,7 @@ const EditModel = (props) => {
         <ExportDDLModel
           {...exportDDLParams}
           reference='exportDDL'
-          ids={(approvalId) ? [currentApprovalModelId] : [modelerData?.id]}
+          ids={[modelerData?.id]}
           names={[modelerData?.name]} 
           onCancel={() => {
             setExportDDLParams({
@@ -773,11 +773,18 @@ const PhysicalModelApprovalBottom = ({ loading, type, data, id, onChange, onOk,
   }
 
   const onOkClick = () => {
-    setWaiting(true);
+    if (
+      (type==='design'&&(item?.designReviewPass===null||item?.designReviewPass===undefined))
+      || (type==='rule'&&(item?.standardReviewPass===null||item?.standardReviewPass===undefined))
+    ) {
+      showMessage('warn', '请先选择评审结论')
+      return
+    }
 
     let newModelInfoList = [...data?.modelInfoList??[]];
     (newModelInfoList??[]).splice(index, 1, item);
     
+    setWaiting(true);
     dispatch({
       type: 'datamodel.updatePhysicalModelApproval',
       payload: {

src/view/Manage/ModelReview/index.jsx

@@ -51,8 +51,9 @@ const FC = (props) => {
     })
   }
 
-  const onSaveClick = () => {
+  const onSaveClick = async () => {
     try {
+      await listRef.current?.validate()
       const tableData = listRef.current?.tableData
       console.log('table data', tableData)
       setWaiting(true)
@@ -127,7 +128,19 @@ const FC = (props) => {
             <Descriptions.Item label="当前环节">{type==='design'?'设计评审':'规范评审'}</Descriptions.Item>
             <Descriptions.Item label="送审时间">{data?.createdTs?new Date(data?.createdTs).toLocaleString():''}</Descriptions.Item>
             <Descriptions.Item label="送审说明">{data?.sendReviewExplain}</Descriptions.Item>
-            <Descriptions.Item label="附件">{<AttachesItem readOnly value={data?.fileList} />}</Descriptions.Item>
+            <Descriptions.Item label="附件">
+              <Space>
+              {
+                (data?.fileList??[]).map(item => (
+                  <a key={item.id} onClick={() => {
+                    window.open(`/api/datamodeler/file/download?id=${item.id}`)
+                  }}>
+                    {item.fileName}
+                  </a>
+                ))
+              }
+              </Space>
+            </Descriptions.Item>
           </Descriptions>
         </div>
         <div className='my-5'>