From a6a7a4e83171181477a99d429b01c3b73cb0be2d Mon Sep 17 00:00:00 2001
From: zhouwx <1175765986@qq.com>
Date: 星期五, 07 十一月 2025 15:35:11 +0800
Subject: [PATCH] 修改

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

diff --git a/src/views/build/conpanyFunctionConsult/orgStructure/dutyDistributeChart/index.vue b/src/views/build/conpanyFunctionConsult/orgStructure/dutyDistributeChart/index.vue
index 6b619b7..65bc74c 100644
--- a/src/views/build/conpanyFunctionConsult/orgStructure/dutyDistributeChart/index.vue
+++ b/src/views/build/conpanyFunctionConsult/orgStructure/dutyDistributeChart/index.vue
@@ -29,9 +29,9 @@
     <div style="display: flex;justify-content: space-between;margin-bottom: 10px">
       <div>质量管理体系过程与部门职能矩阵(▲ 主管部门<span style="font-size: 24px;display: inline-block;margin-left: 20px">●</span> 归口部门<span style="font-size: 24px;display: inline-block;margin-left: 20px">○</span> 配合部门)</div>
       <div>
-        <el-button type="primary" @click="initDistribute">重新生成</el-button>
-        <el-button type="primary" v-if="!isEdit" @click="isEdit = true">编辑</el-button>
-        <el-button type="primary" v-if="isEdit" @click="confirmEdit">保存</el-button>
+        <el-button type="primary" @click="initDistribute" v-hasPermi="['orgStructure:dutyDistributeChart:add']">重新生成</el-button>
+        <el-button type="primary" v-if="!isEdit" @click="isEdit = true" v-hasPermi="['orgStructure:dutyDistributeChart:edit']">编辑</el-button>
+        <el-button type="primary" v-if="isEdit" @click="confirmEdit" v-hasPermi="['orgStructure:dutyDistributeChart:edit']">保存</el-button>
       </div>
     </div>
     <!-- 表格数据 -->
@@ -75,7 +75,7 @@
               </el-input>
             </el-form-item>
 
-            <span v-else>{{ remarkForm.tableData[scope.$index].remark }}</span>
+            <span v-else>{{ remarkForm?.tableData?.[scope.$index]?.remark || '' }}</span>
           </div>
         </template>
       </el-table-column>
@@ -137,7 +137,7 @@
       {required: true, message: "有两个归口部门请填写备注", trigger: "blur"},
     ],
   },
-  mergeValues: ['4','5','6','7','7.1','8','8.2','8.3','8.4','8.5','9','9.1','10']
+  mergeValues: ['7.1','8.2','8.3','8.4','8.5','9.1']
 });
 
 const { queryParams,isEdit, dataList,deptList, isAdmin, companyList, caluseList, form,originRemark, remarkList,dialogVisible,mergeValues,remarkForm,rules } = toRefs(data);
@@ -238,7 +238,7 @@
       return {
         companyId: data.queryParams.companyId,
         clauseNum: i.clauseNum,
-        remark: i.remark
+        remark: i.remark.trim()
       }
     })
     if(data.form.list.length == 0  && data.form.remarks.length == 0){
@@ -444,4 +444,4 @@
 
   }
 }
-</style>
\ No newline at end of file
+</style>

--
Gitblit v1.9.2