修改资料管理系统根据角色查看列表，修改合同、借款的退回后文件上传

oa-back/ruoyi-system/src/main/resources/mapper/file/FilesAchievementMapper.xml

@@ -96,7 +96,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="scaleGrade != null">scale_grade,</if>
             <if test="resultType != null">result_type,</if>
             <if test="fileType != null">file_type,</if>
-            <if test="kmlUrl != null">kml_url,</if>
+            kml_url,
             <if test="kmlLng != null">kml_lng,</if>
             <if test="kmlLat != null">kml_lat,</if>
             <if test="workLoad != null">work_load,</if>
@@ -117,8 +117,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="dataYear != null">#{dataYear},</if>
             <if test="scaleGrade != null">#{scaleGrade},</if>
             <if test="resultType != null">#{resultType},</if>
-            <if test="fileType != null">#{fileType},</if>
-            <if test="kmlUrl != null">#{kmlUrl},</if>
+            #{kmlUrl},
             <if test="kmlLng != null">#{kmlLng},</if>
             <if test="kmlLat != null">#{kmlLat},</if>
             <if test="workLoad != null">#{workLoad},</if>
@@ -143,7 +142,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="scaleGrade != null">scale_grade = #{scaleGrade},</if>
             <if test="resultType != null">result_type = #{resultType},</if>
             <if test="fileType != null">file_type = #{fileType},</if>
-            <if test="kmlUrl != null">kml_url = #{kmlUrl},</if>
+            kml_url = #{kmlUrl},
             <if test="kmlLng != null">kml_lng = #{kmlLng},</if>
             <if test="kmlLat != null">kml_lat = #{kmlLat},</if>
             <if test="workLoad != null">work_load = #{workLoad},</if>

oa-ui/src/directive/permission/hasRole.js

@@ -1,3 +1,9 @@
+/*
+ * @Author: ysh
+ * @Date: 2024-06-21 18:51:40
+ * @LastEditors: Please set LastEditors
+ * @LastEditTime: 2024-12-30 15:14:58
+ */
  /**
  * v-hasRole 角色权限处理
  * Copyright (c) 2019 ruoyi

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

@@ -4,7 +4,7 @@
  * @Author: ysh
  * @Date: 2022-09-08 17:16:12
  * @LastEditors: Please set LastEditors
- * @LastEditTime: 2024-09-18 16:03:28
+ * @LastEditTime: 2024-12-30 15:47:46
 -->
 <template>
   <div>
@@ -197,7 +197,8 @@
                 </div>
                 <div>
                   <el-upload ref="uploadAchiKml" class="upload-demo" action="" :auto-upload="false"
-                    :on-success="successUploadAchiKml" accept=".kml" :on-change="changeUploadKml" :show-file-list="false">
+                    :on-success="successUploadAchiKml" accept=".kml" :on-change="changeUploadKml"
+                    :show-file-list="false">
                     <el-button type="primary" icon="el-icon-plus"></el-button>
                   </el-upload>
                 </div>
@@ -336,7 +337,8 @@
                 </div>
                 <div>
                   <el-upload ref="uploadAchiKml" class="upload-demo" action="" :auto-upload="false"
-                    :on-success="successUploadAchiKml" accept=".kml" :on-change="changeUploadKml" :show-file-list="false">
+                    :on-success="successUploadAchiKml" accept=".kml" :on-change="changeUploadKml"
+                    :show-file-list="false">
                     <el-button type="primary" icon="el-icon-plus"></el-button>
                   </el-upload>
                 </div>
@@ -501,6 +503,9 @@ export default {
     },
     getAchiList() {
       this.loading = true;
+      if (this.$store.getters.roles.includes('projectLeader')) {
+        this.queryParams.projectLeader = this.$store.getters.userId
+      }
       listAchievement(this.queryParams).then(res => {
         this.achiTableData = res.rows;
         this.total = res.total;
@@ -761,8 +766,8 @@ export default {
       } else if (val.length == 1) {
         this.chooseProject = val[0]
         // this.chooseProject.projectNumber = this.chooseProject.projectNumber + '-' + this.chooseProject.projectName;
-        this.$set(this.form,'projectNumber',this.chooseProject.projectNumber)
-        this.$set(this.form,'projectName',this.chooseProject.projectName)
+        this.$set(this.form, 'projectNumber', this.chooseProject.projectNumber)
+        this.$set(this.form, 'projectName', this.chooseProject.projectName)
         this.form.projectId = val[0].projectId
         this.$refs.achiRef.validateField('projectNumber')
         this.form.dataYear = val[0].projectNumber.substring(0, 4)

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

@@ -3,8 +3,8 @@
  * @version: 
  * @Author: ysh
  * @Date: 2022-09-05 16:56:02
- * @LastEditors: wrh
- * @LastEditTime: 2024-05-10 10:16:22
+ * @LastEditors: Please set LastEditors
+ * @LastEditTime: 2024-12-30 16:21:40
 -->
 <template>
   <div class="project-wrapper">
@@ -15,13 +15,13 @@
       <el-tab-pane label="成果管理" name="achievement">
         <Achievement ref="achievementRef"></Achievement>
       </el-tab-pane>
-      <el-tab-pane label="存储地址" name="storage">
+      <el-tab-pane label="存储地址" name="storage" v-if="$store.getters.roles.includes('archive')">
         <Storage ref="storageRef"></Storage>
       </el-tab-pane>
     </el-tabs>
   </div>
 </template>
-<script >
+<script>
 import Project from './project.vue'
 import Achievement from './achievement.vue'
 import Storage from './storage.vue'
@@ -49,4 +49,5 @@ export default {
 <style lang="scss" scoped>
 .project-wrapper {
   padding: 10px 20px 0px;
-}</style>
+}
+</style>

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

@@ -9,8 +9,12 @@
         <el-form-item label="项目名称" prop="projectName">
           <el-input v-model="queryParams.projectName" placeholder="请输入项目名称" clearable @keyup.enter="handleQuery" />
         </el-form-item>
-        <el-form-item label="项目负责人" prop="projectLeader">
-          <el-input v-model="queryParams.projectLeader" placeholder="请输入项目负责人" clearable @keyup.enter="handleQuery" />
+        <el-form-item label="项目负责人" prop="projectLeader" v-hasRole="['archive','leader']">
+          <el-select v-model="queryParams.projectLeader" filterable clearable @change="handleQuery">
+            <el-option v-for="item in $store.state.user.userList" :key="item.userId" :label="item.nickName"
+              :value="item.userId">
+            </el-option>
+          </el-select>
         </el-form-item>
         <el-form-item>
           <el-button type="primary" icon="Search" @click="handleQuery">搜索</el-button>
@@ -37,9 +41,9 @@
         <el-table-column prop="isFinished" label="项目状态" align="center">
           <template #default="scope">
             <el-tag :type="scope.row.isFinished === '1' ? 'warning' : 'success'" disable-transitions>{{
-        scope.row.isFinished
-          === "1" ? '已结束' : '正在进行'
-      }}</el-tag>
+              scope.row.isFinished
+                === "1" ? '已结束' : '正在进行'
+              }}</el-tag>
           </template>
         </el-table-column>
         <el-table-column prop="projectNumber" label="项目编号" align="center" />
@@ -58,7 +62,7 @@
             </el-tooltip>
             <el-tooltip content="成果" placement="top">
               <el-button type="text" icon="Document" @click="handleLookAchi(scope.row)"
-                v-hasPermi="['file:achievement:query']">
+                v-hasPermi="['file:achievement:query']" v-hasRole>
               </el-button>
             </el-tooltip>
             <el-tooltip content="修改" placement="top">
@@ -446,6 +450,9 @@ export default {
   methods: {
     getProList() {
       this.loading = true;
+      if (this.$store.getters.roles.includes('projectLeader') && !this.$store.getters.roles.includes('leader')) {
+        this.queryParams.projectLeader = this.$store.getters.userId
+      }
       listProject(this.queryParams).then(res => {
         this.projectTableData = res.rows;
         this.total = res.total;

oa-ui/src/views/flowable/form/budget/addBudget.vue

@@ -2,7 +2,7 @@
  * @Author: ysh
  * @Date: 2024-06-21 18:51:51
  * @LastEditors: Please set LastEditors
- * @LastEditTime: 2024-12-16 09:31:24
+ * @LastEditTime: 2024-12-30 13:49:54
 -->
 <template>
   <div class="app-container">
@@ -38,6 +38,12 @@
       @settleExpense="getSettleExpense" @contentList="getContentList"></money-table>
     <!-- 其他成本 -->
     <other-table ref="otherRef" @otherCost="getOtherCost" :budgetForm="budgetForm"></other-table>
+    <!-- 预算备注 -->
+    <el-form :model="budgetForm"  style="padding: 20px 100px 0">
+      <el-form-item label="预算表单备注" label-width="100px">
+        <el-input type="textarea" v-model="budgetForm.remark" placeholder="请输入预算备注" :rows="4"></el-input>
+      </el-form-item>
+    </el-form>
     <!-- 统计 -->
     <div class="text-center">
       <el-tag class="ml10 mr10" type="success">间接成本：{{ isNaN(budgetForm.fixCost) ? 0 : budgetForm.fixCost }}</el-tag>

oa-ui/src/views/flowable/form/budget/budgetInfo.vue

@@ -2,7 +2,7 @@
  * @Author: ysh
  * @Date: 2024-04-03 16:28:09
  * @LastEditors: Please set LastEditors
- * @LastEditTime: 2024-12-16 14:50:12
+ * @LastEditTime: 2024-12-30 15:15:58
 -->
 <template>
   <div class="main">
@@ -25,6 +25,9 @@
         <el-descriptions-item label="项目备注" :span="3">
           {{ projectForm.remark }}
         </el-descriptions-item>
+        <el-descriptions-item label="预算表单备注" :span="5">
+          {{ budgetForm.remark }}
+        </el-descriptions-item>
         <el-descriptions-item label="项目计划工作量" :span="3">
           <div>
             <table border="1" style="width: 100%;">
@@ -122,13 +125,13 @@
               <td>{{ user.user ? user.user.nickName : '' }}</td>
               <td>1780</td>
               <td>
-                <span v-if="taskName == '分管审核' || taskName == '总经理审核' || taskName == '预算批准'">
-                  {{ user.salary.salary }}
+                <span v-if="$store.getters.roles.includes('leader')">
+                  {{ user.user.deptId === 115 ? '/' : user.salary.salary }}
                 </span>
                 <span v-else>/</span>
               </td>
               <td>
-                <span v-if="taskName == '分管审核' || taskName == '总经理审核' || taskName == '预算批准'">
+                <span v-if="$store.getters.roles.includes('leader')">
                   {{ parseFloat((user.salary.salary + 1780) / 21.75).toFixed(2) }}
                 </span>
                 <span v-else>/</span>
@@ -277,8 +280,7 @@
             （简写：{{ (budgetForm.totalBudget / 10000).toFixed(4) + '万' }}）
           </div>
         </el-descriptions-item>
-        <el-descriptions-item label="合同总价约" :span="3"
-          v-if="taskName == '分管审核' || taskName == '总经理审核' || taskName == '预算批准'">
+        <el-descriptions-item label="合同总价约" :span="3" v-if="$store.getters.roles.includes('leader')">
           <div class="text-center" style="font-weight:bold;font-size:18px;color:#409EFF">
             {{ contract.contractId ? contract.amount : '' }}
           </div>
@@ -286,8 +288,7 @@
             （简写：{{ contract.contractId ? (contract.amount / 10000).toFixed(4) + '万' : '' }}）
           </div>
         </el-descriptions-item>
-        <el-descriptions-item label="利润" :span="3"
-          v-if="taskName == '分管审核' || taskName == '总经理审核' || taskName == '预算批准'">
+        <el-descriptions-item label="利润" :span="3" v-if="$store.getters.roles.includes('leader')">
           <div class="text-center" style="font-weight:bold;font-size:18px;color:#67C23A">
             {{ profit.toFixed(2) }}
           </div>
@@ -421,13 +422,14 @@ export default {
             this.deviceLen = res.rows.length + 1;
           })
           listBudgetStaff({ pageSize: 100, budgetId: this.budgetForm.budgetId }).then(res => {
-            this.chooseUser = res.rows;
+            let staffList = res.rows;
             this.userLen = res.rows.length + 1;
-            let days = 0;
-            for (let d of this.chooseUser) {
-              days = days + d.days
+            for (let staff of staffList) {
+              if (staff.user.deptId === 115) {
+                staff.salary = { salary: 7898.75 }
+              }
             }
-            this.budgetForm.inOutPriceSum = Number(days) * Number(this.chooseUser[0].inOutPrice)
+            this.chooseUser = staffList
           })
           listBudgetCar({ pageSize: 100, budgetId: this.budgetForm.budgetId }).then(res => {
             this.chooseCar = res.rows;

oa-ui/src/views/flowable/form/budget/staffTable.vue

@@ -106,7 +106,7 @@ export default {
         })
       }
     },
-    initStaffCost(){
+    initStaffCost() {
       let staffCost = 0;
       for (let user of this.chooseUser) {
         staffCost = staffCost + Number(user.staffCost);
@@ -114,6 +114,13 @@ export default {
       this.form.staffCost = staffCost
     },
     getChooseUser(val) {
+      console.log(val);
+
+      for (let v of val) {
+        if (v.deptId === 115) {
+          v.salary = { salary: 7898.75 }
+        }
+      }
       this.chooseUser = val;
       this.openPeople = false;
       this.recalculateCost(val, 'staffCost', 'staffCost');

oa-ui/src/views/flowable/form/business/contractForm.vue

@@ -2,7 +2,7 @@
  * @Author: ysh
  * @Date: 2024-05-10 15:31:57
  * @LastEditors: Please set LastEditors
- * @LastEditTime: 2024-12-19 16:50:23
+ * @LastEditTime: 2024-12-30 16:30:04
 -->
 <template>
   <div class="app-container">
@@ -67,7 +67,7 @@
               :filePathName="'承接合同/合同文件'" :fileType="['doc', 'docx', 'xls', 'xlsx', 'pdf', 'rar', 'zip']"
               @input="getContractPath">
             </FileUpload>
-            <div v-if="form.contractDocument && taskName != '合同拟稿'">
+            <div v-if="form.contractDocument">
               <el-link type="primary" @click="reviewWord(`${baseUrl}${'/profile/upload' + form.contractDocument}`)">
                 {{ getFileName(form.contractDocument) }}
               </el-link>
@@ -75,6 +75,8 @@
                 :underline="false" target="_blank">
                 <span class="el-icon-download">下载文件</span>
               </el-link>
+              <FileUpload v-if="taskName == '合同拟稿'" :limit="1" :filePathName="'承接合同/合同文件'"
+                :fileType="['doc', 'docx', 'xls', 'xlsx', 'pdf', 'rar', 'zip']" @input="getContractPath"></FileUpload>
             </div>
           </el-form-item>
           <el-row>

oa-ui/src/views/flowable/form/business/subContract.vue

@@ -2,7 +2,7 @@
  * @Author: ysh
  * @Date: 2024-05-10 15:31:57
  * @LastEditors: Please set LastEditors
- * @LastEditTime: 2024-12-10 17:11:17
+ * @LastEditTime: 2024-12-30 16:30:28
 -->
 <template>
   <div class="app-container">
@@ -52,6 +52,8 @@
                 :underline="false" target="_blank">
                 <span class="el-icon-download">下载文件</span>
               </el-link>
+              <FileUpload v-if="taskName == '合同拟稿'" :limit="1" :filePathName="'分包合同/合同文件'"
+                :fileType="['doc', 'docx', 'xls', 'xlsx', 'pdf', 'rar', 'zip']" @input="getContractPath"></FileUpload>
             </div>
           </el-form-item>
           <el-form-item label="关联项目" prop="projectId">

oa-ui/src/views/flowable/form/finance/borrowForm.vue

@@ -148,7 +148,7 @@
             <FileUpload v-if="form.borrowDocument == null || form.borrowDocument == ''" :disabled="taskName != '借款申请'"
               :limit="1" :filePathName="'借款/申请附件'" :fileType="['doc', 'docx', 'xls', 'xlsx', 'pdf', 'rar', 'zip']"
               @input="getBorrowPath"></FileUpload>
-            <div v-if="form.borrowDocument && taskName != '借款申请'">
+            <div v-if="form.borrowDocument">
               <!-- <file-item :document="form.borrowDocument"></file-item> -->
               <el-link type="primary" @click="reviewWord(`${baseUrl}${'/profile/upload' + form.borrowDocument}`)">
                 {{ getFileName(form.borrowDocument) }}
@@ -157,6 +157,8 @@
                 :underline="false" target="_blank">
                 <span class="el-icon-download">下载文件</span>
               </el-link>
+              <FileUpload v-if="taskName == '借款申请'" :limit="1" :filePathName="'借款/申请附件'"
+                :fileType="['doc', 'docx', 'xls', 'xlsx', 'pdf', 'rar', 'zip']" @input="getBorrowPath"></FileUpload>
             </div>
           </el-form-item>
           <el-divider></el-divider>
@@ -469,8 +471,8 @@ export default {
     this.initForm();
   },
   methods: {
-    initSign(){
-      
+    initSign() {
+
     },
     initRules() {
       if (this.taskName == '借款申请') {