Merge branch 'wyf-dev' into 'all'

fix: 修复人员分组新建不能提交的问题

See merge request skyeye/skyeye_frontend/skyeye-admin!152

src/views/message/components/PersonFilterSelection.vue

@@ -43,13 +43,13 @@
         >
           <el-checkbox
             v-model="person.checked"
+            :label="person.staffNo + '-' + person.nickname + '&nbsp' + '(' + person.deptName + ')'"
             @change="handleSelect($event, person)"
           ></el-checkbox>
-          <div style="margin-left: 8px">
-            {{ person.staffNo + '-' + person.nickname + '(' + person.deptName + ')' }}
-          </div>
+          <!-- <div style="margin-left: 8px">
+            {{ person.staffNo + '-' + person.nickname + '&nbsp' + '(' + person.deptName + ')' }}
+          </div> -->
         </div>
-        <!-- todo -->
         <div
           id="next-loading"
           style="text-align: center"
@@ -187,14 +187,14 @@
         gap: 8px;
         height: 392px;
         overflow: auto;
-        .filter-result-item {
-          display: flex;
-          align-items: center;
-          font-weight: 500;
-          font-size: 14px;
-          color: #303133;
-          line-height: 22px;
-        }
+        // .filter-result-item {
+        //   display: flex;
+        //   align-items: center;
+        //   font-weight: 500;
+        //   font-size: 14px;
+        //   color: #303133;
+        //   line-height: 22px;
+        // }
       }
       .filter-result-empty {
         display: flex;

src/views/message/persongroup/components/GroupBoard.vue

@@ -177,11 +177,10 @@
   };
   const total = ref<number>(0);
   const handleSubmit = (selectedData: SelectedFilterPersonInfo[]) => {
-    console.log('submit!', selectedData);
-    // selectedUser.value = selectedData;
-    // ruleForm.userList = selectedData;
-    // total.value = ruleForm.userList.length;
-    // dialogVisible.value = false;
+    selectedUser.value = selectedData;
+    ruleForm.userList = selectedData;
+    total.value = ruleForm.userList.length;
+    dialogVisible.value = false;
   };
   const emit = defineEmits(['close']);
   const debounceEmit = debounce((addUserGroupParams) => {