考勤管理-详情查询条件

src/views/oa/salary_management/Attendance/modules/AnnualLeave.vue

@@ -17,12 +17,18 @@
                     <a-row :gutter="24">
                         <a-col :md="8" :sm="8">
                             <a-form-model-item label="组织"  prop="name">
-                                <a-input  v-model="formState.orgName" />
+                                <a-select  v-model="formState.orgName" show-search :filterOption="filterOption" allowClear>
+                                    <a-select-option value="">所有</a-select-option>
+                                    <a-select-option value="正织">正织</a-select-option>
+                                    <a-select-option value="森语">森语</a-select-option>
+                                    <a-select-option value="马菲羊">马菲羊</a-select-option>
+                                </a-select>
                             </a-form-model-item>
                         </a-col>
                         <a-col :md="8" :sm="8">
                             <a-form-model-item label="姓名"  >
-                                <a-input placeholder="请输入" v-model="formState.name" />
+                                <j-search-select-tag v-model="formState.name" placeholder="请选择用户名称" 
+                                    dict="sys_user,realname,realname" @search="searchName" allowClear/>
                             </a-form-model-item>
                         </a-col>
                         <a-col :md="8" :sm="8">
@@ -52,11 +58,13 @@
       import { FormTypes } from '@/utils/JEditableTableUtil'
       import { putAction,getAction } from '@/api/manage'
       import JEllipsis from '@/components/jeecg/JEllipsis'
+      import JSearchSelectTag from '@/components/dict/JSearchSelectTag'
       export default {
         name: 'AnnualLeave',
         components: {
             moment,
-            JEllipsis
+            JEllipsis,
+            JSearchSelectTag
         },
         data() {
           let ellipsis = (v, l) => <j-ellipsis value={v} length={l} />
@@ -148,6 +156,11 @@
         watch: {
         },
         methods: {
+            filterOption(input, option) {
+                return (
+                    option.componentOptions.children[0].text.toLowerCase().indexOf(input.toLowerCase()) >= 0
+                )
+            },
             handleCancel(){
                 this.visible = false
                 this.formState = {}

src/views/oa/salary_management/Attendance/modules/AttendancelDetail.vue

@@ -17,7 +17,7 @@
                     <a-row :gutter="24">
                         <a-col :md="8" :sm="8">
                             <a-form-model-item label="组织"  prop="name">
-                                <a-select  v-model="formState.orgName" show-search :filterOption="filterOption">
+                                <a-select  v-model="formState.orgName" show-search :filterOption="filterOption" allowClear>
                                     <a-select-option value="">所有</a-select-option>
                                     <a-select-option value="正织">正织</a-select-option>
                                     <a-select-option value="森语">森语</a-select-option>
@@ -28,7 +28,7 @@
                         <a-col :md="8" :sm="8">
                             <a-form-model-item label="姓名"  >
                                 <j-search-select-tag v-model="formState.name" placeholder="请选择用户名称" 
-                                    dict="sys_user,realname,username" @search="searchName" />
+                                    dict="sys_user,realname,realname" @search="searchName" allowClear/>
                             </a-form-model-item>
                         </a-col>
                         <a-col :md="8" :sm="8">