yuansh vor 2 Jahren
Ursprung
Commit
9f701b8e9b

+ 4 - 0
src/views/oa/enterpriseAnnouncement.vue

@@ -102,6 +102,10 @@
             <a-tag color="cyan" v-if="record.type == '财务'">
               财务
             </a-tag>
+            <a-tag color="#87d068" v-else>
+              {{record.type}}
+            </a-tag>
+           
           </span>
 
           <!-- 操作 -->

+ 9 - 2
src/views/oa/myLinks.vue

@@ -9,7 +9,13 @@
               <a-input placeholder="请输入名称查询" v-model="queryParam.name"></a-input>
             </a-form-item>
           </a-col>
-
+          <a-col :md="6" :sm="8">
+            <a-form-item label="创建人">
+              <j-search-select-tag v-model="queryParam.createBy" placeholder="请选择用户名称"
+                 dict="sys_user,realname,username"/>
+              <!-- <a-input placeholder="请输入创建人" v-model="queryParam.createBy"></a-input> -->
+            </a-form-item>
+          </a-col>
           <span>
             <a-col :md="6" :sm="12">
               <a-button type="primary" style="left: 10px" @click="searchQuery" icon="search">查询</a-button>
@@ -106,12 +112,13 @@
 </template>
 
 <script>
+import JSearchSelectTag from '@/components/dict/JSearchSelectTag'
 import AddLinksModal from '@views/oa/my-links/add/addLinksModal.vue'
 import { linksList, linksQueryById, linksDelete, linksReleseUpdate } from '@api/oa/cd_links'
 export default {
     name: 'MyLinks',
     components: {
-        AddLinksModal
+        AddLinksModal,JSearchSelectTag
     },
     data () {
         return {

+ 12 - 5
src/views/system/CertificateManagement.vue

@@ -34,11 +34,18 @@
             </a-form-item>
           </a-col>
           <template v-if="toggleSearchStatus">
-               <a-col :md="6" :sm="12">
-            <a-form-item label="证件编号">
-              <a-input placeholder="输入证件编号查询" v-model="queryParam.code"></a-input>
-            </a-form-item>
-          </a-col>
+            <a-col :md="6" :sm="12">
+              <a-form-item label="证件编号">
+                <a-input placeholder="输入证件编号查询" v-model="queryParam.code"></a-input>
+              </a-form-item>
+            </a-col>
+          
+            <a-col :md="6" :sm="12">
+              <a-form-item label="创建人">
+                <!--<a-input placeholder="请输入账号查询" v-model="queryParam.username"></a-input>-->
+                <a-input placeholder="输入创建人" v-model="queryParam.createBy"></a-input>
+              </a-form-item>
+            </a-col>
           </template>
 
           <a-col :md="6" :sm="8">

+ 11 - 1
src/views/system/SysPositionList.vue

@@ -107,7 +107,7 @@
   import SysPositionModal from './modules/SysPositionModal'
   import { JeecgListMixin } from '@/mixins/JeecgListMixin'
   import JDictSelectTag from '@/components/dict/JDictSelectTag'
-
+  import { filterObj } from '@/utils/util';
   export default {
     name: 'SysPositionList',
     mixins: [JeecgListMixin],
@@ -170,6 +170,16 @@
       importExcelUrl: function () {
         return `${window._CONFIG['domianURL']}/${this.url.importExcelUrl}`
       }
+    },
+     methods: {
+      getQueryParams() {
+         // var param = Object.assign({}, this.queryParam, this.isorter);
+        var param = Object.assign({}, this.queryParam, null);
+        param.field = this.getQueryField();
+        param.pageNo = this.ipagination.current;
+        param.pageSize = this.ipagination.pageSize;
+        return filterObj(param);
+      }
     }
   }
 </script>

+ 15 - 2
src/views/system/modules/SelectUserModal.vue

@@ -15,11 +15,23 @@
         <a-form layout="inline"  @keyup.enter.native="searchQuery">
           <a-row :gutter="24">
 
-            <a-col :span="10">
+            <!-- <a-col :span="10">
               <a-form-item label="用户账号">
                 <a-input placeholder="请输入用户账号" v-model="queryParam.username"></a-input>
               </a-form-item>
+            </a-col> -->
+            <a-col :span="10">
+              <a-form-item label="用户名称">
+                <a-input placeholder="请输入用户名称" v-model="queryParam.realname"></a-input>
+              </a-form-item>
             </a-col>
+           <a-col :span="10">
+              <a-form-item label="部门" style="margin-left:8px">
+                 <j-search-select-tag v-model="queryParam.deptName" placeholder="请选择部门" 
+                     dict="sys_depart,depart_name,depart_name,org_type='3' or org_code='TBD' order by org_code"/>
+              </a-form-item>
+            </a-col>
+            
             <a-col :span="8">
                     <span style="float: left;overflow: hidden;" class="table-page-search-submitButtons">
                       <a-button type="primary" @click="searchQuery" icon="search">查询</a-button>
@@ -56,9 +68,10 @@
 <script>
   import {filterObj} from '@/utils/util'
   import {getAction} from '@/api/manage'
-
+  import JSearchSelectTag from '@/components/dict/JSearchSelectTag'
   export default {
     name: "SelectUserModal",
+    components: {JSearchSelectTag},
     data() {
       return {
         title: "添加已有用户",