资料管理员无法新增项目，可以上传kml

oa-back/ruoyi-system/src/main/java/com/ruoyi/oa/domain/CmcProject.java

@@ -40,11 +40,11 @@ public class CmcProject extends BaseEntity
     private SysUser qualityInspectorUser;
 
     /** 项目状态（0进行中、1已结束） */
-    @Excel(name = "项目状态", readConverterExp = "0=进行中、1已结束")
+    @Excel(name = "项目状态", readConverterExp = "0=进行中,1=已结束")
     private String isFinished;
 
     /** 项目来源（0院内、1院外） */
-    @Excel(name = "项目来源", readConverterExp = "0=院内、1院外")
+    @Excel(name = "项目来源", readConverterExp = "0=院内,1=院外")
     private String projectSource;
 
     /** 甲方单位 */
@@ -64,7 +64,7 @@ public class CmcProject extends BaseEntity
     private String projectType;
 
     /** 项目级别（0一般项目、1重大项目） */
-    @Excel(name = "项目级别", readConverterExp = "0=一般项目、1重大项目")
+    @Excel(name = "项目级别", readConverterExp = "0=一般项目,1=重大项目")
     private String projectLevel;
 
     /** 项目登记人 */

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

@@ -4,7 +4,7 @@
  * @Author: ysh
  * @Date: 2022-09-08 17:16:12
  * @LastEditors: wrh
- * @LastEditTime: 2024-05-30 16:31:54
+ * @LastEditTime: 2024-05-30 17:18:22
 -->
 <template>
   <div>
@@ -31,13 +31,13 @@
     <!-- 操作栏 -->
     <el-row style="margin-bottom: 10px;">
       <el-button type="primary" size="small" icon="el-icon-plus" @click="handleAddAchievement"
-        v-hasPermi="['file:achievement:add']">新增成果</el-button>
+        v-hasPermi="['oa:archive:add']">新增成果</el-button>
       <el-button type="success" size="small" icon="el-icon-download" @click="handleExprot"
-        v-hasPermi="['file:achievement:export']">导出</el-button>
+        v-hasPermi="['oa:archive:export']">导出</el-button>
       <el-button type="warning" size="small" icon="el-icon-upload" @click="uploadAchievement"
-        v-hasPermi="['file:achievement:add']">上传成果表</el-button>
+        v-hasPermi="['oa:archive:add']">上传成果表</el-button>
       <el-button type="danger" size="small" icon="el-icon-delete" :disabled="multiple" @click="handleDeleteMany"
-        v-hasPermi="['file:achievement:edit']">批量删除
+        v-hasPermi="['oa:archive:edit']">批量删除
       </el-button>
     </el-row>
     <!-- 表格 -->
@@ -53,8 +53,16 @@
               {{ parseInt(scope.row.dataYear)}}
             </template> -->
         </el-table-column>
-        <el-table-column prop="resultType" label="成果类型" align="center" />
-        <el-table-column prop="scaleGrade" label="比例尺或等级" align="center" />
+        <el-table-column prop="resultType" label="成果类型" align="center">
+          <template slot-scope="scope">
+            {{ selectDictLabel(dict.type.cmc_achi_type, scope.row.resultType) }}
+          </template>
+        </el-table-column>
+        <el-table-column prop="scaleGrade" label="比例尺或等级" align="center">
+          <template slot-scope="scope">
+            {{ selectDictLabel(dict.type.cmc_scale_grade, scope.row.scaleGrade) }}
+          </template>
+        </el-table-column>
         <el-table-column prop="fileType" label="文件类型" align="center" />
         <el-table-column prop="workLoad" label="工作量" align="center" />
         <el-table-column prop="unit" label="单位" align="center" />
@@ -68,12 +76,12 @@
           <template #default="scope">
             <el-tooltip content="修改" placement="top">
               <el-button type="text" icon="el-icon-edit-outline" @click="handleUpdate(scope.row)"
-                v-hasPermi="['file:achievement:edit']">
+                v-hasPermi="['oa:archive:edit']">
               </el-button>
             </el-tooltip>
             <el-tooltip content="删除" placement="top">
               <el-button type="text" icon="el-icon-delete" @click="handleDelete(scope.row)"
-                v-hasPermi="['file:achievement:remove']">
+                v-hasPermi="['oa:archive:remove']">
               </el-button>
             </el-tooltip>
           </template>

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

@@ -20,14 +20,14 @@
     </el-row>
     <!-- 操作栏 -->
     <el-row>
-      <el-button type="primary" size="small" icon="el-icon-plus" @click="handleAddProject"
-        v-hasPermi="['file:project:add']">新增项目</el-button>
+      <!-- <el-button type="primary" size="small" icon="el-icon-plus" @click="handleAddProject"
+        v-hasPermi="['oa:archive:add']">新增项目</el-button> -->
       <el-button type="success" size="small" icon="el-icon-download" @click="handleExport"
-        v-hasPermi="['file:project:export']">导出</el-button>
-      <el-button type="warning" size="small" icon="el-icon-upload" @click="uploadProject"
-        v-hasPermi="['file:project:add']">上传项目表</el-button>
-      <el-button type="danger" size="small" icon="el-icon-delete" :disabled="multiple" @click="handleDeleteMany"
-        v-hasPermi="['file:project:remove']">批量删除</el-button>
+        v-hasPermi="['oa:archive:export']">导出</el-button>
+      <!-- <el-button type="warning" size="small" icon="el-icon-upload" @click="uploadProject"
+        v-hasPermi="['oa:archive:add']">上传项目表</el-button> -->
+      <!-- <el-button type="danger" size="small" icon="el-icon-delete" :disabled="multiple" @click="handleDeleteMany"
+        v-hasPermi="['oa:archive:remove']">批量删除</el-button> -->
     </el-row>
     <!-- 项目表格 -->
     <el-row>
@@ -53,20 +53,20 @@
         <el-table-column label="操作" align="center" width="150" class-name="small-padding fixed-width">
           <template #default="scope">
             <el-tooltip content="详情" placement="top">
-              <el-button type="text" icon="View" @click="handleLook(scope.row)" v-hasPermi="['file:project:query']">
+              <el-button type="text" icon="View" @click="handleLook(scope.row)" v-hasPermi="['oa:archive:query']">
               </el-button>
             </el-tooltip>
             <el-tooltip content="成果" placement="top">
               <el-button type="text" icon="Document" @click="handleLookAchi(scope.row)"
-                v-hasPermi="['file:project:query']">
+                v-hasPermi="['oa:archive:query']">
               </el-button>
             </el-tooltip>
             <el-tooltip content="修改" placement="top">
-              <el-button type="text" icon="el-icon-edit-outline" @click="handleUpdate(scope.row)" v-hasPermi="['file:project:edit']">
+              <el-button type="text" icon="el-icon-edit-outline" @click="handleUpdate(scope.row)" v-hasPermi="['oa:archive:edit']">
               </el-button>
             </el-tooltip>
             <el-tooltip content="删除" placement="top">
-              <el-button type="text" icon="el-icon-delete" @click="handleDelete(scope.row)" v-hasPermi="['file:project:remove']">
+              <el-button type="text" icon="el-icon-delete" @click="handleDelete(scope.row)" v-hasPermi="['oa:archive:remove']">
               </el-button>
             </el-tooltip>
           </template>
@@ -326,31 +326,28 @@
     <el-dialog :title="title" :visible.sync="modifyOpen" width="60%" append-to-body>
       <el-form :model="modifyForm" ref="projectModifyRef" label-width="130px" :rules="modifyRules">
         <el-row :gutter="20">
-          <el-col :span="24">
+          <el-col :span="12">
             <el-form-item label="项目是否结束" prop="isFinished">
-              <el-switch v-model="modifyForm.isFinished" class="ml-2" inline-prompt
+              <el-switch :disabled="true" v-model="modifyForm.isFinished" class="ml-2" inline-prompt
                 style="--el-switch-on-color: #13ce66; --el-switch-off-color: #ff4949" active-text="是" inactive-text="否"
                 active-value="1" inactive-value="0" />
             </el-form-item>
-
           </el-col>
-        </el-row>
-        <el-row :gutter="20">
           <el-col :span="12">
             <el-form-item label="项目编号" prop="projectNumber">
-              <el-input v-model="modifyForm.projectNumber" placeholder="请输入项目编号" />
+              <el-input :disabled="true" v-model="modifyForm.projectNumber" placeholder="请输入项目编号" />
             </el-form-item>
           </el-col>
+        </el-row>
+        <el-row :gutter="20">
           <el-col :span="12">
             <el-form-item label="项目名称" prop="projectName">
-              <el-input v-model="modifyForm.projectName" placeholder="请输入项目名称" />
+              <el-input :disabled="true" v-model="modifyForm.projectName" placeholder="请输入项目名称" />
             </el-form-item>
           </el-col>
-        </el-row>
-        <el-row :gutter="20">
           <el-col :span="12">
             <el-form-item label="项目负责人" prop="projectLeader">
-              <el-input v-model="modifyForm.projectLeader" placeholder="请输入项目负责人" />
+              <el-input :disabled="true" v-model="modifyForm.projectLeader" placeholder="请输入项目负责人" />
             </el-form-item>
           </el-col>
         </el-row>
@@ -407,168 +404,168 @@
         <el-row :gutter="20">
           <el-col :span="12">
             <el-form-item label="项目类型" prop="projectType">
-              <el-input v-model="modifyForm.projectType" />
+              <el-input :disabled="true" v-model="modifyForm.projectType" />
             </el-form-item>
           </el-col>
           <el-col :span="12">
             <el-form-item label="甲方单位" prop="partyA">
-              <el-input v-model="modifyForm.partyA" />
+              <el-input :disabled="true" v-model="modifyForm.partyA" />
             </el-form-item>
           </el-col>
         </el-row>
         <el-row :gutter="20">
           <el-col :span="12">
             <el-form-item label="联系人" prop="contactPerson">
-              <el-input v-model="modifyForm.contactPerson" />
+              <el-input :disabled="true" v-model="modifyForm.contactPerson" />
             </el-form-item>
           </el-col>
           <el-col :span="12">
             <el-form-item label="联系电话" prop="telephone">
-              <el-input v-model="modifyForm.telephone" />
+              <el-input :disabled="true" v-model="modifyForm.telephone" />
             </el-form-item>
           </el-col>
         </el-row>
         <el-row :gutter="20">
           <el-col :span="12">
             <el-form-item label="项目来源" prop="projectSource">
-              <el-input v-model="modifyForm.projectSource" />
+              <el-input :disabled="true" v-model="modifyForm.projectSource" />
             </el-form-item>
           </el-col>
           <el-col :span="12">
             <el-form-item label="合同编码" prop="contractCode">
-              <el-input v-model="modifyForm.contractCode" />
+              <el-input :disabled="true" v-model="modifyForm.contractCode" />
             </el-form-item>
           </el-col>
         </el-row>
         <el-row :gutter="20">
           <el-col :span="12">
             <el-form-item label="合同编号" prop="contractNumber">
-              <el-input v-model="modifyForm.contractNumber" />
+              <el-input :disabled="true" v-model="modifyForm.contractNumber" />
             </el-form-item>
           </el-col>
           <el-col :span="12">
             <el-form-item label="预计价款" prop="expectedPrice">
-              <el-input v-model="modifyForm.expectedPrice" />
+              <el-input :disabled="true" v-model="modifyForm.expectedPrice" />
             </el-form-item>
           </el-col>
         </el-row>
         <el-row :gutter="20">
           <el-col :span="12">
             <el-form-item label="项目级别" prop="projectLevel">
-              <el-input v-model="modifyForm.projectLevel" />
+              <el-input :disabled="true" v-model="modifyForm.projectLevel" />
             </el-form-item>
           </el-col>
           <el-col :span="12">
             <el-form-item label="技术负责人" prop="technicalDirector">
-              <el-input v-model="modifyForm.technicalDirector" />
+              <el-input :disabled="true" v-model="modifyForm.technicalDirector" />
             </el-form-item>
           </el-col>
         </el-row>
         <el-row :gutter="20">
           <el-col :span="12">
             <el-form-item label="技术设计人" prop="techinicalDesigner">
-              <el-input v-model="modifyForm.techinicalDesigner" />
+              <el-input :disabled="true" v-model="modifyForm.techinicalDesigner" />
             </el-form-item>
           </el-col>
           <el-col :span="12">
             <el-form-item label="质量检查员" prop="qualityInspector">
-              <el-input v-model="modifyForm.qualityInspector" />
+              <el-input :disabled="true" v-model="modifyForm.qualityInspector" />
             </el-form-item>
           </el-col>
         </el-row>
         <el-row :gutter="20">
           <el-col :span="12">
             <el-form-item label="承担部门" prop="undertakingSector">
-              <el-input v-model="modifyForm.undertakingSector" />
+              <el-input :disabled="true" v-model="modifyForm.undertakingSector" />
             </el-form-item>
           </el-col>
           <el-col :span="12">
             <el-form-item label="经费合计" prop="fund">
-              <el-input v-model="modifyForm.fund" />
+              <el-input :disabled="true" v-model="modifyForm.fund" />
             </el-form-item>
           </el-col>
         </el-row>
         <el-row :gutter="20">
           <el-col :span="12">
             <el-form-item label="领导批准时间" prop="approvalDate">
-              <el-input v-model="modifyForm.approvalDate" />
+              <el-input :disabled="true" v-model="modifyForm.approvalDate" />
             </el-form-item>
           </el-col>
           <el-col :span="12">
             <el-form-item label="进场时间" prop="approachTime">
-              <el-input v-model="modifyForm.approachTime" />
+              <el-input :disabled="true" v-model="modifyForm.approachTime" />
             </el-form-item>
           </el-col>
         </el-row>
         <el-row :gutter="20">
           <el-col :span="12">
             <el-form-item label="项目要求完成日期" prop="requiredCompletionDate">
-              <el-input v-model="modifyForm.requiredCompletionDate" />
+              <el-input :disabled="true" v-model="modifyForm.requiredCompletionDate" />
             </el-form-item>
           </el-col>
           <el-col :span="12">
             <el-form-item label="资料提交日期" prop="submissionDate">
-              <el-input v-model="modifyForm.submissionDate" />
+              <el-input :disabled="true" v-model="modifyForm.submissionDate" />
             </el-form-item>
           </el-col>
         </el-row>
         <el-row :gutter="20">
           <el-col :span="12">
             <el-form-item label="使用车辆" prop="licensePlateNumber">
-              <el-input v-model="modifyForm.licensePlateNumber" />
+              <el-input :disabled="true" v-model="modifyForm.licensePlateNumber" />
             </el-form-item>
           </el-col>
           <el-col :span="12">
             <el-form-item label="项目行车公里数" prop="mileage">
-              <el-input v-model="modifyForm.mileage" />
+              <el-input :disabled="true" v-model="modifyForm.mileage" />
             </el-form-item>
           </el-col>
         </el-row>
         <el-row :gutter="20">
           <el-col :span="12">
             <el-form-item label="项目燃油使用费" prop="fuelExpense">
-              <el-input v-model="modifyForm.fuelExpense" />
+              <el-input :disabled="true" v-model="modifyForm.fuelExpense" />
             </el-form-item>
           </el-col>
           <el-col :span="12">
             <el-form-item label="主要设备" prop="mainEquipment">
-              <el-input v-model="modifyForm.mainEquipment" />
+              <el-input :disabled="true" v-model="modifyForm.mainEquipment" />
             </el-form-item>
           </el-col>
         </el-row>
         <el-row :gutter="20">
           <el-col :span="12">
             <el-form-item label="项目参与人员" prop="projectParticipants">
-              <el-input v-model="modifyForm.projectParticipants" />
+              <el-input :disabled="true" v-model="modifyForm.projectParticipants" />
             </el-form-item>
           </el-col>
           <el-col :span="12">
             <el-form-item label="当前处理环节" prop="currentProcessing">
-              <el-input v-model="modifyForm.currentProcessing" />
+              <el-input :disabled="true" v-model="modifyForm.currentProcessing" />
             </el-form-item>
           </el-col>
         </el-row>
         <el-row :gutter="20">
           <el-col :span="12">
             <el-form-item label="当前处理人" prop="currentHandler">
-              <el-input v-model="modifyForm.currentHandler" />
+              <el-input :disabled="true" v-model="modifyForm.currentHandler" />
             </el-form-item>
           </el-col>
           <el-col :span="12">
             <el-form-item label="项目登记人" prop="projectRegistrant">
-              <el-input v-model="modifyForm.projectRegistrant" />
+              <el-input :disabled="true" v-model="modifyForm.projectRegistrant" />
             </el-form-item>
           </el-col>
         </el-row>
         <el-row :gutter="20">
           <el-col :span="12">
             <el-form-item label="项目登记日期" prop="registrationDate">
-              <el-input v-model="modifyForm.registrationDate" />
+              <el-input :disabled="true" v-model="modifyForm.registrationDate" />
             </el-form-item>
           </el-col>
           <el-col :span="12">
             <el-form-item label="牵头项目" prop="leadingSector">
-              <el-input v-model="modifyForm.leadingSector" />
+              <el-input :disabled="true" v-model="modifyForm.leadingSector" />
             </el-form-item>
           </el-col>
         </el-row>
@@ -747,7 +744,7 @@ export default {
       modifyRules: {
         projectNumber: [{ required: true, message: "项目编号不能为空", trigger: "blur" }],
         projectName: [{ required: true, message: "项目名称不能为空", trigger: "blur" }],
-        projectLeader: [{ required: true, message: "项目负责人不能为空", trigger: "blur" }],
+        // projectLeader: [{ required: true, message: "项目负责人不能为空", trigger: "blur" }],
       },
       /*** 用户导入参数 */
       upload: {

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

@@ -25,9 +25,9 @@
     <!-- 操作栏 -->
     <el-row>
       <el-button type="primary" size="small" icon="el-icon-plus" @click="handleAddAStorage"
-        v-hasPermi="['file:storage:add']">新增存储地址</el-button>
+        v-hasPermi="['oa:archive:add']">新增存储地址</el-button>
       <el-button type="danger" size="small" icon="el-icon-delete" :disabled="multiple" @click="handleDeleteMany"
-        v-hasPermi="['file:storage:remove']">批量删除
+        v-hasPermi="['oa:archive:remove']">批量删除
       </el-button>
     </el-row>
     <!-- 表格 -->
@@ -43,11 +43,11 @@
         <el-table-column label="操作" align="center" width="150" class-name="small-padding fixed-width">
           <template #default="scope">
             <el-tooltip content="修改" placement="top">
-              <el-button type="text" icon="el-icon-edit-outline" @click="handleUpdate(scope.row)" v-hasPermi="['file:storage:edit']">
+              <el-button type="text" icon="el-icon-edit-outline" @click="handleUpdate(scope.row)" v-hasPermi="['oa:archive:edit']">
               </el-button>
             </el-tooltip>
             <el-tooltip content="删除" placement="top">
-              <el-button type="text" icon="el-icon-delete" @click="handleDelete(scope.row)" v-hasPermi="['file:storage:remove']">
+              <el-button type="text" icon="el-icon-delete" @click="handleDelete(scope.row)" v-hasPermi="['oa:archive:remove']">
               </el-button>
             </el-tooltip>
           </template>