项目登记修改、选择项目界面选择类型

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

@@ -418,7 +418,7 @@ public class CmcProjectController extends BaseController
 
     //各部门承担项目数量
     public void getProjectDeptStatistic(CmcProject cmcProject, JSONObject deptObject) {
-        for (int i = 107; i <= 115; i++) {
+        for (int i = 107; i <= 116; i++) {
             cmcProject.setUndertakingDept(String.valueOf(i));
             List<CmcProject> deptList = new ArrayList<>();
             if (i != 113)

oa-ui/src/views/flowable/form/components/chooseProject.vue

@@ -2,6 +2,12 @@
   <div>
     <el-row>
       <el-form :model="queryParams" ref="queryForm" :inline="true" label-width="88px">
+        <el-form-item label="项目类型" prop="projectType">
+          <el-select v-model="projectType" clearable filterable placeholder="请输入项目类型" size="large"
+            style="width: 240px" @keyup.enter.native="handleQuery()">
+            <el-option v-for="item in typeList" :key="item.typeId" :label="item.typeName" :value="item.typeName"/>
+          </el-select>
+        </el-form-item>
         <el-form-item label="项目编号" prop="projectNumber">
           <el-input v-model="queryParams.projectNumber" placeholder="请输入项目编号" clearable
             @keyup.enter.native="handleQuery()" />
@@ -65,6 +71,8 @@ export default {
         projectLeader: undefined,
         projectName: '',
       },
+      projectType: '测绘',
+      typeList: [{typeId: 1, typeName: "测绘"}, {typeId: 2, typeName: "勘察"}],
       projectList: [],
       userList: [],
       total: 0,
@@ -80,6 +88,12 @@ export default {
     // 查询项目列表
     getList() {
       this.loading = true
+      if (this.projectType == '测绘') {
+        this.queryParams.undertakingDept = undefined
+      }
+      if (this.projectType == '勘察') {
+        this.queryParams.undertakingDept = 113
+      }
       listProject(this.queryParams).then(response => {
         this.projectList = response.rows;
         this.total = response.total;

oa-ui/src/views/flowable/form/projectProcess/addproject.vue

@@ -1,8 +1,8 @@
 <!--
  * @Author: ysh
  * @Date: 2024-03-18 11:00:04
- * @LastEditors: Please set LastEditors
- * @LastEditTime: 2024-10-14 17:02:05
+ * @LastEditors: wrh
+ * @LastEditTime: 2025-02-10 17:36:01
 -->
 <template>
   <div class="project-wrapper">
@@ -297,6 +297,8 @@ export default {
     async getDeptLeader(val) {
       this.deptLeaderList = [];
       for (let v of val) {
+        if (v == 116)
+          v = 102
         let res = await getUsersDeptLeaderByDept({ deptId: Number(v) })
         this.deptLeaderList.push(res.data.userId);
       }

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

@@ -86,6 +86,11 @@
           <span>{{ parseTime(scope.row.applyDate, '{y}-{m}-{d}') }}</span>
         </template>
       </el-table-column>
+      <el-table-column label="返回日期" align="center" prop="returnDate">
+        <template slot-scope="scope">
+          <span>{{ parseTime(scope.row.returnDate, '{y}-{m}-{d}') }}</span>
+        </template>
+      </el-table-column>
       <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
         <template slot-scope="scope">
           <el-button size="mini" type="text" icon="el-icon-view" @click="handleView(scope.row)">查看</el-button>