From 7a173d37aa782ee0e349b6b6a892a5f3e3174d29 Mon Sep 17 00:00:00 2001
From: 祖安之光 <11848914+light-of-zuan@user.noreply.gitee.com>
Date: Thu, 19 Mar 2026 09:50:32 +0800
Subject: [PATCH] 修改新增

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

diff --git a/src/views/build/conpanyFunctionConsult/orgStructure/dutyDistributeChart/index.vue b/src/views/build/conpanyFunctionConsult/orgStructure/dutyDistributeChart/index.vue
index 65bc74c..e1a9cfa 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"
@@ -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>
@@ -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,13 +137,12 @@
       {required: true, message: "有两个归口部门请填写备注", trigger: "blur"},
     ],
   },
-  mergeValues: ['7.1','8.2','8.3','8.4','8.5','9.1']
+  mergeValues: []
 });
 
 const { queryParams,isEdit, dataList,deptList, isAdmin, companyList, caluseList, form,originRemark, remarkList,dialogVisible,mergeValues,remarkForm,rules } = toRefs(data);
 const noticeRef = ref();
 onMounted(async ()=>{
-  await getSysClauseList()
   if(userStore.roles.includes('admin')){
     data.isAdmin = true
     await getCompanyList()
@@ -177,7 +176,7 @@
 }
 
 const getSysClauseList = async ()=> {
-  const res = await getSysClause()
+  const res = await getSysClause({companyId: data.queryParams.companyId})
   if(res.code == 200){
     data.caluseList = res.data.map(i=>{
       return {
@@ -283,6 +282,8 @@
 const getList = async () => {
   loading.value = true
   await getDeptList()
+  await getSysClauseList()
+  await getRemarksList()
   const res = await getDistribution(data.queryParams)
   if(res.code == 200){
     data.dataList = res.data
@@ -303,7 +304,6 @@
         item.remark = i.remark
       }
     }
-    await getRemarksList()
   }else{
     ElMessage.warning(res.message)
   }

--
Gitblit v1.9.2