diff --git a/ruoyi-system/src/main/resources/mapper/technicalConfirm/QuotJsqrMapper.xml b/ruoyi-system/src/main/resources/mapper/technicalConfirm/QuotJsqrMapper.xml
index 4277e2b..729481c 100644
--- a/ruoyi-system/src/main/resources/mapper/technicalConfirm/QuotJsqrMapper.xml
+++ b/ruoyi-system/src/main/resources/mapper/technicalConfirm/QuotJsqrMapper.xml
@@ -109,10 +109,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <include refid="selectQuotJsqrVo"/>
         <where>
             <if test="quotJsqrCode != null  and quotJsqrCode != ''"> and quot_jsqr_code like concat('%', #{quotJsqrCode}, '%')</if>
-            <if test="quotJsqrTlApprovalStatus != null  and quotJsqrTlApprovalStatus != ''"> and quot_jsqr_tl_approval_status = #{quotJsqrTlApprovalStatus}</if>
-            <if test="quotJsqrDyApprovalStatus != null  and quotJsqrDyApprovalStatus != ''"> and quot_jsqr_dy_approval_status = #{quotJsqrDyApprovalStatus}</if>
-            <if test="quotJsqrZyApprovalStatus != null  and quotJsqrZyApprovalStatus != ''"> and quot_jsqr_zy_approval_status = #{quotJsqrZyApprovalStatus}</if>
-            <if test="quotJsqrQtApprovalStatus != null  and quotJsqrQtApprovalStatus != ''"> and quot_jsqr_qt_approval_status = #{quotJsqrQtApprovalStatus}</if>
+            <if test="quotJsxzApprovalStatus != null  and quotJsxzApprovalStatus != ''"> and q.quot_jsxz_approval_status = #{quotJsxzApprovalStatus}</if>
+            <if test="quotCode != null  and quotCode != ''"> and q.quot_code like concat('%', #{quotCode}, '%')</if>
         </where>
         order by a.update_time desc
     </select>
diff --git a/ruoyi-ui/src/views/technicalConfirm/technicalConfirm/index.vue b/ruoyi-ui/src/views/technicalConfirm/technicalConfirm/index.vue
index 936a57f..ec4c20f 100644
--- a/ruoyi-ui/src/views/technicalConfirm/technicalConfirm/index.vue
+++ b/ruoyi-ui/src/views/technicalConfirm/technicalConfirm/index.vue
@@ -9,6 +9,24 @@
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
+      <el-form-item label="技术协助状态" prop="quotJsxzApprovalStatus">
+        <el-select v-model="queryParams.quotJsxzApprovalStatus" placeholder="请选择技术协助状态" clearable>
+          <el-option
+            v-for="dict in dict.type.quot_jsxz_approval_status"
+            :key="dict.value"
+            :label="dict.label"
+            :value="dict.value"
+          />
+        </el-select>
+      </el-form-item>
+      <el-form-item label="报价单号" prop="quotCode">
+        <el-input
+          v-model="queryParams.quotCode"
+          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>
@@ -23,15 +41,15 @@
           <el-link :underline="false" type="primary" @click="handleUpdate(scope.row)">{{scope.row.quotJsqrCode}}</el-link>
         </template>
       </el-table-column>
-      <el-table-column label="报价单号" align="center" prop="quotCode" width="250px"/>
-      <el-table-column label="客户" align="center" prop="quotCustomerName" width="250px"/>
-      <el-table-column label="业务员" align="center" prop="quotSalesmanName" width="150px"/>
-      <el-table-column label="项目名称" align="center" prop="quotProject" width="250px"/>
-      <el-table-column label="技术协助状态" align="center" prop="quotJsxzApprovalStatus" width="150px">
+      <el-table-column fixed label="技术协助状态" align="center" prop="quotJsxzApprovalStatus" width="150px">
         <template slot-scope="scope">
           <dict-tag :options="dict.type.quot_jsxz_approval_status" :value="scope.row.quotJsxzApprovalStatus"/>
         </template>
       </el-table-column>
+      <el-table-column label="报价单号" align="center" prop="quotCode" width="250px"/>
+      <el-table-column label="客户" align="center" prop="quotCustomerName" width="250px"/>
+      <el-table-column label="业务员" align="center" prop="quotSalesmanName" width="150px"/>
+      <el-table-column label="项目名称" align="center" prop="quotProject" width="250px"/>
       <el-table-column label="技术协助分组" align="center" prop="quotJsxzGroup" width="150px">
         <template slot-scope="scope">
           <dict-tag :options="dict.type.quot_jsxz_group" :value="scope.row.quotJsxzGroupValues"/>