累积更新

oa-back/ruoyi-admin/src/main/java/com/ruoyi/web/controller/file/FilesProjectController.java

@@ -183,7 +183,7 @@ public class FilesProjectController extends BaseController {
                 File transferFile = new File( profilePath + "/upload/uploadKmlFiles/" + uploadCpKmlFile.getOriginalFilename());
                 if (!transferFile.exists())
                     uploadCpKmlFile.transferTo(transferFile);
-                cmcProject.setProjectCp(transferFile.getName());
+                cmcProject.setProjectCp("/uploadKmlFiles/" + transferFile.getName());
                 return false;
             }
             else

oa-back/ruoyi-agent/src/main/java/com/ruoyi/agent/service/impl/McpServiceImpl.java

@@ -23,8 +23,11 @@ import io.milvus.v2.service.vector.request.SearchReq;
 import io.milvus.v2.service.vector.request.data.BaseVector;
 import io.milvus.v2.service.vector.request.data.FloatVec;
 import io.milvus.v2.service.vector.response.SearchResp;
-import org.apache.poi.extractor.POITextExtractor;
 import org.apache.poi.extractor.ExtractorFactory;
+import org.apache.poi.extractor.POITextExtractor;
+import org.apache.poi.hwpf.HWPFDocument;
+import org.apache.poi.hwpf.usermodel.Paragraph;
+import org.apache.poi.hwpf.usermodel.Range;
 import org.apache.poi.xwpf.usermodel.*;
 import org.apache.xmlbeans.XmlCursor;
 import org.noear.solon.ai.annotation.ToolMapping;
@@ -76,10 +79,10 @@ public class McpServiceImpl implements IMcpService {
      */
     @PostConstruct
     public void initMilvusClient() {
-        if (milvusServiceUrl == null || milvusServiceUrl.trim().isEmpty()) {
+        if (milvusServiceUrl == null || milvusServiceUrl.isEmpty()) {
             throw new IllegalStateException("Milvus service URL 未配置");
         }
-//        this.milvusClient = new MilvusClientV2(
+//        milvusClient = new MilvusClientV2(
 //                ConnectConfig.builder()
 //                        .uri(milvusServiceUrl)
 //                        .build());
@@ -414,29 +417,299 @@ public class McpServiceImpl implements IMcpService {
      */
     private List<TextSegment> splitDocument(File transferFile) throws IOException {
         // 加载文档
-        Document document;
         InputStream fileInputStream = new FileInputStream(transferFile);
         String filename = transferFile.getName().toLowerCase();
-        if (filename.endsWith(".doc") || filename.endsWith(".docx")) {
-            try (POITextExtractor extractor = ExtractorFactory.createExtractor(fileInputStream)) {
-                String text = extractor.getText();
-                document = Document.from(text);
+        if (filename.endsWith(".docx")) {
+            // 使用XWPFDocument处理DOCX文件，按二级标题分割（二级标题样式为2）
+            List<TextSegment> segments = new ArrayList<>();
+            try (XWPFDocument xwpfDocument = new XWPFDocument(fileInputStream)) {
+                StringBuilder currentLevel2Content = new StringBuilder();
+                boolean inLevel2Section = false;
+
+                for (XWPFParagraph paragraph : xwpfDocument.getParagraphs()) {
+                    String text = paragraph.getText().trim();
+                    if (text.isEmpty()) continue;
+
+                    if (paragraph.getStyle() != null) {
+                        // 二级标题（样式2）开始新的分段
+                        if (paragraph.getStyle().equals("2")) {
+                            // 保存当前二级标题下的内容
+                            if (currentLevel2Content.length() != 0) {
+                                // 检查当前二级标题内容的字节数
+                                int level2Length = currentLevel2Content.toString().getBytes().length;
+                                if (level2Length <= 65535) {
+                                    // 字数不大于65535，按二级标题分割
+                                    TextSegment segment = TextSegment.from(currentLevel2Content.toString());
+                                    segments.add(segment);
+                                } else {
+                                    // 字数大于65535，按三级标题分割
+                                    // 将当前二级标题内容按三级标题重新分割
+                                    StringBuilder currentLevel3Content = new StringBuilder();
+                                    String[] paragraphs = currentLevel2Content.toString().split("\n");
+                                    for (String para : paragraphs) {
+                                        if (para.trim().isEmpty()) continue;
+                                        
+                                        // 检查是否是三级标题
+                                        boolean isLevel3Title = false;
+                                        for (XWPFParagraph p : xwpfDocument.getParagraphs()) {
+                                            if (p.getText().trim().equals(para.trim()) && p.getStyle() != null && p.getStyle().equals("3")) {
+                                                isLevel3Title = true;
+                                                break;
+                                            }
+                                        }
+                                        
+                                        if (isLevel3Title) {
+                                            // 保存当前三级标题内容
+                                            if (currentLevel3Content.length() != 0) {
+                                                TextSegment segment = TextSegment.from(currentLevel3Content.toString());
+                                                segments.add(segment);
+                                                currentLevel3Content = new StringBuilder();
+                                            }
+                                            // 开始新的三级标题内容
+                                            currentLevel3Content.append(para).append("\n");
+                                        } else {
+                                            // 普通内容，添加到当前三级标题
+                                            if (currentLevel3Content.length() != 0) {
+                                                currentLevel3Content.append(para).append("\n");
+                                            }
+                                        }
+                                    }
+                                    // 保存最后一个三级标题内容
+                                    if (currentLevel3Content.length() != 0) {
+                                        TextSegment segment = TextSegment.from(currentLevel3Content.toString());
+                                        segments.add(segment);
+                                    }
+                                }
+                                currentLevel2Content = new StringBuilder();
+                            }
+                            // 开始新的二级标题内容
+                            currentLevel2Content.append(text).append("\n");
+                            inLevel2Section = true;
+                        }
+                        // 其他标题样式（包括三级标题）
+                        else {
+                            if (inLevel2Section) {
+                                currentLevel2Content.append(text).append("\n");
+                            }
+                        }
+                    }
+                    else {
+                        // 普通内容段落
+                        if (inLevel2Section) {
+                            currentLevel2Content.append(text).append("\n");
+                        }
+                    }
+                }
+
+                // 保存最后一个二级标题内容
+                if (currentLevel2Content.length() != 0) {
+                    // 检查字节数
+                    int level2Length = currentLevel2Content.toString().getBytes().length;
+                    if (level2Length <= 65535) {
+                        // 字数不大于65535，按二级标题分割
+                        TextSegment segment = TextSegment.from(currentLevel2Content.toString());
+                        segments.add(segment);
+                    } else {
+                        // 字数大于65535，按三级标题分割
+                        StringBuilder currentLevel3Content = new StringBuilder();
+                        String[] paragraphs = currentLevel2Content.toString().split("\n");
+                        for (String para : paragraphs) {
+                            if (para.trim().isEmpty()) continue;
+                            
+                            boolean isLevel3Title = false;
+                            for (XWPFParagraph p : xwpfDocument.getParagraphs()) {
+                                if (p.getText().trim().equals(para.trim()) && p.getStyle() != null && p.getStyle().equals("3")) {
+                                    isLevel3Title = true;
+                                    break;
+                                }
+                            }
+                            
+                            if (isLevel3Title) {
+                                // 保存当前三级标题内容
+                                if (currentLevel3Content.length() != 0) {
+                                    TextSegment segment = TextSegment.from(currentLevel3Content.toString());
+                                    segments.add(segment);
+                                    currentLevel3Content = new StringBuilder();
+                                }
+                                // 开始新的三级标题内容
+                                currentLevel3Content.append(para).append("\n");
+                            } else {
+                                // 普通内容，添加到当前三级标题
+                                if (currentLevel3Content.length() != 0) {
+                                    currentLevel3Content.append(para).append("\n");
+                                }
+                            }
+                        }
+                        // 保存最后一个三级标题内容
+                        if (currentLevel3Content.length() != 0) {
+                            TextSegment segment = TextSegment.from(currentLevel3Content.toString());
+                            segments.add(segment);
+                        }
+                    }
+                }
             }
-            catch (IOException e) {
-                throw new RuntimeException(e);
+            return segments;
+        }
+        else if (filename.endsWith(".doc")) {
+            // 使用HWPFDocument处理DOC文件
+            List<TextSegment> segments = new ArrayList<>();
+            try (HWPFDocument hwpfDocument = new HWPFDocument(fileInputStream)) {
+                StringBuilder currentLevel2Content = new StringBuilder();
+                boolean inLevel2Section = false;
+
+                Range range = hwpfDocument.getRange();
+                for (int i = 0; i < range.numParagraphs(); i++) {
+                    Paragraph paragraph = range.getParagraph(i);
+                    String text = paragraph.text().trim();
+                    if (text.isEmpty()) continue;
+
+                    // 获取段落样式索引
+                    short styleIndex = paragraph.getStyleIndex();
+
+                    if (styleIndex == 2) {
+                        // 二级标题，开始新的分段
+                        // 保存当前二级标题下的内容
+                        if (currentLevel2Content.length() != 0) {
+                            // 检查当前二级标题内容的字节数
+                            int level2Length = currentLevel2Content.toString().getBytes().length;
+                            if (level2Length <= 65535) {
+                                // 字数不大于65535，按二级标题分割
+                                TextSegment segment = TextSegment.from(currentLevel2Content.toString());
+                                segments.add(segment);
+                            } else {
+                                // 字数大于65535，按三级标题分割
+                                // 将当前二级标题内容按三级标题重新分割
+                                StringBuilder currentLevel3Content = new StringBuilder();
+                                Range level2Range = hwpfDocument.getRange();
+                                boolean foundCurrentLevel2 = false;
+                                
+                                for (int j = 0; j < level2Range.numParagraphs(); j++) {
+                                    Paragraph p = level2Range.getParagraph(j);
+                                    String paraText = p.text().trim();
+                                    if (paraText.isEmpty()) continue;
+                                    
+                                    // 找到当前二级标题的开始
+                                    if (p.getStyleIndex() == 2 && paraText.equals(currentLevel2Content.toString().split("\n")[0].trim())) {
+                                        foundCurrentLevel2 = true;
+                                    }
+                                    
+                                    if (foundCurrentLevel2) {
+                                        short paraStyleIndex = p.getStyleIndex();
+                                        
+                                        if (paraStyleIndex == 3) {
+                                            // 三级标题
+                                            // 保存当前三级标题内容
+                                            if (currentLevel3Content.length() != 0) {
+                                                TextSegment segment = TextSegment.from(currentLevel3Content.toString());
+                                                segments.add(segment);
+                                                currentLevel3Content = new StringBuilder();
+                                            }
+                                            // 开始新的三级标题内容
+                                            currentLevel3Content.append(paraText).append("\n");
+                                        } else if (paraStyleIndex == 2 && !paraText.equals(currentLevel2Content.toString().split("\n")[0].trim())) {
+                                            // 下一个二级标题，结束当前二级标题的处理
+                                            break;
+                                        } else {
+                                            // 普通内容或当前二级标题
+                                            if (currentLevel3Content.length() != 0 || paraStyleIndex == 2) {
+                                                currentLevel3Content.append(paraText).append("\n");
+                                            }
+                                        }
+                                    }
+                                }
+                                
+                                // 保存最后一个三级标题内容
+                                if (currentLevel3Content.length() != 0) {
+                                    TextSegment segment = TextSegment.from(currentLevel3Content.toString());
+                                    segments.add(segment);
+                                }
+                            }
+                            currentLevel2Content = new StringBuilder();
+                        }
+                        // 开始新的二级标题内容
+                        currentLevel2Content.append(text).append("\n");
+                        inLevel2Section = true;
+                    } else {
+                        // 非二级标题或普通内容段落
+                        if (inLevel2Section) {
+                            currentLevel2Content.append(text).append("\n");
+                        }
+                    }
+                }
+
+                // 保存最后一个二级标题内容
+                if (currentLevel2Content.length() != 0) {
+                    // 检查字节数
+                    int level2Length = currentLevel2Content.toString().getBytes().length;
+                    if (level2Length <= 65535) {
+                        // 字数不大于65535，按二级标题分割
+                        TextSegment segment = TextSegment.from(currentLevel2Content.toString());
+                        segments.add(segment);
+                    } else {
+                        // 字数大于65535，按三级标题分割
+                        StringBuilder currentLevel3Content = new StringBuilder();
+                        Range level2Range = hwpfDocument.getRange();
+                        boolean foundCurrentLevel2 = false;
+                        
+                        for (int j = 0; j < level2Range.numParagraphs(); j++) {
+                            Paragraph p = level2Range.getParagraph(j);
+                            String paraText = p.text().trim();
+                            if (paraText.isEmpty()) continue;
+                            
+                            // 找到当前二级标题的开始
+                            if (p.getStyleIndex() == 2 && paraText.equals(currentLevel2Content.toString().split("\n")[0].trim())) {
+                                foundCurrentLevel2 = true;
+                            }
+                            
+                            if (foundCurrentLevel2) {
+                                short paraStyleIndex = p.getStyleIndex();
+                                
+                                if (paraStyleIndex == 3) {
+                                    // 三级标题
+                                    // 保存当前三级标题内容
+                                    if (currentLevel3Content.length() != 0) {
+                                        TextSegment segment = TextSegment.from(currentLevel3Content.toString());
+                                        segments.add(segment);
+                                        currentLevel3Content = new StringBuilder();
+                                    }
+                                    // 开始新的三级标题内容
+                                    currentLevel3Content.append(paraText).append("\n");
+                                } else if (paraStyleIndex == 2 && !paraText.equals(currentLevel2Content.toString().split("\n")[0].trim())) {
+                                    // 下一个二级标题，结束当前二级标题的处理
+                                    break;
+                                } else {
+                                    // 普通内容或当前二级标题
+                                    if (currentLevel3Content.length() != 0 || paraStyleIndex == 2) {
+                                        currentLevel3Content.append(paraText).append("\n");
+                                    }
+                                }
+                            }
+                        }
+                        
+                        // 保存最后一个三级标题内容
+                        if (currentLevel3Content.length() != 0) {
+                            TextSegment segment = TextSegment.from(currentLevel3Content.toString());
+                            segments.add(segment);
+                        }
+                    }
+                }
             }
+            return segments;
         }
+
         else if (filename.endsWith(".pdf")) {
-            document = new ApachePdfBoxDocumentParser().parse(fileInputStream);
+            Document document = new ApachePdfBoxDocumentParser().parse(fileInputStream);
+            DocumentByParagraphSplitter splitter = new DocumentByParagraphSplitter(300,50);
+            return splitter.split(document);
         }
         else if (filename.endsWith(".txt")) {
-            document = new TextDocumentParser().parse(fileInputStream);
+            Document document = new TextDocumentParser().parse(fileInputStream);
+            DocumentByParagraphSplitter splitter = new DocumentByParagraphSplitter(300,50);
+            return splitter.split(document);
         }
         else {
             throw new UnsupportedOperationException("不支持文件类型: " + filename);
         }
-        DocumentByParagraphSplitter splitter = new DocumentByParagraphSplitter(300,50);
-        return splitter.split(document);
     }
 
 }

oa-back/ruoyi-llm/src/main/java/com/ruoyi/web/llm/service/impl/LangChainMilvusServiceImpl.java

@@ -32,8 +32,11 @@ import io.milvus.v2.service.vector.request.data.BaseVector;
 import io.milvus.v2.service.vector.request.data.FloatVec;
 import io.milvus.v2.service.vector.response.InsertResp;
 import io.milvus.v2.service.vector.response.SearchResp;
-import org.apache.poi.extractor.POITextExtractor;
 import org.apache.poi.extractor.ExtractorFactory;
+import org.apache.poi.extractor.POITextExtractor;
+import org.apache.poi.hwpf.HWPFDocument;
+import org.apache.poi.hwpf.usermodel.Paragraph;
+import org.apache.poi.hwpf.usermodel.Range;
 import org.apache.poi.xwpf.usermodel.XWPFDocument;
 import org.apache.poi.xwpf.usermodel.XWPFParagraph;
 import org.noear.solon.ai.chat.ChatModel;
@@ -429,14 +432,284 @@ public class LangChainMilvusServiceImpl implements ILangChainMilvusService
         Document document;
         InputStream fileInputStream = new FileInputStream(transferFile);
         String filename = transferFile.getName().toLowerCase();
-        if (filename.endsWith(".doc") || filename.endsWith(".docx")) {
-            try (POITextExtractor extractor = ExtractorFactory.createExtractor(fileInputStream)) {
-                String text = extractor.getText();
-                document = Document.from(text);
+        if (filename.endsWith(".docx")) {
+            // 使用XWPFDocument处理DOCX文件，按二级标题分割（二级标题样式为2）
+            List<TextSegment> segments = new ArrayList<>();
+            try (XWPFDocument xwpfDocument = new XWPFDocument(fileInputStream)) {
+                StringBuilder currentLevel2Content = new StringBuilder();
+                boolean inLevel2Section = false;
+
+                for (XWPFParagraph paragraph : xwpfDocument.getParagraphs()) {
+                    String text = paragraph.getText().trim();
+                    if (text.isEmpty()) continue;
+
+                    if (paragraph.getStyle() != null) {
+                        // 二级标题（样式2）开始新的分段
+                        if (paragraph.getStyle().equals("2")) {
+                            // 保存当前二级标题下的内容
+                            if (currentLevel2Content.length() != 0) {
+                                // 检查当前二级标题内容的字节数
+                                int level2Length = currentLevel2Content.toString().getBytes().length;
+                                if (level2Length <= 65535) {
+                                    // 字数不大于65535，按二级标题分割
+                                    TextSegment segment = TextSegment.from(currentLevel2Content.toString());
+                                    segments.add(segment);
+                                } else {
+                                    // 字数大于65535，按三级标题分割
+                                    // 将当前二级标题内容按三级标题重新分割
+                                    StringBuilder currentLevel3Content = new StringBuilder();
+                                    String[] paragraphs = currentLevel2Content.toString().split("\n");
+                                    for (String para : paragraphs) {
+                                        if (para.trim().isEmpty()) continue;
+                                        
+                                        // 检查是否是三级标题（简单判断：如果是三级标题，样式应该是3，但这里需要重新解析）
+                                        // 由于已经将内容转为字符串，这里采用另一种方式：假设三级标题以数字+点+空格开头（如"1.1."）
+                                        // 或者可以重新遍历段落，但为了效率，这里采用简单的判断方式
+                                        boolean isLevel3Title = false;
+                                        for (XWPFParagraph p : xwpfDocument.getParagraphs()) {
+                                            if (p.getText().trim().equals(para.trim()) && p.getStyle() != null && p.getStyle().equals("3")) {
+                                                isLevel3Title = true;
+                                                break;
+                                            }
+                                        }
+                                        
+                                        if (isLevel3Title) {
+                                            // 保存当前三级标题内容
+                                            if (currentLevel3Content.length() != 0) {
+                                                TextSegment segment = TextSegment.from(currentLevel3Content.toString());
+                                                segments.add(segment);
+                                                currentLevel3Content = new StringBuilder();
+                                            }
+                                            // 开始新的三级标题内容
+                                            currentLevel3Content.append(para).append("\n");
+                                        } else {
+                                            // 普通内容，添加到当前三级标题
+                                            if (currentLevel3Content.length() != 0) {
+                                                currentLevel3Content.append(para).append("\n");
+                                            }
+                                        }
+                                    }
+                                    // 保存最后一个三级标题内容
+                                    if (currentLevel3Content.length() != 0) {
+                                        TextSegment segment = TextSegment.from(currentLevel3Content.toString());
+                                        segments.add(segment);
+                                    }
+                                }
+                                currentLevel2Content = new StringBuilder();
+                            }
+                            // 开始新的二级标题内容
+                            currentLevel2Content.append(text).append("\n");
+                            inLevel2Section = true;
+                        }
+                        // 其他标题样式（包括三级标题）
+                        else {
+                            if (inLevel2Section) {
+                                currentLevel2Content.append(text).append("\n");
+                            }
+                        }
+                    }
+                    else {
+                        // 普通内容段落
+                        if (inLevel2Section) {
+                            currentLevel2Content.append(text).append("\n");
+                        }
+                    }
+                }
+
+                // 保存最后一个二级标题内容
+                if (currentLevel2Content.length() != 0) {
+                    // 检查字节数
+                    int level2Length = currentLevel2Content.toString().getBytes().length;
+                    if (level2Length <= 65535) {
+                        // 字数不大于65535，按二级标题分割
+                        TextSegment segment = TextSegment.from(currentLevel2Content.toString());
+                        segments.add(segment);
+                    } else {
+                        // 字数大于65535，按三级标题分割
+                        StringBuilder currentLevel3Content = new StringBuilder();
+                        String[] paragraphs = currentLevel2Content.toString().split("\n");
+                        for (String para : paragraphs) {
+                            if (para.trim().isEmpty()) continue;
+                            
+                            boolean isLevel3Title = false;
+                            for (XWPFParagraph p : xwpfDocument.getParagraphs()) {
+                                if (p.getText().trim().equals(para.trim()) && p.getStyle() != null && p.getStyle().equals("3")) {
+                                    isLevel3Title = true;
+                                    break;
+                                }
+                            }
+                            
+                            if (isLevel3Title) {
+                                // 保存当前三级标题内容
+                                if (currentLevel3Content.length() != 0) {
+                                    TextSegment segment = TextSegment.from(currentLevel3Content.toString());
+                                    segments.add(segment);
+                                    currentLevel3Content = new StringBuilder();
+                                }
+                                // 开始新的三级标题内容
+                                currentLevel3Content.append(para).append("\n");
+                            } else {
+                                // 普通内容，添加到当前三级标题
+                                if (currentLevel3Content.length() != 0) {
+                                    currentLevel3Content.append(para).append("\n");
+                                }
+                            }
+                        }
+                        // 保存最后一个三级标题内容
+                        if (currentLevel3Content.length() != 0) {
+                            TextSegment segment = TextSegment.from(currentLevel3Content.toString());
+                            segments.add(segment);
+                        }
+                    }
+                }
             }
-            catch (IOException e) {
-                throw new RuntimeException(e);
+            return segments;
+        }
+        else if (filename.endsWith(".doc")) {
+            // 使用HWPFDocument处理DOC文件
+            List<TextSegment> segments = new ArrayList<>();
+            try (HWPFDocument hwpfDocument = new HWPFDocument(fileInputStream)) {
+                StringBuilder currentLevel2Content = new StringBuilder();
+                boolean inLevel2Section = false;
+
+                Range range = hwpfDocument.getRange();
+                for (int i = 0; i < range.numParagraphs(); i++) {
+                    Paragraph paragraph = range.getParagraph(i);
+                    String text = paragraph.text().trim();
+                    if (text.isEmpty()) continue;
+
+                    // 获取段落样式索引
+                    short styleIndex = paragraph.getStyleIndex();
+
+                    if (styleIndex == 2) {
+                        // 二级标题，开始新的分段
+                        // 保存当前二级标题下的内容
+                        if (currentLevel2Content.length() != 0) {
+                            // 检查当前二级标题内容的字节数
+                            int level2Length = currentLevel2Content.toString().getBytes().length;
+                            if (level2Length <= 65535) {
+                                // 字数不大于65535，按二级标题分割
+                                TextSegment segment = TextSegment.from(currentLevel2Content.toString());
+                                segments.add(segment);
+                            } else {
+                                // 字数大于65535，按三级标题分割
+                                // 将当前二级标题内容按三级标题重新分割
+                                StringBuilder currentLevel3Content = new StringBuilder();
+                                Range level2Range = hwpfDocument.getRange();
+                                boolean foundCurrentLevel2 = false;
+                                
+                                for (int j = 0; j < level2Range.numParagraphs(); j++) {
+                                    Paragraph p = level2Range.getParagraph(j);
+                                    String paraText = p.text().trim();
+                                    if (paraText.isEmpty()) continue;
+                                    
+                                    // 找到当前二级标题的开始
+                                    if (p.getStyleIndex() == 2 && paraText.equals(currentLevel2Content.toString().split("\n")[0].trim())) {
+                                        foundCurrentLevel2 = true;
+                                    }
+                                    
+                                    if (foundCurrentLevel2) {
+                                        short paraStyleIndex = p.getStyleIndex();
+                                        
+                                        if (paraStyleIndex == 3) {
+                                            // 三级标题
+                                            // 保存当前三级标题内容
+                                            if (currentLevel3Content.length() != 0) {
+                                                TextSegment segment = TextSegment.from(currentLevel3Content.toString());
+                                                segments.add(segment);
+                                                currentLevel3Content = new StringBuilder();
+                                            }
+                                            // 开始新的三级标题内容
+                                            currentLevel3Content.append(paraText).append("\n");
+                                        } else if (paraStyleIndex == 2 && !paraText.equals(currentLevel2Content.toString().split("\n")[0].trim())) {
+                                            // 下一个二级标题，结束当前二级标题的处理
+                                            break;
+                                        } else {
+                                            // 普通内容或当前二级标题
+                                            if (currentLevel3Content.length() != 0 || paraStyleIndex == 2) {
+                                                currentLevel3Content.append(paraText).append("\n");
+                                            }
+                                        }
+                                    }
+                                }
+                                
+                                // 保存最后一个三级标题内容
+                                if (currentLevel3Content.length() != 0) {
+                                    TextSegment segment = TextSegment.from(currentLevel3Content.toString());
+                                    segments.add(segment);
+                                }
+                            }
+                            currentLevel2Content = new StringBuilder();
+                        }
+                        // 开始新的二级标题内容
+                        currentLevel2Content.append(text).append("\n");
+                        inLevel2Section = true;
+                    } else {
+                        // 非二级标题或普通内容段落
+                        if (inLevel2Section) {
+                            currentLevel2Content.append(text).append("\n");
+                        }
+                    }
+                }
+
+                // 保存最后一个二级标题内容
+                if (currentLevel2Content.length() != 0) {
+                    // 检查字节数
+                    int level2Length = currentLevel2Content.toString().getBytes().length;
+                    if (level2Length <= 65535) {
+                        // 字数不大于65535，按二级标题分割
+                        TextSegment segment = TextSegment.from(currentLevel2Content.toString());
+                        segments.add(segment);
+                    } else {
+                        // 字数大于65535，按三级标题分割
+                        StringBuilder currentLevel3Content = new StringBuilder();
+                        Range level2Range = hwpfDocument.getRange();
+                        boolean foundCurrentLevel2 = false;
+                        
+                        for (int j = 0; j < level2Range.numParagraphs(); j++) {
+                            Paragraph p = level2Range.getParagraph(j);
+                            String paraText = p.text().trim();
+                            if (paraText.isEmpty()) continue;
+                            
+                            // 找到当前二级标题的开始
+                            if (p.getStyleIndex() == 2 && paraText.equals(currentLevel2Content.toString().split("\n")[0].trim())) {
+                                foundCurrentLevel2 = true;
+                            }
+                            
+                            if (foundCurrentLevel2) {
+                                short paraStyleIndex = p.getStyleIndex();
+                                
+                                if (paraStyleIndex == 3) {
+                                    // 三级标题
+                                    // 保存当前三级标题内容
+                                    if (currentLevel3Content.length() != 0) {
+                                        TextSegment segment = TextSegment.from(currentLevel3Content.toString());
+                                        segments.add(segment);
+                                        currentLevel3Content = new StringBuilder();
+                                    }
+                                    // 开始新的三级标题内容
+                                    currentLevel3Content.append(paraText).append("\n");
+                                } else if (paraStyleIndex == 2 && !paraText.equals(currentLevel2Content.toString().split("\n")[0].trim())) {
+                                    // 下一个二级标题，结束当前二级标题的处理
+                                    break;
+                                } else {
+                                    // 普通内容或当前二级标题
+                                    if (currentLevel3Content.length() != 0 || paraStyleIndex == 2) {
+                                        currentLevel3Content.append(paraText).append("\n");
+                                    }
+                                }
+                            }
+                        }
+                        
+                        // 保存最后一个三级标题内容
+                        if (currentLevel3Content.length() != 0) {
+                            TextSegment segment = TextSegment.from(currentLevel3Content.toString());
+                            segments.add(segment);
+                        }
+                    }
+                }
             }
+            return segments;
         }
         else if (filename.endsWith(".pdf")) {
             document = new ApachePdfBoxDocumentParser().parse(fileInputStream);

oa-back/ruoyi-system/src/main/java/com/ruoyi/llm/service/impl/CmcAgentServiceImpl.java

@@ -34,6 +34,9 @@ import io.milvus.v2.service.vector.request.data.FloatVec;
 import io.milvus.v2.service.vector.response.SearchResp;
 import org.apache.poi.extractor.ExtractorFactory;
 import org.apache.poi.extractor.POITextExtractor;
+import org.apache.poi.hwpf.HWPFDocument;
+import org.apache.poi.hwpf.usermodel.Paragraph;
+import org.apache.poi.hwpf.usermodel.Range;
 import org.apache.poi.xwpf.usermodel.*;
 import org.apache.xmlbeans.XmlCursor;
 import org.noear.solon.ai.chat.ChatModel;
@@ -871,29 +874,299 @@ public class CmcAgentServiceImpl implements ICmcAgentService
      */
     private List<TextSegment> splitDocument(File transferFile, int maxSegmentSizeInChars, int maxOverlapSizeInChars) throws IOException {
         // 加载文档
-        Document document;
         InputStream fileInputStream = new FileInputStream(transferFile);
         String filename = transferFile.getName().toLowerCase();
-        if (filename.endsWith(".doc") || filename.endsWith(".docx")) {
-            try (POITextExtractor extractor = ExtractorFactory.createExtractor(fileInputStream)) {
-                String text = extractor.getText();
-                document = Document.from(text);
+        if (filename.endsWith(".docx")) {
+            // 使用XWPFDocument处理DOCX文件，按二级标题分割（二级标题样式为2）
+            List<TextSegment> segments = new ArrayList<>();
+            try (XWPFDocument xwpfDocument = new XWPFDocument(fileInputStream)) {
+                StringBuilder currentLevel2Content = new StringBuilder();
+                boolean inLevel2Section = false;
+
+                for (XWPFParagraph paragraph : xwpfDocument.getParagraphs()) {
+                    String text = paragraph.getText().trim();
+                    if (text.isEmpty()) continue;
+
+                    if (paragraph.getStyle() != null) {
+                        // 二级标题（样式2）开始新的分段
+                        if (paragraph.getStyle().equals("2")) {
+                            // 保存当前二级标题下的内容
+                            if (currentLevel2Content.length() != 0) {
+                                // 检查当前二级标题内容的字节数
+                                int level2Length = currentLevel2Content.toString().getBytes().length;
+                                if (level2Length <= 65535) {
+                                    // 字数不大于65535，按二级标题分割
+                                    TextSegment segment = TextSegment.from(currentLevel2Content.toString());
+                                    segments.add(segment);
+                                } else {
+                                    // 字数大于65535，按三级标题分割
+                                    // 将当前二级标题内容按三级标题重新分割
+                                    StringBuilder currentLevel3Content = new StringBuilder();
+                                    String[] paragraphs = currentLevel2Content.toString().split("\n");
+                                    for (String para : paragraphs) {
+                                        if (para.trim().isEmpty()) continue;
+                                        
+                                        // 检查是否是三级标题
+                                        boolean isLevel3Title = false;
+                                        for (XWPFParagraph p : xwpfDocument.getParagraphs()) {
+                                            if (p.getText().trim().equals(para.trim()) && p.getStyle() != null && p.getStyle().equals("3")) {
+                                                isLevel3Title = true;
+                                                break;
+                                            }
+                                        }
+                                        
+                                        if (isLevel3Title) {
+                                            // 保存当前三级标题内容
+                                            if (currentLevel3Content.length() != 0) {
+                                                TextSegment segment = TextSegment.from(currentLevel3Content.toString());
+                                                segments.add(segment);
+                                                currentLevel3Content = new StringBuilder();
+                                            }
+                                            // 开始新的三级标题内容
+                                            currentLevel3Content.append(para).append("\n");
+                                        } else {
+                                            // 普通内容，添加到当前三级标题
+                                            if (currentLevel3Content.length() != 0) {
+                                                currentLevel3Content.append(para).append("\n");
+                                            }
+                                        }
+                                    }
+                                    // 保存最后一个三级标题内容
+                                    if (currentLevel3Content.length() != 0) {
+                                        TextSegment segment = TextSegment.from(currentLevel3Content.toString());
+                                        segments.add(segment);
+                                    }
+                                }
+                                currentLevel2Content = new StringBuilder();
+                            }
+                            // 开始新的二级标题内容
+                            currentLevel2Content.append(text).append("\n");
+                            inLevel2Section = true;
+                        }
+                        // 其他标题样式（包括三级标题）
+                        else {
+                            if (inLevel2Section) {
+                                currentLevel2Content.append(text).append("\n");
+                            }
+                        }
+                    }
+                    else {
+                        // 普通内容段落
+                        if (inLevel2Section) {
+                            currentLevel2Content.append(text).append("\n");
+                        }
+                    }
+                }
+
+                // 保存最后一个二级标题内容
+                if (currentLevel2Content.length() != 0) {
+                    // 检查字节数
+                    int level2Length = currentLevel2Content.toString().getBytes().length;
+                    if (level2Length <= 65535) {
+                        // 字数不大于65535，按二级标题分割
+                        TextSegment segment = TextSegment.from(currentLevel2Content.toString());
+                        segments.add(segment);
+                    } else {
+                        // 字数大于65535，按三级标题分割
+                        StringBuilder currentLevel3Content = new StringBuilder();
+                        String[] paragraphs = currentLevel2Content.toString().split("\n");
+                        for (String para : paragraphs) {
+                            if (para.trim().isEmpty()) continue;
+                            
+                            boolean isLevel3Title = false;
+                            for (XWPFParagraph p : xwpfDocument.getParagraphs()) {
+                                if (p.getText().trim().equals(para.trim()) && p.getStyle() != null && p.getStyle().equals("3")) {
+                                    isLevel3Title = true;
+                                    break;
+                                }
+                            }
+                            
+                            if (isLevel3Title) {
+                                // 保存当前三级标题内容
+                                if (currentLevel3Content.length() != 0) {
+                                    TextSegment segment = TextSegment.from(currentLevel3Content.toString());
+                                    segments.add(segment);
+                                    currentLevel3Content = new StringBuilder();
+                                }
+                                // 开始新的三级标题内容
+                                currentLevel3Content.append(para).append("\n");
+                            } else {
+                                // 普通内容，添加到当前三级标题
+                                if (currentLevel3Content.length() != 0) {
+                                    currentLevel3Content.append(para).append("\n");
+                                }
+                            }
+                        }
+                        // 保存最后一个三级标题内容
+                        if (currentLevel3Content.length() != 0) {
+                            TextSegment segment = TextSegment.from(currentLevel3Content.toString());
+                            segments.add(segment);
+                        }
+                    }
+                }
             }
-            catch (IOException e) {
-                throw new RuntimeException(e);
+            return segments;
+        }
+        else if (filename.endsWith(".doc")) {
+            // 使用HWPFDocument处理DOC文件
+            List<TextSegment> segments = new ArrayList<>();
+            try (HWPFDocument hwpfDocument = new HWPFDocument(fileInputStream)) {
+                StringBuilder currentLevel2Content = new StringBuilder();
+                boolean inLevel2Section = false;
+
+                Range range = hwpfDocument.getRange();
+                for (int i = 0; i < range.numParagraphs(); i++) {
+                    Paragraph paragraph = range.getParagraph(i);
+                    String text = paragraph.text().trim();
+                    if (text.isEmpty()) continue;
+
+                    // 获取段落样式索引
+                    short styleIndex = paragraph.getStyleIndex();
+
+                    if (styleIndex == 2) {
+                        // 二级标题，开始新的分段
+                        // 保存当前二级标题下的内容
+                        if (currentLevel2Content.length() != 0) {
+                            // 检查当前二级标题内容的字节数
+                            int level2Length = currentLevel2Content.toString().getBytes().length;
+                            if (level2Length <= 65535) {
+                                // 字数不大于65535，按二级标题分割
+                                TextSegment segment = TextSegment.from(currentLevel2Content.toString());
+                                segments.add(segment);
+                            } else {
+                                // 字数大于65535，按三级标题分割
+                                // 将当前二级标题内容按三级标题重新分割
+                                StringBuilder currentLevel3Content = new StringBuilder();
+                                Range level2Range = hwpfDocument.getRange();
+                                boolean foundCurrentLevel2 = false;
+                                
+                                for (int j = 0; j < level2Range.numParagraphs(); j++) {
+                                    Paragraph p = level2Range.getParagraph(j);
+                                    String paraText = p.text().trim();
+                                    if (paraText.isEmpty()) continue;
+                                    
+                                    // 找到当前二级标题的开始
+                                    if (p.getStyleIndex() == 2 && paraText.equals(currentLevel2Content.toString().split("\n")[0].trim())) {
+                                        foundCurrentLevel2 = true;
+                                    }
+                                    
+                                    if (foundCurrentLevel2) {
+                                        short paraStyleIndex = p.getStyleIndex();
+                                        
+                                        if (paraStyleIndex == 3) {
+                                            // 三级标题
+                                            // 保存当前三级标题内容
+                                            if (currentLevel3Content.length() != 0) {
+                                                TextSegment segment = TextSegment.from(currentLevel3Content.toString());
+                                                segments.add(segment);
+                                                currentLevel3Content = new StringBuilder();
+                                            }
+                                            // 开始新的三级标题内容
+                                            currentLevel3Content.append(paraText).append("\n");
+                                        } else if (paraStyleIndex == 2 && !paraText.equals(currentLevel2Content.toString().split("\n")[0].trim())) {
+                                            // 下一个二级标题，结束当前二级标题的处理
+                                            break;
+                                        } else {
+                                            // 普通内容或当前二级标题
+                                            if (currentLevel3Content.length() != 0 || paraStyleIndex == 2) {
+                                                currentLevel3Content.append(paraText).append("\n");
+                                            }
+                                        }
+                                    }
+                                }
+                                
+                                // 保存最后一个三级标题内容
+                                if (currentLevel3Content.length() != 0) {
+                                    TextSegment segment = TextSegment.from(currentLevel3Content.toString());
+                                    segments.add(segment);
+                                }
+                            }
+                            currentLevel2Content = new StringBuilder();
+                        }
+                        // 开始新的二级标题内容
+                        currentLevel2Content.append(text).append("\n");
+                        inLevel2Section = true;
+                    } else {
+                        // 非二级标题或普通内容段落
+                        if (inLevel2Section) {
+                            currentLevel2Content.append(text).append("\n");
+                        }
+                    }
+                }
+
+                // 保存最后一个二级标题内容
+                if (currentLevel2Content.length() != 0) {
+                    // 检查字节数
+                    int level2Length = currentLevel2Content.toString().getBytes().length;
+                    if (level2Length <= 65535) {
+                        // 字数不大于65535，按二级标题分割
+                        TextSegment segment = TextSegment.from(currentLevel2Content.toString());
+                        segments.add(segment);
+                    } else {
+                        // 字数大于65535，按三级标题分割
+                        StringBuilder currentLevel3Content = new StringBuilder();
+                        Range level2Range = hwpfDocument.getRange();
+                        boolean foundCurrentLevel2 = false;
+                        
+                        for (int j = 0; j < level2Range.numParagraphs(); j++) {
+                            Paragraph p = level2Range.getParagraph(j);
+                            String paraText = p.text().trim();
+                            if (paraText.isEmpty()) continue;
+                            
+                            // 找到当前二级标题的开始
+                            if (p.getStyleIndex() == 2 && paraText.equals(currentLevel2Content.toString().split("\n")[0].trim())) {
+                                foundCurrentLevel2 = true;
+                            }
+                            
+                            if (foundCurrentLevel2) {
+                                short paraStyleIndex = p.getStyleIndex();
+                                
+                                if (paraStyleIndex == 3) {
+                                    // 三级标题
+                                    // 保存当前三级标题内容
+                                    if (currentLevel3Content.length() != 0) {
+                                        TextSegment segment = TextSegment.from(currentLevel3Content.toString());
+                                        segments.add(segment);
+                                        currentLevel3Content = new StringBuilder();
+                                    }
+                                    // 开始新的三级标题内容
+                                    currentLevel3Content.append(paraText).append("\n");
+                                } else if (paraStyleIndex == 2 && !paraText.equals(currentLevel2Content.toString().split("\n")[0].trim())) {
+                                    // 下一个二级标题，结束当前二级标题的处理
+                                    break;
+                                } else {
+                                    // 普通内容或当前二级标题
+                                    if (currentLevel3Content.length() != 0 || paraStyleIndex == 2) {
+                                        currentLevel3Content.append(paraText).append("\n");
+                                    }
+                                }
+                            }
+                        }
+                        
+                        // 保存最后一个三级标题内容
+                        if (currentLevel3Content.length() != 0) {
+                            TextSegment segment = TextSegment.from(currentLevel3Content.toString());
+                            segments.add(segment);
+                        }
+                    }
+                }
             }
+            return segments;
         }
+
         else if (filename.endsWith(".pdf")) {
-            document = new ApachePdfBoxDocumentParser().parse(fileInputStream);
+            Document document = new ApachePdfBoxDocumentParser().parse(fileInputStream);
+            DocumentByParagraphSplitter splitter = new DocumentByParagraphSplitter(maxSegmentSizeInChars, maxOverlapSizeInChars);
+            return splitter.split(document);
         }
         else if (filename.endsWith(".txt")) {
-            document = new TextDocumentParser().parse(fileInputStream);
+            Document document = new TextDocumentParser().parse(fileInputStream);
+            DocumentByParagraphSplitter splitter = new DocumentByParagraphSplitter(maxSegmentSizeInChars, maxOverlapSizeInChars);
+            return splitter.split(document);
         }
         else {
             throw new UnsupportedOperationException("不支持文件类型: " + filename);
         }
-        DocumentByParagraphSplitter splitter = new DocumentByParagraphSplitter(maxSegmentSizeInChars,  maxOverlapSizeInChars);
-        return splitter.split(document);
     }
 
     public void generateWordDocument(String content, XWPFDocument document, int insertPos) {

oa-back/ruoyi-system/src/main/java/com/ruoyi/oa/domain/CmcTitleEval.java

@@ -51,6 +51,10 @@ public class CmcTitleEval extends BaseEntity
     @Excel(name = "评审表盖章前")
     private String sheet;
 
+    /** 保密审核意见 */
+    @Excel(name = "保密审核意见")
+    private String secretOpinion;
+
     /** 评审表（盖章后） */
     @Excel(name = "评审表盖章后")
     private String sheetStamp;
@@ -314,6 +318,15 @@ public class CmcTitleEval extends BaseEntity
     {
         return confirmStatus;
     }
+    public void setSecretOpinion(String secretOpinion)
+    {
+        this.secretOpinion = secretOpinion;
+    }
+
+    public String getSecretOpinion()
+    {
+        return secretOpinion;
+    }
     public void setApplyUser(SysUser applyUser)
     {
         this.applyUser = applyUser;

oa-back/ruoyi-system/src/main/resources/mapper/oa/CmcTitleEvalMapper.xml

@@ -27,6 +27,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="confirmer"    column="confirmer"    />
         <result property="confirmTime"    column="confirm_time"    />
         <result property="confirmStatus"    column="confirm_status"    />
+        <result property="secretOpinion"    column="secret_opinion"    />
         <association property="applyUser"    javaType="SysUser"         resultMap="ApplyUserResult" />
         <association property="titleUser"    javaType="SysUser"         resultMap="TitleUserResult" />
         <association property="confirmUser"    javaType="SysUser"         resultMap="ConfirmUserResult" />
@@ -50,7 +51,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     <sql id="selectCmcTitleEvalVo">
         select te.title_eval_id, te.user_id, u.nick_name as apply_nick_name, te.annual, te.institude, te.type, te.level, te.title_profession, te.sheet, te.sheet_stamp, te.material, te.is_approved, te.publicity_file, te.scan_file,
                te.obtain_time, te.apply_time, te.title_user_id, u1.nick_name as title_nick_name, te.title_time, te.title_comment, te.material_upload_time, te.confirmer, u2.nick_name as confirm_nick_name, te.confirm_time,
-               te.confirm_status from cmc_title_eval as te
+               te.confirm_status, te.secret_opinion from cmc_title_eval as te
         left join sys_user as u on u.user_id = te.user_id
         left join sys_user as u1 on u1.user_id = te.title_user_id
         left join sys_user as u2 on u2.user_id = te.confirmer
@@ -113,6 +114,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="confirmer != null">confirmer,</if>
             <if test="confirmTime != null">confirm_time,</if>
             <if test="confirmStatus != null">confirm_status,</if>
+            <if test="secretOpinion != null">secret_opinion,</if>
          </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="titleEvalId != null">#{titleEvalId},</if>
@@ -137,6 +139,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="confirmer != null">#{confirmer},</if>
             <if test="confirmTime != null">#{confirmTime},</if>
             <if test="confirmStatus != null">#{confirmStatus},</if>
+            <if test="secretOpinion != null">#{secretOpinion},</if>
          </trim>
     </insert>
 
@@ -164,6 +167,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="confirmer != null">confirmer = #{confirmer},</if>
             <if test="confirmTime != null">confirm_time = #{confirmTime},</if>
             <if test="confirmStatus != null">confirm_status = #{confirmStatus},</if>
+            <if test="secretOpinion != null">secret_opinion = #{secretOpinion},</if>
         </trim>
         where title_eval_id = #{titleEvalId}
     </update>

oa-ui/src/views/flowable/form/business/subContract.vue

@@ -2,7 +2,7 @@
  * @Author: ysh
  * @Date: 2024-05-10 15:31:57
  * @LastEditors: wrh
- * @LastEditTime: 2025-12-16 11:06:33
+ * @LastEditTime: 2026-01-09 16:14:26
 -->
 <template>
   <div class="app-container">
@@ -352,7 +352,7 @@
     <el-dialog title="选择承接合同" :visible.sync="contractOpen" width="70%" append-to-body>
       <choose-contract @choose="confirmContract"></choose-contract>
     </el-dialog>
-    <el-drawer :visible.sync="drawerOpen" title="" :size="'70%'" append-to-body>
+    <el-drawer :visible.sync="drawerOpen" title="" :size="'70%'" append-to-body @close="closeDrawerFn">
       <projectInfo :needReturn="false"></projectInfo>
     </el-drawer>
     <el-drawer :visible.sync="formOpen" title="" :size="'55%'" append-to-body>
@@ -1245,6 +1245,25 @@ export default {
     clickProjectFn(row) {
       this.$router.replace({ query: { ...this.$route.query, projectId: row.projectId } });
       this.drawerOpen = true;
+      // 找到当前tab并修改当前tab显示的标题
+      let currentView = this.$store.state.tagsView.visitedViews.find(item => item.path === this.$route.path);
+      if (currentView != null) {
+        currentView.title = row.projectName;
+      }
+    },
+    closeDrawerFn() {
+      this.drawerOpen = false;
+      // 只需要删除 query 中的 projectId参数，保留其他参数
+      const { projectId, ...otherQuery } = this.$route.query;
+      this.$router.replace({ 
+        path: this.$route.path, 
+        query: otherQuery 
+      });
+      // 找到当前tab并修改当前tab显示的标题为"分包合同"
+      let currentView = this.$store.state.tagsView.visitedViews.find(item => item.path === this.$route.path);
+      if (currentView != null) {
+        currentView.title = '分包合同';
+      }
     },
     isReturn(val) {
       this.showAlter = val

oa-ui/src/views/flowable/form/oa/titlesForm.vue

@@ -1,8 +1,8 @@
 <!--
  * @Author: ysh
  * @Date: 2025-08-18 10:59:25
- * @LastEditors: Please set LastEditors
- * @LastEditTime: 2025-08-19 16:33:56
+ * @LastEditors: wrh
+ * @LastEditTime: 2026-01-09 15:52:07
 -->
 <template>
   <div>
@@ -37,8 +37,7 @@
           </el-card>
         </div>
 
-        <el-form :model="form" :rules="formRules" ref="form" label-width="135px" :disabled="taskName == ''"
-          class="mt20">
+        <el-form :model="form" :rules="formRules" ref="form" label-width="135px" :disabled="taskName == ''" class="mt20">
           <!-- 基本信息区域 -->
           <div class="form-section" v-if="showBasicInfo()">
             <div class="section-title">
@@ -77,9 +76,10 @@
             <el-form-item label="职称类型" prop="type">
               <el-select v-model="form.type" placeholder="请选择职称类型" style="width: 100%"
                 :disabled="taskName == '' || taskName != '评审申请'">
-                <el-option label="工程技术类" value="工程技术类" />
-                <el-option label="工程经济类" value="工程经济类" />
-                <el-option label="其他" value="其他" />
+                <el-option label="工程类" value="工程类" />
+                <el-option label="经济类" value="经济类" />
+                <el-option label="政工类" value="政工类" />
+                <el-option label="企业法律顾问类" value="企业法律顾问类" />
               </el-select>
             </el-form-item>
 
@@ -112,7 +112,7 @@
             <!-- 盖章前评审表 -->
             <el-form-item label="评审表（盖章前）" prop="sheet">
               <FileUpload v-if="taskName == '评审申请' && !form.sheet" :disabled="taskName == '' || taskName != '评审申请'"
-                ref="sheetFile" :limit="1" :filePathName="'职称评审/盖章前评审表'" :fileType="['pdf']" @input="getSheetPath">
+                ref="sheetFile" :limit="1" :filePathName="'职称评审/盖章前评审表/' + form.annual + '/' + getUserName(form.userId)" :fileType="['pdf']" @input="getSheetPath">
               </FileUpload>
               <div v-if="form.sheet">
                 <el-link type="primary" @click="reviewWord(`${baseUrl}${'/profile/upload' + form.sheet}`)">
@@ -126,11 +126,24 @@
                   v-if="taskName == '评审申请' && taskName != ''">删除文件</span>
               </div>
             </el-form-item>
-
+            <el-form-item label="保密审核意见单及承诺书" prop="secretOpinion">
+              <el-button v-if="taskName == '评审申请' && !form.secretOpinion" type="primary" size="small" @click="openUploadDialog">选取文件</el-button>
+              <div v-if="form.secretOpinion">
+                <el-link type="primary" @click="reviewWord(`${baseUrl}${'/profile/upload' + form.secretOpinion}`)">
+                  {{ getFileName(form.secretOpinion) }}
+                </el-link>
+                <el-link class="ml20" type="warning" :href="`${baseUrl}${'/profile/upload' + form.secretOpinion}`"
+                  :underline="false" target="_blank">
+                  <span class="el-icon-download">下载文件</span>
+                </el-link>
+                <span class="el-icon-delete del-file" @click="deleteDoc('secretOpinion')"
+                  v-if="taskName == '评审申请' && taskName != ''">删除文件</span>
+              </div>
+            </el-form-item>
             <!-- 其他材料 -->
             <el-form-item label="其他材料" prop="material">
               <FileUpload v-if="taskName == '评审申请' && !form.material" :disabled="taskName == '' || taskName != '评审申请'"
-                ref="materialFile" :limit="1" :filePathName="'职称评审/其他材料'" :fileType="['rar', 'zip']"
+                ref="materialFile" :limit="1" :filePathName="'职称评审/其他材料/' + form.annual + '/' + getUserName(form.userId)" :fileType="['rar', 'zip']"
                 @input="getMaterialPath">
               </FileUpload>
               <div v-if="form.material">
@@ -177,7 +190,7 @@
             <!-- 盖章后评审表 -->
             <el-form-item label="评审表（盖章后）" prop="sheetStamp">
               <FileUpload v-if="taskName == '盖章上传' && !form.sheetStamp" :disabled="taskName == '' || taskName != '盖章上传'"
-                ref="sheetStampFile" :limit="1" :filePathName="'职称评审/盖章后评审表'" :fileType="['pdf']"
+                ref="sheetStampFile" :limit="1" :filePathName="'职称评审/盖章后评审表/' + form.annual + '/' + getUserName(form.userId)" :fileType="['pdf']"
                 @input="getSheetStampPath">
               </FileUpload>
               <div v-if="form.sheetStamp">
@@ -218,6 +231,28 @@
       <return-btn :taskForm="taskForm" :comment="commentByRole()" @goBack="$emit('goBack')" @saves=""
         @cancel="returnOpen = false"></return-btn>
     </el-dialog>
+    <el-dialog :title="upload.title" :visible.sync="upload.open" width="400px" append-to-body>
+      <el-upload ref="uploadRef" accept=".pdf" :headers="upload.headers" :action="upload.url" :data="upload.data"
+        :disabled="upload.isUploading" :on-progress="handleFileUploadProgress" :on-change="handleFileUploadChange"
+        :on-success="handleFileSuccess" :auto-upload="false" drag v-loading="uploadLoading"
+        element-loading-text="正在上传，请稍等">
+        <i class="el-icon-upload"></i>
+        <div class="el-upload__text">将文件拖到此处，或<em>点击上传</em></div>
+        <template #tip>
+          <div class="el-upload__tip text-center">
+            <span>仅允许导入pdf格式文件。</span>
+            <el-link type="primary" :underline="false" style="font-size:12px;vertical-align: baseline;"
+              @click="importTemplate">下载模板</el-link>
+          </div>
+        </template>
+      </el-upload>
+      <template #footer>
+        <div class="dialog-footer">
+          <el-button type="primary" @click="submitUpload">确 定</el-button>
+          <el-button @click="upload.open = false">取 消</el-button>
+        </div>
+      </template>
+    </el-dialog>
   </div>
 </template>
 
@@ -226,6 +261,8 @@ import flow from '@/views/flowable/task/todo/detail/flow'
 import { flowXmlAndNode } from "@/api/flowable/definition";
 import { listEval, getEval, delEval, addEval, updateEval } from "@/api/oa/titles/titles";
 import { complete, getNextFlowNode } from "@/api/flowable/todo";
+import { getToken } from "@/utils/auth";
+import { downloadTemplate } from "@/api/file/project";
 import { allocatedUserList } from "@/api/system/role";
 import ReturnComment from "@/views/flowable/form/components/flowBtn/returnComment.vue";
 import ReturnBtn from "@/views/flowable/form/components/flowBtn/returnBtn.vue";
@@ -270,10 +307,22 @@ export default {
         level: '',
         titleProfession: '',
         sheet: '',
+        secretOpinion: '',
         material: ''
       },
       rules: {},
-      returnOpen: false,
+      returnOpen: false,      
+      upload: {
+        open: false,
+        title: "上传保密审核意见单",
+        isUploading: false,
+        updateSupport: 0,
+        headers: { 'Authorization': "Bearer " + getToken() },
+        data: { 'fileType': '' },
+        url: process.env.VUE_APP_BASE_API + "/common/upload"
+      },
+      uploadLoading: false,
+      uploadFormData: undefined,
       showAlter: true
     }
   },
@@ -301,6 +350,9 @@ export default {
         sheet: [
           { required: true, message: '请上传盖章前评审表', trigger: 'change' }
         ],
+        secretOpinion: [
+          { required: true, message: '请上传保密审核意见单', trigger: 'change' }
+        ],
         material: [
           { required: true, message: '请上传其他材料', trigger: 'change' }
         ],
@@ -485,6 +537,50 @@ export default {
         return this.form.titleComment;
       }
     },
+    /**PDF文件上传中处理 */
+    handleFileUploadProgress(event, file, fileList) {
+      this.form.secretOpinion = "/职称评审/保密审核意见单/" + this.form.annual + '/' + this.$store.state.user.name + "/" + file.name;
+      this.upload.isUploading = true;
+      this.uploadLoading = true;
+    },
+    /* PDF文件改变时 */
+    handleFileUploadChange(file, fileList) {
+      if (fileList.length > 1) {
+        fileList.splice(0, 1);
+      }
+      this.uploadFormData = new FormData();
+      this.uploadFormData.append("file", file);
+      this.form.secretOpinion = "/职称评审/保密审核意见单/" + this.form.annual + '/' + this.$store.state.user.name + "/" + file.name;
+    },
+    /** PDF文件上传成功处理 */
+    handleFileSuccess(response, file, fileList) {
+      console.log("成功");
+      this.upload.open = false;
+      this.upload.isUploading = false;
+      this.uploadLoading = false;
+      this.fileList = [];
+      this.$alert("<div style='overflow: auto;overflow-x: hidden;max-height: 70vh;padding: 10px 20px 0;'>" + response.msg + "</div>", "导入结果", { dangerouslyUseHTMLString: true });
+      this.$refs["uploadRef"].clearFiles();
+    },
+    /* 打开上传对话框 */
+    openUploadDialog() {
+      // 设置文件类型和存储路径
+      this.upload.data.fileType = '职称评审/保密审核意见单/' + this.form.annual + '/' + this.$store.state.user.name;
+      // 打开上传对话框
+      this.upload.open = true;
+    },
+    /* PDF上传提交按钮 */
+    submitUpload() {
+      this.$refs['uploadRef'].submit();
+    },
+    /* 下载模板 */
+    importTemplate() {
+      const path = '/profile/upload/template/opinion.docx'
+      downloadTemplate(path).then(res => {
+        const blob = new Blob([res])
+        saveAs(blob, 'opinion.docx');
+      });
+    },
   }
 }
 </script>

oa-ui/src/views/llm/agent/AgentDetail.vue

@@ -2,7 +2,7 @@
  * @Author: wrh
  * @Date: 2025-01-01 00:00:00
  * @LastEditors: wrh
- * @LastEditTime: 2025-11-19 16:41:27
+ * @LastEditTime: 2026-01-19 15:28:10
 -->
 <template>
   <div class="agent-detail-container" v-loading="loading">
@@ -262,7 +262,7 @@ export default {
         if (this.agentInfo?.agentName) {
           const res = await opening(this.agentInfo.agentName)
           this.openingMessage = res.data.resultContent;
-          if (this.agentInfo.agentName.includes('技术文件')) {
+          if (this.agentInfo.agentName.includes('技术')) {
             this.selectDocument = '选择招标文件'
             this.selectDocumentTip = '请上传您需要分析的招标文件（单个文件）：'
           }

oa-ui/src/views/llm/agent/index.vue

@@ -2,7 +2,7 @@
  * @Author: ysh
  * @Date: 2025-07-17 18:16:50
  * @LastEditors: wrh
- * @LastEditTime: 2025-11-19 16:26:10
+ * @LastEditTime: 2026-01-19 15:24:42
 -->
 <template>
   <div class="app-container">
@@ -150,7 +150,7 @@ export default {
       dialogTitle: '',
       isModifyAgent: false,
       // 模型列表
-      modelList: []
+      modelList: [{name: "Qwen2.5-7B-Instruct"}]
     }
   },
   mounted() {

oa-ui/src/views/llm/knowledge/index.vue

@@ -273,7 +273,7 @@
           <el-input v-model="uploadForm.collectionName" disabled />
         </el-form-item>
         <el-form-item label="选择文件" prop="file">
-          <el-upload ref="knowledgeUpload" multiple accept=".docx,.pdf" :headers="upload.headers" :action="''"
+          <el-upload ref="knowledgeUpload" multiple accept=".docx,.doc,.pdf" :headers="upload.headers" :action="''"
             :disabled="upload.isUploading" :on-progress="handleFileUploadProgress" :on-success="handleFileSuccess"
             :auto-upload="false" drag :on-change="handleFileChange">
             <i class="el-icon-upload"></i>
@@ -283,7 +283,7 @@
                 <el-checkbox v-model="upload.updateSupport" />
                 是否更新已经存在的文件数据
               </div>
-              <span>支持 .docx、.pdf 格式文件</span>
+              <span>支持 .docx、.doc、.pdf 格式文件</span>
             </div>
           </el-upload>
         </el-form-item>
@@ -839,6 +839,8 @@ export default {
           return 'PDF文档';
         case 'docx':
           return 'Word文档';
+        case 'doc':
+          return 'Word文档';
         default:
           return '文档';
       }

oa-ui/src/views/oa/contract/components/edit.vue

@@ -207,7 +207,7 @@
         <choose-party-a @confirm="confirmPartyA"></choose-party-a>
       </div>
     </el-drawer>
-    <el-drawer :visible.sync="drawerOpen" title="" :size="'70%'" append-to-body>
+    <el-drawer :visible.sync="drawerOpen" title="" :size="'70%'" append-to-body @close="closeDrawerFn">
       <projectInfo :needReturn="false"></projectInfo>
     </el-drawer>
     <el-drawer :visible.sync="subInfoOpen" title="" :size="'55%'" append-to-body>
@@ -466,6 +466,25 @@ export default {
     clickProjectFn(row) {
       this.$router.replace({ query: { ...this.$route.query, projectId: row.projectId } });
       this.drawerOpen = true;
+      // 找到当前tab并修改当前tab显示的标题
+      let currentView = this.$store.state.tagsView.visitedViews.find(item => item.path === this.$route.path);
+      if (currentView != null) {
+        currentView.title = row.projectName;
+      }
+    },
+    closeDrawerFn() {
+      this.drawerOpen = false;
+      // 只需要删除 query 中的 projectId参数，保留其他参数
+      const { projectId, ...otherQuery } = this.$route.query;
+      this.$router.replace({ 
+        path: this.$route.path, 
+        query: otherQuery 
+      });
+      // 找到当前tab并修改当前tab显示的标题为"承接合同"
+      let currentView = this.$store.state.tagsView.visitedViews.find(item => item.path === this.$route.path);
+      if (currentView != null) {
+        currentView.title = '承接合同';
+      }
     },
     handleDelete(index, row) {
       this.connectProjectList.splice(index, 1)

oa-ui/src/views/oa/contract/components/subEdit.vue

@@ -182,7 +182,7 @@
         <choose-party-a @confirm="confirmPartyA"></choose-party-a>
       </div>
     </el-drawer>
-    <el-drawer :visible.sync="drawerOpen" title="" :size="'70%'" append-to-body>
+    <el-drawer :visible.sync="drawerOpen" title="" :size="'70%'" append-to-body @close="closeDrawerFn">
       <projectInfo :needReturn="false"></projectInfo>
     </el-drawer>
     <el-drawer :visible.sync="formOpen" title="" :size="'60%'" append-to-body>
@@ -501,6 +501,25 @@ export default {
     clickProjectFn(row) {
       this.$router.replace({ query: { ...this.$route.query, projectId: row.projectId } });
       this.drawerOpen = true;
+      // 找到当前tab并修改当前tab显示的标题
+      let currentView = this.$store.state.tagsView.visitedViews.find(item => item.path === this.$route.path);
+      if (currentView != null) {
+        currentView.title = row.projectName;
+      }
+    },
+    closeDrawerFn() {
+      this.drawerOpen = false;
+      // 只需要删除 query 中的 projectId参数，保留其他参数
+      const { projectId, ...otherQuery } = this.$route.query;
+      this.$router.replace({ 
+        path: this.$route.path, 
+        query: otherQuery 
+      });
+      // 找到当前tab并修改当前tab显示的标题为"分包合同"
+      let currentView = this.$store.state.tagsView.visitedViews.find(item => item.path === this.$route.path);
+      if (currentView != null) {
+        currentView.title = '分包合同';
+      }
     },
     handleDelete(index, row) {
       this.connectProjectList.splice(index, 1)

oa-ui/src/views/oa/titles/info.vue

@@ -1,38 +1,22 @@
 <!--
  * @Author: ysh
  * @Date: 2025-08-15 16:13:32
- * @LastEditors: 
- * @LastEditTime: 2025-08-15 16:13:39
+ * @LastEditors: wrh
+ * @LastEditTime: 2026-01-22 16:40:59
 -->
 <template>
   <div class="app-container">
-    <el-form
-      :model="queryParams"
-      ref="queryForm"
-      size="small"
-      :inline="true"
-      v-show="showSearch"
-      label-width="68px"
-    >
+    <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
       <el-form-item label="职称类型" prop="type">
-        <el-select
-          v-model="queryParams.type"
-          clearable
-          placeholder="请选择职称类型"
-          @change="handleQuery"
-        >
-          <el-option label="工程技术类" value="工程技术类"></el-option>
-          <el-option label="工程经济类" value="工程经济类"></el-option>
-          <el-option label="其他" value="其他"></el-option>
+        <el-select v-model="queryParams.type" clearable placeholder="请选择职称类型" @change="handleQuery">
+          <el-option label="工程类" value="工程类" />
+          <el-option label="经济类" value="经济类" />
+          <el-option label="政工类" value="政工类" />
+          <el-option label="企业法律顾问类" value="企业法律顾问类" />
         </el-select>
       </el-form-item>
       <el-form-item label="职称级别" prop="level">
-        <el-select
-          v-model="queryParams.level"
-          clearable
-          placeholder="请选择职称级别"
-          @change="handleQuery"
-        >
+        <el-select v-model="queryParams.level" clearable placeholder="请选择职称级别" @change="handleQuery">
           <el-option label="正高级" value="正高级"></el-option>
           <el-option label="副高级" value="副高级"></el-option>
           <el-option label="高级" value="高级"></el-option>
@@ -42,93 +26,39 @@
         </el-select>
       </el-form-item>
       <el-form-item label="姓名" prop="userId">
-        <el-select
-          v-model="queryParams.userId"
-          filterable
-          clearable
-          @change="handleQuery"
-        >
-          <el-option
-            v-for="item in $store.state.user.userList"
-            :key="item.userId"
-            :label="item.nickName"
-            :value="item.userId"
-          >
+        <el-select v-model="queryParams.userId" filterable clearable @change="handleQuery">
+          <el-option v-for="item in $store.state.user.userList" :key="item.userId" :label="item.nickName"
+            :value="item.userId">
           </el-option>
         </el-select>
       </el-form-item>
       <el-form-item>
-        <el-button
-          type="primary"
-          icon="el-icon-search"
-          size="mini"
-          @click="handleQuery"
-          >搜索</el-button
-        >
-        <el-button icon="el-icon-refresh" size="mini" @click="resetQuery"
-          >重置</el-button
-        >
+        <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
+        <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
       </el-form-item>
     </el-form>
 
     <el-row :gutter="10" class="mb8">
       <el-col :span="1.5">
-        <el-button
-          type="primary"
-          plain
-          icon="el-icon-plus"
-          size="mini"
-          @click="handleAdd"
-          v-hasPermi="['oa:title:add']"
-          >新增</el-button
-        >
+        <el-button type="primary" plain icon="el-icon-plus" size="mini" @click="handleAdd"
+          v-hasPermi="['oa:title:add']">新增</el-button>
       </el-col>
       <el-col :span="1.5">
-        <el-button
-          type="success"
-          plain
-          icon="el-icon-edit"
-          size="mini"
-          :disabled="single"
-          @click="handleUpdate"
-          v-hasPermi="['oa:title:edit']"
-          >修改</el-button
-        >
+        <el-button type="success" plain icon="el-icon-edit" size="mini" :disabled="single" @click="handleUpdate"
+          v-hasPermi="['oa:title:edit']">修改</el-button>
       </el-col>
       <el-col :span="1.5">
-        <el-button
-          type="danger"
-          plain
-          icon="el-icon-delete"
-          size="mini"
-          :disabled="multiple"
-          @click="handleDelete"
-          v-hasPermi="['oa:title:remove']"
-          >删除</el-button
-        >
+        <el-button type="danger" plain icon="el-icon-delete" size="mini" :disabled="multiple" @click="handleDelete"
+          v-hasPermi="['oa:title:remove']">删除</el-button>
       </el-col>
       <el-col :span="1.5">
-        <el-button
-          type="warning"
-          plain
-          icon="el-icon-download"
-          size="mini"
-          @click="handleExport"
-          v-hasPermi="['oa:title:export']"
-          >导出</el-button
-        >
+        <el-button type="warning" plain icon="el-icon-download" size="mini" @click="handleExport"
+          v-hasPermi="['oa:title:export']">导出</el-button>
       </el-col>
-      <right-toolbar
-        :showSearch.sync="showSearch"
-        @queryTable="getList"
-      ></right-toolbar>
+      <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
     </el-row>
 
-    <el-table
-      v-loading="loading"
-      :data="evalList"
-      @selection-change="handleSelectionChange"
-    >
+    <el-table v-loading="loading" :data="evalList" @selection-change="handleSelectionChange">
       <el-table-column type="selection" width="55" align="center" />
       <el-table-column label="姓名" align="center" prop="userId">
         <template slot-scope="scope">
@@ -139,61 +69,35 @@
       <el-table-column label="职称级别" align="center" prop="level" />
       <el-table-column label="职称专业名称" align="center" prop="titleProfession" />
       <el-table-column label="评审单位" align="center" prop="institude" />
-      <el-table-column label="证书取得时间" align="center" prop="obtainTime" width="180" >
+      <el-table-column label="证书取得时间" align="center" prop="obtainTime" width="180">
         <template slot-scope="scope">
           <span>{{ parseTime(scope.row.obtainTime, "{y}-{m}-{d}") }}</span>
         </template>
       </el-table-column>
-      
-      <el-table-column label="文件" align="center" prop="publicityFile" >
-      <template slot-scope="scope">
-        <el-link
-            type="primary" @click="reviewWord(`${baseUrl}${'/profile/upload' + scope.row.publicityFile}`)">
+
+      <el-table-column label="文件" align="center" prop="publicityFile">
+        <template slot-scope="scope">
+          <el-link type="primary" @click="reviewWord(`${baseUrl}${scope.row.publicityFile}`)">
             {{ getFileName(scope.row.publicityFile) }}
           </el-link>
           <br>
-          <el-link
-            class="ml20"
-            type="warning"
-            :href="`${baseUrl}${'/profile/upload' + scope.row.publicityFile}`"
-            :underline="false"
-            target="_blank">
+          <el-link class="ml20" type="warning" :href="`${baseUrl}${scope.row.publicityFile}`"
+            :underline="false" target="_blank">
           </el-link>
-          <el-link
-            type="primary" @click="reviewWord(`${baseUrl}${'/profile/upload' + scope.row.scanFile}`)">
+          <el-link type="primary" @click="reviewWord(`${baseUrl}${scope.row.scanFile}`)">
             {{ getFileName(scope.row.scanFile) }}
           </el-link>
-          <el-link
-            class="ml20"
-            type="warning"
-            :href="`${baseUrl}${'/profile/upload' + scope.row.scanFile}`"
-            :underline="false"
-            target="_blank">
+          <el-link class="ml20" type="warning" :href="`${baseUrl}${scope.row.scanFile}`"
+            :underline="false" target="_blank">
           </el-link>
-      </template>
+        </template>
       </el-table-column>
-      <el-table-column
-        label="操作"
-        align="center"
-        class-name="small-padding fixed-width"
-      >
+      <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
         <template slot-scope="scope">
-          <el-button
-            size="mini"
-            type="text"
-            icon="el-icon-edit"
-            @click="handleUpdate(scope.row)"
-            v-hasPermi="['oa:title:edit']"
-            >修改</el-button
-          >
-          <el-button
-            size="mini"
-            type="text"
-            icon="el-icon-delete"
-            @click="handleDelete(scope.row)"
-            v-hasPermi="['oa:title:remove']"
-            >删除</el-button
-          >
+          <el-button size="mini" type="text" icon="el-icon-edit" @click="handleUpdate(scope.row)"
+            v-hasPermi="['oa:title:edit']">修改</el-button>
+          <el-button size="mini" type="text" icon="el-icon-delete" @click="handleDelete(scope.row)"
+            v-hasPermi="['oa:title:remove']">删除</el-button>
         </template>
       </el-table-column>
     </el-table>
@@ -201,62 +105,55 @@
     <pagination v-show="total > 0" :total="total" :page.sync="queryParams.pageNum" :limit.sync="queryParams.pageSize"
       @pagination="getList" />
 
-     <!-- 添加或修改职称信息对话框 -->
+    <!-- 添加或修改职称信息对话框 -->
     <el-dialog :title="title" :visible.sync="open" width="60%" append-to-body>
       <el-form ref="form" :model="form" :rules="formRules" label-width="120px">
         <el-form-item label="姓名" prop="userId">
-          <el-select v-model="form.userId" filterable clearable >
-            <el-option
-              v-for="item in $store.state.user.userList"
-              :key="item.userId"
-              :label="item.nickName"
+          <el-select v-model="form.userId" filterable clearable>
+            <el-option v-for="item in $store.state.user.userList" :key="item.userId" :label="item.nickName"
               :value="item.userId">
             </el-option>
           </el-select>
         </el-form-item>
         <el-form-item label="职称类型" prop="type">
-              <el-select v-model="form.type" placeholder="请选择职称类型" style="width: 100%">
-                <el-option label="工程技术类" value="工程技术类" />
-                <el-option label="工程经济类" value="工程经济类" />
-                <el-option label="其他" value="其他" />
-              </el-select>
-            </el-form-item>
-         <el-form-item label="职称级别" prop="level">
-           <el-select v-model="form.level" placeholder="请选择职称级别" style="width: 100%">
-                <el-option label="员级" value="员级" />
-                <el-option label="助理级" value="助理级" />
-                <el-option label="中级" value="中级" />
-                <el-option label="副高级" value="副高级" />
-                <el-option label="正高级" value="正高级" />
-              </el-select>
+          <el-select v-model="form.type" placeholder="请选择职称类型" style="width: 100%">
+            <el-option label="工程类" value="工程类" />
+            <el-option label="经济类" value="经济类" />
+            <el-option label="政工类" value="政工类" />
+            <el-option label="企业法律顾问类" value="企业法律顾问类" />
+          </el-select>
+        </el-form-item>
+        <el-form-item label="职称级别" prop="level">
+          <el-select v-model="form.level" placeholder="请选择职称级别" style="width: 100%">
+            <el-option label="员级" value="员级" />
+            <el-option label="助理级" value="助理级" />
+            <el-option label="中级" value="中级" />
+            <el-option label="副高级" value="副高级" />
+            <el-option label="正高级" value="正高级" />
+          </el-select>
         </el-form-item>
         <el-form-item label="职称专业名称" prop="titleProfession">
-           <el-input v-model="form.titleProfession" placeholder="请输入职称专业名称"  maxlength="50" show-word-limit/>
+          <el-input v-model="form.titleProfession" placeholder="请输入职称专业名称" maxlength="50" show-word-limit />
         </el-form-item>
         <el-form-item label="评审单位" prop="institude">
-           <el-select v-model="form.institude" placeholder="请选择评审单位" style="width: 100%">
-                <el-option label="中国电建" value="中国电建" />
-                <el-option label="成都人社" value="成都人社" />
-                <el-option label="四川省测绘局" value="四川省测绘局" />
-                <el-option label="四川省建设厅" value="四川省建设厅" />
-                <el-option label="其他" value="其他" />
-              </el-select>
+          <el-select v-model="form.institude" placeholder="请选择评审单位" style="width: 100%">
+            <el-option label="中国电建" value="中国电建" />
+            <el-option label="成都人社" value="成都人社" />
+            <el-option label="四川省测绘局" value="四川省测绘局" />
+            <el-option label="四川省建设厅" value="四川省建设厅" />
+            <el-option label="其他" value="其他" />
+          </el-select>
         </el-form-item>
-        
+
         <el-form-item label="公示红头文件" prop="publicityFile">
-          <file-upload v-model="form.publicityFile" :fileType="['pdf']"/>
+          <file-upload v-model="form.publicityFile" :fileType="['pdf']" />
         </el-form-item>
         <el-form-item label="证书扫描件" prop="scanFile">
-          <file-upload v-model="form.scanFile" :fileType="['pdf']"/>
+          <file-upload v-model="form.scanFile" :fileType="['pdf']" />
         </el-form-item>
         <el-form-item label="证书取得时间" prop="obtainTime">
-          <el-date-picker
-            clearable
-            v-model="form.obtainTime"
-            type="date"
-            value-format="yyyy-MM-dd"
-            placeholder="请选择证书取得时间"
-          >
+          <el-date-picker clearable v-model="form.obtainTime" type="date" value-format="yyyy-MM-dd"
+            placeholder="请选择证书取得时间">
           </el-date-picker>
         </el-form-item>
       </el-form>
@@ -270,14 +167,14 @@
 </template>
 
 <script>
-  import {
+import {
   listEval,
   getEval,
   delEval,
   addEval,
   updateEval,
 } from "@/api/oa/titles/titles";
-import {Snowflake} from"@/utils/snowFlake.js";
+import { Snowflake } from "@/utils/snowFlake.js";
 
 export default {
   name: "Eval",
@@ -336,7 +233,7 @@ export default {
   created() {
     this.getList();
   },
-  computed:{
+  computed: {
     formRules() {
       return {
         userId: [
@@ -371,10 +268,10 @@ export default {
           { required: () => this.form.isApproved == '1', message: '请上传证书扫描件', trigger: 'change' }
         ],
         obtainTime: [
-          { required: () => this.form.isApproved == '1', message: '请选择证书取得时间', trigger: 'change'}
+          { required: () => this.form.isApproved == '1', message: '请选择证书取得时间', trigger: 'change' }
         ]
       }
-  }
+    }
   },
   methods: {
     /** 查询职称信息列表 */
@@ -486,7 +383,7 @@ export default {
           this.getList();
           this.$modal.msgSuccess("删除成功");
         })
-        .catch(() => {});
+        .catch(() => { });
     },
     /** 导出按钮操作 */
     handleExport() {
@@ -502,6 +399,4 @@ export default {
 };
 </script>
 
-<style lang="scss" scoped>
-
-</style>
+<style lang="scss" scoped></style>

oa-ui/src/views/oa/titles/record.vue

@@ -1,31 +1,16 @@
 <template>
   <div class="app-container">
-    <el-form
-      :model="queryParams"
-      ref="queryForm"
-      size="small"
-      :inline="true"
-      v-show="showSearch"
-      label-width="68px"
-    >
+    <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
       <el-form-item label="职称类型" prop="type">
-        <el-select
-          v-model="queryParams.type"
-          clearable
-          placeholder="请选择职称类型"
-          @change="handleQuery"
-        >
-          <el-option label="工程技术类" value="工程技术类"></el-option>
-          <el-option label="工程经济类" value="工程经济类"></el-option>
-          <el-option label="其他" value="其他"></el-option>
+        <el-select v-model="queryParams.type" clearable placeholder="请选择职称类型" @change="handleQuery">
+          <el-option label="工程类" value="工程类" />
+          <el-option label="经济类" value="经济类" />
+          <el-option label="政工类" value="政工类" />
+          <el-option label="企业法律顾问类" value="企业法律顾问类" />
         </el-select>
       </el-form-item>
       <el-form-item label="职称级别" prop="level">
-        <el-select
-          v-model="queryParams.level"
-          clearable
-          placeholder="请选择职称级别"
-          @change="handleQuery">
+        <el-select v-model="queryParams.level" clearable placeholder="请选择职称级别" @change="handleQuery">
           <el-option label="正高级" value="正高级"></el-option>
           <el-option label="副高级" value="副高级"></el-option>
           <el-option label="高级" value="高级"></el-option>
@@ -35,81 +20,37 @@
         </el-select>
       </el-form-item>
       <el-form-item label="申请人" prop="userId">
-        <el-select
-          v-model="queryParams.userId"
-          filterable
-          clearable
-          @change="handleQuery"
-        >
-          <el-option
-            v-for="item in $store.state.user.userList"
-            :key="item.userId"
-            :label="item.nickName"
-            :value="item.userId"
-          >
+        <el-select v-model="queryParams.userId" filterable clearable @change="handleQuery">
+          <el-option v-for="item in $store.state.user.userList" :key="item.userId" :label="item.nickName"
+            :value="item.userId">
           </el-option>
         </el-select>
       </el-form-item>
       <el-form-item>
-        <el-button
-          type="primary"
-          icon="el-icon-search"
-          size="mini"
-          @click="handleQuery"
-          >搜索</el-button
-        >
-        <el-button icon="el-icon-refresh" size="mini" @click="resetQuery"
-          >重置</el-button
-        >
+        <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
+        <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
       </el-form-item>
     </el-form>
     <el-row :gutter="10" class="mb8">
       <el-col :span="1.5">
-        <el-button
-          type="success"
-          plain
-          icon="el-icon-edit"
-          size="mini"
-          :disabled="single"
-          @click="handleUpdate"
-          v-hasPermi="['oa:title:edit']"
-          >修改</el-button
-        >
+        <el-button type="success" plain icon="el-icon-edit" size="mini" :disabled="single" @click="handleUpdate"
+          v-hasPermi="['oa:title:edit']">修改</el-button>
       </el-col>
       <el-col :span="1.5">
-        <el-button
-          type="warning"
-          plain
-          icon="el-icon-download"
-          size="mini"
-          @click="handleExport"
-          v-hasPermi="['oa:title:export']"
-          >导出</el-button
-        >
+        <el-button type="warning" plain icon="el-icon-download" size="mini" @click="handleExport"
+          v-hasPermi="['oa:title:export']">导出</el-button>
       </el-col>
-      <right-toolbar
-        :showSearch.sync="showSearch"
-        @queryTable="getList"
-      ></right-toolbar>
+      <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
     </el-row>
 
-    <el-table
-      v-loading="loading"
-      :data="evalList"
-      @selection-change="handleSelectionChange"
-    >
+    <el-table v-loading="loading" :data="evalList" @selection-change="handleSelectionChange">
       <el-table-column type="selection" width="55" align="center" />
       <el-table-column label="申请人" align="center" prop="userId">
         <template slot-scope="scope">
           {{ getUserName(scope.row.userId) }}
         </template>
       </el-table-column>
-      <el-table-column
-        label="申请时间"
-        align="center"
-        prop="applyTime"
-        width="150"
-      >
+      <el-table-column label="申请时间" align="center" prop="applyTime" width="150">
         <template slot-scope="scope">
           <span>{{ parseTime(scope.row.applyTime, "{y}-{m}-{d}") }}</span>
         </template>
@@ -118,18 +59,9 @@
       <el-table-column label="评审单位" align="center" prop="institude" />
       <el-table-column label="职称类型" align="center" prop="type" />
       <el-table-column label="职称级别" align="center" prop="level" />
-      <el-table-column
-        label="职称专业名称"
-        align="center"
-        prop="titleProfession"
-      />
+      <el-table-column label="职称专业名称" align="center" prop="titleProfession" />
       <el-table-column label="审核意见" align="center" prop="titleComment" />
-      <el-table-column
-        label="审核时间"
-        align="center"
-        prop="titleTime"
-        width="180"
-      >
+      <el-table-column label="审核时间" align="center" prop="titleTime" width="180">
         <template slot-scope="scope">
           <span>{{ parseTime(scope.row.titleTime, "{y}-{m}-{d}") }}</span>
         </template>
@@ -139,55 +71,35 @@
           {{ getUserName(scope.row.titleUserId) }}
         </template>
       </el-table-column>
-      <el-table-column
-        label="确认时间"
-        align="center"
-        prop="confirmTime"
-        width="150"
-      >
+      <el-table-column label="确认时间" align="center" prop="confirmTime" width="150">
         <template slot-scope="scope">
           <span>{{ parseTime(scope.row.confirmTime, "{y}-{m}-{d}") }}</span>
         </template>
       </el-table-column>
-      <el-table-column label="确认状态" align="center" prop="confirmStatus" >
+      <el-table-column label="确认状态" align="center" prop="confirmStatus">
         <template slot-scope="scope">
           <el-tag :type="scope.row.confirmStatus == '1' ? 'success' : 'danger'">
             {{ scope.row.confirmStatus == "1" ? "已确认" : "未确认" }}
           </el-tag>
         </template>
       </el-table-column>
-      <el-table-column label="是否通过" align="center" prop="isApproved" >
+      <el-table-column label="是否通过" align="center" prop="isApproved">
         <template slot-scope="scope">
           <el-tag :type="scope.row.isApproved == '1' ? 'success' : 'danger'">
             {{ scope.row.isApproved == "1" ? "通过" : "未通过" }}
           </el-tag>
         </template>
       </el-table-column>
-      <el-table-column
-        label="操作"
-        align="center"
-        class-name="small-padding fixed-width"
-      >
+      <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
         <template slot-scope="scope">
-          <el-button
-            size="mini"
-            type="text"
-            icon="el-icon-edit"
-            @click="handleUpdate(scope.row)"
-            v-hasPermi="['oa:title:edit']"
-            >修改</el-button
-          >
+          <el-button size="mini" type="text" icon="el-icon-edit" @click="handleUpdate(scope.row)"
+            v-hasPermi="['oa:title:edit']">修改</el-button>
         </template>
       </el-table-column>
     </el-table>
 
-    <pagination
-      v-show="total > 0"
-      :total="total"
-      :page.sync="queryParams.pageNum"
-      :limit.sync="queryParams.pageSize"
-      @pagination="getList"
-    />
+    <pagination v-show="total > 0" :total="total" :page.sync="queryParams.pageNum" :limit.sync="queryParams.pageSize"
+      @pagination="getList" />
 
     <!-- 添加或修改职称评审对话框 -->
     <el-dialog :title="title" :visible.sync="open" width="60%" append-to-body>
@@ -211,77 +123,49 @@
           {{ form.titleProfession }}
         </el-form-item>
         <el-form-item label="评审表(盖章前)" prop="sheet">
-          <el-link
-            type="primary"
-            @click="reviewWord(`${baseUrl}${'/profile/upload' + form.sheet}`)"
-          >
+          <el-link type="primary" @click="reviewWord(`${baseUrl}${'/profile/upload' + form.sheet}`)">
             {{ getFileName(form.sheet) }}
           </el-link>
-          <el-link
-            class="ml20"
-            type="warning"
-            :href="`${baseUrl}${'/profile/upload' + form.sheet}`"
-            :underline="false"
-            target="_blank"
-          >
+          <el-link class="ml20" type="warning" :href="`${baseUrl}${'/profile/upload' + form.sheet}`" :underline="false"
+            target="_blank">
             <span class="el-icon-download">下载文件</span>
           </el-link>
         </el-form-item>
         <el-form-item label="评审表(盖章后)" prop="sheetStamp">
-          <el-link
-            type="primary" @click="reviewWord(`${baseUrl}${'/profile/upload' + form.sheetStamp}`)">
+          <el-link type="primary" @click="reviewWord(`${baseUrl}${'/profile/upload' + form.sheetStamp}`)">
             {{ getFileName(form.sheetStamp) }}
           </el-link>
-          <el-link
-            class="ml20"
-            type="warning"
-            :href="`${baseUrl}${'/profile/upload' + form.sheetStamp}`"
-            :underline="false"
-            target="_blank"
-          >
+          <el-link class="ml20" type="warning" :href="`${baseUrl}${'/profile/upload' + form.sheetStamp}`"
+            :underline="false" target="_blank">
             <span class="el-icon-download">下载文件</span>
           </el-link>
         </el-form-item>
         <el-form-item label="其他材料" prop="material">
-          <el-link
-            type="primary" @click="reviewWord(`${baseUrl}${'/profile/upload' + form.material}`)">
+          <el-link type="primary" @click="reviewWord(`${baseUrl}${'/profile/upload' + form.material}`)">
             {{ getFileName(form.material) }}
           </el-link>
-          <el-link
-            class="ml20"
-            type="warning"
-            :href="`${baseUrl}${'/profile/upload' + form.material}`"
-            :underline="false"
+          <el-link class="ml20" type="warning" :href="`${baseUrl}${'/profile/upload' + form.material}`" :underline="false"
             target="_blank">
             <span class="el-icon-download">下载文件</span>
           </el-link>
         </el-form-item>
         <!-- 审核是否通过并添加材料 -->
         <el-form-item label="是否通过" prop="isApproved">
-          <el-switch
-            v-model="form.isApproved"
-            active-value="1"
-            inactive-value="0"
-            active-text="通过"
-            inactive-text="未通过">
+          <el-switch v-model="form.isApproved" active-value="1" inactive-value="0" active-text="通过" inactive-text="未通过">
           </el-switch>
         </el-form-item>
         <template v-if="form.isApproved == '1'">
-        <el-form-item label="公示红头文件" prop="publicityFile">
-          <file-upload v-model="form.publicityFile" :fileType="['pdf']"/>
-        </el-form-item>
-        <el-form-item label="证书扫描件" prop="scanFile">
-          <file-upload v-model="form.scanFile" :fileType="['pdf']"/>
-        </el-form-item>
-        <el-form-item label="证书取得时间" prop="obtainTime">
-          <el-date-picker
-            clearable
-            v-model="form.obtainTime"
-            type="date"
-            value-format="yyyy-MM-dd"
-            placeholder="请选择证书取得时间">
-          </el-date-picker>
-        </el-form-item>
+          <el-form-item label="公示红头文件" prop="publicityFile">
+            <file-upload v-model="form.publicityFile" :fileType="['pdf']" />
+          </el-form-item>
+          <el-form-item label="证书扫描件" prop="scanFile">
+            <file-upload v-model="form.scanFile" :fileType="['pdf']" />
+          </el-form-item>
+          <el-form-item label="证书取得时间" prop="obtainTime">
+            <el-date-picker clearable v-model="form.obtainTime" type="date" value-format="yyyy-MM-dd"
+              placeholder="请选择证书取得时间">
+            </el-date-picker>
+          </el-form-item>
         </template>
       </el-form>
       <div slot="footer" class="dialog-footer">
@@ -293,8 +177,8 @@
 </template>
 
 <script>
-import {listEval,getEval,delEval,addEval,updateEval} from "@/api/oa/titles/titles";
-import {Snowflake} from"@/utils/snowFlake.js";
+import { listEval, getEval, delEval, addEval, updateEval } from "@/api/oa/titles/titles";
+import { Snowflake } from "@/utils/snowFlake.js";
 
 export default {
   name: "Eval",
@@ -361,7 +245,7 @@ export default {
       }
     }
   },
-  computed:{
+  computed: {
     formRules() {
       return {
         publicityFile: [
@@ -371,10 +255,10 @@ export default {
           { required: () => this.form.isApproved == '1', message: '请上传证书扫描件', trigger: 'change' }
         ],
         obtainTime: [
-          { required: () => this.form.isApproved == '1', message: '请选择证书取得时间', trigger: 'change'}
+          { required: () => this.form.isApproved == '1', message: '请选择证书取得时间', trigger: 'change' }
         ]
       }
-  },
+    },
   },
   methods: {
     /** 查询职称评审列表 */
@@ -455,31 +339,32 @@ export default {
     /**switch切换到未通过时清除上传文件 */
     clearFiles() {
       this.form.publicityFile = "";
-      this.form.scanFile= "";
+      this.form.scanFile = "";
       this.form.obtainTime = "";
     },
     /** 提交按钮 */
     submitForm() {
-      if(this.form.confirmStatus=="1"){
-      this.$refs["form"].validate((valid) => {
-        if (valid) {
-          if (this.form.titleEvalId != null) {
-            updateEval(this.form).then((response) => {
-              this.$modal.msgSuccess("修改成功");
-              this.open = false;
-              this.getList();
-            });
-          } else {
-            addEval(this.form).then((response) => {
-              this.$modal.msgSuccess("新增成功");
-              this.open = false;
-              this.getList();
-            });
+      if (this.form.confirmStatus == "1") {
+        this.$refs["form"].validate((valid) => {
+          if (valid) {
+            if (this.form.titleEvalId != null) {
+              updateEval(this.form).then((response) => {
+                this.$modal.msgSuccess("修改成功");
+                this.open = false;
+                this.getList();
+              });
+            } else {
+              addEval(this.form).then((response) => {
+                this.$modal.msgSuccess("新增成功");
+                this.open = false;
+                this.getList();
+              });
+            }
           }
-        }
-      })}
-      else{
-         this.$message.error('未在流程中确认信息，无法提交。')
+        })
+      }
+      else {
+        this.$message.error('未在流程中确认信息，无法提交。')
       }
     },
     /** 删除按钮操作 */
@@ -494,7 +379,7 @@ export default {
           this.getList();
           this.$modal.msgSuccess("删除成功");
         })
-        .catch(() => {});
+        .catch(() => { });
     },
     /** 导出按钮操作 */
     handleExport() {