From 4d99171d6e935ba2060ae0af723a8e2db72d22d6 Mon Sep 17 00:00:00 2001
From: 祖安之光 <11848914+light-of-zuan@user.noreply.gitee.com>
Date: 星期三, 02 七月 2025 11:07:04 +0800
Subject: [PATCH] 修改新增

---
 src/views/build/conpanyFunctionConsult/orgStructure/departManage/index.vue |   12 ++++++------
 1 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/views/build/conpanyFunctionConsult/orgStructure/departManage/index.vue b/src/views/build/conpanyFunctionConsult/orgStructure/departManage/index.vue
index 955110e..f66da1c 100644
--- a/src/views/build/conpanyFunctionConsult/orgStructure/departManage/index.vue
+++ b/src/views/build/conpanyFunctionConsult/orgStructure/departManage/index.vue
@@ -18,7 +18,7 @@
         <el-form-item >
           <el-button v-if="isAdmin" type="primary" @click="getList">查询</el-button>
           <el-button v-if="isAdmin" type="primary" plain @click="reset">重置</el-button>
-          <el-button type="primary" @click="initDistribute">生成智能分配表</el-button>
+          <el-button type="primary" @click="initDistribute">生成职能分配表</el-button>
         </el-form-item>
       </el-form>
     </div>
@@ -154,14 +154,13 @@
   const res = await getCompany(queryParams)
   if (res.code == 200) {
     data.companyList = res.data.list?res.data.list:[]
-    data.queryParams.companyId = data.companyList[0].id
   } else {
     ElMessage.warning(res.message)
   }
 }
 
 const openDialog = (type, value) => {
-  dialogRef.value.openDialog(type, value, data.queryParams.companyId);
+  dialogRef.value.openDialog(type, value, data.queryParams.companyId, data.isAdmin, data.companyList );
 }
 const openDutyDialog = (value) =>{
   dutyDialogRef.value.openDialog(value);
@@ -200,7 +199,6 @@
 const download = async (val) => {
   const templatePath = '/dutyFile.docx'
   const data = await getDeptDetail(val.deptId)
-  console.log(data)
   try {
     generateWordDocument(templatePath, data, `${data.deptName}职责表.docx`);
   } catch (error){
@@ -221,6 +219,7 @@
         tableData.tableData = sortResponsibilities(res.data.sysDeptResponsibilitys.map(i=>{
           return {
             ...i,
+            leader: i.leader || '',
             evidenceMaterials: i.evidenceMaterials || '',
             managementDocuments: i.managementDocuments || '',
             technicalDocuments: i.technicalDocuments || '',
@@ -228,15 +227,16 @@
           }
         }))
       }else{
-        tableData.tableData = [...data.firstFive,...res.data.sysDeptResponsibilitys.map(i=>{
+        tableData.tableData = [...data.firstFive,...res.data.sysDeptResponsibilitys,...data.lastTwo].map(i=>{
           return {
             ...i,
+            leader: i.leader || '',
             evidenceMaterials: i.evidenceMaterials || '',
             managementDocuments: i.managementDocuments || '',
             technicalDocuments: i.technicalDocuments || '',
             existingRecords: i.existingRecords || '',
           }
-        }),...data.lastTwo]
+        })
       }
       return tableData
     }else{

--
Gitblit v1.9.2