修改项目编号的查询（可项目名称查），新增人员信息路由缓存

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

@@ -8,9 +8,13 @@
           </el-option>
         </el-select>
       </el-form-item>
-      <el-form-item label="项目编号" prop="projectId">
-        <el-select v-model="queryParams.projectId" clearable filterable remote reserve-keyword placeholder="请输入项目编号"
-          :remote-method="remoteMethod" :loading="loading" style="width: 400px;">
+      <el-form-item prop="projectId">
+        <el-select v-model="queryType" style="width: 100px;">
+          <el-option label="项目编号" value="1"></el-option>
+          <el-option label="项目名称" value="2"></el-option>
+        </el-select>
+        <el-select v-model="queryParams.projectId" clearable filterable remote reserve-keyword placeholder="请输入关键字"
+          :remote-method="remoteMethod" :loading="loading" style="width: 300px;">
           <el-option v-for="project in projectList" :key="project.projectId"
             :label="project.projectNumber + '-' + project.projectName" :value="project.projectId">
           </el-option>
@@ -208,7 +212,8 @@ export default {
       taskForm: {
         formId: ''
       },
-      infoOpen: false
+      infoOpen: false,
+      queryType: '1',
     };
   },
   created() {
@@ -230,11 +235,23 @@ export default {
       this.reset();
     },
     remoteMethod(val) {
-      listProject({
+      let params1 = {
         pageNum: 1,
         pageSize: 20,
         projectNumber: val
-      }).then(res => {
+      }
+      let params2 = {
+        pageNum: 1,
+        pageSize: 20,
+        projectName: val
+      }
+      let params = {};
+      if (this.queryType == '1') {
+        params = params1
+      } else {
+        params = params2
+      }
+      listProject(params).then(res => {
         this.projectList = res.rows;
       })
     },

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

@@ -1,15 +1,19 @@
 <!--
  * @Author: ysh
  * @Date: 2024-06-21 18:51:59
- * @LastEditors: wrh
- * @LastEditTime: 2024-08-22 09:21:21
+ * @LastEditors: Please set LastEditors
+ * @LastEditTime: 2025-01-02 14:05:40
 -->
 <template>
   <div class="app-container">
     <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
-      <el-form-item label="项目编号" prop="projectId">
-        <el-select v-model="queryParams.projectId" clearable filterable remote reserve-keyword placeholder="请输入项目编号"
-          :remote-method="remoteMethod" :loading="loading" style="width: 400px;">
+      <el-form-item prop="projectId">
+        <el-select v-model="queryType" style="width: 100px;">
+          <el-option label="项目编号" value="1"></el-option>
+          <el-option label="项目名称" value="2"></el-option>
+        </el-select>
+        <el-select v-model="queryParams.projectId" clearable filterable remote reserve-keyword placeholder="请输入关键字"
+          :remote-method="remoteMethod" :loading="loading" style="width: 300px;">
           <el-option v-for="project in projectList" :key="project.projectId"
             :label="project.projectNumber + '-' + project.projectName" :value="project.projectId">
           </el-option>
@@ -174,7 +178,8 @@ export default {
         formId: '',
         procDefName: '借款审批'
       },
-      activeName: '0'
+      activeName: '0',
+      queryType: '1',
     };
   },
   created() {
@@ -206,11 +211,23 @@ export default {
       });
     },
     remoteMethod(val) {
-      listProject({
+      let params1 = {
         pageNum: 1,
         pageSize: 20,
         projectNumber: val
-      }).then(res => {
+      }
+      let params2 = {
+        pageNum: 1,
+        pageSize: 20,
+        projectName: val
+      }
+      let params = {};
+      if (this.queryType == '1') {
+        params = params1
+      } else {
+        params = params2
+      }
+      listProject(params).then(res => {
         this.projectList = res.rows;
       })
     },

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

@@ -1,9 +1,13 @@
 <template>
   <div class="app-container">
     <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
-      <el-form-item label="项目编号" prop="projectId">
-        <el-select v-model="queryParams.projectId" clearable filterable remote reserve-keyword placeholder="请输入项目编号"
-          :remote-method="remoteMethod" :loading="loading" style="width: 400px;">
+      <el-form-item prop="projectId">
+        <el-select v-model="queryType" style="width: 100px;">
+          <el-option label="项目编号" value="1"></el-option>
+          <el-option label="项目名称" value="2"></el-option>
+        </el-select>
+        <el-select v-model="queryParams.projectId" clearable filterable remote reserve-keyword placeholder="请输入关键字"
+          :remote-method="remoteMethod" :loading="loading" style="width: 300px;">
           <el-option v-for="project in projectList" :key="project.projectId"
             :label="project.projectNumber + '-' + project.projectName" :value="project.projectId">
           </el-option>
@@ -152,7 +156,8 @@ export default {
       taskForm: {
         formId:''
       },
-      projectList: []
+      projectList: [],
+      queryType: '1',
     };
   },
   created() {
@@ -167,13 +172,25 @@ export default {
         this.total = response.total;
         this.loading = false;
       });
-    },
+    }, 
     remoteMethod(val) {
-      listProject({
+      let params1 = {
         pageNum: 1,
-        pageSize: 20, 
+        pageSize: 20,
         projectNumber: val
-      }).then(res => {
+      }
+      let params2 = {
+        pageNum: 1,
+        pageSize: 20,
+        projectName: val
+      }
+      let params = {};
+      if (this.queryType == '1') {
+        params = params1
+      } else {
+        params = params2
+      }
+      listProject(params).then(res => {
         this.projectList = res.rows;
       })
     },

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

@@ -7,9 +7,13 @@
 <template>
   <div class="app-container">
     <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
-      <el-form-item label="项目编号" prop="projectId">
-        <el-select v-model="queryParams.projectId" clearable filterable remote reserve-keyword placeholder="请输入项目编号"
-          :remote-method="remoteMethod" :loading="loading" style="width: 400px;">
+      <el-form-item prop="projectId">
+        <el-select v-model="queryType" style="width: 100px;">
+          <el-option label="项目编号" value="1"></el-option>
+          <el-option label="项目名称" value="2"></el-option>
+        </el-select>
+        <el-select v-model="queryParams.projectId" clearable filterable remote reserve-keyword placeholder="请输入关键字"
+          :remote-method="remoteMethod" :loading="loading" style="width: 300px;">
           <el-option v-for="project in projectList" :key="project.projectId"
             :label="project.projectNumber + '-' + project.projectName" :value="project.projectId">
           </el-option>
@@ -222,7 +226,8 @@ export default {
       },
       // 表单校验
       rules: {
-      }
+      },
+      queryType: '1',
     };
   },
   created() {
@@ -247,11 +252,23 @@ export default {
       this.reset();
     },
     remoteMethod(val) {
-      listProject({
+      let params1 = {
         pageNum: 1,
         pageSize: 20,
         projectNumber: val
-      }).then(res => {
+      }
+      let params2 = {
+        pageNum: 1,
+        pageSize: 20,
+        projectName: val
+      }
+      let params = {};
+      if (this.queryType == '1') {
+        params = params1
+      } else {
+        params = params2
+      }
+      listProject(params).then(res => {
         this.projectList = res.rows;
       })
     },

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

@@ -1,9 +1,13 @@
 <template>
   <div class="app-container">
     <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">      
-      <el-form-item label="项目编号" prop="projectId">
-        <el-select v-model="queryParams.projectId" clearable filterable remote reserve-keyword placeholder="请输入项目编号"
-          :remote-method="remoteMethod" :loading="loading" style="width: 400px;">
+      <el-form-item prop="projectId">
+        <el-select v-model="queryType" style="width: 100px;">
+          <el-option label="项目编号" value="1"></el-option>
+          <el-option label="项目名称" value="2"></el-option>
+        </el-select>
+        <el-select v-model="queryParams.projectId" clearable filterable remote reserve-keyword placeholder="请输入关键字"
+          :remote-method="remoteMethod" :loading="loading" style="width: 300px;">
           <el-option v-for="project in projectList" :key="project.projectId"
             :label="project.projectNumber + '-' + project.projectName" :value="project.projectId">
           </el-option>
@@ -158,7 +162,8 @@ export default {
       taskForm: {
         formId: ''
       },      
-      projectList: []
+      projectList: [],
+      queryType: '1',
     };
   },
   created() {
@@ -269,13 +274,25 @@ export default {
       this.download('oa/outsource/export', {
         ...this.queryParams
       }, `outsource_${new Date().getTime()}.xlsx`)
-    },    
+    }, 
     remoteMethod(val) {
-      listProject({
+      let params1 = {
         pageNum: 1,
         pageSize: 20,
         projectNumber: val
-      }).then(res => {
+      }
+      let params2 = {
+        pageNum: 1,
+        pageSize: 20,
+        projectName: val
+      }
+      let params = {};
+      if (this.queryType == '1') {
+        params = params1
+      } else {
+        params = params2
+      }
+      listProject(params).then(res => {
         this.projectList = res.rows;
       })
     },

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

@@ -1,8 +1,8 @@
 <!--
  * @Author: ysh
  * @Date: 2024-02-27 14:49:15
- * @LastEditors: wrh
- * @LastEditTime: 2024-12-09 17:42:50
+ * @LastEditors: Please set LastEditors
+ * @LastEditTime: 2025-01-02 14:24:27
 -->
 <template>
   <div class="project-wrapper">
@@ -45,39 +45,6 @@
         </el-form-item>
       </el-form>
     </el-row>
-    <!-- 项目统计 -->
-    <!-- <el-row>
-      <el-col>
-        <el-row :gutter="20">
-          <el-col :span="8" :xs="24">
-            <div class="static-box">
-              <div class="title">今年项目数量</div>
-              <div class="box-content">
-                <div class="box-left">
-                  <div class="number">48</div>
-                </div>
-                <dir class="box-right">
-                  <div style="display: flex;">
-                    <div>院内</div>
-                    <div class="progress"><el-progress :percentage="100" :stroke-width="14"></el-progress></div>
-                  </div>
-                  <div style="display: flex;" class="mt10">
-                    <div>院外</div>
-                    <div class="progress"><el-progress :percentage="100" :stroke-width="14"></el-progress></div>
-                  </div>
-                </dir>
-              </div>
-            </div>
-          </el-col>
-          <el-col :span="8" :xs="24">
-
-          </el-col>
-          <el-col :span="8" :xs="24">
-
-          </el-col>
-        </el-row>
-      </el-col>
-    </el-row> -->
     <!-- 项目列表 -->
     <el-card style="margin-top: 20px;">
       <div slot="header" class="card-header">
@@ -243,12 +210,6 @@
           </el-form-item>
         </el-form>
       </el-dialog>
-
-      <!-- 修改项目 -->
-      <el-dialog :title="title" :visible.sync="modifyOpen">
-
-      </el-dialog>
-
     </el-dialog>
   </div>
 </template>

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

@@ -1,9 +1,13 @@
 <template>
   <div class="app-container">
     <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="120px">
-      <el-form-item label="项目编号" prop="projectId">
-        <el-select v-model="queryParams.projectId" clearable filterable remote reserve-keyword placeholder="请输入项目编号"
-          :remote-method="remoteMethod" :loading="loading" style="width: 400px;">
+      <el-form-item prop="projectId">
+        <el-select v-model="queryType" style="width: 100px;">
+          <el-option label="项目编号" value="1"></el-option>
+          <el-option label="项目名称" value="2"></el-option>
+        </el-select>
+        <el-select v-model="queryParams.projectId" clearable filterable remote reserve-keyword placeholder="请输入关键字"
+          :remote-method="remoteMethod" :loading="loading" style="width: 300px;">
           <el-option v-for="project in projectList" :key="project.projectId"
             :label="project.projectNumber + '-' + project.projectName" :value="project.projectId">
           </el-option>
@@ -158,7 +162,8 @@ export default {
       },
       // 表单校验
       rules: {
-      }
+      },
+      queryType: '1',
     };
   },
   created() {
@@ -175,11 +180,23 @@ export default {
       });
     },
     remoteMethod(val) {
-      listProject({
+      let params1 = {
         pageNum: 1,
-        pageSize: 20, 
+        pageSize: 20,
         projectNumber: val
-      }).then(res => {
+      }
+      let params2 = {
+        pageNum: 1,
+        pageSize: 20,
+        projectName: val
+      }
+      let params = {};
+      if (this.queryType == '1') {
+        params = params1
+      } else {
+        params = params2
+      }
+      listProject(params).then(res => {
         this.projectList = res.rows;
       })
     },

oa-ui/src/views/oa/safe/report.vue

@@ -1,9 +1,13 @@
 <template>
   <div class="app-container">
     <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
-      <el-form-item label="项目编号" prop="projectId">
-        <el-select v-model="queryParams.projectId" clearable filterable remote reserve-keyword placeholder="请输入项目编号"
-          :remote-method="remoteMethod" :loading="loading" style="width: 400px;">
+      <el-form-item prop="projectId">
+        <el-select v-model="queryType" style="width: 100px;">
+          <el-option label="项目编号" value="1"></el-option>
+          <el-option label="项目名称" value="2"></el-option>
+        </el-select>
+        <el-select v-model="queryParams.projectId" clearable filterable remote reserve-keyword placeholder="请输入关键字"
+          :remote-method="remoteMethod" :loading="loading" style="width: 300px;">
           <el-option v-for="project in projectList" :key="project.projectId"
             :label="project.projectNumber + '-' + project.projectName" :value="project.projectId">
           </el-option>
@@ -187,7 +191,8 @@ export default {
         member: [{ required: true, message: "公司人员不能为空", trigger: "blur" }],
         reportDate: [{ required: true, message: "报告日期不能为空", trigger: "blur" }],
         content: [{ required: true, message: "安全汇报内容不能为空", trigger: "blur" }],
-      }
+      },
+      queryType: '1',
     };
   },
   created() {
@@ -226,11 +231,23 @@ export default {
       })
     },
     remoteMethod(val) {
-      listProject({
+      let params1 = {
         pageNum: 1,
         pageSize: 20,
         projectNumber: val
-      }).then(res => {
+      }
+      let params2 = {
+        pageNum: 1,
+        pageSize: 20,
+        projectName: val
+      }
+      let params = {};
+      if (this.queryType == '1') {
+        params = params1
+      } else {
+        params = params2
+      }
+      listProject(params).then(res => {
         this.projectList = res.rows;
       })
     },

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

@@ -1,9 +1,13 @@
 <template>
   <div class="app-container">
     <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
-      <el-form-item label="项目编号" prop="projectId">
-        <el-select v-model="queryParams.projectId" clearable filterable remote reserve-keyword placeholder="请输入项目编号"
-          :remote-method="remoteMethod" :loading="loading" style="width: 400px;">
+      <el-form-item prop="projectId">
+        <el-select v-model="queryType" style="width: 100px;">
+          <el-option label="项目编号" value="1"></el-option>
+          <el-option label="项目名称" value="2"></el-option>
+        </el-select>
+        <el-select v-model="queryParams.projectId" clearable filterable remote reserve-keyword placeholder="请输入关键字"
+          :remote-method="remoteMethod" :loading="loading" style="width: 300px;">
           <el-option v-for="project in projectList" :key="project.projectId"
             :label="project.projectNumber + '-' + project.projectName" :value="project.projectId">
           </el-option>
@@ -62,7 +66,7 @@
       </el-table-column>
       <el-table-column label="结算总额" align="center" prop="reportTime" width="180">
         <template slot-scope="scope">
-          <span>{{ scope.row.amount ? scope.row.amount : 0}}</span>
+          <span>{{ scope.row.amount ? scope.row.amount : 0 }}</span>
         </template>
       </el-table-column>
       <!-- <el-table-column label="工作量上报说明" align="center" prop="workloadReport" /> -->
@@ -164,9 +168,11 @@ export default {
       rules: {
       },
       projectList: [],
+      projectNameList: [],
       taskForm: {
         formId: ''
-      }
+      },
+      queryType: '1',
     };
   },
   created() {
@@ -177,11 +183,14 @@ export default {
     getList() {
       this.loading = true;
       if (this.roles.some(element => element === "dept")) {
-          this.queryParams.undertakingDept = this.deptId;        
+        this.queryParams.undertakingDept = this.deptId;
       }
       if (this.roles.some(e => e === 'leader')) {
         this.queryParams.undertakingDept = null;
       }
+      if (this.queryProjectIdByName) {
+        this.queryForm.projectId = this.queryProjectIdByName
+      }
       listSettle(this.queryParams).then(response => {
         this.settleList = response.rows;
         this.total = response.total;
@@ -189,11 +198,23 @@ export default {
       });
     },
     remoteMethod(val) {
-      listProject({
+      let params1 = {
         pageNum: 1,
         pageSize: 20,
         projectNumber: val
-      }).then(res => {
+      }
+      let params2 = {
+        pageNum: 1,
+        pageSize: 20,
+        projectName: val
+      }
+      let params = {};
+      if (this.queryType == '1') {
+        params = params1
+      } else {
+        params = params2
+      }
+      listProject(params).then(res => {
         this.projectList = res.rows;
       })
     },

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

@@ -363,7 +363,7 @@ import Treeselect from "@riophae/vue-treeselect";
 import "@riophae/vue-treeselect/dist/vue-treeselect.css";
 
 export default {
-  name: "Staff",
+  name: "People",
   dicts: ['sys_post_status', 'sys_user_sex', 'sys_user_titles', 'sys_user_certificates', 'sys_user_pmlevel', 'sys_user_engineerlevel', 'sys_user_operatorlevel', 'sys_user_postlevel', 'sys_user_salarylevel', 'sys_user_political', 'sys_user_degree'],
   components: { Treeselect },
   data() {

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

@@ -1,9 +1,13 @@
 <template>
   <div class="app-container">
     <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="120px">
-      <el-form-item label="项目编号" prop="projectId">
-        <el-select v-model="queryParams.projectId" clearable filterable remote reserve-keyword placeholder="请输入项目编号"
-          :remote-method="remoteMethod" :loading="loading" style="width: 400px;">
+      <el-form-item prop="projectId">
+        <el-select v-model="queryType" style="width: 100px;">
+          <el-option label="项目编号" value="1"></el-option>
+          <el-option label="项目名称" value="2"></el-option>
+        </el-select>
+        <el-select v-model="queryParams.projectId" clearable filterable remote reserve-keyword placeholder="请输入关键字"
+          :remote-method="remoteMethod" :loading="loading" style="width: 300px;">
           <el-option v-for="project in projectList" :key="project.projectId"
             :label="project.projectNumber + '-' + project.projectName" :value="project.projectId">
           </el-option>
@@ -155,7 +159,8 @@ export default {
       },
       // 表单校验
       rules: {
-      }
+      },
+      queryType: '1',
     };
   },
   created() {
@@ -172,11 +177,23 @@ export default {
       });
     },
     remoteMethod(val) {
-      listProject({
+      let params1 = {
         pageNum: 1,
-        pageSize: 20, 
+        pageSize: 20,
         projectNumber: val
-      }).then(res => {
+      }
+      let params2 = {
+        pageNum: 1,
+        pageSize: 20,
+        projectName: val
+      }
+      let params = {};
+      if (this.queryType == '1') {
+        params = params1
+      } else {
+        params = params2
+      }
+      listProject(params).then(res => {
         this.projectList = res.rows;
       })
     },

oa-ui/src/views/oa/technical/plan.vue

@@ -1,9 +1,13 @@
 <template>
   <div class="app-container">
     <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="128px">
-      <el-form-item label="项目编号" prop="projectId">
-        <el-select v-model="queryParams.projectId" clearable filterable remote reserve-keyword placeholder="请输入项目编号"
-          :remote-method="remoteMethod" :loading="loading" style="width: 400px;">
+      <el-form-item prop="projectId">
+        <el-select v-model="queryType" style="width: 100px;">
+          <el-option label="项目编号" value="1"></el-option>
+          <el-option label="项目名称" value="2"></el-option>
+        </el-select>
+        <el-select v-model="queryParams.projectId" clearable filterable remote reserve-keyword placeholder="请输入关键字"
+          :remote-method="remoteMethod" :loading="loading" style="width: 300px;">
           <el-option v-for="project in projectList" :key="project.projectId"
             :label="project.projectNumber + '-' + project.projectName" :value="project.projectId">
           </el-option>
@@ -220,7 +224,8 @@ export default {
       },
       // 表单校验
       rules: {
-      }
+      },
+      queryType: '1',
     };
   },
   created() {
@@ -237,11 +242,23 @@ export default {
       });
     },
     remoteMethod(val) {
-      listProject({
+      let params1 = {
         pageNum: 1,
-        pageSize: 20, 
+        pageSize: 20,
         projectNumber: val
-      }).then(res => {
+      }
+      let params2 = {
+        pageNum: 1,
+        pageSize: 20,
+        projectName: val
+      }
+      let params = {};
+      if (this.queryType == '1') {
+        params = params1
+      } else {
+        params = params2
+      }
+      listProject(params).then(res => {
         this.projectList = res.rows;
       })
     },