From d85d9ae08781a5b0d9b7f854460d3f07d043595a Mon Sep 17 00:00:00 2001
From: 祖安之光 <11848914+light-of-zuan@user.noreply.gitee.com>
Date: 星期五, 11 七月 2025 13:27:22 +0800
Subject: [PATCH] 修改新增

---
 src/views/build/conpanyFunctionConsult/digitalFileDep/manageType/qualityManual/index.vue |   21 +++++++++++++--------
 1 files changed, 13 insertions(+), 8 deletions(-)

diff --git a/src/views/build/conpanyFunctionConsult/digitalFileDep/manageType/qualityManual/index.vue b/src/views/build/conpanyFunctionConsult/digitalFileDep/manageType/qualityManual/index.vue
index 745679e..a5d5418 100644
--- a/src/views/build/conpanyFunctionConsult/digitalFileDep/manageType/qualityManual/index.vue
+++ b/src/views/build/conpanyFunctionConsult/digitalFileDep/manageType/qualityManual/index.vue
@@ -183,7 +183,7 @@
 const getDeptList = async (val) => {
   const res = await getDepart({responsType: 1, companyId: val.companyId})
   if(res.code == 200){
-    data.originDeptList = res.data
+    data.originDeptList = JSON.parse(JSON.stringify(res.data))
     data.deptList.deptName = val.companyName
     data.deptList.children = proxy.handleTree(res.data, "deptId")
   }else{
@@ -234,7 +234,8 @@
     data.companyInfo.summaries = res.data.companySummaries ? res.data.companySummaries[0]?.companySummary : []
     data.companyInfo.policies = res.data.companyQualityPolicies ? res.data.companyQualityPolicies[0]?.policy : []
     const duties = transToTableData(res.data.sysFunctionalDistributions,data.originDeptList)
-    data.companyInfo.allDeptNames = duties.allDeptNames
+    data.companyInfo.allDepts = duties.allDepts
+    console.log(data.companyInfo.allDepts,'all')
     data.companyInfo.clauses = duties.clauses
     data.companyInfo.temps = res.data.companyIndustryTemplates?.map((item,index)=>{
       return {
@@ -250,7 +251,7 @@
 const transToTableData=(duties,deptList)=>{
   // 步骤1:获取所有唯一的部门和条款编号
   // const allDeptNames = [...new Set(duties.map(item => item.deptName))];
-  const allDeptNames = deptList ? deptList.map(item => item.deptName) : [...new Set(duties.map(item => item.deptName))]
+  const allDepts = deptList
   const allClauseNums = [...new Set([
     ...data.caluseList.map(c => c.clauseNum),
     ...duties.map(d => d.clauseNum)
@@ -261,11 +262,15 @@
   const processedClauses = allClauseNums.map(clauseNum => {
     const clauseContent = data.caluseList.find(c => c.clauseNum === clauseNum)?.content || "";
     // 为当前条款生成所有部门的数据(确保每个部门都有值)
-    const deptValues = allDeptNames.map(deptName => {
+    const deptValues = allDepts.map(dept => {
       const matchedDept = duties.find(
-          item => item.clauseNum === clauseNum && item.deptName === deptName
-      );
-      return matchedDept ? (matchedDept.chooseLab==1?'●':'○' ): '○'
+          item => item.clauseNum === clauseNum && item.deptId === dept.deptId
+      )
+      if(dept.deptType == '0'){
+        return matchedDept ? (matchedDept.chooseLab==1?'●':'○' ): '○'
+      }else{
+        return matchedDept ? (matchedDept.chooseLab==1?'▲':'○' ): '○'
+      }
     });
     return {
       clauseNum,
@@ -276,7 +281,7 @@
 // 最终数据结构
   return {
     clauses: processedClauses,
-    allDeptNames // 用于生成表头
+    allDepts // 用于生成表头
   };
 }
 

--
Gitblit v1.9.2