进度跟踪 - 搜索栏添加“章节名称”模糊查询、“序号”查询

rc-buisness/src/main/resources/mapper/rc/TProgressMapper.xml

@@ -66,6 +66,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="processId != null "> and p.process_id = #{processId}</if>
             <if test="taskId != null  and taskId != ''"> and p.task_id = #{taskId}</if>
             <if test="taskName != null  and taskName != ''"> and p.task_name = #{taskName}</if>
+            <if test="code != null  and code != ''"> and q.code = #{code}</if>
         </where>
     </select>
     

ruoyi-ui/src/views/rc/progress/index.vue

@@ -1,6 +1,22 @@
 <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="secSubChapName">
+        <el-input
+          v-model="queryParams.secSubChapName"
+          placeholder="请输入章节名称"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="序号" prop="code">
+        <el-input
+          v-model="queryParams.code"
+          placeholder="请输入序号"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
       <el-form-item label="负责人" prop="personInCharge">
         <el-select clearable v-model="queryParams.personInCharge" placeholder="请选择负责人"
                    @keyup.enter.native="handleQuery">
@@ -47,26 +63,26 @@
           placeholder="请选择实际完成日期">
         </el-date-picker>
       </el-form-item>
-      <el-form-item label="准备情况" prop="preparation">
-        <el-select v-model="queryParams.preparation" placeholder="请选择准备情况" clearable>
-          <el-option
-            v-for="dict in dict.type.t_progress_preparation"
-            :key="dict.value"
-            :label="dict.label"
-            :value="dict.value"
-          />
-        </el-select>
-      </el-form-item>
-      <el-form-item label="进度描述" prop="progress">
-        <el-select v-model="queryParams.progress" placeholder="请选择进度描述" clearable>
-          <el-option
-            v-for="dict in dict.type.t_progress_description"
-            :key="dict.value"
-            :label="dict.label"
-            :value="dict.value"
-          />
-        </el-select>
-      </el-form-item>
+      <!--<el-form-item label="准备情况" prop="preparation">-->
+        <!--<el-select v-model="queryParams.preparation" placeholder="请选择准备情况" clearable>-->
+          <!--<el-option-->
+            <!--v-for="dict in dict.type.t_progress_preparation"-->
+            <!--:key="dict.value"-->
+            <!--:label="dict.label"-->
+            <!--:value="dict.value"-->
+          <!--/>-->
+        <!--</el-select>-->
+      <!--</el-form-item>-->
+      <!--<el-form-item label="进度描述" prop="progress">-->
+        <!--<el-select v-model="queryParams.progress" placeholder="请选择进度描述" clearable>-->
+          <!--<el-option-->
+            <!--v-for="dict in dict.type.t_progress_description"-->
+            <!--:key="dict.value"-->
+            <!--:label="dict.label"-->
+            <!--:value="dict.value"-->
+          <!--/>-->
+        <!--</el-select>-->
+      <!--</el-form-item>-->
       <el-form-item label="审批状态" prop="applyStatus">
         <el-select v-model="queryParams.applyStatus" placeholder="请选择审批状态" clearable>
           <el-option