From 0a7829811f6df7a6eb4e32ba5ba53b1db9f10e9c Mon Sep 17 00:00:00 2001
From: zhouwx <1175765986@qq.com>
Date: 星期三, 23 七月 2025 10:01:09 +0800
Subject: [PATCH] 修改

---
 src/views/build/conpanyFunctionConsult/digitalFileDep/manageType/qualityManual/index.vue |   28 ++++++++++++++++++++++++----
 1 files changed, 24 insertions(+), 4 deletions(-)

diff --git a/src/views/build/conpanyFunctionConsult/digitalFileDep/manageType/qualityManual/index.vue b/src/views/build/conpanyFunctionConsult/digitalFileDep/manageType/qualityManual/index.vue
index a5d5418..53f2ae7 100644
--- a/src/views/build/conpanyFunctionConsult/digitalFileDep/manageType/qualityManual/index.vue
+++ b/src/views/build/conpanyFunctionConsult/digitalFileDep/manageType/qualityManual/index.vue
@@ -80,7 +80,7 @@
   getStandardDetail,
   getStandardQuality
 } from "@/api/standardSys/standardSys";
-import {getDepart, getDistribution, getSysClause} from "@/api/orgStructure/depart";
+import {getDepart, getDistribution, getFunctionalRemarkList, getSysClause} from "@/api/orgStructure/depart";
 
 const userStore = useUserStore()
 const { proxy } = getCurrentInstance();
@@ -229,7 +229,8 @@
   if(res.code === 200){
     if(!res.data || (res.data.companyIndustryTemplates.length == 0 && res.data.companyQualityPolicies.length == 0 && res.data.companySummaries.length == 0 && res.data.sysFunctionalDistributions
         .length == 0 && res.data.treeSelects.length == 0)){
-      return Promise.reject(new Error('该企业暂无质量数据'));
+      loading.value = false
+      return Promise.reject(new Error('该企业暂无质量数据'))
     }
     data.companyInfo.summaries = res.data.companySummaries ? res.data.companySummaries[0]?.companySummary : []
     data.companyInfo.policies = res.data.companyQualityPolicies ? res.data.companyQualityPolicies[0]?.policy : []
@@ -248,6 +249,24 @@
   }
 }
 
+const getRemarksList = async (companyId)=> {
+  const res = await getFunctionalRemarkList({companyId: companyId})
+  if(res.code == 200){
+    const originRemark = res.data
+    for(let item of originRemark){
+      const foundObj = data.caluseList.find(i=>i.clauseNum == item.clauseNum)
+      if(foundObj){
+        foundObj.remark = item.remark
+      }
+    }
+    data.companyInfo.remarks = originRemark.map(i=>{
+      return `${i.clauseNum}:${i.remark}`
+    }).join(';')
+  }else{
+    ElMessage.warning(res.message)
+  }
+}
+
 const transToTableData=(duties,deptList)=>{
   // 步骤1:获取所有唯一的部门和条款编号
   // const allDeptNames = [...new Set(duties.map(item => item.deptName))];
@@ -258,7 +277,7 @@
   ])];
 
 // 步骤2:为每个条款生成完整的部门数据(缺失数据默认 chooseLab: 0)
-  const mergeValues = ['4','5','6','7','7.1','8','8.2','8.3','8.4','8.5','9','9.1','10']
+  const mergeValues = ['7.1','8.2','8.3','8.4','8.5','9.1']
   const processedClauses = allClauseNums.map(clauseNum => {
     const clauseContent = data.caluseList.find(c => c.clauseNum === clauseNum)?.content || "";
     // 为当前条款生成所有部门的数据(确保每个部门都有值)
@@ -294,6 +313,7 @@
     try {
       await getDeptList(val)
       await getInfo(val)
+      await getRemarksList(val.companyId)
       // 2. 等待DOM更新完成
       await nextTick();
 
@@ -372,4 +392,4 @@
     pointer-events: none; /* 禁止交互 */
     z-index: -1;
   }
-</style>
\ No newline at end of file
+</style>

--
Gitblit v1.9.2