From c7dbf58f6856cb92e1ac33d2cfefc693b69d4b59 Mon Sep 17 00:00:00 2001
From: "zyx.net" <zyx>
Date: Fri, 22 Jul 2022 15:30:42 +0800
Subject: [PATCH] =?UTF-8?q?=E7=94=A8=E6=88=B7=E7=AE=A1=E7=90=86-=E5=A2=9E?=
 =?UTF-8?q?=E5=8A=A0=E7=BB=84=E7=BB=87=E6=9C=BA=E6=9E=84=E6=90=9C=E7=B4=A2?=
 =?UTF-8?q?=E6=9D=A1=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 jero-web/src/common/lang/en-us.js      |  1 +
 jero-web/src/common/lang/zh-cn.js      |  1 +
 jero-web/src/views/system/UserList.vue | 49 +++++++++++++++++++++++++-
 3 files changed, 50 insertions(+), 1 deletion(-)

diff --git a/jero-web/src/common/lang/en-us.js b/jero-web/src/common/lang/en-us.js
index 423f7bcbd..bfdf0cd66 100644
--- a/jero-web/src/common/lang/en-us.js
+++ b/jero-web/src/common/lang/en-us.js
@@ -1168,4 +1168,5 @@ module.exports = {
   fullTextComments:'Full text comments',
   fileDeclaration:'file Declaration',
   FileForDetails:'File For Details',
+  Theorganization:'The Organization',
 }
\ No newline at end of file
diff --git a/jero-web/src/common/lang/zh-cn.js b/jero-web/src/common/lang/zh-cn.js
index 30aeaec72..c369d321b 100644
--- a/jero-web/src/common/lang/zh-cn.js
+++ b/jero-web/src/common/lang/zh-cn.js
@@ -1172,4 +1172,5 @@ module.exports = {
   fullTextComments:'全文评论',
   fileDeclaration:'文件说明',
   FileForDetails:'文件详情',
+  Theorganization:'组织机构',
 }
\ No newline at end of file
diff --git a/jero-web/src/views/system/UserList.vue b/jero-web/src/views/system/UserList.vue
index 45f381221..93c62e384 100644
--- a/jero-web/src/views/system/UserList.vue
+++ b/jero-web/src/views/system/UserList.vue
@@ -57,6 +57,28 @@
                 </a-select>
               </div>
             </a-col>
+            <a-col :md="6" :sm="8">
+              <div class="box-title-text">
+                <div class="title-text" :title="$t('Theorganization')">
+                  <span>{{ $t('Theorganization') }}</span>
+                </div>
+                <a-tree-select
+                  tree-node-filter-prop="title"
+                  v-model="queryParam.orgCode"
+                  :maxTagCount="1"
+                  show-search
+                  :getPopupContainer="triggerNode=> triggerNode.parentNode"
+                  class="box-input"
+                  style="width: 100%"
+                  :tree-data="CategoryTreeList"
+                  :placeholder="$t('PleaseSelect')+$t('Theorganization')"
+                />
+                <!--              <j-dict-select-tag class="box-input" v-model="queryParam.technologyTerritory"-->
+                <!--                                 :placeholder="$t('PleaseSelect')+$t('technicalField')"-->
+                <!--                                 :type="'select'"-->
+                <!--                                 :triggerChange="false" :dictCode="'duty_territory'"/>-->
+              </div>
+            </a-col>
           </template>
           <span style="float: right;overflow: hidden;margin-right: 11px" class="table-page-search-submitButtons">
                <a-col :md="6" :sm="24">
@@ -141,7 +163,7 @@
   import DepartmentAllocation from './modules/departmentAllocation'
   import UserModal from './modules/UserModal'
   import PasswordModal from './modules/PasswordModal'
-  import { putAction, getFileAccessHttpUrl } from '@/api/manage'
+  import {getAction, putAction, getFileAccessHttpUrl } from '@/api/manage'
   import { frozenBatch } from '@/api/api'
   import { JeroListMixin } from '@/mixins/JeroListMixin'
   import JInput from '@/components/jero/JInput'
@@ -174,6 +196,18 @@
         departmentvisible: false, // 部门配置得弹框
         selectedRowKeys: [],
         selectedRowKeysvalue: [],
+        CategoryTreeList:[],
+        ipagination: {
+          current: 1,
+          pageSize: 10,
+          pageSizeOptions: ['10', '30', '50', '100'],
+          showTotal: (total, range) => {
+            return range[0] + '-' + range[1] + ' 共' + total + '条'
+          },
+          showQuickJumper: true,
+          showSizeChanger: true,
+          total: 0
+        },
         columns: [
           {
             title: this.$t('serialNumber'),
@@ -259,6 +293,7 @@
           list: '/sys/user/page',
           delete: '/sys/user/delete',
           deleteBatch: '/sys/user/deleteBatch',
+          getSysCategoryTree: '/sys/sysDepart/queryTreeList',
           exportXlsUrl: '/sys/user/exportXls',
           importExcelUrl: 'sys/user/importExcel'
         }
@@ -269,6 +304,9 @@
         return `${window._CONFIG['domianURL']}/${this.url.importExcelUrl}`
       }
     },
+    mounted() {
+      this.getSysCategoryTree()
+    },
     methods: {
       // 重置密码
       resetPassword(val) {
@@ -368,6 +406,15 @@
           })
         }
       },
+      getSysCategoryTree() {
+        getAction(this.url.getSysCategoryTree, {}).then((res) => {
+          if (res.success) {
+            this.CategoryTreeList = res.result
+          } else {
+            this.CategoryTreeList = []
+          }
+        })
+      },
       handleMenuClick(e) {
         if (e.key == 1) {
           this.batchDel()