From 8b2959dd8a5078805fe1eed8b0c0916b611ca56d Mon Sep 17 00:00:00 2001
From: fengchenchen <fengchenchen@syxysoft.com>
Date: Thu, 9 Sep 2021 11:39:20 +0800
Subject: [PATCH] =?UTF-8?q?[update]=20=E7=94=A8=E6=88=B7=E7=AE=A1=E7=90=86?=
 =?UTF-8?q?-=E7=BB=84=E7=BB=87=E6=9C=BA=E6=9E=84=E5=A4=9A=E9=80=89?=
 =?UTF-8?q?=E5=8F=98=E5=8D=95=E9=80=89=EF=BC=9B=E7=BB=84=E7=BB=87=E6=9C=BA?=
 =?UTF-8?q?=E6=9E=84=E7=AE=A1=E7=90=86=E5=8E=BB=E6=8E=89=E6=B7=BB=E5=8A=A0?=
 =?UTF-8?q?=E7=94=A8=E6=88=B7=E7=9A=84=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/system/DepartList.vue        | 14 ++++++++------
 src/views/system/modules/UserModal.vue | 24 ++++++++++++++++++++----
 2 files changed, 28 insertions(+), 10 deletions(-)

diff --git a/src/views/system/DepartList.vue b/src/views/system/DepartList.vue
index 5ca9097..00c4a8b 100644
--- a/src/views/system/DepartList.vue
+++ b/src/views/system/DepartList.vue
@@ -157,9 +157,9 @@
 <!--        <a-tab-pane tab="部门权限" key="2" forceRender>-->
 <!--          <depart-auth-modules ref="departAuth"/>-->
 <!--        </a-tab-pane>-->
-        <a-tab-pane tab="用户信息" key="3">
-          <Dept-User-Info ref="DeptUserInfo"></Dept-User-Info>
-        </a-tab-pane>
+<!--        <a-tab-pane tab="用户信息" key="3">-->
+<!--          <Dept-User-Info ref="DeptUserInfo"></Dept-User-Info>-->
+<!--        </a-tab-pane>-->
       </a-tabs>
     </a-col>
     <depart-modal ref="departModal" @ok="loadTree"></depart-modal>
@@ -167,7 +167,7 @@
 </template>
 <script>
 import DepartModal from './modules/DepartModal'
-import DeptUserInfo from './modules/DeptUserInfo'
+// import DeptUserInfo from './modules/DeptUserInfo'
 import pick from 'lodash.pick'
 import {queryDepartTreeList, searchByKeywords, deleteByDepartId} from '@/api/api'
 import {httpAction,getAction} from '@/api/manage'
@@ -219,7 +219,7 @@ export default {
   components: {
     // DepartAuthModal,
     DepartModal,
-    DeptUserInfo
+    // DeptUserInfo
   },
   data() {
     return {
@@ -450,7 +450,7 @@ export default {
       // 记录当前选择的部门id 作为判重参数条件
       this.currentDepartSelectedId = record.id
 
-      if(record.orgCategory == '1'){
+      if((record.orgCategory + '') === '1'){
         this.orgCategoryDisabled = true
       }else{
         this.orgCategoryDisabled = false
@@ -512,6 +512,8 @@ export default {
     },
     emptyCurrForm() {
       this.form.resetFields()
+      // 对右侧基本信息进行赋值
+      this.setValuesToForm(this.model)
     },
     nodeSettingFormSubmit() {
       this.form.validateFields((err, values) => {
diff --git a/src/views/system/modules/UserModal.vue b/src/views/system/modules/UserModal.vue
index af43fe5..e261255 100644
--- a/src/views/system/modules/UserModal.vue
+++ b/src/views/system/modules/UserModal.vue
@@ -120,7 +120,10 @@
               :labelCol="labelCol"
               :wrapperCol="wrapperCol">
             <a-tree-select
-                multiple
+                :multiple="false"
+                show-search
+                tree-default-expand-all
+                tree-node-filter-prop="title"
                 style="width:100%"
                 :dropdownStyle="{ maxHeight: '200px',maxWidth:'100px','overflow-x':'hidden',' overflo-y': 'auto' }"
                 :treeData="treeDepartData"
@@ -350,6 +353,7 @@ export default {
       that.initialRoleList()
       that.checkedDepartNameString = ''
       that.form.resetFields()
+      // eslint-disable-next-line no-prototype-builtins
       if (record.hasOwnProperty('id')) {
         that.loadUserRoles(record.id).then(res => {
           that.form.setFieldsValue({selectedroles:res})
@@ -361,8 +365,15 @@ export default {
       that.userId = record.id
       that.visible = true
       that.model = Object.assign({}, record)
+      // 组织机构修改成了单选，此处不需要了
       if(record.departIds !== '' && record.id){
-        that.model.selecteddeparts = record.departIds.split(',')
+        // 部门是数组的时候以逗号拼接
+        if(Object.prototype.toString.call(record.departIds) === '[object Array]') {
+          that.model.selecteddeparts = record.departIds.split(',')
+        } else {
+          that.model.selecteddeparts = record.departIds
+        }
+
       }
       that.$nextTick(() => {
         that.form.setFieldsValue(pick(this.model, 'username', 'realname', 'email', 'phone', 'post','selecteddeparts'))
@@ -481,8 +492,9 @@ export default {
       // 触发表单验证
       this.form.validateFields((err, values) => {
         if (!err) {
+          console.log("values=======", values)
           let formData = Object.assign(this.model, values)
-          if (that.fileList != '') {
+          if (that.fileList !== '') {
             formData.avatar = that.fileList
           } else {
             formData.avatar = null
@@ -498,7 +510,11 @@ export default {
           formData.relTenantIds = this.currentTenant.length > 0 ? this.currentTenant.join(',') : ''
           //update-end-author:taoyan date:2020710 for:多租户配置
           formData.selectedroles = values.selectedroles.length > 0 ? values.selectedroles.join(',') : ''
-          formData.selecteddeparts = values.selecteddeparts.length > 0 ? values.selecteddeparts.join(',') : ''
+          // 部门由多选改成单选 所以不需要单独处理了，但为了历史数据可以使用，对values.selecteddeparts类型进行判断，如果是数组则以逗号分隔转成字符串，若是字符串则直接显示
+          if(Object.prototype.toString.call(values.selecteddeparts) === '[object Array]') {
+            formData.selecteddeparts = values.selecteddeparts.length > 0 ? values.selecteddeparts.join(',') : ''
+          }
+          // formData.selecteddeparts = values.selecteddeparts.length > 0 ? values.selecteddeparts.join(',') : ''
           formData.userIdentity = this.identity
           //如果是上级择传入departIds,否则为空
           if (this.identity === '2') {