From 554506ad78906d8f7b66630973cb262bbd503f92 Mon Sep 17 00:00:00 2001
From: xd <844539747@qq.com>
Date: Fri, 7 Jun 2024 09:46:39 +0800
Subject: [PATCH] '123'

---
 .../ruoyi/web/controller/tool/quot/quotJswController.java | 1 +
 .../src/main/resources/mapper/customer/CustomerMapper.xml | 1 +
 .../src/main/resources/mapper/quot/QuotMapper.xml         | 1 +
 ruoyi-ui/src/views/customer/customer/index.vue            | 8 ++++++++
 ruoyi-ui/src/views/quot/quot/index.vue                    | 8 ++++++++
 5 files changed, 19 insertions(+)

diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/tool/quot/quotJswController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/tool/quot/quotJswController.java
index a46cd80..43a0fb3 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/tool/quot/quotJswController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/tool/quot/quotJswController.java
@@ -154,6 +154,7 @@ public class quotJswController extends BaseController {
             q.setQuotLvPrice(quot.getQuotLvPrice());
             q.setQuotTongPrice(quot.getQuotTongPrice());
             q.setQuotMatpriceDiff(quot.getQuotMatpriceDiff());
+            q.setQuotJswApprovalStatus("2");
 
             List<QuotMaterial> qmaterials = new ArrayList<QuotMaterial>();
             QuotMaterial quotMaterial = new QuotMaterial();
diff --git a/ruoyi-system/src/main/resources/mapper/customer/CustomerMapper.xml b/ruoyi-system/src/main/resources/mapper/customer/CustomerMapper.xml
index aaf2426..af7e430 100644
--- a/ruoyi-system/src/main/resources/mapper/customer/CustomerMapper.xml
+++ b/ruoyi-system/src/main/resources/mapper/customer/CustomerMapper.xml
@@ -82,6 +82,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="cusCode != null  and cusCode != ''"> and cus_code like concat('%', #{cusCode}, '%')</if>
             <if test="cusName != null  and cusName != ''"> and cus_name like concat('%', #{cusName}, '%')</if>
             <if test="cusSapCode != null  and cusSapCode != ''"> and cus_sap_code like concat('%', #{cusSapCode}, '%')</if>
+            <if test="cusSalesman != null  and cusSalesman != ''"> and cus_salesman like concat('%', #{cusSalesman}, '%')</if>
             <if test="cusState != null  and cusState != ''"> and cus_state = #{cusState}</if>
             <if test="cusApprovalStatus != null  and cusApprovalStatus != ''"> and cus_approval_status = #{cusApprovalStatus}</if>
             <!-- 数据范围过滤 -->
diff --git a/ruoyi-system/src/main/resources/mapper/quot/QuotMapper.xml b/ruoyi-system/src/main/resources/mapper/quot/QuotMapper.xml
index ec43727..2ee5e99 100644
--- a/ruoyi-system/src/main/resources/mapper/quot/QuotMapper.xml
+++ b/ruoyi-system/src/main/resources/mapper/quot/QuotMapper.xml
@@ -137,6 +137,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="quotCode != null  and quotCode != ''"> and quot_code like concat('%', #{quotCode}, '%')</if>
             <if test="quotCustomerName != null  and quotCustomerName != ''"> and quot_customer_name like concat('%', #{quotCustomerName}, '%')</if>
             <if test="quotProject != null  and quotProject != ''"> and quot_project like concat('%', #{quotProject}, '%')</if>
+            <if test="quotSalesmanName != null  and quotSalesmanName != ''"> and quot_salesman_name like concat('%', #{quotSalesmanName}, '%')</if>
             <if test="quotPrint != null  and quotPrint != ''"> and quot_print = #{quotPrint}</if>
             <if test="quotApprovalStatus != null  and quotApprovalStatus != ''"> and quot_approval_status = #{quotApprovalStatus}</if>
             <!-- 数据范围过滤 -->
diff --git a/ruoyi-ui/src/views/customer/customer/index.vue b/ruoyi-ui/src/views/customer/customer/index.vue
index c294a77..841a309 100644
--- a/ruoyi-ui/src/views/customer/customer/index.vue
+++ b/ruoyi-ui/src/views/customer/customer/index.vue
@@ -25,6 +25,14 @@
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
+      <el-form-item label="业务员" prop="cusSalesman" v-if="checkRole(['ITZX_SJZ'])">
+        <el-input
+          v-model="queryParams.cusSalesman"
+          placeholder="请输入业务员"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
       <!--<el-form-item label="状态" prop="cusState">
         <el-select v-model="queryParams.cusState" placeholder="请选择客户禁用状态" clearable>
           <el-option
diff --git a/ruoyi-ui/src/views/quot/quot/index.vue b/ruoyi-ui/src/views/quot/quot/index.vue
index ea38b46..d13c108 100644
--- a/ruoyi-ui/src/views/quot/quot/index.vue
+++ b/ruoyi-ui/src/views/quot/quot/index.vue
@@ -25,6 +25,14 @@
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
+      <el-form-item label="业务员" prop="quotSalesmanName" v-if="checkRole(['QUOT'])">
+        <el-input
+          v-model="queryParams.quotSalesmanName"
+          placeholder="请输入业务员"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
       <el-form-item label="是否打印" prop="quotPrint">
         <el-select v-model="queryParams.quotPrint" placeholder="请选择打印状态" clearable>
           <el-option