Merge branch 'bug5684' into custom

src/views/system_manage/components/opearAuthSetDia.vue

@@ -21,7 +21,7 @@
           ref="userRef"
           :options="userList"
           :props="{
-            value: 'NodeId',
+            value: 'NodeIdKey',
             label: 'NodeName',
             children: 'Children',
             emitPath: false,
@@ -209,7 +209,7 @@ export default {
       if(res.Ret !== 200) return
 
       if(res.Data && res.Data.length){
-        this.selectUserIds = res.Data
+        this.selectUserIds = res.Data.map(_ => String(_))
         this.$nextTick(() => {
           this.checkUser()
         })

src/views/system_manage/dataOperaAuth.vue

@@ -214,7 +214,7 @@
               v-model="transferForm.creatorIds"
               :options="userList"
               :props="{
-                value: 'NodeId',
+                value: 'NodeIdKey',
                 label: 'NodeName',
                 children: 'Children',
                 emitPath: false,
@@ -291,6 +291,7 @@
 <script>
 import { operateAuthInterface,departInterence } from '@/api/modules/setApi';
 import {dataAuthInterface} from '@/api/modules/dataApi.js'
+import { traverseTree } from "@/utils/commonOptions"
 import mPage from '@/components/mPage.vue';
 import mDialog from '@/components/mDialog.vue'
 import opearAuthSetDia from './components/opearAuthSetDia.vue';
@@ -470,6 +471,17 @@ export default {
       if (res.Ret !== 200) return
     
       this.userList = res.Data || []
+      //遍历加上唯一的key
+      traverseTree(
+          {Children:this.userList},
+          {
+              childKey:'Children',
+              nodeKey:'NodeIdKey',
+              cb:(node)=>node.NodeType===3,
+              cb2:(node)=>node.NodeId+''
+          }
+      )
+      
       this.filterTreeEmpty({Children:this.userList})
     },