部门负责人查看用车、借款、结算

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

@@ -48,23 +48,6 @@ public class CmcBorrowController extends BaseController
         return getDataTable(list);
     }
 
-    /**
-     * 部门负责人查询cmc借款申请列表
-     */
-    @GetMapping("/listDeptQuery")
-    public TableDataInfo listDeptQuery()
-    {
-        CmcBorrow cmcBorrow = new CmcBorrow();
-        cmcBorrow.setApplyDept(getLoginUser().getDeptId());
-        List<CmcBorrow> list = cmcBorrowService.selectCmcBorrowList(cmcBorrow);
-        CmcBorrow borrow = new CmcBorrow();
-        borrow.setUndertakingDept(getLoginUser().getDeptId().toString());
-        List<CmcBorrow> list1 = cmcBorrowService.selectCmcBorrowList(borrow);
-        list.addAll(list1);
-        list.stream().distinct().collect(Collectors.toList());
-        return getDataTable(list);
-    }
-
     /**
      * 导出cmc借款申请列表
      */

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

@@ -72,6 +72,7 @@ public class CmcSettleController extends BaseController
     @PostMapping
     public AjaxResult add(@RequestBody CmcSettle cmcSettle)
     {
+        cmcSettle.setReportDept(getLoginUser().getDeptId());
         if (cmcSettle.getProjectId() != null && cmcSettle.getXmName() == null)
             cmcSettle.setXmName(" ");
         if (cmcSettle.getProjectId() == null && cmcSettle.getXmName() != null)

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

@@ -43,6 +43,8 @@ public class CmcCarApproval extends BaseEntity
     private String projectNumber;
     @Excel(name = "项目名称")
     private String projectName;
+    @Excel(name = "承担部门")
+    private String undertakingDept;
     private CmcProject project;
 
     /** 用车事由 */
@@ -358,6 +360,15 @@ public class CmcCarApproval extends BaseEntity
     {
         return project;
     }
+    public void setUndertakingDept(String undertakingDept)
+    {
+        this.undertakingDept = undertakingDept;
+    }
+
+    public String getUndertakingDept()
+    {
+        return undertakingDept;
+    }
     public void setApplyReason(String applyReason)
     {
         this.applyReason = applyReason;

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

@@ -47,6 +47,10 @@ public class CmcSettle extends BaseEntity
     private String reporterUserName;
     private Long reporter;
 
+    /** 上报部门 */
+    @Excel(name = "上报部门")
+    private Long reportDept;
+
     /** 上报日期 */
     @JsonFormat(pattern = "yyyy-MM-dd")
     @Excel(name = "上报日期", width = 30, dateFormat = "yyyy-MM-dd")
@@ -211,6 +215,15 @@ public class CmcSettle extends BaseEntity
     {
         return undertakingDept;
     }
+    public void setReportDept(Long reportDept)
+    {
+        this.reportDept = reportDept;
+    }
+
+    public Long getReportDept()
+    {
+        return reportDept;
+    }
     public void setWorkloadReport(String workloadReport) 
     {
         this.workloadReport = workloadReport;

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

@@ -11,6 +11,7 @@
         <result property="cars"    column="cars"    />
         <result property="drivers"    column="drivers"    />
         <result property="projectId"    column="project_id"    />
+        <result property="undertakingDept"    column="undertaking_dept"    />
         <result property="applyReason"    column="apply_reason"    />
         <result property="passengers"    column="passengers"    />
         <result property="applyDate"    column="apply_date"    />
@@ -92,10 +93,11 @@
         <result property="projectId"    column="project_id"    />
         <result property="projectNumber"    column="project_number"    />
         <result property="projectName"    column="project_name"    />
+        <result property="undertakingDept"    column="undertaking_dept"    />
     </resultMap>
 
     <sql id="selectCmcCarApprovalVo">
-        select ca.car_apply_id, ca.applier, u.nick_name as applier_nick_name, ca.use_dept, d.dept_name, ca.cars, ca.drivers, ca.project_id, p.project_number, p.project_name,
+        select ca.car_apply_id, ca.applier, u.nick_name as applier_nick_name, ca.use_dept, d.dept_name, ca.cars, ca.drivers, ca.project_id, p.project_number, p.project_name, p.undertaking_dept,
                ca.apply_reason, ca.passengers, ca.apply_date, ca.begin_date, ca.end_date, ca.days, ca.dept_user_id, u1.nick_name as dept_nick_name, ca.dept_comment, ca.manager_user_id,
                u2.nick_name as manager_nick_name, ca.manager_comment, ca.car_usage, ca.union_user_id, u3.nick_name as union_nick_name, ca.union_comment, ca.gm_user_id, u4.nick_name as gm_nick_name,
                ca.dsz_user_id, u5.nick_name as dsz_nick_name, ca.gm_comment, ca.dsz_comment, ca.dispatcher, u6.nick_name as dispatch_nick_name, ca.dispatch_comment, ca.estimate_cost, ca.dept_time,

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

@@ -8,6 +8,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="settleId"    column="settle_id"    />
         <result property="projectId"    column="project_id"    />
         <result property="undertakingDept"    column="undertaking_dept"    />
+        <result property="reportDept"    column="report_dept"    />
         <result property="xmName"    column="xm_name"    />
         <result property="workloadReport"    column="workload_report"    />
         <result property="reporter"    column="reporter"    />
@@ -90,7 +91,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         select s.settle_id, s.project_id, p.project_number, p.project_name, p.undertaking_dept, s.xm_name, s.workload_report, s.reporter, u.nick_name as reporter_nick_name, s.report_time, s.settle_comment, s.zh_user_id, u1.nick_name as zh_nick_name,
                s.zh_time, s.zh_comment, s.js_user_id, u2.nick_name as js_nick_name, s.js_time, s.js_comment, s.jy_user_id, u3.nick_name as jy_nick_name, s.jy_time, s.jy_comment, 
                s.manager_user_id, u4.nick_name as manager_nick_name, s.manager_time, s.manager_comment, s.gm_user_id, u5.nick_name as gm_nick_name, s.gm_time, s.gm_comment,
-               s.dsz_user_id, u6.nick_name as dsz_nick_name, s.dsz_time, s.dsz_comment, s.settle_document, s.modify_document, s.final_document from cmc_settle as s
+               s.dsz_user_id, u6.nick_name as dsz_nick_name, s.dsz_time, s.dsz_comment, s.settle_document, s.modify_document, s.final_document, s.report_dept from cmc_settle as s
         left join sys_user as u on u.user_id = s.reporter
         left join sys_user as u1 on u1.user_id = s.zh_user_id
         left join sys_user as u2 on u2.user_id = s.js_user_id
@@ -107,6 +108,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="settleId != null  and settleId != ''"> and s.settle_id = #{settleId}</if>
             <if test="projectId != null"> and s.project_id = #{projectId}</if>
             <if test="undertakingDept != null  and undertakingDept != ''"> and find_in_set(#{undertakingDept}, p.undertaking_dept)</if>
+            <if test="reportDept != null  and reportDept != ''"> and s.report_dept = #{reportDept}</if>
             <if test="xmName != null"> and s.xm_name like concat('%', #{xmName}, '%')</if>
             <if test="workloadReport != null  and workloadReport != ''"> and s.workload_report = #{workloadReport}</if>
             <if test="reporter != null "> and s.reporter = #{reporter}</if>
@@ -167,6 +169,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="settleDocument != null">settle_document,</if>
             <if test="modifyDocument != null">modify_document,</if>
             <if test="finalDocument != null">final_document,</if>
+            <if test="reportDept != null">report_dept,</if>
          </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="settleId != null">#{settleId},</if>
@@ -197,6 +200,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="settleDocument != null">#{settleDocument},</if>
             <if test="modifyDocument != null">#{modifyDocument},</if>
             <if test="finalDocument != null">#{finalDocument},</if>
+            <if test="reportDept != null">#{reportDept},</if>
          </trim>
     </insert>
 
@@ -230,6 +234,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="settleDocument != null">settle_document = #{settleDocument},</if>
             <if test="modifyDocument != null">modify_document = #{modifyDocument},</if>
             <if test="finalDocument != null">final_document = #{finalDocument},</if>
+            <if test="reportDept != null">report_dept = #{reportDept},</if>
         </trim>
         where settle_id = #{settleId}
     </update>

oa-ui/src/api/oa/borrow/borrow.js

@@ -1,3 +1,9 @@
+/*
+ * @Author: wrh
+ * @Date: 2024-04-07 10:45:54
+ * @LastEditors: wrh
+ * @LastEditTime: 2024-08-22 09:31:26
+ */
 import request from '@/utils/request'
 
 // 查询cmc借款申请列表
@@ -9,15 +15,6 @@ export function listBorrow(query) {
   })
 }
 
-// 部门负责人查询cmc借款申请列表
-export function listBorrowDeptQuery(query) {
-  return request({
-    url: '/oa/borrow/listDeptQuery',
-    method: 'get',
-    params: query
-  })
-}
-
 // 查询cmc借款申请详细
 export function getBorrow(borrowId) {
   return request({

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

@@ -2,7 +2,7 @@
  * @Author: ysh
  * @Date: 2024-06-21 18:51:49
  * @LastEditors: wrh
- * @LastEditTime: 2024-08-20 11:05:25
+ * @LastEditTime: 2024-08-21 14:36:48
 -->
 <template>
   <div class="warpper-container">
@@ -98,53 +98,53 @@
               <template slot-scope="props">
                 <div class="expand-info">
                   <el-descriptions :column="2">
-                    <el-descriptions-item label="存放地址：" class="desLabel" :span="2">
+                    <el-descriptions-item label="存放地址" class="desLabel" :span="2">
                       {{ props.row.storageAddress == '' || props.row.storageAddress == undefined ? '暂无' :
                         props.row.storageAddress
                       }}
                     </el-descriptions-item>
-                    <el-descriptions-item label="甲方单位：" class="desLabel" :span="2">{{ props.row.partyA.partyAName == ''
+                    <el-descriptions-item label="甲方单位" class="desLabel" :span="2">{{ props.row.partyA.partyAName == ''
                       ? '暂无' :
                       props.row.partyA.partyAName
                     }}</el-descriptions-item>
-                    <el-descriptions-item label="联系人：" class="desLabel">{{ props.row.contactPerson == '' ? '暂无' :
+                    <el-descriptions-item label="联系人" class="desLabel">{{ props.row.contactPerson == '' ? '暂无' :
                       props.row.contactPerson
                     }}</el-descriptions-item>
-                    <el-descriptions-item label="联系电话：" class="desLabel">{{ props.row.telephone == '' ? '暂无' :
+                    <el-descriptions-item label="联系电话" class="desLabel">{{ props.row.telephone == '' ? '暂无' :
                       props.row.telephone
                     }}</el-descriptions-item>
-                    <el-descriptions-item label="项目类型：" class="desLabel">{{ props.row.projectType == '' ? '暂无' :
+                    <el-descriptions-item label="项目类型" class="desLabel">{{ props.row.projectType == '' ? '暂无' :
                       props.row.projectType
                     }}</el-descriptions-item>
-                    <el-descriptions-item label="技术负责人：" class="desLabel">{{ props.row.technicalDirector == '' ? '暂无'
+                    <el-descriptions-item label="技术负责人" class="desLabel">{{ props.row.technicalDirector == '' ? '暂无'
                       :
                       getUserName(props.row.technicalDirector)
                     }}</el-descriptions-item>
-                    <el-descriptions-item label="技术设计人：" class="desLabel">{{ props.row.techinicalDesigner == '' ? '暂无'
+                    <el-descriptions-item label="技术设计人" class="desLabel">{{ props.row.techinicalDesigner == '' ? '暂无'
                       :
                       getUserName(props.row.techinicalDesigner)
                     }}</el-descriptions-item>
-                    <el-descriptions-item label="承担部门：" class="desLabel">{{ props.row.undertakingSector == '' ? '暂无' :
-                      props.row.undertakingSector
+                    <el-descriptions-item label="承担部门" class="desLabel">{{ props.row.undertakingSector == '' ? '暂无' :
+                      props.row.undertakingDeptName
                     }}</el-descriptions-item>
-                    <el-descriptions-item label="质量检察员：" class="desLabel">{{ props.row.qualityInspector == '' ? '暂无' :
+                    <el-descriptions-item label="质量检察员" class="desLabel">{{ props.row.qualityInspector == '' ? '暂无' :
                       getUserNames(props.row.qualityInspector)
                     }}</el-descriptions-item>
-                    <el-descriptions-item label="项目登记时间：" class="desLabel" :span="2">{{ props.row.registrationDate ==
+                    <el-descriptions-item label="项目登记时间" class="desLabel" :span="2">{{ props.row.registrationDate ==
                       '' ? '暂无' :
                       props.row.registrationDate
                     }}</el-descriptions-item>
-                    <el-descriptions-item label="项目登记人：" class="desLabel">{{ props.row.projectRegistrant == '' ? '暂无'
+                    <el-descriptions-item label="项目登记人" class="desLabel">{{ props.row.projectRegistrant == '' ? '暂无'
                       :
                       getUserName(props.row.projectRegistrant)
                     }}</el-descriptions-item>
-                    <el-descriptions-item label="进场时间：" class="desLabel">{{ props.row.approachTime == '' ? '暂无' :
+                    <el-descriptions-item label="进场时间" class="desLabel">{{ props.row.approachTime == '' ? '暂无' :
                       props.row.approachTime
                     }}</el-descriptions-item>
-                    <el-descriptions-item label="撤场时间：" class="desLabel">{{ props.row.withdrawalTime == '' ? '暂无' :
+                    <el-descriptions-item label="撤场时间" class="desLabel">{{ props.row.withdrawalTime == '' ? '暂无' :
                       props.row.withdrawalTime
                     }}</el-descriptions-item>
-                    <el-descriptions-item label="项目要求完成时间：" class="desLabel">{{ props.row.requiredCompletionDate == ''
+                    <el-descriptions-item label="项目要求完成时间" class="desLabel">{{ props.row.requiredCompletionDate == ''
                       ? '暂无' :
                       props.row.requiredCompletionDate
                     }}</el-descriptions-item>
@@ -186,41 +186,41 @@
                 <template #default="props">
                   <el-descriptions :column="2" size="small">
                     <el-descriptions-item min-width="195px" label-class-name="my-label" class-name="my-content"
-                      label="成果名称:">{{
+                      label="成果名称">{{
                         props.row.achiName
                       }}</el-descriptions-item>
                     <el-descriptions-item min-width="195px" label-class-name="my-label" class-name="my-content"
-                      label="数据年份:">{{
+                      label="数据年份">{{
                         props.row.dataYear }}</el-descriptions-item>
                     <el-descriptions-item min-width="195px" label-class-name="my-label" class-name="my-content"
-                      label="成果类型:">{{ selectDictLabel(dict.type.cmc_achi_type, props.row.resultType)
+                      label="成果类型">{{ selectDictLabel(dict.type.cmc_achi_type, props.row.resultType)
                       }}</el-descriptions-item>
                     <el-descriptions-item min-width="195px" label-class-name="my-label" class-name="my-content"
-                      label="文件类型:">{{
+                      label="文件类型">{{
                         props.row.fileType }}</el-descriptions-item>
                     <el-descriptions-item min-width="195px" label-class-name="my-label" class-name="my-content"
-                      label="工作量:">{{
+                      label="工作量">{{
                         props.row.workLoad }}</el-descriptions-item>
                     <el-descriptions-item min-width="195px" label-class-name="my-label" class-name="my-content"
-                      label="单位:">{{
+                      label="单位">{{
                         props.row.unit }}</el-descriptions-item>
                     <el-descriptions-item min-width="195px" label-class-name="my-label" class-name="my-content"
-                      label="大地基准:">{{
+                      label="大地基准">{{
                         props.row.geodeticDatum }}</el-descriptions-item>
                     <el-descriptions-item min-width="195px" label-class-name="my-label" class-name="my-content"
-                      label="分辨率:">{{
+                      label="分辨率">{{
                         props.row.resolution }}</el-descriptions-item>
                     <el-descriptions-item min-width="195px" label-class-name="my-label" class-name="my-content"
-                      label="比例尺或等级:">{{ selectDictLabel(dict.type.cmc_scale_grade, props.row.scaleGrade)
+                      label="比例尺或等级">{{ selectDictLabel(dict.type.cmc_scale_grade, props.row.scaleGrade)
                       }}</el-descriptions-item>
                     <el-descriptions-item min-width="195px" label-class-name="my-label" class-name="my-content"
-                      label="数据类型:">{{
+                      label="数据类型">{{
                         props.row.dataType }}</el-descriptions-item>
                     <el-descriptions-item min-width="195px" label-class-name="my-label" class-name="my-content"
-                      label="存放地址:">{{
+                      label="存放地址">{{
                         props.row.storageAddress }}</el-descriptions-item>
                     <el-descriptions-item min-width="195px" label-class-name="my-label" class-name="my-content"
-                      label="提交时间:">{{
+                      label="提交时间">{{
                         props.row.submitDate }}</el-descriptions-item>
                   </el-descriptions>
                 </template>
@@ -833,8 +833,10 @@ export default {
           this.$message.error('暂无成果，请添加');
           this.achiDialogData = [];
         } else {
-          this.dialogTableVisible = true;
-          console.log(res.rows);
+          if (this.dialogTableVisible == false)
+            this.dialogTableVisible = true;
+          else
+            this.dialogTableVisible = false;
           this.achiDialogData = res.rows;
         }
       })

oa-ui/src/views/oa/borrow/index.vue

@@ -1,8 +1,8 @@
 <!--
  * @Author: ysh
  * @Date: 2024-06-21 18:51:59
- * @LastEditors: Please set LastEditors
- * @LastEditTime: 2024-08-21 10:22:33
+ * @LastEditors: wrh
+ * @LastEditTime: 2024-08-22 09:21:21
 -->
 <template>
   <div class="app-container">
@@ -186,8 +186,14 @@ export default {
     getList() {
       this.loading = true;
       if (this.roles.some(element => element === "dept")) {
-        this.queryParams.applyDept = this.deptId;
-        // this.queryParams.undertakingDept = this.deptId;
+        if (this.queryParams.borrowUsage == '0') {
+          this.queryParams.undertakingDept = this.deptId;
+          this.queryParams.applyDept = null;
+        }
+        else {
+          this.queryParams.applyDept = this.deptId;
+          this.queryParams.undertakingDept = null;
+        }
       }
       if (this.roles.some(e => e === 'leader')) {
         this.queryParams.applyDept = null;

oa-ui/src/views/oa/car/approval.vue

@@ -177,8 +177,19 @@ export default {
     /** 查询cmc用车审批列表 */
     getList() {
       this.loading = true;
-      if (this.roles.some(element => element === "dept")) {
-        this.queryParams.useDept = this.deptId;
+      if (this.roles.some(element => element === "dept")) {        
+        if (this.queryParams.carUsage == '0') {
+          this.queryParams.undertakingDept = this.deptId;
+          this.queryParams.useDept = null;
+        }
+        else {
+          this.queryParams.useDept = this.deptId;
+          this.queryParams.undertakingDept = null;
+        }
+      }
+      if (this.roles.some(e => e === 'leader')) {
+        this.queryParams.useDept = null;
+        this.queryParams.undertakingDept = null;
       }
       listCarApproval(this.queryParams).then(response => {
         this.carApprovalList = response.rows;

oa-ui/src/views/oa/settle/index.vue

@@ -88,10 +88,14 @@
 import { listSettle, getSettle, delSettle, addSettle, updateSettle } from "@/api/oa/settle/settle";
 import { listProject } from '@/api/oa/project/project';
 import settleForm from '../../flowable/form/settleForm.vue';
+import { mapGetters } from 'vuex'
 
 export default {
   components: { settleForm },
   name: "Settle",
+  computed: {
+    ...mapGetters(['roles', 'deptId']),
+  },
   data() {
     return {
       // 遮罩层
@@ -162,6 +166,12 @@ export default {
     /** 查询cmc结算审批列表 */
     getList() {
       this.loading = true;
+      if (this.roles.some(element => element === "dept")) {
+          this.queryParams.undertakingDept = this.deptId;        
+      }
+      if (this.roles.some(e => e === 'leader')) {
+        this.queryParams.undertakingDept = null;
+      }
       listSettle(this.queryParams).then(response => {
         this.settleList = response.rows;
         this.total = response.total;

oa-ui/src/views/oa/settle/other.vue

@@ -82,10 +82,14 @@
 import { listSettle, getSettle, delSettle, addSettle, updateSettle } from "@/api/oa/settle/settle";
 import { listProject } from '@/api/oa/project/project';
 import settleOther from '../../flowable/form/settleOther.vue';
+import { mapGetters } from 'vuex'
 
 export default {
   components: { settleOther },
   name: "Settle",
+  computed: {
+    ...mapGetters(['roles', 'deptId']),
+  },
   data() {
     return {
       // 遮罩层
@@ -156,6 +160,12 @@ export default {
     /** 查询cmc结算审批列表 */
     getList() {
       this.loading = true;
+      if (this.roles.some(element => element === "dept")) {
+          this.queryParams.reportDept = this.deptId;        
+      }
+      if (this.roles.some(e => e === 'leader')) {
+        this.queryParams.reportDept = null;
+      }
       listSettle(this.queryParams).then(response => {
         this.settleList = response.rows;
         this.total = response.total;