结算单价查询

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

@@ -51,7 +51,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 
     <select id="selectCmcPriceByScaleGrade" parameterType="String" resultMap="CmcPriceResult">
         <include refid="selectCmcPriceVo"/>
-        where work_item = #{param1} and sub_item = #{param2} and scale_grade = #{param3}
+        <where>
+            <if test="param1 != null  and param1 != ''"> and work_item = #{param1}</if>
+            <if test="param2 != null  and param2 != ''"> and sub_item = #{param2}</if>
+            <if test="param3 != null  and param3 != ''"> and scale_grade = #{param3}</if>
+        </where>
     </select>
 
     <insert id="insertCmcPrice" parameterType="CmcPrice" useGeneratedKeys="true" keyProperty="id">

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

@@ -46,6 +46,7 @@
         <where>
             <if test="projectNumber != null  and projectNumber != ''"> and p.project_number like concat('%', #{projectNumber}, '%')</if>
             <if test="projectName != null  and projectName != ''"> and p.project_name like concat('%', #{projectName}, '%')</if>
+            <if test="projectLeader != null  and projectLeader != ''"> and p.project_leader like concat('%', #{projectLeader}, '%')</if>
             <if test="isFinished != null  and isFinished != ''"> and p.is_finished = #{isFinished}</if>
             <if test="projectSource != null  and projectSource != ''"> and p.project_source = #{projectSource}</if>
             <if test="partyA != null  and partyA != ''"> and p.party_a like concat('%', #{partyA}, '%')</if>

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

@@ -23,7 +23,7 @@
       <el-descriptions-item>
         <template slot="label">
           <svg-icon slot="prefix" icon-class="PhAppStoreLogoFill" class="el-input__icon input-icon" />
-          系列
+          车型
         </template>
         {{ carInfo.series }}
       </el-descriptions-item>

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

@@ -1,8 +1,8 @@
 <!--
  * @Author: ysh
  * @Date: 2024-02-27 14:49:15
- * @LastEditors: Please set LastEditors
- * @LastEditTime: 2024-03-04 09:29:14
+ * @LastEditors: wrh
+ * @LastEditTime: 2024-03-28 10:50:22
 -->
 <template>
   <div class="project-wrapper">
@@ -13,9 +13,10 @@
           <el-input v-model="queryParams.projectNumber" placeholder="请输入项目编号" clearable
             @keyup.enter.native="handleQuery" />
         </el-form-item>
-        <el-form-item label="项目负责人" prop="projectLeaderName">
-          <el-input v-model="queryParams.projectLeaderName" placeholder="请输入项目负责人" clearable
-            @keyup.enter.native="handleQuery" />
+        <el-form-item label="项目负责人" prop="projectLeader">
+          <el-select v-model="queryParams.projectLeader" clearable filterable placeholder="请输入项目负责人" size="large" style="width: 240px" @keyup.enter.native="handleQuery">
+            <el-option v-for="item in userList" :key="item.userId" :label="item.nickName" :value="item.userId" />
+          </el-select>
         </el-form-item>
         <el-form-item label="项目名称" prop="projectName">
           <el-input v-model="queryParams.projectName" placeholder="请输入项目名称" clearable @keyup.enter.native="handleQuery" />
@@ -80,7 +81,7 @@
         </el-table-column>
         <el-table-column label="项目编号" align="center" key="projectNumber" prop="projectNumber" />
         <el-table-column label="项目名称" align="center" key="projectName" prop="projectName" />
-        <el-table-column label="项目负责人" align="center" key="projectLeaderName" prop="projectLeaderName" />
+        <el-table-column label="项目负责人" align="center" key="projectLeaderName" prop="projectLeaderUser.nickName" />
         <el-table-column label="操作" align="center" width="160" class-name="small-padding fixed-width">
           <template slot-scope="scope" v-if="scope.row.userId !== 1">
             <el-button size="mini" type="text" icon="el-icon-edit" @click="handleUpdate(scope.row)"
@@ -219,13 +220,13 @@ import { listUser, getUser } from '@/api/system/user'
 export default {
   data() {
     return {
+      userList: [],
       // 查询参数
       queryParams: {
         pageNum: 1,
         pageSize: 10,
         projectNumber: '',
-        projectLeader: '',
-        projectLeaderName: undefined,
+        projectLeader: undefined,
         projectName: '',
       },
       projectList: [],
@@ -259,21 +260,14 @@ export default {
   created() {
     this.getList();
     this.getDeptList();
+    this.getUserList();
   },
   methods: {
     // 查询项目列表
     getList() {
       this.loading = true
       listProject(this.queryParams).then(response => {
-        this.projectList = [];
-        for (let p of response.rows) {
-          if (p.projectLeader != null) {
-            getUser(Number(p.projectLeader)).then(res => {
-              p.projectLeaderName = res.data.nickName;
-            })
-          }
-          this.projectList.push(p);
-        }
+        this.projectList = response.rows;
         this.total = response.total;
         this.loading = false;
       })
@@ -286,6 +280,11 @@ export default {
         this.peopleForm.deptList = res.data
       })
     },
+    getUserList() {
+      listUser({pageNum: 1, pageSize: 9999}).then(res => {
+        this.userList = res.rows
+      })
+    },
     handleQuery() {
       this.queryParams.pageNum = 1;
       this.getList();
@@ -324,10 +323,10 @@ export default {
         });
       else
         modifyProject(formData).then(response => {
-            this.$modal.msgSuccess("修改成功");
-            this.addOpen = false;
-            this.getList();
-          });
+          this.$modal.msgSuccess("修改成功");
+          this.addOpen = false;
+          this.getList();
+        });
     },
     // 人员选择
     choosePeople() {
@@ -383,7 +382,7 @@ export default {
         arr.splice(index, 1);
       }
     },
-    cancelChoosePeople(){
+    cancelChoosePeople() {
       this.peopleForm.deptId = '';
       this.peopleForm.userId = '';
       this.peopleVisible = false;