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

---
 src/views/build/conpanyFunctionConsult/orgStructure/dutyDistributeChart/index.vue |   72 +++++++++++++++++++++++++++++-------
 1 files changed, 58 insertions(+), 14 deletions(-)

diff --git a/src/views/build/conpanyFunctionConsult/orgStructure/dutyDistributeChart/index.vue b/src/views/build/conpanyFunctionConsult/orgStructure/dutyDistributeChart/index.vue
index b67b257..9fa37aa 100644
--- a/src/views/build/conpanyFunctionConsult/orgStructure/dutyDistributeChart/index.vue
+++ b/src/views/build/conpanyFunctionConsult/orgStructure/dutyDistributeChart/index.vue
@@ -38,16 +38,16 @@
     <el-table v-loading="loading" :data="caluseList" class="caluseTable" :border="true" :span-method="arraySpanMethod">
       <el-table-column label="条款号" prop="clauseNum" align="center"/>
       <el-table-column label="条款内容/要素" prop="content" align="left"/>
-      <el-table-column label="总经理" prop="manage" align="center">
-        <template #default="scope">
-          <el-checkbox v-model="scope.row.manage" disabled size="large" />
-        </template>
-      </el-table-column>
-      <el-table-column label="管理者代表" prop="represent" align="center">
-        <template #default="scope">
-          <el-checkbox v-model="scope.row.represent" disabled size="large" />
-        </template>
-      </el-table-column>
+<!--      <el-table-column label="总经理" prop="manage" align="center">-->
+<!--        <template #default="scope">-->
+<!--          <el-checkbox v-model="scope.row.manage" disabled size="large" />-->
+<!--        </template>-->
+<!--      </el-table-column>-->
+<!--      <el-table-column label="管理者代表" prop="represent" align="center">-->
+<!--        <template #default="scope">-->
+<!--          <el-checkbox v-model="scope.row.represent" disabled size="large" />-->
+<!--        </template>-->
+<!--      </el-table-column>-->
       <el-table-column v-for="column in deptList" :key="column.deptId" :prop="column.deptId" :label="column.deptName" align="center">
         <template #default="scope">
           <el-checkbox v-model="scope.row[column.deptId]" :disabled="!isEdit" size="large" @change="changeStatus(scope.row)"/>
@@ -97,7 +97,50 @@
     {clauseNum: '7.1.3', content: '基础设施',manage: false,represent: true},
     {clauseNum: '7.1.4', content: '过程运行环境',manage: false,represent: true},
     {clauseNum: '7.1.5', content: '监视和测量资源',manage: false,represent: true},
-    {clauseNum: '7.1.6', content: '组织的知识',manage: false,represent: true}
+    {clauseNum: '7.1.6', content: '组织的知识',manage: false,represent: true},
+    {clauseNum: '7.2', content: '能力'},
+    {clauseNum: '7.3', content: '意识'},
+    {clauseNum: '7.4', content: '沟通'},
+    {clauseNum: '7.5', content: '成文信息'},
+    {clauseNum: '7.6', content: '质量信息'},
+    {clauseNum: '8', content: '运行'},
+    {clauseNum: '8.1', content: '运行策划和控制'},
+    {clauseNum: '8.2', content: '产品和服务的要求'},
+    {clauseNum: '8.2.1', content: '顾客沟通'},
+    {clauseNum: '8.2.2', content: '与产品和服务有关的要求的确定'},
+    {clauseNum: '8.2.3', content: '与产品和服务有关的要求的评审'},
+    {clauseNum: '8.2.4', content: '产品和服务要求的更改'},
+    {clauseNum: '8.3', content: '产品和服务的设计和开发'},
+    {clauseNum: '8.3.1', content: '总则'},
+    {clauseNum: '8.3.2', content: '设计和开发策划'},
+    {clauseNum: '8.3.3', content: '设计和开发输入'},
+    {clauseNum: '8.3.4', content: '设计和开发控制'},
+    {clauseNum: '8.3.5', content: '设计和开发输出'},
+    {clauseNum: '8.3.6', content: '设计和开发更改'},
+    {clauseNum: '8.3.7', content: '新产品试制'},
+    {clauseNum: '8.3.8', content: '设计和开发的试验控制'},
+    {clauseNum: '8.4', content: '外部提供过程、产品和服务的控制'},
+    {clauseNum: '8.4.1', content: '总则'},
+    {clauseNum: '8.4.2', content: '控制类型和程度'},
+    {clauseNum: '8.4.3', content: '提供给外部供方的信息'},
+    {clauseNum: '8.5', content: '生产和服务提供'},
+    {clauseNum: '8.5.1', content: '生产和服务提供的控制'},
+    {clauseNum: '8.5.2', content: '标识和可追溯性'},
+    {clauseNum: '8.5.3', content: '顾客或外部供方的财产'},
+    {clauseNum: '8.5.4', content: '防护'},
+    {clauseNum: '8.5.5', content: '交付后的活动'},
+    {clauseNum: '8.5.6', content: '更改控制'},
+    {clauseNum: '8.5.7', content: '关键过程'},
+    {clauseNum: '8.6', content: '产品和服务的放行'},
+    {clauseNum: '8.7', content: '不合格输出的控制'},
+    {clauseNum: '9', content: '绩效评价'},
+    {clauseNum: '9.1', content: '监视、测量、分析和评价'},
+    {clauseNum: '9.1.1', content: '总则'},
+    {clauseNum: '9.1.2', content: '顾客满意'},
+    {clauseNum: '9.1.3', content: '分析和评价'},
+    {clauseNum: '9.2', content: '内部审核'},
+    {clauseNum: '9.3', content: '管理评审'},
+    {clauseNum: '10', content: '持续改进'}
   ],
   form: {
     companyId: null,
@@ -170,7 +213,8 @@
      rowIndex,
      columnIndex,
    }) => {
-  if (rowIndex === 0 || rowIndex === 5 ||rowIndex === 9 ||rowIndex === 13) {
+  const mergeValues = ['4','5','6','7','7.1','8','8.2','8.3','8.4','8.5','9','9.1','10']
+  if (mergeValues.includes(row.clauseNum)) {
     if (columnIndex === 0) {
       return [1, 1]
     } else if(columnIndex === 1){
@@ -287,7 +331,7 @@
 <style lang="scss">
 .caluseTable{
   .el-table__cell{
-    padding: 4px 0 !important;
+    padding: 0 !important;
     .is-disabled{
       .el-checkbox__label{
         color: #606266 !important
@@ -313,7 +357,7 @@
     }
   }
   .cell{
-    padding: 0 6px !important;
+    padding: 0 4px !important;
   }
 }
 </style>
\ No newline at end of file

--
Gitblit v1.9.2