资料管理项目承担部门显示

oa-back/ruoyi-admin/src/main/java/com/ruoyi/web/controller/file/FilesAchievementController.java

@@ -222,11 +222,19 @@ public class FilesAchievementController extends BaseController
                 if (!transferFile.exists())
                     uploadKmlFile.transferTo(transferFile);
                 filesAchievement.setKmlUrl(transferFile.getName());
+                return false;
             }
             else
+            {
+                filesAchievement.setKmlUrl(null);
                 return true;
+            }
+        }
+        else
+        {
+            filesAchievement.setKmlUrl(null);
+            return true;
         }
-        return false;
     }
 
     /**

oa-back/ruoyi-admin/src/main/java/com/ruoyi/web/controller/file/FilesProjectController.java

@@ -55,6 +55,9 @@ public class FilesProjectController extends BaseController {
     public TableDataInfo list(CmcProject cmcProject) {
         startPage();
         List<CmcProject> list = cmcProjectService.selectCmcProjectList(cmcProject);
+        for (CmcProject project : list) {
+            project.setUndertakingDeptName(deptIdToName(project));
+        }
         return getDataTable(list);
     }
 

oa-ui/src/views/file/filesProject/achievement.vue

@@ -3,8 +3,8 @@
  * @version: 
  * @Author: ysh
  * @Date: 2022-09-08 17:16:12
- * @LastEditors: Please set LastEditors
- * @LastEditTime: 2024-12-30 15:47:46
+ * @LastEditors: wrh
+ * @LastEditTime: 2024-12-30 17:06:44
 -->
 <template>
   <div>
@@ -37,7 +37,7 @@
       <el-button type="warning" size="small" icon="el-icon-upload" @click="uploadAchievement"
         v-hasPermi="['file:achievement:add']">上传成果表</el-button>
       <el-button type="danger" size="small" icon="el-icon-delete" :disabled="multiple" @click="handleDeleteMany"
-        v-hasPermi="['file:achievement:edit']">批量删除
+        v-hasPermi="['file:achievement:remove']">批量删除
       </el-button>
     </el-row>
     <!-- 表格 -->
@@ -503,7 +503,7 @@ export default {
     },
     getAchiList() {
       this.loading = true;
-      if (this.$store.getters.roles.includes('projectLeader')) {
+      if (this.$store.getters.roles.includes('projectLeader') && !this.$store.getters.roles.includes('leader')) {
         this.queryParams.projectLeader = this.$store.getters.userId
       }
       listAchievement(this.queryParams).then(res => {

oa-ui/src/views/file/filesProject/project.vue

@@ -48,10 +48,13 @@
         </el-table-column>
         <el-table-column prop="projectNumber" label="项目编号" align="center" />
         <el-table-column prop="projectName" label="项目名称" width="200px" align="center" />
-        <el-table-column prop="projectLeaderUser.nickName" label="项目负责人" align="center" />
+        <el-table-column prop="projectLeader" label="项目负责人" align="center" >
+          <template #default="scope">
+            <span>{{ getUserName(scope.row.projectLeader) }}</span>
+          </template>
+        </el-table-column>
         <el-table-column prop="partyA.partyAName" label="甲方单位" align="center" />
-        <el-table-column prop="undertakingSector" label="承担部门" align="center" />
-        <el-table-column prop="storageAddress" label="存放地址" align="center" />
+        <el-table-column prop="undertakingDeptName" label="承担部门" align="center" />
         <el-table-column label="有无范围KML" align="center" :formatter="formatterKmlurl" />
         <el-table-column label="有无控制点" align="center" :formatter="formatterCpKmlurl" />
         <el-table-column label="操作" align="center" width="150" class-name="small-padding fixed-width">
@@ -102,14 +105,14 @@
               <el-input v-model="form.projectLeader" placeholder="请输入项目负责人" />
             </el-form-item>
           </el-col>
-          <el-col :span="12">
+          <!-- <el-col :span="12">
             <el-form-item label="存放地址" prop="storageAddress">
               <el-select v-model="form.storageAddress" placeholder="请选择" filterable allow-create clearable>
                 <el-option v-for="item, index in storageList" :key="index" :label="item.storageAddress"
                   :value="item.storageAddress" />
               </el-select>
             </el-form-item>
-          </el-col>
+          </el-col> -->
         </el-row>
         <el-row :gutter="20">
           <el-col :span="12">
@@ -188,7 +191,7 @@
             </el-form-item>
           </el-col>
         </el-row> -->
-        <el-row :gutter="20">
+        <!-- <el-row :gutter="20">
           <el-col :span="12">
             <el-form-item label="存放地址" prop="storageAddress">
               <el-select v-model="modifyForm.storageAddress" placeholder="请选择" filterable allow-create clearable
@@ -198,7 +201,7 @@
               </el-select>
             </el-form-item>
           </el-col>
-        </el-row>
+        </el-row> -->
         <el-row :gutter="20">
           <el-col :span="12">
             <el-form-item label="范围kml" prop="projectKml">
@@ -282,7 +285,7 @@
         <el-descriptions-item label="项目登记人">{{ curProject.projectRegistrant }}</el-descriptions-item>
         <el-descriptions-item label="项目登记日期">{{ curProject.registrationDate }}</el-descriptions-item>
         <el-descriptions-item label="牵头部门">{{ curProject.leadingSector }}</el-descriptions-item>
-        <el-descriptions-item label="存储地址">{{ curProject.storageAddress }}</el-descriptions-item>
+        <!-- <el-descriptions-item label="存储地址">{{ curProject.storageAddress }}</el-descriptions-item> -->
         <el-descriptions-item label="项目kml">{{ curProject.projectKml }}</el-descriptions-item>
         <el-descriptions-item label="项目控制点">{{ curProject.projectCp }}</el-descriptions-item>
       </el-descriptions>