From 61e123855b229bc33346bff19bbd43fb15b20ca4 Mon Sep 17 00:00:00 2001
From: zhaomeijing <zhaomeijing@syxysoft.com>
Date: Wed, 25 May 2022 11:56:54 +0800
Subject: [PATCH] =?UTF-8?q?[update]=20=E7=94=A8=E6=88=B7=E7=AE=A1=E7=90=86?=
 =?UTF-8?q?=20=E9=83=A8=E9=97=A8=E5=88=86=E9=85=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 jero-web/src/views/system/UserList.vue        |  2 +-
 .../system/modules/departmentAllocation.vue   | 42 +++++++++++++++----
 2 files changed, 34 insertions(+), 10 deletions(-)

diff --git a/jero-web/src/views/system/UserList.vue b/jero-web/src/views/system/UserList.vue
index 4da00cd28..2b15e877f 100644
--- a/jero-web/src/views/system/UserList.vue
+++ b/jero-web/src/views/system/UserList.vue
@@ -85,7 +85,7 @@
       <!--      </a-upload>-->
       <!--      <a-button type="primary" icon="hdd" @click="recycleBinVisible=true">{{$t('recycleBin')}}</a-button>-->
       <a-button type="primary" icon="hdd" @click="RoleAssignment" v-has="'sys:user:role'">{{$t('RoleAssignment')}}</a-button>
-      <a-button type="primary" icon="hdd" @click="departmentAllocation" v-has="'sys:user:depart'">{{$t('departmentAllocation')}}</a-button>
+      <a-button type="primary" icon="hdd" @click="departmentAllocation" v-has="'sys:user:depart'">{{$t('DepartmentAllocation')}}</a-button>
 <!--      <div @click="handleExportXls($t('userInformation'))" class="operator-text">-->
 <!--        <a-icon type="export" :rotate="-90"/>-->
 <!--        {{$t('export')}}-->
diff --git a/jero-web/src/views/system/modules/departmentAllocation.vue b/jero-web/src/views/system/modules/departmentAllocation.vue
index c4e24e2b6..113a8e341 100644
--- a/jero-web/src/views/system/modules/departmentAllocation.vue
+++ b/jero-web/src/views/system/modules/departmentAllocation.vue
@@ -11,14 +11,24 @@
       >
         <a-row :gutter='24'>
           <a-col :span='24'>
-            <a-form-item :label="$t('RoleAssignment')" :labelCol="labelCol" :wrapperCol="wrapperCol">
-              <a-select mode="multiple" :placeholder="$t('PleaseSelect')+$t('controlVerification')" v-model:value="selectedRole">
-                <a-select-option v-for="(role,roleindex) in roleList" :key="role.id" :value="role.id">
-                    <span style="display: inline-block;width: 100%">
-                      {{ role.roleName }}
-                    </span>
-                </a-select-option>
-              </a-select>
+<!--            <a-form-item :label="$t('RoleAssignment')" :labelCol="labelCol" :wrapperCol="wrapperCol">-->
+<!--              <a-select mode="multiple" :placeholder="$t('PleaseSelect')+$t('controlVerification')" v-model:value="selectedRole">-->
+<!--                <a-select-option v-for="(role,roleindex) in roleList" :key="role.id" :value="role.id">-->
+<!--                    <span style="display: inline-block;width: 100%">-->
+<!--                      {{ role.roleName }}-->
+<!--                    </span>-->
+<!--                </a-select-option>-->
+<!--              </a-select>-->
+<!--            </a-form-item>-->
+            <a-form-item :label="$t('DepartmentAllocation')" :labelCol="labelCol" :wrapperCol="wrapperCol"
+            >
+              <a-input-search
+                :placeholder="$t('ClickSelectDepartment')"
+                v-model="checkedDepartNameString"
+                readOnly
+                @search="onSearch">
+                <a-button slot="enterButton" icon="search">{{$t('choice')}}</a-button>
+              </a-input-search>
             </a-form-item>
           </a-col>
         </a-row>
@@ -28,6 +38,7 @@
       <a-button style='margin-right: .8rem' @click='handleCancel'>{{ $t('cancel') }}</a-button>
       <a-button @click='handleSubmit' type='primary' :loading='confirmLoading'>{{ $t('determine') }}</a-button>
     </div>
+    <depart-window ref="departWindow" @ok="modalFormOk"></depart-window>
   </div>
 </template>
 
@@ -38,11 +49,16 @@ import Vue from 'vue'
 import { ACCESS_TOKEN } from '@/store/mutation-types'
 import moment from 'moment'
 // import eventBUs from '../../common/event'
+// 引入搜索部门弹出框的组件
+import departWindow from './DepartWindow'
 export default {
   name: 'diolagArea',
-  components: {},
+  components: {
+    departWindow
+  },
   data() {
     return {
+      checkedDepartNameString: '',
       token:Vue.ls.get(ACCESS_TOKEN),
       title: this.$t('add'),
       total: 0,
@@ -81,6 +97,14 @@ export default {
     this.loadData()
   },
   methods: {
+    modalFormOk(val,vauel) {
+      // console.log('pppppp')
+      console.log(val)
+      console.log(vauel,'vauelvauel')
+    },
+    onSearch() {
+      this.$refs.departWindow.add(this.checkedDepartKeys, this.userId)
+    },
     loadData() {
       this.loading = true
       getAction(`sys/role/queryall`, {}).then(res => {