'123'

ruoyi-system/src/main/resources/mapper/priceVerification/QuotHjMapper.xml

@@ -64,6 +64,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="quotHjCode != null  and quotHjCode != ''"> and quot_hj_code like concat('%', #{quotHjCode}, '%')</if>
             <if test="params.beginQuotHjPricingDate != null and params.beginQuotHjPricingDate != '' and params.endQuotHjPricingDate != null and params.endQuotHjPricingDate != ''"> and quot_hj_pricing_date between #{params.beginQuotHjPricingDate} and #{params.endQuotHjPricingDate}</if>
             <if test="quotHjApprovalStatus != null  and quotHjApprovalStatus != ''"> and q.quot_hj_approval_status = #{quotHjApprovalStatus}</if>
+            <if test="quotSalesmanName != null  and quotSalesmanName != ''"> and q.quot_salesman_name like concat('%', #{quotSalesmanName}, '%')</if>
+            <if test="quotCustomerName != null  and quotCustomerName != ''"> and q.quot_customer_name like concat('%', #{quotCustomerName}, '%')</if>
+            <if test="quotProject != null  and quotProject != ''"> and q.quot_project like concat('%', #{quotProject}, '%')</if>
+
             <!-- 数据范围过滤 -->
             <!--${params.dataScope}-->
         </where>

ruoyi-ui/src/views/priceVerification/priceVerification/index.vue

@@ -30,6 +30,30 @@
           />
         </el-select>
       </el-form-item>
+      <el-form-item label="业务员" prop="quotSalesmanName">
+        <el-input
+          v-model="queryParams.quotSalesmanName"
+          placeholder="请输入业务员"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="客户" prop="quotCustomerName">
+        <el-input
+          v-model="queryParams.quotCustomerName"
+          placeholder="请输入客户"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="项目" prop="quotProject">
+        <el-input
+          v-model="queryParams.quotProject"
+          placeholder="请输入项目"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
       <el-form-item>
         <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
         <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>

ruoyi-ui/src/views/statisticsQuot/statisticsQuot/index.vue

@@ -62,10 +62,10 @@
       </el-col>
     </el-row>
     <el-table v-loading="loading" :data="quotList" style="width: 100%;margin-top: 10px;" :height="tableHeight">
-      <el-table-column fixed label="报价单号" align="center" prop="quotCode" width="250px"/>
+      <el-table-column label="报价单号" align="center" prop="quotCode" width="250px"/>
-      <el-table-column fixed label="业务员" align="center" prop="quotSalesmanName" width="150px"/>
+      <el-table-column label="业务员" align="center" prop="quotSalesmanName" width="150px"/>
-      <el-table-column fixed label="客户名称" align="center" prop="quotCustomerName" width="250px"/>
+      <el-table-column label="客户名称" align="center" prop="quotCustomerName" width="250px"/>
-      <el-table-column fixed label="项目名称" align="center" prop="quotProject" width="250px"/>
+      <el-table-column label="项目名称" align="center" prop="quotProject" width="250px"/>
       <el-table-column label="明细条数" align="center" prop="quotMaterialsCount" width="100"/>
       <el-table-column label="总价" align="center" prop="quotTotalPrice" width="100"/>
       <!--<el-table-column label="金思维报价单号" align="center" prop="quotJswCode" width="280px"/>-->