新建运维用户默认角色

admin-web/src/components/form/ExtPage.vue

@@ -42,9 +42,11 @@ const state = reactive({
 watch(
     () => props.value,
     (val, oldVal) => {
-      setupPage();
+      nextTick(() => {
+        setupPage();
+      })
     },
-    {deep: true,}
+    {deep: true,immediate:true}
 );
 
 onMounted(() => {
@@ -55,7 +57,7 @@ onMounted(() => {
 
 const setupPage = () => {
   if (props.value) {
-    state.page.pageNum = props.value.pageIndex;
+    state.page.pageNum = props.value.pageNum||props.value.pageIndex;
     state.page.pageSize = props.value.pageSize;
     state.page.total = props.value.total;
   }

admin-web/src/views/admin/user/dialog.vue

@@ -141,7 +141,7 @@ const state = reactive(initState());
 // 打开弹窗
 const open = (action: string = 'add', row: any) => {
   console.log(state.ruleForm)
-  loadRole();
+  loadRole(row);
   state.dialog.title = u.dialog.actions[action].title + "『运营用户』"
   state.dialog.submitTxt = u.dialog.actions[action].btn + "『运营用户』"
   state.dialog.isShowDialog = true;
@@ -188,7 +188,7 @@ const onSubmit = () => {
           onClose();
           emit('refresh');
         }
-      }).catch(()=>{
+      }).catch(() => {
         state.btnLoading = false;
       })
     } else {
@@ -209,9 +209,14 @@ const handleFormChange = (formData: any) => {
   console.log(formData)
 }
 
-const loadRole = () => {
+const loadRole = (row: any) => {
   $get(`role/list`).then((res: any) => {
     state.roleList = res;
+    if (!row || !row.id) {
+      if (res && !u.isEmptyOrNull(res)) {
+        state.checkRoleIdList = [res[0].id]
+      }
+    }
   })
 }