[update] 修改选择用户和组织机构组件

src/components/selection/UserOrganSelectModal.vue

@@ -73,12 +73,12 @@
         <a-table
           v-if="switchValue === 'organ'"
           :columns="columnsOrgan"
-          rowKey="id"
+          rowKey="key"
           bordered
           :scroll="{x: 500}"
           :data-source="dataSourceOrgan"
           :pagination="ipaginationOrgan"
-          :row-selection="{ selectedRowKeys: selectedRowKeysOrgan, onChange: onSelectChangeOrgan, getCheckboxProps: getCheckboxPropsOrgan, type: type }"
+          :row-selection="{ selectedRowKeys: selectedRowKeysOrgan, onChange: onSelectChangeOrgan, type: type }"
           :loading="loadingLeft"
           @change="organLeftTableChange">
         </a-table>
@@ -90,7 +90,7 @@
           :scroll="{x: 500}"
           :data-source="dataSourceUser"
           :pagination="ipaginationUser"
-          :row-selection="{ selectedRowKeys: selectedRowKeysUser, onChange: onSelectChangeUser, getCheckboxProps: getCheckboxPropsUser, type: type }"
+          :row-selection="{ selectedRowKeys: selectedRowKeysUser, onChange: onSelectChangeUser, type: type }"
           :loading="loadingLeft"
           @change="userLeftTableChange">
         </a-table>
@@ -102,7 +102,8 @@
         <a-table
           v-if="switchValue === 'organ'"
           :columns="columnsOrganRight"
-          rowKey="id"
+          rowKey="key"
+          :pagination="false"
           bordered
           :scroll="{x: 300}"
           :loading="loadingRight"
@@ -115,6 +116,7 @@
           v-else-if="switchValue === 'user'"
           :columns="columnsOrganRight"
           rowKey="id"
+          :pagination="false"
           bordered
           :scroll="{x: 300}"
           :loading="loadingRight"
@@ -378,7 +380,13 @@ export default {
             this.loadDataOrgan()
             return
           }
-          this.dataSourceOrgan = res.result || []
+          this.dataSourceOrgan = res.result.map(item => {
+            return {
+              key: item.key,
+              parentId: item.parentId,
+              title: item.title
+            }
+          }) || []
           this.ipaginationOrgan.total = res.result.total
         } else {
           this.$message.warn(res.message)
@@ -389,9 +397,18 @@ export default {
     },
     // 组织机构左侧树的选择
     onSelectChangeOrgan (selectedRowKeys, selectedRows) {
-      this.selectedRowKeysOrgan = selectedRows
+      this.selectedRowKeysOrgan = selectedRowKeys
       this.selectedRowsOrgan = selectedRows
-      this.dataSourceOrganRight.map(selectedRows)
+      if (this.type === 'checkbox') {
+        for (const rowIndex in selectedRows) {
+          if (!this.dataSourceOrganRight.find(item => item.key === selectedRows[rowIndex].key)) {
+            // 右侧不存在，追加到右侧表格
+            this.dataSourceOrganRight.push(selectedRows[rowIndex])
+          }
+        }
+      } else {
+        this.dataSourceOrganRight = selectedRows
+      }
     },
     // 组织结构左侧树的复选框状态
     getCheckboxPropsOrgan (record) {
@@ -457,9 +474,18 @@ export default {
     },
     // 用户左侧表的选择
     onSelectChangeUser (selectedRowKeys, selectedRows) {
-      this.selectedRowKeysUser = selectedRows
+      this.selectedRowKeysUser = selectedRowKeys
       this.selectedRowsUser = selectedRows
-      this.dataSourceUserRight.map(selectedRows)
+      if (this.type === 'checkbox') {
+        for (const rowIndex in selectedRows) {
+          if (!this.dataSourceUserRight.find(item => item.id === selectedRows[rowIndex].id)) {
+            // 右侧不存在，追加到右侧表格
+            this.dataSourceUserRight.push(selectedRows[rowIndex])
+          }
+        }
+      } else {
+        this.dataSourceUserRight = selectedRows
+      }
     },
     // 用户左侧表的复选框状态
     getCheckboxPropsUser (record) {
@@ -499,14 +525,15 @@ export default {
       } else {
         this.$emit('change', this.dataSourceUserRight)
       }
+      this.visible = false
     },
     handleCancel () {
       this.close()
     },
     close () {
       this.visible = false
-      this.dataSourceOrgan = []
-      this.dataSourceUser = []
+      // this.dataSourceOrgan = []
+      // this.dataSourceUser = []
       this.dataSourceOrganRight = []
       this.dataSourceUserRight = []
       this.selectedRowKeysOrgan = []