From ff1169ac5114c68e96c5686a0caa5d69d8a60b8a Mon Sep 17 00:00:00 2001
From: zhouwx <1175765986@qq.com>
Date: 星期五, 12 十二月 2025 16:55:39 +0800
Subject: [PATCH] 修改

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

diff --git a/src/views/build/conpanyFunctionConsult/orgStructure/dutyDistributeChart/index.vue b/src/views/build/conpanyFunctionConsult/orgStructure/dutyDistributeChart/index.vue
index 6b619b7..8f833dc 100644
--- a/src/views/build/conpanyFunctionConsult/orgStructure/dutyDistributeChart/index.vue
+++ b/src/views/build/conpanyFunctionConsult/orgStructure/dutyDistributeChart/index.vue
@@ -10,7 +10,7 @@
 <!--              @click="openDialog('add',{})"-->
 <!--          >新增</el-button>-->
 <!--        </el-form-item>-->
-        <el-form-item v-if="isAdmin" label="企业:" >
+        <el-form-item v-if="isAdmin" label="单位:" >
           <el-select v-model="data.queryParams.companyId" placeholder="请选择" clearable @change="getList">
             <el-option
                 v-for="item in companyList"
@@ -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>
     <!-- 表格数据 -->
@@ -51,8 +51,8 @@
 <!--      </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-if="isEdit" v-model="scope.row[column.deptId]" size="large" @change="changeStatus(scope.row,scope.$index)"/>
-          <div v-else>
+<!--          <el-checkbox v-if="isEdit" v-model="scope.row[column.deptId]" size="large" @change="changeStatus(scope.row,scope.$index)"/>-->
+          <div>
             <el-checkbox v-if="column.deptType == '0'" v-model="scope.row[column.deptId]" disabled size="large"/>
             <div class="markBox" v-else>
               <div class="triangle" v-show="scope.row[column.deptId]"></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>
@@ -89,7 +89,7 @@
 <!--        :before-close="handleClose"-->
 <!--    >-->
 <!--      <el-form :model="remarkList" size="default" ref="superRef" :rules="formRules" label-width="150px">-->
-<!--        <el-form-item label="企业:" prop="companyId"></el-form-item>-->
+<!--        <el-form-item label="单位:" prop="companyId"></el-form-item>-->
 <!--      </el-form>-->
 <!--    </el-dialog>-->
   </div>
@@ -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