Merge branch 'master' of https://code.palacesun.com/wuchao/nse-ui

src/views/assetLibrary/modules/formGroup.vue

@@ -98,7 +98,7 @@ const { form, rules } = toRefs(data);
 const onAdd = () => {
   const formData = {
     flag: 1,
-    user: form.value.user ? form.value.user : []
+    user: form.value.user ? form.value.user.map(item => { return {id: item} }) : []
   }
   form.value = {...form.value,...formData}
   if (props.page === "edit") {
@@ -248,6 +248,7 @@ const getInitEdit = () => {
   initEdit(data).then((res) => {
     // console.log(res)
     form.value = res.data;
+    form.value.user = form.value.user ? form.value.user.map(item => { return item.id }) : []
     titleName.value = form.value.dbtype
     getQueryDatadis();
     pagecodeList.value = getCode(titleName.value.toLowerCase());
@@ -407,7 +408,7 @@ onMounted(() => {
       <el-form-item label="授权用户" prop="user">
         <div style="width: 100%;background: #F3F5FA;margin-left: 4px;">
           <el-select v-model="form.user" multiple>
-            <el-option v-for="item in userList" :key="item.value" :label="item.label" :value="item.value">
+            <el-option v-for="item in userList" :key="item.id" :label="item.realname" :value="item.id">
             </el-option>
           </el-select>
         </div>