委员会名册、党员名册、申请人积极分子名册 - 搜索栏

ruoyi-system/src/main/resources/mapper/branch/TBranchMemberMapper.xml

@@ -93,8 +93,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="currentMentor != null  and currentMentor != ''"> and u.current_mentor = #{currentMentor}</if>
             <if test="planDevelopDuration != null  and planDevelopDuration != ''"> and u.plan_develop_duration = #{planDevelopDuration}</if>
             <if test="isTrained != null  and isTrained != ''"> and u.is_trained = #{isTrained}</if>
-            <if test="remarks != null  and remarks != ''"> and u.remarks = #{remarks}</if>
+            <if test="remarks != null  and remarks != ''"> and u.remarks like concat(concat('%', #{remarks}), '%')</if>
             <if test="deptId != null "> and u.dept_id = #{deptId}</if>
+            <if test="nickName != null  and nickName != ''"> and us.nick_name like concat(concat('%', #{nickName}), '%')</if>
             and u.del_flag = 0
         </where>
         <!-- 数据范围过滤 -->

ruoyi-ui/src/views/branch/dymc/index.vue

@@ -1,7 +1,72 @@
 <template>
   <div class="app-container">
     <el-form :model="queryParams" ref="queryForm" :inline="true" size="small" v-show="showSearch" label-width="68px">
-
+      <el-form-item label="姓名" prop="nickName">
+        <el-input v-model="queryParams.nickName" placeholder="请输入姓名" />
+      </el-form-item>
+      <el-form-item label="成员类型" prop="memberType">
+        <el-select v-model="queryParams.memberType" placeholder="请选择成员类型">
+          <el-option
+            v-for="dict in memberTypeOptions"
+            :key="dict.dictValue"
+            :label="dict.dictLabel"
+            :value="dict.dictValue"
+          ></el-option>
+        </el-select>
+      </el-form-item>
+      <el-form-item label="出生年月" prop="birthday">
+        <el-date-picker clearable size="small" style="width: 200px"
+                        v-model="queryParams.birthday"
+                        type="date"
+                        value-format="yyyy-MM-dd"
+                        placeholder="选择出生年月">
+        </el-date-picker>
+      </el-form-item>
+      <el-form-item label="学历" prop="educationLevel">
+        <el-select v-model="queryParams.educationLevel" placeholder="请选择学历">
+          <el-option
+            v-for="dict in educationLevelOptions"
+            :key="dict.dictValue"
+            :label="dict.dictLabel"
+            :value="dict.dictValue"
+          ></el-option>
+        </el-select>
+      </el-form-item>
+      <el-form-item label="参加工作时间" prop="workJoinTime" label-width="102px">
+        <el-date-picker clearable size="small" style="width: 200px"
+                        v-model="queryParams.workJoinTime"
+                        type="date"
+                        value-format="yyyy-MM-dd"
+                        placeholder="选择参加工作时间">
+        </el-date-picker>
+      </el-form-item>
+      <el-form-item label="入党时间" prop="partyEntryTime">
+        <el-date-picker clearable size="small" style="width: 200px"
+                        v-model="queryParams.partyEntryTime"
+                        type="date"
+                        value-format="yyyy-MM-dd"
+                        placeholder="选择入党时间">
+        </el-date-picker>
+      </el-form-item>
+      <el-form-item label="调进时间" prop="entryTime">
+        <el-date-picker clearable size="small" style="width: 200px"
+                        v-model="queryParams.entryTime"
+                        type="date"
+                        value-format="yyyy-MM-dd"
+                        placeholder="选择调进时间">
+        </el-date-picker>
+      </el-form-item>
+      <el-form-item label="调出时间" prop="leaveTime">
+        <el-date-picker clearable size="small" style="width: 200px"
+                        v-model="queryParams.leaveTime"
+                        type="date"
+                        value-format="yyyy-MM-dd"
+                        placeholder="选择调出时间">
+        </el-date-picker>
+      </el-form-item>
+      <el-form-item label="归属部门" prop="deptId" style="width: 268px;">
+        <treeselect style="width: 200px;" v-model="queryParams.deptId" :options="deptOptions" :show-count="true" placeholder="请选择归属部门" />
+      </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/branch/sqrjjfzmc/index.vue

@@ -1,7 +1,118 @@
 <template>
   <div class="app-container">
     <el-form :model="queryParams" ref="queryForm" :inline="true" size="small" v-show="showSearch" label-width="68px">
-
+      <el-form-item label="姓名" prop="nickName">
+        <el-input v-model="queryParams.nickName" placeholder="请输入姓名" />
+      </el-form-item>
+      <el-form-item label="成员类型" prop="memberType">
+        <el-select v-model="form.memberType" placeholder="请选择成员类型">
+          <el-option
+            v-for="dict in memberTypeOptions"
+            :key="dict.dictValue"
+            :label="dict.dictLabel"
+            :value="dict.dictValue"
+          ></el-option>
+        </el-select>
+      </el-form-item>
+      <el-form-item label="工号" prop="staffId">
+        <el-input v-model="queryParams.staffId" placeholder="请输入工号" />
+      </el-form-item>
+      <el-form-item label="民族" prop="ethnic">
+        <el-select v-model="queryParams.ethnic" placeholder="请选择民族">
+          <el-option
+            v-for="dict in memberEthnicOptions"
+            :key="dict.dictValue"
+            :label="dict.dictLabel"
+            :value="dict.dictValue"
+          ></el-option>
+        </el-select>
+      </el-form-item>
+      <el-form-item label="出生年月" prop="birthday">
+        <el-date-picker clearable size="small" style="width: 200px"
+                        v-model="queryParams.birthday"
+                        type="date"
+                        value-format="yyyy-MM-dd"
+                        placeholder="选择出生年月">
+        </el-date-picker>
+      </el-form-item>
+      <el-form-item label="参加工作时间" prop="workJoinTime" label-width="102px">
+        <el-date-picker clearable size="small" style="width: 200px"
+                        v-model="queryParams.workJoinTime"
+                        type="date"
+                        value-format="yyyy-MM-dd"
+                        placeholder="选择参加工作时间">
+        </el-date-picker>
+      </el-form-item>
+      <el-form-item label="入职时间" prop="workEntryTime">
+        <el-date-picker clearable size="small" style="width: 200px"
+                        v-model="queryParams.workEntryTime"
+                        type="date"
+                        value-format="yyyy-MM-dd"
+                        placeholder="选择入职时间">
+        </el-date-picker>
+      </el-form-item>
+      <el-form-item label="学历" prop="educationLevel">
+        <el-select v-model="queryParams.educationLevel" placeholder="请选择学历">
+          <el-option
+            v-for="dict in educationLevelOptions"
+            :key="dict.dictValue"
+            :label="dict.dictLabel"
+            :value="dict.dictValue"
+          ></el-option>
+        </el-select>
+      </el-form-item>
+      <el-form-item label="是否团员">
+        <el-select v-model="queryParams.isLeague" placeholder="请选择是否团员">
+          <el-option key="1" label="是" value="1"></el-option>
+          <el-option key="0" label="否" value="0"></el-option>
+        </el-select>
+      </el-form-item>
+      <el-form-item label="申请入党时间" prop="applyTime" label-width="102px">
+        <el-date-picker clearable size="small" style="width: 200px"
+                        v-model="queryParams.applyTime"
+                        type="date"
+                        value-format="yyyy-MM-dd"
+                        placeholder="选择申请入党时间">
+        </el-date-picker>
+      </el-form-item>
+      <el-form-item label="建表考察时间" prop="formCreateTime" label-width="102px">
+        <el-date-picker clearable size="small" style="width: 200px"
+                        v-model="queryParams.formCreateTime"
+                        type="date"
+                        value-format="yyyy-MM-dd"
+                        placeholder="选择建表考察时间">
+        </el-date-picker>
+      </el-form-item>
+      <el-form-item label="现培养人" prop="currentMentor">
+        <el-select v-model="queryParams.currentMentor" placeholder="请选择现培养人">
+          <el-option
+            v-for="dict in userList"
+            :key="dict.dictValue"
+            :label="dict.dictLabel"
+            :value="dict.dictValue"
+          ></el-option>
+        </el-select>
+      </el-form-item>
+      <el-form-item label="计划发展时间" prop="planDevelopDuration" label-width="102px">
+        <el-date-picker clearable size="small" style="width: 200px"
+                        v-model="queryParams.planDevelopDuration"
+                        type="date"
+                        value-format="yyyy-MM-dd"
+                        placeholder="选择计划发展时间">
+        </el-date-picker>
+      </el-form-item>
+      <el-form-item label="是否参加过入党前培训" label-width="170px">
+        <el-select v-model="queryParams.isTrained" placeholder="请选择是否参加过入党前培训">
+          <el-option key="1" label="是" value="1"></el-option>
+          <el-option key="0" label="否" value="0"></el-option>
+        </el-select>
+      </el-form-item>
+      <el-form-item label="备注" prop="remarks">
+        <el-input v-model="queryParams.remarks" placeholder="请输入备注" />
+      </el-form-item>
+      <el-form-item label="归属部门" prop="deptId" style="width: 268px;">
+        <treeselect style="width: 200px;" v-model="queryParams.deptId" :options="deptOptions" :show-count="true" placeholder="请选择归属部门" />
+      </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/branch/wyhmc/index.vue

@@ -1,7 +1,72 @@
 <template>
   <div class="app-container">
     <el-form :model="queryParams" ref="queryForm" :inline="true" size="small" v-show="showSearch" label-width="68px">
-
+      <el-form-item label="姓名" prop="nickName">
+        <el-input v-model="queryParams.nickName" placeholder="请输入姓名" />
+      </el-form-item>
+      <el-form-item label="成员类型" prop="memberType">
+        <el-select v-model="queryParams.memberType" placeholder="请选择成员类型">
+          <el-option
+            v-for="dict in memberTypeOptions"
+            :key="dict.dictValue"
+            :label="dict.dictLabel"
+            :value="dict.dictValue"
+          ></el-option>
+        </el-select>
+      </el-form-item>
+      <el-form-item label="出生年月" prop="birthday">
+        <el-date-picker clearable size="small" style="width: 200px"
+                        v-model="queryParams.birthday"
+                        type="date"
+                        value-format="yyyy-MM-dd"
+                        placeholder="选择出生年月">
+        </el-date-picker>
+      </el-form-item>
+      <el-form-item label="学历" prop="educationLevel">
+        <el-select v-model="queryParams.educationLevel" placeholder="请选择学历">
+          <el-option
+            v-for="dict in educationLevelOptions"
+            :key="dict.dictValue"
+            :label="dict.dictLabel"
+            :value="dict.dictValue"
+          ></el-option>
+        </el-select>
+      </el-form-item>
+      <el-form-item label="入职时间" prop="workEntryTime">
+        <el-date-picker clearable size="small" style="width: 200px"
+                        v-model="queryParams.workEntryTime"
+                        type="date"
+                        value-format="yyyy-MM-dd"
+                        placeholder="选择入职时间">
+        </el-date-picker>
+      </el-form-item>
+      <el-form-item label="入党时间" prop="partyEntryTime">
+        <el-date-picker clearable size="small" style="width: 200px"
+                        v-model="queryParams.partyEntryTime"
+                        type="date"
+                        value-format="yyyy-MM-dd"
+                        placeholder="选择入党时间">
+        </el-date-picker>
+      </el-form-item>
+      <el-form-item label="任职时间" prop="labourEntryTime">
+        <el-date-picker clearable size="small" style="width: 200px"
+                        v-model="queryParams.labourEntryTime"
+                        type="date"
+                        value-format="yyyy-MM-dd"
+                        placeholder="选择任职时间">
+        </el-date-picker>
+      </el-form-item>
+      <el-form-item label="离任时间" prop="labourLeaveTime">
+        <el-date-picker clearable size="small" style="width: 200px"
+                        v-model="queryParams.labourLeaveTime"
+                        type="date"
+                        value-format="yyyy-MM-dd"
+                        placeholder="选择离任时间">
+        </el-date-picker>
+      </el-form-item>
+      <el-form-item label="归属部门" prop="deptId" style="width: 268px;">
+        <treeselect style="width: 200px;" v-model="queryParams.deptId" :options="deptOptions" :show-count="true" placeholder="请选择归属部门" />
+      </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>