From 3d2331c2e7ed3aa2935c0abba7c65a4ae4af1dcb Mon Sep 17 00:00:00 2001
From: fmm <1442620801@qq.com>
Date: Wed, 21 Aug 2024 20:00:08 +0800
Subject: [PATCH 1/3] =?UTF-8?q?fix:=20vue=E7=94=A8=E6=88=B7=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9=E5=92=8C=E6=B7=BB=E5=8A=A0=E4=BC=98=E5=8C=96=E4=B8=BA?=
 =?UTF-8?q?=E5=BC=B9=E7=AA=97?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../pro/template/tinyvue/src/locale/zh-CN.ts  |   2 +-
 .../userManager/info/components/info-tab.vue  |  83 +++-
 .../views/userManager/info/locale/zh-CN.ts    |   4 +-
 .../userManager/setting/components/head.vue   | 164 -------
 .../setting/components/set-from.vue           | 266 ----------
 .../src/views/userManager/setting/index.vue   | 462 +++++++++---------
 .../views/userManager/setting/locale/en-US.ts |   2 +
 .../src/views/userManager/useradd/index.vue   | 422 ++++++++--------
 8 files changed, 525 insertions(+), 880 deletions(-)
 delete mode 100644 packages/toolkits/pro/template/tinyvue/src/views/userManager/setting/components/head.vue
 delete mode 100644 packages/toolkits/pro/template/tinyvue/src/views/userManager/setting/components/set-from.vue

diff --git a/packages/toolkits/pro/template/tinyvue/src/locale/zh-CN.ts b/packages/toolkits/pro/template/tinyvue/src/locale/zh-CN.ts
index 12874bec..cb95a8dc 100644
--- a/packages/toolkits/pro/template/tinyvue/src/locale/zh-CN.ts
+++ b/packages/toolkits/pro/template/tinyvue/src/locale/zh-CN.ts
@@ -58,7 +58,7 @@ export default {
   'menu.menuPage.third': '菜单demo页',
   'menu.user': '个人中心',
   'menu.userManager': '用户管理',
-  'menu.userManager.info': '所有用户',
+  'menu.userManager.info': '查看用户',
   'menu.userManager.setting': '修改信息',
   'menu.userManager.useradd': '添加用户',
   'menu.permission': '权限管理',
diff --git a/packages/toolkits/pro/template/tinyvue/src/views/userManager/info/components/info-tab.vue b/packages/toolkits/pro/template/tinyvue/src/views/userManager/info/components/info-tab.vue
index 911a99a7..1adca8e0 100644
--- a/packages/toolkits/pro/template/tinyvue/src/views/userManager/info/components/info-tab.vue
+++ b/packages/toolkits/pro/template/tinyvue/src/views/userManager/info/components/info-tab.vue
@@ -1,6 +1,14 @@
 <template>
   <div class="tiny-fullscreen-scroll">
     <div class="tiny-fullscreen-wrapper">
+      <div class="user-add-btn">
+        <tiny-button
+          v-permission="'role::add'"
+          type="primary"
+          @click="handleAddUser"
+          >{{ $t('userInfo.modal.title.add') }}
+        </tiny-button>
+      </div>
       <div class="table">
         <tiny-grid
           ref="expandGrid"
@@ -50,14 +58,17 @@
                 </li>
                 <li>
                   <span>{{ $t('userInfo.table.protocolStart') }}：</span>
-                  <span>{{ $t(`${data.row.protocolStart}`) }}</span> </li
-                ><li>
+                  <span>{{ $t(`${data.row.protocolStart}`) }}</span></li
+                >
+                <li>
                   <span>{{ $t('userInfo.table.protocolEnd') }}：</span>
-                  <span>{{ $t(`${data.row.protocolEnd}`) }}</span> </li
-                ><li>
+                  <span>{{ $t(`${data.row.protocolEnd}`) }}</span></li
+                >
+                <li>
                   <span>{{ $t('userInfo.table.address') }}：</span>
-                  <span>{{ $t(`${data.row.address}`) }}</span> </li
-                ><li>
+                  <span>{{ $t(`${data.row.address}`) }}</span></li
+                >
+                <li>
                   <span>{{ $t('userInfo.table.status') }}：</span>
                   <span v-if="data.row.status == 1">已启用</span>
                   <span v-if="data.row.status !== 1">已禁用</span>
@@ -213,6 +224,30 @@
       </div>
     </div>
   </div>
+  <div v-if="state.isUserAdd">
+    <tiny-modal
+      v-model="state.isUserAdd"
+      :lock-scroll="true"
+      mask-closable="true"
+      height="auto"
+      width="800"
+      :title="$t('userInfo.modal.title.add')"
+    >
+      <UserAdd></UserAdd>
+    </tiny-modal>
+  </div>
+  <div v-if="state.isUserUpdate">
+    <tiny-modal
+      v-model="state.isUserUpdate"
+      :lock-scroll="true"
+      mask-closable="true"
+      height="auto"
+      width="800"
+      :title="$t('userInfo.modal.title.update')"
+    >
+      <UserSetting :email="state.email"></UserSetting>
+    </tiny-modal>
+  </div>
   <div v-if="state.isPwdUpdate">
     <tiny-modal
       v-model="state.isPwdUpdate"
@@ -274,12 +309,12 @@
         </tiny-layout>
       </template>
       <template #footer>
-        <tiny-button type="primary" @click="handlePwdUpdateSubmit">{{
-          $t('menu.btn.confirm')
-        }}</tiny-button>
-        <tiny-button @click="handlePwdUpdateCancel">{{
-          $t('menu.btn.cancel')
-        }}</tiny-button>
+        <tiny-button type="primary" @click="handlePwdUpdateSubmit"
+          >{{ $t('menu.btn.confirm') }}
+        </tiny-button>
+        <tiny-button @click="handlePwdUpdateCancel"
+          >{{ $t('menu.btn.cancel') }}
+        </tiny-button>
       </template>
     </tiny-modal>
   </div>
@@ -313,6 +348,8 @@
     updatePwdUser,
   } from '@/api/user';
   import { useRouter } from 'vue-router';
+  import UserAdd from '../../useradd/index.vue';
+  import UserSetting from '../../setting/index.vue';
 
   const router = useRouter();
 
@@ -324,13 +361,19 @@
     tableData: any;
     pageData: any;
     isPwdUpdate: boolean;
+    isUserAdd: boolean;
+    isUserUpdate: boolean;
     pwdData: any;
+    email: string;
   }>({
     loading: null,
     tableData: [] as any,
     pageData: [] as any,
     isPwdUpdate: false,
+    isUserAdd: false,
+    isUserUpdate: false,
     pwdData: {} as any,
+    email: '',
   });
 
   // 变量设置
@@ -405,12 +448,8 @@
   };
 
   const handleUpdate = (email: string) => {
-    router.push({
-      name: 'AllSetting',
-      query: {
-        email,
-      },
-    });
+    state.isUserUpdate = true;
+    state.email = email;
   };
 
   const handlePwdUpdate = (email: string) => {
@@ -423,6 +462,10 @@
     state.pwdData = {} as any;
   };
 
+  const handleAddUser = () => {
+    state.isUserAdd = true;
+  };
+
   async function handlePwdUpdateSubmit() {
     let data = state.pwdData;
     let newTemp = {
@@ -458,6 +501,10 @@
 </script>
 
 <style scoped lang="less">
+  .user-add-btn {
+    padding: 10px 0 10px 10px;
+  }
+
   #contain {
     height: 100%;
     padding: 15px;
diff --git a/packages/toolkits/pro/template/tinyvue/src/views/userManager/info/locale/zh-CN.ts b/packages/toolkits/pro/template/tinyvue/src/views/userManager/info/locale/zh-CN.ts
index 68de9abd..c1eca877 100644
--- a/packages/toolkits/pro/template/tinyvue/src/views/userManager/info/locale/zh-CN.ts
+++ b/packages/toolkits/pro/template/tinyvue/src/views/userManager/info/locale/zh-CN.ts
@@ -1,5 +1,5 @@
 export default {
-  'menu.allUser.info': '所有用户',
+  'menu.allUser.info': '查看用户',
   'userInfo.table.id': 'ID',
   'userInfo.table.name': '名称',
   'userInfo.table.email': '邮箱',
@@ -28,4 +28,6 @@ export default {
   'userInfo.modal.input.confirmNewPassword': '确认新密码',
   'userInfo.modal.message.error': '确认新密码错误',
   'userInfo.modal.message.notNull': '密码不能为空',
+  'userInfo.modal.title.add': '添加用户',
+  'userInfo.modal.title.update': '更新用户',
 };
diff --git a/packages/toolkits/pro/template/tinyvue/src/views/userManager/setting/components/head.vue b/packages/toolkits/pro/template/tinyvue/src/views/userManager/setting/components/head.vue
deleted file mode 100644
index 0ecae7b0..00000000
--- a/packages/toolkits/pro/template/tinyvue/src/views/userManager/setting/components/head.vue
+++ /dev/null
@@ -1,164 +0,0 @@
-<template>
-  <div class="user">
-    <img src="@/assets/images/user-head.png" alt="user" class="user-image" />
-    <div>
-      <h3 class="user-name">{{ $t('stepForm.head.admin') }}</h3>
-      <h3 class="user-name">{{ userData.name }}</h3>
-    </div>
-  </div>
-  <div class="divider"></div>
-  <div class="user-content">
-    <tiny-layout>
-      <tiny-row :flex="true" justify="center" class="margin-bottom">
-        <img src="@/assets/images/head-1.png" class="head-image" />
-        <tiny-col :span="6">
-          <div class="col">
-            <div>{{ $t('stepForm.recruitment.department') }}</div>
-            <div class="space"></div>
-            <div>{{ userData.department }}</div>
-          </div>
-        </tiny-col>
-        <img src="@/assets/images/head-2.png" class="head-image" />
-        <tiny-col :span="6">
-          <div class="col">
-            <div>{{ $t('stepForm.recruitment.type') }}</div>
-            <div class="space"></div>
-            <div>{{ userData.employeeType }}</div>
-          </div>
-        </tiny-col>
-        <img src="@/assets/images/head-3.png" class="head-image" />
-        <tiny-col :span="6">
-          <div class="col">
-            <div>{{ $t('stepForm.recruitment.position') }}</div>
-            <div class="space"></div>
-            <div v-if="userData.role">{{ userData.role[0].name }}</div>
-          </div>
-        </tiny-col>
-      </tiny-row>
-      <tiny-row :flex="true" justify="center" class="margin-bottom">
-        <img src="@/assets/images/head-4.png" class="head-image" />
-        <tiny-col :span="6">
-          <div class="col">
-            <div>{{ $t('stepForm.probation.start') }}</div>
-            <div class="space"></div>
-            <div>
-              {{ userData.probationStart }}
-              ~
-              {{ userData.probationEnd }}
-            </div>
-          </div>
-        </tiny-col>
-        <img src="@/assets/images/head-5.png" class="head-image" />
-        <tiny-col :span="6">
-          <div class="col">
-            <div>{{ $t('stepForm.start.date') }}</div>
-            <div class="space"></div>
-            <div>{{ userData.protocolStart }}</div>
-          </div>
-        </tiny-col>
-        <img src="@/assets/images/head-6.png" class="head-image" />
-        <tiny-col :span="6">
-          <div class="col">
-            <div>{{ $t('stepForm.probation.period') }}</div>
-            <div class="space"></div>
-            <div
-              >{{ userData.probationDuration
-              }}{{ $t('stepForm.probation.day') }}</div
-            >
-          </div>
-        </tiny-col>
-      </tiny-row>
-    </tiny-layout>
-  </div>
-</template>
-
-<script lang="ts" setup>
-  import { onMounted,defineProps } from 'vue';
-  import {
-    Layout as TinyLayout,
-    Row as TinyRow,
-    Col as TinyCol,
-  } from '@opentiny/vue';
-
-  const props = defineProps({
-    userData: {} as any
-  })
-
-</script>
-
-<style scoped lang="less">
-  .user-content {
-    display: flex;
-    flex-direction: column;
-    justify-content: center;
-    width: 66%;
-    padding-bottom: 8px;
-  }
-
-  .divider {
-    width: 1px;
-    height: 60px;
-    margin-top: 70px;
-    background: #fff;
-    opacity: 0.3;
-  }
-
-  .user {
-    display: flex;
-    align-items: center;
-    justify-content: space-around;
-    width: 16%;
-  }
-
-  .user-image {
-    font-style: oblique;
-    border-radius: 60px;
-    fill: var(--ti-common-color-line-active);
-  }
-
-  .space {
-    height: 10px;
-  }
-
-  .head-image {
-    margin-top: 6px;
-    padding-right: 10px;
-  }
-
-  .user-name {
-    padding-left: 26px;
-    color: #fff;
-    font-weight: 600;
-    font-size: large;
-  }
-
-  .margin-bottom {
-    margin-top: 30px;
-    margin-bottom: 30px;
-  }
-
-  .col {
-    color: #fff;
-  }
-</style>
-
-<style lang="less" scoped>
-  // responsive
-  @media (max-width: @screen-lg) {
-    .margin-bottom {
-      margin-top: 10px;
-      margin-bottom: 12px;
-    }
-  }
-  @media (max-width: @screen-ml) {
-    .margin-bottom {
-      margin-top: 10px;
-      margin-bottom: 12px;
-    }
-  }
-  @media (max-width: @screen-xs) {
-    .user {
-      width: 25%;
-    }
-  }
-</style>
diff --git a/packages/toolkits/pro/template/tinyvue/src/views/userManager/setting/components/set-from.vue b/packages/toolkits/pro/template/tinyvue/src/views/userManager/setting/components/set-from.vue
deleted file mode 100644
index 122e6b8d..00000000
--- a/packages/toolkits/pro/template/tinyvue/src/views/userManager/setting/components/set-from.vue
+++ /dev/null
@@ -1,266 +0,0 @@
-<template>
-  <tiny-layout>
-    <tiny-form
-      ref="setFormRef"
-      :model="state.filterOptions"
-      :rules="rules"
-      label-width="150px"
-      :label-align="true"
-      label-position="left"
-      size="small"
-    >
-      <tiny-row :flex="true" justify="left">
-        <tiny-col :span="5" label-width="100px">
-          <tiny-form-item
-            :label="$t('userSetting.name')"
-            prop="department"
-          >
-            <tiny-input v-model="state.filterOptions.name"></tiny-input>
-          </tiny-form-item>
-        </tiny-col>
-        <tiny-col :span="5" label-width="100px">
-          <tiny-form-item :label="$t('userSetting.address')" prop="position">
-            <tiny-input v-model="state.filterOptions.address"></tiny-input>
-          </tiny-form-item>
-        </tiny-col>
-      </tiny-row>
-
-      <tiny-row :flex="true" justify="left">
-        <tiny-col :span="5" label-width="100px">
-          <tiny-form-item
-            :label="$t('userSetting.department')"
-            prop="department"
-          >
-            <tiny-input v-model="state.filterOptions.department"></tiny-input>
-          </tiny-form-item>
-        </tiny-col>
-        <tiny-col :span="5" label-width="100px">
-          <tiny-form-item :label="$t('userSetting.position')" prop="position">
-            <tiny-input v-model="state.filterOptions.position"></tiny-input>
-          </tiny-form-item>
-        </tiny-col>
-      </tiny-row>
-
-      <tiny-row :flex="true" justify="left">
-        <tiny-col :span="5" label-width="100px">
-          <tiny-form-item :label="$t('userSetting.type')" prop="type">
-            <tiny-select
-              v-model="state.filterOptions.type"
-              :placeholder="$t('baseForm.form.label.placeholder')"
-            >
-              <tiny-option
-                v-for="item in (projectData as any)"
-                :key="item.value"
-                :label="$t(item.label)"
-                :value="item.label"
-              ></tiny-option>
-            </tiny-select>
-          </tiny-form-item>
-        </tiny-col>
-        <tiny-col :span="5" label-width="100px">
-          <tiny-form-item :label="$t('userSetting.date')" prop="date">
-            <tiny-date-picker
-              v-model="state.filterOptions.date"
-              unlink-panels
-              type="daterange"
-              range-separator="-"
-              :start-placeholder="$t('userSetting.first')"
-              :end-placeholder="$t('userSetting.last')"
-            ></tiny-date-picker>
-          </tiny-form-item>
-        </tiny-col>
-      </tiny-row>
-
-      <tiny-row :flex="true" justify="left">
-        <tiny-col :span="5" label-width="100px">
-          <tiny-form-item :label="$t('userSetting.during')" prop="during">
-            <tiny-input v-model="state.filterOptions.during"></tiny-input>
-          </tiny-form-item>
-        </tiny-col>
-        <tiny-col :span="5" label-width="100px">
-          <tiny-form-item :label="$t('userSetting.startTime')" prop="startTime">
-            <tiny-date-picker
-              v-model="state.filterOptions.startTime"
-              @blur="handleBlur"
-            ></tiny-date-picker>
-          </tiny-form-item>
-        </tiny-col>
-      </tiny-row>
-
-      <tiny-row :flex="true" justify="left">
-        <tiny-col :span="5" label-width="100px">
-          <tiny-form-item :label="$t('userSetting.endTime')" prop="endTime">
-            <tiny-date-picker
-              v-model="state.filterOptions.endTime"
-              @blur="handleBlur"
-            ></tiny-date-picker>
-          </tiny-form-item>
-        </tiny-col>
-        <tiny-col :span="5" label-width="100px">
-          <tiny-form-item :label="$t('userSetting.status')" prop="type">
-            <tiny-select
-              v-model="state.filterOptions.status"
-              :placeholder="$t('baseForm.form.label.placeholder')"
-            >
-              <tiny-option
-                v-for="item in (statusData as any)"
-                :key="item.value"
-                :label="$t(item.label)"
-                :value="item.label"
-              ></tiny-option>
-            </tiny-select>
-          </tiny-form-item>
-        </tiny-col>
-      </tiny-row>
-    </tiny-form>
-  </tiny-layout>
-</template>
-
-<script lang="ts" setup>
-import {ref, reactive, defineProps, computed, defineExpose, onMounted} from 'vue';
-  import { useI18n } from 'vue-i18n';
-  import {
-    Select as TinySelect,
-    Option as TinyOption,
-    Layout as TinyLayout,
-    Form as TinyForm,
-    FormItem as TinyFormItem,
-    Row as TinyRow,
-    Col as TinyCol,
-    Input as TinyInput,
-    DatePicker as TinyDatePicker,
-    Modal,
-  } from '@opentiny/vue';
-
-
-  const props = defineProps({
-    userData: {} as any
-  })
-
-  interface FilterOptions {
-    department: string;
-    position: Array<object>;
-    type: Array<object>;
-    date: Array<object>;
-    during: Array<object>;
-    startTime: string;
-    endTime: string;
-    name: string;
-    address: string;
-    status: number;
-  }
-
-  const projectData = [
-    {
-      value: '1',
-      label: 'Social Recruitment',
-    },
-    {
-      value: '2',
-      label: 'School Recruitment',
-    },
-    {
-      value: '3',
-      label: 'Job Transfer',
-    },
-  ];
-
-  const statusData = [
-    {
-      value: 1,
-      label: 'Active',
-    },
-    {
-      value: 2,
-      label: 'Disabled',
-    },
-  ];
-
-  // 加载效果
-  const state = reactive<{
-    filterOptions: FilterOptions;
-  }>({
-    filterOptions: {
-      name: props.userData.name,
-      address: props.userData.address,
-      department: props.userData.department,
-      position: '',
-      type: props.userData.employeeType,
-      date: [props.userData.probationStart,props.userData.probationEnd],
-      during: props.userData.probationDuration,
-      startTime: props.userData.protocolStart,
-      endTime: props.userData.protocolEnd,
-      status: '',
-    } as FilterOptions,
-  });
-
-  // 初始化请求数据
-  const setFormRef = ref();
-  const { t } = useI18n();
-
-  // 校验规则
-  const rulesType = {
-    required: true,
-    trigger: 'blur',
-  };
-  const rulesSelect = {
-    required: true,
-    message: '必选',
-    trigger: 'blur',
-  };
-  const rules = computed(() => {
-    return {
-      department: [rulesType],
-      position: [rulesType],
-      type: [rulesSelect],
-      date: [rulesType],
-      during: [rulesType],
-      startTime: [rulesType],
-      endTime: [rulesType],
-      name:[rulesType],
-      address: [rulesType],
-      status: [rulesSelect],
-    };
-  });
-
-  // 结束时间校验
-  const handleBlur = () => {
-    const start = state.filterOptions.startTime?.getTime();
-    const end = state.filterOptions.endTime?.getTime();
-    if (end < start) {
-      state.filterOptions.endTime = '';
-      Modal.message({
-        message: t('userInfo.time.message'),
-        status: 'error',
-      });
-    }
-  };
-  const setFormValid = () => {
-    let setValidate = false;
-    setFormRef.value.validate((valid: boolean) => {
-      setValidate = valid;
-    });
-
-    return setValidate;
-  };
-
-  const setReset = () => {
-    state.filterOptions = {} as FilterOptions;
-  };
-
-  const setData = () => {
-    return state;
-  };
-
-  defineExpose({
-    setData,
-    setFormValid,
-    setReset,
-  });
-</script>
-
-<style scoped lang="less">
-  :deep(.tiny-row) {
-    margin-bottom: 15px;
-  }
-</style>
diff --git a/packages/toolkits/pro/template/tinyvue/src/views/userManager/setting/index.vue b/packages/toolkits/pro/template/tinyvue/src/views/userManager/setting/index.vue
index 9a35fd85..f5757cd3 100644
--- a/packages/toolkits/pro/template/tinyvue/src/views/userManager/setting/index.vue
+++ b/packages/toolkits/pro/template/tinyvue/src/views/userManager/setting/index.vue
@@ -1,33 +1,28 @@
 <template>
   <div class="container-set">
-    <Breadcrumb :items="['menu.userManager', 'menu.userManager.setting']"/>
     <div class="general-card">
-      <div class="general-top">
-        <headtop :userData="state.userData"></headtop>
-      </div>
       <div class="general-contain">
-
         <tiny-layout>
           <tiny-form
             ref="setFormRef"
             :model="state.userData"
             :rules="rules"
-            label-width="150px"
+            label-width="80"
             :label-align="true"
             label-position="left"
             size="small"
           >
             <tiny-row :flex="true" justify="left">
               <tiny-col :span="5" label-width="100px">
-                <tiny-form-item
-                  :label="$t('userSetting.name')"
-                  prop="name"
-                >
+                <tiny-form-item :label="$t('userSetting.name')" prop="name">
                   <tiny-input v-model="state.userData.name"></tiny-input>
                 </tiny-form-item>
               </tiny-col>
               <tiny-col :span="5" label-width="100px">
-                <tiny-form-item :label="$t('userSetting.address')" prop="address">
+                <tiny-form-item
+                  :label="$t('userSetting.address')"
+                  prop="address"
+                >
                   <tiny-input v-model="state.userData.address"></tiny-input>
                 </tiny-form-item>
               </tiny-col>
@@ -43,13 +38,16 @@
                 </tiny-form-item>
               </tiny-col>
               <tiny-col :span="5" label-width="100px">
-                <tiny-form-item :label="$t('userSetting.position')" prop="roleIds">
+                <tiny-form-item
+                  :label="$t('userSetting.position')"
+                  prop="roleIds"
+                >
                   <tiny-select
                     v-model="state.userData.roleIds"
                     :placeholder="$t('baseForm.form.label.placeholder')"
                   >
                     <tiny-option
-                      v-for="item in (state.roleData as any)"
+                      v-for="item in state.roleData as any"
                       :key="item.id"
                       :label="$t(item.name)"
                       :value="item.id"
@@ -61,13 +59,16 @@
 
             <tiny-row :flex="true" justify="left">
               <tiny-col :span="5" label-width="100px">
-                <tiny-form-item :label="$t('userSetting.type')" prop="employeeType">
+                <tiny-form-item
+                  :label="$t('userSetting.type')"
+                  prop="employeeType"
+                >
                   <tiny-select
                     v-model="state.userData.employeeType"
                     :placeholder="$t('baseForm.form.label.placeholder')"
                   >
                     <tiny-option
-                      v-for="item in (projectData as any)"
+                      v-for="item in projectData as any"
                       :key="item.value"
                       :label="$t(item.label)"
                       :value="item.label"
@@ -76,7 +77,10 @@
                 </tiny-form-item>
               </tiny-col>
               <tiny-col :span="5" label-width="100px">
-                <tiny-form-item :label="$t('userSetting.date')" prop="probationDate">
+                <tiny-form-item
+                  :label="$t('userSetting.date')"
+                  prop="probationDate"
+                >
                   <tiny-date-picker
                     v-model="state.userData.probationDate"
                     unlink-panels
@@ -91,12 +95,20 @@
 
             <tiny-row :flex="true" justify="left">
               <tiny-col :span="5" label-width="100px">
-                <tiny-form-item :label="$t('userSetting.during')" prop="probationDuration">
-                  <tiny-input v-model="state.userData.probationDuration"></tiny-input>
+                <tiny-form-item
+                  :label="$t('userSetting.during')"
+                  prop="probationDuration"
+                >
+                  <tiny-input
+                    v-model="state.userData.probationDuration"
+                  ></tiny-input>
                 </tiny-form-item>
               </tiny-col>
               <tiny-col :span="5" label-width="100px">
-                <tiny-form-item :label="$t('userSetting.startTime')" prop="protocolStart">
+                <tiny-form-item
+                  :label="$t('userSetting.startTime')"
+                  prop="protocolStart"
+                >
                   <tiny-date-picker
                     v-model="state.userData.protocolStart"
                     @blur="handleBlur"
@@ -107,7 +119,10 @@
 
             <tiny-row :flex="true" justify="left">
               <tiny-col :span="5" label-width="100px">
-                <tiny-form-item :label="$t('userSetting.endTime')" prop="protocolEnd">
+                <tiny-form-item
+                  :label="$t('userSetting.endTime')"
+                  prop="protocolEnd"
+                >
                   <tiny-date-picker
                     v-model="state.userData.protocolEnd"
                     @blur="handleBlur"
@@ -121,7 +136,7 @@
                     :placeholder="$t('baseForm.form.label.placeholder')"
                   >
                     <tiny-option
-                      v-for="item in (statusData as any)"
+                      v-for="item in statusData as any"
                       :key="item.value"
                       :label="$t(item.label)"
                       :value="item.label"
@@ -139,9 +154,8 @@
             type="primary"
             native-type="submit"
             @click="handleSubmit"
-          >{{ $t('userSetting.save') }}
-          </tiny-button
-          >
+            >{{ $t('userSetting.save') }}
+          </tiny-button>
           <tiny-button @click="handleFormReset">
             {{ $t('userSetting.cancel') }}
           </tiny-button>
@@ -152,228 +166,226 @@
 </template>
 
 <script lang="ts" setup>
-import {computed, onMounted, reactive} from 'vue';
-import {useI18n} from 'vue-i18n';
-import {
-  Select as TinySelect,
-  Option as TinyOption,
-  Layout as TinyLayout,
-  Form as TinyForm,
-  FormItem as TinyFormItem,
-  Row as TinyRow,
-  Col as TinyCol,
-  Input as TinyInput,
-  DatePicker as TinyDatePicker,
-  Modal,
-  Button as TinyButton,
-} from '@opentiny/vue';
-import {getSimpleDate} from '@/utils/time';
-import {useRoute, useRouter} from 'vue-router';
-import {getAllUser, getUserInfo, updateUserInfo} from '@/api/user'
-import {getAllRole} from '@/api/role'
-
-import headtop from './components/head.vue';
-import setFrom from './components/set-from.vue';
-
-
-const route = useRoute();
-const router = useRouter();
-
-
-// 初始化请求数据
-onMounted(() => {
-  fetchData();
-  fetchRole()
-});
-
-// 加载效果
-const state = reactive<{
-  userData: any;
-  roleData: any;
-}>({
-  userData: {} as any,
-  roleData: [] as any,
-});
-
-const projectData = [
-  {
-    value: '1',
-    label: 'Social Recruitment',
-  },
-  {
-    value: '2',
-    label: 'School Recruitment',
-  },
-  {
-    value: '3',
-    label: 'Job Transfer',
-  },
-];
-
-const statusData = [
-  {
-    value: 1,
-    label: 'Active',
-  },
-  {
-    value: 2,
-    label: 'Disabled',
-  },
-];
-
-// 校验规则
-const rulesType = {
-  required: true,
-  trigger: 'blur',
-};
-const rulesSelect = {
-  required: true,
-  message: '必选',
-  trigger: 'blur',
-};
-const rules = computed(() => {
-  return {
-    department: [rulesType],
-    roleIds: [rulesSelect],
-    employeeType: [rulesSelect],
-    probationDate: [rulesSelect],
-    probationDuration: [rulesType],
-    protocolStart: [rulesSelect],
-    protocolEnd: [rulesSelect],
-    name:[rulesType],
-    address: [rulesType],
-    status: [rulesSelect],
+  import { computed, onMounted, reactive, defineProps } from 'vue';
+  import { useI18n } from 'vue-i18n';
+  import {
+    Select as TinySelect,
+    Option as TinyOption,
+    Layout as TinyLayout,
+    Form as TinyForm,
+    FormItem as TinyFormItem,
+    Row as TinyRow,
+    Col as TinyCol,
+    Input as TinyInput,
+    DatePicker as TinyDatePicker,
+    Modal,
+    Button as TinyButton,
+  } from '@opentiny/vue';
+  import { getSimpleDate } from '@/utils/time';
+  import { useRoute, useRouter } from 'vue-router';
+  import { getAllUser, getUserInfo, updateUserInfo } from '@/api/user';
+  import { getAllRole } from '@/api/role';
+
+  const route = useRoute();
+  const router = useRouter();
+
+  const props = defineProps({
+    email: String,
+  });
+
+  // 初始化请求数据
+  onMounted(() => {
+    fetchData(props.email);
+    fetchRole();
+  });
+
+  // 加载效果
+  const state = reactive<{
+    userData: any;
+    roleData: any;
+  }>({
+    userData: {} as any,
+    roleData: [] as any,
+  });
+
+  const projectData = [
+    {
+      value: '1',
+      label: 'Social Recruitment',
+    },
+    {
+      value: '2',
+      label: 'School Recruitment',
+    },
+    {
+      value: '3',
+      label: 'Job Transfer',
+    },
+  ];
+
+  const statusData = [
+    {
+      value: 1,
+      label: 'Active',
+    },
+    {
+      value: 2,
+      label: 'Disabled',
+    },
+  ];
+
+  // 校验规则
+  const rulesType = {
+    required: true,
+    trigger: 'blur',
   };
-});
-
-const {t} = useI18n();
-
-// btn操作
-function handleFormReset() {
-  router.back();
-}
-
-async function handleSubmit() {
-  let data = state.userData;
-  if(data.status === 'Active'){data.status = 1}
-  else{ data.status = 2 }
-  let newTemp = {
-    email: data.email,
-    name: data.name,
-    address: data.address,
-    department: data.department,
-    roleIds: [data.roleIds],
-    employeeType: data.employeeType,
-    probationStart: getSimpleDate(data.probationDate[0]),
-    probationEnd: getSimpleDate(data.probationDate[1]),
-    probationDuration: data.probationDuration,
-    protocolStart: getSimpleDate(data.protocolStart),
-    protocolEnd: getSimpleDate(data.protocolEnd),
-    status: data.status,
+  const rulesSelect = {
+    required: true,
+    message: '必选',
+    trigger: 'blur',
   };
+  const rules = computed(() => {
+    return {
+      department: [rulesType],
+      roleIds: [rulesSelect],
+      employeeType: [rulesSelect],
+      probationDate: [rulesSelect],
+      probationDuration: [rulesType],
+      protocolStart: [rulesSelect],
+      protocolEnd: [rulesSelect],
+      name: [rulesType],
+      address: [rulesType],
+      status: [rulesSelect],
+    };
+  });
+
+  const { t } = useI18n();
+
+  // btn操作
+  function handleFormReset() {
+    router.go(0);
+  }
 
-  try {
-    await updateUserInfo(newTemp);
-    Modal.message({
-      message: t('baseForm.form.submit.success'),
-      status: 'success',
-    });
-    handleFormReset();
-  } catch (error) {
-    if (error.response && error.response.data) {
-      const errorMessage = error.response.data.message || '未知错误';
+  async function handleSubmit() {
+    let data = state.userData;
+    if (data.status === 'Active') {
+      data.status = 1;
+    } else {
+      data.status = 2;
+    }
+    let newTemp = {
+      email: data.email,
+      name: data.name,
+      address: data.address,
+      department: data.department,
+      roleIds: [data.roleIds],
+      employeeType: data.employeeType,
+      probationStart: getSimpleDate(data.probationDate[0]),
+      probationEnd: getSimpleDate(data.probationDate[1]),
+      probationDuration: data.probationDuration,
+      protocolStart: getSimpleDate(data.protocolStart),
+      protocolEnd: getSimpleDate(data.protocolEnd),
+      status: data.status,
+    };
+
+    try {
+      await updateUserInfo(newTemp);
       Modal.message({
-        message: errorMessage[0],
-        status: 'error',
+        message: t('baseForm.form.submit.success'),
+        status: 'success',
       });
+      handleFormReset();
+    } catch (error) {
+      if (error.response && error.response.data) {
+        const errorMessage = error.response.data.message || '未知错误';
+        Modal.message({
+          message: errorMessage[0],
+          status: 'error',
+        });
+      }
     }
   }
-}
 
-async function fetchData() {
-  if (route.query.email !== undefined || null) {
-    const {data} = await getUserInfo(route.query.email);
-    if (data.status === 1) {
-      data.status = statusData[0].label
-    } else {
-      data.status = statusData[1].label
-    }
-    if(data.role !== null){
-      data.roleIds = data.role[0].id
-      data.roleName = data.role[0].name
+  async function fetchData(email: string) {
+    if (email !== undefined || null) {
+      const { data } = await getUserInfo(email);
+      if (data.status === 1) {
+        data.status = statusData[0].label;
+      } else {
+        data.status = statusData[1].label;
+      }
+      if (data.role !== null) {
+        data.roleIds = data.role[0].id;
+        data.roleName = data.role[0].name;
+      }
+      state.userData = data;
+      state.userData.probationDate = [data.probationStart, data.probationEnd];
     }
-    state.userData = data;
-    state.userData.probationDate = [data.probationStart, data.probationEnd]
   }
-}
-
-async function fetchRole(){
-  const {data} = await getAllRole();
-  state.roleData = data;
-}
 
+  async function fetchRole() {
+    const { data } = await getAllRole();
+    state.roleData = data;
+  }
 </script>
 
 <style scoped lang="less">
-.container-set {
-  display: flex;
-  flex-direction: column;
-  justify-content: space-between;
-  width: 98%;
-  height: inherit;
-  margin: 0 auto;
-
-  .general-card {
-    height: 100%;
-    padding: 10px;
-    overflow-x: hidden;
-    overflow-y: auto;
-    border-radius: 10px;
-
-    .general-top {
-      display: flex;
-      justify-content: space-around;
-      min-height: 202px;
-      margin: 0 -12px;
-      overflow: hidden;
-      background-image: url('@/assets/images/step-head.png');
-      background-size: 100% 100%;
-    }
-
-    .general-contain {
-      display: flex;
-      flex-direction: column;
-      justify-content: flex-start;
-      min-height: 75%;
-      padding: 30px 0 10px 20px;
-      color: black;
-      background-color: #fff;
+  .container-set {
+    display: flex;
+    flex-direction: column;
+    justify-content: space-between;
+    width: 98%;
+    height: inherit;
+    margin: 0 auto;
+
+    .general-card {
+      height: 100%;
+      padding: 10px;
+      overflow-x: hidden;
+      overflow-y: auto;
       border-radius: 10px;
 
-      .tiny-layout {
-        width: 80%;
+      .general-top {
+        display: flex;
+        justify-content: space-around;
+        min-height: 202px;
+        margin: 0 -12px;
+        overflow: hidden;
+        background-image: url('@/assets/images/step-head.png');
+        background-size: 100% 100%;
       }
-    }
 
-    .general-btn {
-      position: relative;
-      left: 160px;
-
-      button {
-        width: 100px;
-        height: 36px;
-        border-radius: 4px;
+      .general-contain {
+        display: flex;
+        flex-direction: column;
+        justify-content: center;
+        min-height: 75%;
+        padding: 30px 0 10px 0;
+
+        .tiny-layout {
+          width: 100%;
+          margin-left: 8%;
+        }
       }
-    }
 
-    .margin-bottom {
-      margin: 15px 0;
-    }
+      .general-btn {
+        position: relative;
+        margin: 0 auto;
 
-    .col {
-      padding: 4px 0;
-      color: #fff;
+        button {
+          width: 100px;
+          height: 36px;
+          border-radius: 4px;
+        }
+      }
+
+      //.margin-bottom {
+      //  margin: 15px 0;
+      //}
+      .col {
+        padding: 4px 0;
+        color: #fff;
+      }
     }
   }
-}
 </style>
diff --git a/packages/toolkits/pro/template/tinyvue/src/views/userManager/setting/locale/en-US.ts b/packages/toolkits/pro/template/tinyvue/src/views/userManager/setting/locale/en-US.ts
index 4d5d2626..1d2f33c2 100644
--- a/packages/toolkits/pro/template/tinyvue/src/views/userManager/setting/locale/en-US.ts
+++ b/packages/toolkits/pro/template/tinyvue/src/views/userManager/setting/locale/en-US.ts
@@ -14,4 +14,6 @@ export default {
   'userSetting.name': 'UserName',
   'userSetting.address': 'Address',
   'userSetting.status': 'Status',
+  'userInfo.modal.title.add': 'Add User',
+  'userInfo.modal.title.update': 'Update User',
 };
diff --git a/packages/toolkits/pro/template/tinyvue/src/views/userManager/useradd/index.vue b/packages/toolkits/pro/template/tinyvue/src/views/userManager/useradd/index.vue
index 27f85385..f927ddaa 100644
--- a/packages/toolkits/pro/template/tinyvue/src/views/userManager/useradd/index.vue
+++ b/packages/toolkits/pro/template/tinyvue/src/views/userManager/useradd/index.vue
@@ -1,6 +1,5 @@
 <template>
   <div class="container-set">
-    <Breadcrumb :items="['menu.userManager', 'menu.userManager.useradd']"/>
     <div class="general-card">
       <div class="general-contain">
         <tiny-layout>
@@ -8,35 +7,31 @@
             ref="setFormRef"
             :model="state.userData"
             :rules="rules"
-            label-width="150px"
+            label-width="80"
             :label-align="true"
             label-position="left"
             size="small"
           >
             <tiny-row :flex="true" justify="left">
               <tiny-col :span="5" label-width="100px">
-                <tiny-form-item
-                  :label="$t('userAdd.email')"
-                  prop="email"
-                >
+                <tiny-form-item :label="$t('userAdd.email')" prop="email">
                   <tiny-input v-model="state.userData.email"></tiny-input>
                 </tiny-form-item>
               </tiny-col>
               <tiny-col :span="5" label-width="100px">
                 <tiny-form-item :label="$t('userAdd.password')" prop="password">
-                  <tiny-input v-model="state.userData.password "
-                              type="password"
-                              show-password></tiny-input>
+                  <tiny-input
+                    v-model="state.userData.password"
+                    type="password"
+                    show-password
+                  ></tiny-input>
                 </tiny-form-item>
               </tiny-col>
             </tiny-row>
 
             <tiny-row :flex="true" justify="left">
               <tiny-col :span="5" label-width="100px">
-                <tiny-form-item
-                  :label="$t('userAdd.name')"
-                  prop="name"
-                >
+                <tiny-form-item :label="$t('userAdd.name')" prop="name">
                   <tiny-input v-model="state.userData.name"></tiny-input>
                 </tiny-form-item>
               </tiny-col>
@@ -63,7 +58,7 @@
                     :placeholder="$t('baseForm.form.label.placeholder')"
                   >
                     <tiny-option
-                      v-for="item in (state.roleData as any)"
+                      v-for="item in state.roleData as any"
                       :key="item.id"
                       :label="$t(item.name)"
                       :value="item.id"
@@ -81,7 +76,7 @@
                     :placeholder="$t('baseForm.form.label.placeholder')"
                   >
                     <tiny-option
-                      v-for="item in (projectData as any)"
+                      v-for="item in projectData as any"
                       :key="item.value"
                       :label="$t(item.label)"
                       :value="item.label"
@@ -90,7 +85,10 @@
                 </tiny-form-item>
               </tiny-col>
               <tiny-col :span="5" label-width="100px">
-                <tiny-form-item :label="$t('userAdd.date')" prop="probationDate">
+                <tiny-form-item
+                  :label="$t('userAdd.date')"
+                  prop="probationDate"
+                >
                   <tiny-date-picker
                     v-model="state.userData.probationDate"
                     unlink-panels
@@ -105,12 +103,20 @@
 
             <tiny-row :flex="true" justify="left">
               <tiny-col :span="5" label-width="100px">
-                <tiny-form-item :label="$t('userAdd.during')" prop="probationDuration">
-                  <tiny-input v-model="state.userData.probationDuration"></tiny-input>
+                <tiny-form-item
+                  :label="$t('userAdd.during')"
+                  prop="probationDuration"
+                >
+                  <tiny-input
+                    v-model="state.userData.probationDuration"
+                  ></tiny-input>
                 </tiny-form-item>
               </tiny-col>
               <tiny-col :span="5" label-width="100px">
-                <tiny-form-item :label="$t('userAdd.startTime')" prop="protocolStart">
+                <tiny-form-item
+                  :label="$t('userAdd.startTime')"
+                  prop="protocolStart"
+                >
                   <tiny-date-picker
                     v-model="state.userData.protocolStart"
                     @blur="handleBlur"
@@ -121,7 +127,10 @@
 
             <tiny-row :flex="true" justify="left">
               <tiny-col :span="5" label-width="100px">
-                <tiny-form-item :label="$t('userAdd.endTime')" prop="protocolEnd">
+                <tiny-form-item
+                  :label="$t('userAdd.endTime')"
+                  prop="protocolEnd"
+                >
                   <tiny-date-picker
                     v-model="state.userData.protocolEnd"
                     @blur="handleBlur"
@@ -135,7 +144,7 @@
                     :placeholder="$t('baseForm.form.label.placeholder')"
                   >
                     <tiny-option
-                      v-for="item in (statusData as any)"
+                      v-for="item in statusData as any"
                       :key="item.value"
                       :label="$t(item.label)"
                       :value="item.label"
@@ -153,9 +162,8 @@
             type="primary"
             native-type="submit"
             @click="handleSubmit"
-          >{{ $t('userAdd.save') }}
+            >{{ $t('userAdd.save') }}
           </tiny-button>
-
         </div>
       </div>
     </div>
@@ -163,218 +171,222 @@
 </template>
 
 <script lang="ts" setup>
-import {computed, onMounted, reactive} from 'vue';
-import {useI18n} from 'vue-i18n';
-import {
-  Select as TinySelect,
-  Option as TinyOption,
-  Layout as TinyLayout,
-  Form as TinyForm,
-  FormItem as TinyFormItem,
-  Row as TinyRow,
-  Col as TinyCol,
-  Input as TinyInput,
-  DatePicker as TinyDatePicker,
-  Modal,
-  Button as TinyButton,
-} from '@opentiny/vue';
-import {getSimpleDate} from '@/utils/time';
-import {useRoute, useRouter} from 'vue-router';
-import {getUserInfo, registerUser, updateUserInfo} from '@/api/user'
-import {getAllRole} from '@/api/role'
+  import { computed, onMounted, reactive } from 'vue';
+  import { useI18n } from 'vue-i18n';
+  import {
+    Select as TinySelect,
+    Option as TinyOption,
+    Layout as TinyLayout,
+    Form as TinyForm,
+    FormItem as TinyFormItem,
+    Row as TinyRow,
+    Col as TinyCol,
+    Input as TinyInput,
+    DatePicker as TinyDatePicker,
+    Modal,
+    Button as TinyButton,
+  } from '@opentiny/vue';
+  import { getSimpleDate } from '@/utils/time';
+  import { useRoute, useRouter } from 'vue-router';
+  import { getUserInfo, registerUser, updateUserInfo } from '@/api/user';
+  import { getAllRole } from '@/api/role';
 
+  const route = useRoute();
+  const router = useRouter();
 
-const route = useRoute();
-const router = useRouter();
+  // 初始化请求数据
+  onMounted(() => {
+    fetchRole();
+  });
 
-// 初始化请求数据
-onMounted(() => {
-  fetchRole()
-});
+  const { t } = useI18n();
 
-const {t} = useI18n();
+  // 加载效果
+  const state = reactive<{
+    userData: any;
+    roleData: any;
+  }>({
+    userData: {} as any,
+    roleData: [] as any,
+  });
 
-// 加载效果
-const state = reactive<{
-  userData: any;
-  roleData: any;
-}>({
-  userData: {} as any,
-  roleData: [] as any,
-});
+  const projectData = [
+    {
+      value: '1',
+      label: 'Social Recruitment',
+    },
+    {
+      value: '2',
+      label: 'School Recruitment',
+    },
+    {
+      value: '3',
+      label: 'Job Transfer',
+    },
+  ];
 
-const projectData = [
-  {
-    value: '1',
-    label: 'Social Recruitment',
-  },
-  {
-    value: '2',
-    label: 'School Recruitment',
-  },
-  {
-    value: '3',
-    label: 'Job Transfer',
-  },
-];
+  const statusData = [
+    {
+      value: 1,
+      label: 'Active',
+    },
+    {
+      value: 2,
+      label: 'Disabled',
+    },
+  ];
 
-const statusData = [
-  {
-    value: 1,
-    label: 'Active',
-  },
-  {
-    value: 2,
-    label: 'Disabled',
-  },
-];
+  // 校验规则
+  const rulesType = {
+    required: true,
+    trigger: 'blur',
+  };
+  const rulesSelect = {
+    required: true,
+    message: '必选',
+    trigger: 'blur',
+  };
 
-// 校验规则
-const rulesType = {
-  required: true,
-  trigger: 'blur',
-};
-const rulesSelect = {
-  required: true,
-  message: '必选',
-  trigger: 'blur',
-};
+  const rules = computed(() => {
+    return {
+      email: [rulesType],
+      password: [rulesType],
+      department: [rulesType],
+      roleIds: [rulesSelect],
+      employeeType: [rulesSelect],
+      probationDate: [rulesSelect],
+      probationDuration: [rulesType],
+      protocolStart: [rulesSelect],
+      protocolEnd: [rulesSelect],
+      name: [rulesType],
+      address: [rulesType],
+      status: [rulesSelect],
+    };
+  });
 
-const rules = computed(() => {
-  return {
-    email: [rulesType],
-    password: [rulesType],
-    department: [rulesType],
-    roleIds: [rulesSelect],
-    employeeType: [rulesSelect],
-    probationDate: [rulesSelect],
-    probationDuration: [rulesType],
-    protocolStart: [rulesSelect],
-    protocolEnd: [rulesSelect],
-    name:[rulesType],
-    address: [rulesType],
-    status: [rulesSelect],
-  };
-});
+  // btn操作
+  function handleFormReset() {
+    router.go(0);
+  }
 
-async function handleSubmit() {
-  let data = state.userData;
-  if(data.status === 'Active'){data.status = 1}
-  else{ data.status = 2 }
-  let newTemp = {
-    email: data.email,
-    password: data.password,
-    name: data.name,
-    address: data.address,
-    department: data.department,
-    roleIds: [data.roleIds],
-    employeeType: data.employeeType,
-    probationStart: getSimpleDate(data.probationDate[0]),
-    probationEnd: getSimpleDate(data.probationDate[1]),
-    probationDuration: data.probationDuration,
-    protocolStart: getSimpleDate(data.protocolStart),
-    protocolEnd: getSimpleDate(data.protocolEnd),
-    status: data.status,
-  };
+  async function handleSubmit() {
+    let data = state.userData;
+    if (data.status === 'Active') {
+      data.status = 1;
+    } else {
+      data.status = 2;
+    }
+    let newTemp = {
+      email: data.email,
+      password: data.password,
+      name: data.name,
+      address: data.address,
+      department: data.department,
+      roleIds: [data.roleIds],
+      employeeType: data.employeeType,
+      probationStart: getSimpleDate(data.probationDate[0]),
+      probationEnd: getSimpleDate(data.probationDate[1]),
+      probationDuration: data.probationDuration,
+      protocolStart: getSimpleDate(data.protocolStart),
+      protocolEnd: getSimpleDate(data.protocolEnd),
+      status: data.status,
+    };
 
-  try {
-    await registerUser(newTemp);
-    Modal.message({
-      message: t('baseForm.form.submit.success'),
-      status: 'success',
-    });
-    state.userData = {} as any;
-  } catch (error) {
-    if (error.response && error.response.data) {
-      const errorMessage = error.response.data.message || '未知错误';
+    try {
+      await registerUser(newTemp);
       Modal.message({
-        message: errorMessage[0],
-        status: 'error',
+        message: t('baseForm.form.submit.success'),
+        status: 'success',
       });
+      state.userData = {} as any;
+      handleFormReset();
+    } catch (error) {
+      if (error.response && error.response.data) {
+        const errorMessage = error.response.data.message || '未知错误';
+        Modal.message({
+          message: errorMessage[0],
+          status: 'error',
+        });
+      }
     }
   }
-}
 
-async function fetchRole(){
-  const {data} = await getAllRole();
-  state.roleData = data;
-}
-
-// 结束时间校验
-const handleBlur = () => {
-  const start = state.userData.protocolStart?.getTime();
-  const end = state.userData.protocolEnd?.getTime();
-  if (end < start) {
-    state.userData.protocolEnd = '';
-    Modal.message({
-      message: t('userInfo.time.message'),
-      status: 'error',
-    });
+  async function fetchRole() {
+    const { data } = await getAllRole();
+    state.roleData = data;
   }
-};
 
+  // 结束时间校验
+  const handleBlur = () => {
+    const start = state.userData.protocolStart?.getTime();
+    const end = state.userData.protocolEnd?.getTime();
+    if (end < start) {
+      state.userData.protocolEnd = '';
+      Modal.message({
+        message: t('userInfo.time.message'),
+        status: 'error',
+      });
+    }
+  };
 </script>
 
 <style scoped lang="less">
-.container-set {
-  display: flex;
-  flex-direction: column;
-  justify-content: space-between;
-  width: 98%;
-  height: inherit;
-  margin: 0 auto;
+  .container-set {
+    display: flex;
+    flex-direction: column;
+    justify-content: space-between;
+    width: 98%;
+    height: inherit;
+    margin: 0 auto;
 
-  .general-card {
-    height: 100%;
-    padding: 10px;
-    overflow-x: hidden;
-    overflow-y: auto;
-    border-radius: 10px;
-
-    .general-top {
-      display: flex;
-      justify-content: space-around;
-      min-height: 202px;
-      margin: 0 -12px;
-      overflow: hidden;
-      background-image: url('@/assets/images/step-head.png');
-      background-size: 100% 100%;
-    }
-
-    .general-contain {
-      display: flex;
-      flex-direction: column;
-      justify-content: flex-start;
-      min-height: 75%;
-      padding: 30px 0 10px 20px;
-      color: black;
-      background-color: #fff;
+    .general-card {
+      height: 100%;
+      padding: 10px;
+      overflow-x: hidden;
+      overflow-y: auto;
       border-radius: 10px;
 
-      .tiny-layout {
-        width: 80%;
+      .general-top {
+        display: flex;
+        justify-content: space-around;
+        min-height: 202px;
+        margin: 0 -12px;
+        overflow: hidden;
+        background-image: url('@/assets/images/step-head.png');
+        background-size: 100% 100%;
       }
-    }
 
-    .general-btn {
-      position: relative;
-      left: 160px;
+      .general-contain {
+        display: flex;
+        flex-direction: column;
+        justify-content: center;
+        min-height: 75%;
+        padding: 30px 0 10px 0;
 
-      button {
-        width: 100px;
-        height: 36px;
-        border-radius: 4px;
+        .tiny-layout {
+          width: 100%;
+          margin-left: 8%;
+        }
       }
-    }
 
-    .margin-bottom {
-      margin: 15px 0;
-    }
+      .general-btn {
+        position: relative;
+        margin: 0 auto;
+
+        button {
+          width: 100px;
+          height: 36px;
+          border-radius: 4px;
+        }
+      }
 
-    .col {
-      padding: 4px 0;
-      color: #fff;
+      //.margin-bottom {
+      //  margin: 15px 0;
+      //}
+      .col {
+        padding: 4px 0;
+        color: #fff;
+      }
     }
   }
-}
 </style>

From 567e853225fd6b5f9012aff677b52a255651edf7 Mon Sep 17 00:00:00 2001
From: fmm <1442620801@qq.com>
Date: Wed, 21 Aug 2024 20:01:45 +0800
Subject: [PATCH 2/3] =?UTF-8?q?fix:=20nest=E5=88=9D=E5=A7=8B=E5=8C=96?=
 =?UTF-8?q?=E8=8F=9C=E5=8D=95=E5=88=A0=E9=99=A4=E4=BF=AE=E6=94=B9=E7=94=A8?=
 =?UTF-8?q?=E6=88=B7=E5=92=8C=E6=B7=BB=E5=8A=A0=E7=94=A8=E6=88=B7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../server/nestJs/src/menu/init/menuData.ts   | 20 -------------------
 .../server/nestJs/src/menu/menu.service.ts    |  6 ++----
 2 files changed, 2 insertions(+), 24 deletions(-)

diff --git a/packages/toolkits/pro/template/server/nestJs/src/menu/init/menuData.ts b/packages/toolkits/pro/template/server/nestJs/src/menu/init/menuData.ts
index de5aa83d..20bab9da 100644
--- a/packages/toolkits/pro/template/server/nestJs/src/menu/init/menuData.ts
+++ b/packages/toolkits/pro/template/server/nestJs/src/menu/init/menuData.ts
@@ -299,26 +299,6 @@ export const menuData = [
     path: 'allInfo',
     locale: 'menu.userManager.info',
   },
-  {
-    name: 'AllSetting',
-    order: 1,
-    parentId: null,
-    menuType: 'admin',
-    icon: '',
-    component: 'userManager/setting/index',
-    path: 'allSetting',
-    locale: 'menu.userManager.setting',
-  },
-  {
-    name: 'UserAdd',
-    order: 1,
-    parentId: null,
-    menuType: 'admin',
-    icon: '',
-    component: 'userManager/useradd/index',
-    path: 'userAdd',
-    locale: 'menu.userManager.useradd',
-  },
   {
     name: 'MenuPage',
     order: 9,
diff --git a/packages/toolkits/pro/template/server/nestJs/src/menu/menu.service.ts b/packages/toolkits/pro/template/server/nestJs/src/menu/menu.service.ts
index 8f2a96f8..abdaf7e5 100644
--- a/packages/toolkits/pro/template/server/nestJs/src/menu/menu.service.ts
+++ b/packages/toolkits/pro/template/server/nestJs/src/menu/menu.service.ts
@@ -127,10 +127,8 @@ export class MenuService {
       menu[25].parentId = menuId[24];
       menu[27].parentId = menuId[26];
       menu[29].parentId = menuId[28];
-      menu[30].parentId = menuId[28];
-      menu[31].parentId = menuId[28];
-      menu[33].parentId = menuId[32];
-      menu[34].parentId = menuId[33];
+      menu[31].parentId = menuId[30];
+      menu[32].parentId = menuId[31];
     }
     for (const item of menu) {
       await this.menu.update(item.id, { parentId: item.parentId });

From 91383bc6a58705671db90dbe7f5bebc5918ac5e0 Mon Sep 17 00:00:00 2001
From: fmm <1442620801@qq.com>
Date: Wed, 21 Aug 2024 20:34:45 +0800
Subject: [PATCH 3/3] =?UTF-8?q?fix:=20=E6=A3=80=E8=A7=86=E6=84=8F=E8=A7=81?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../template/tinyvue/src/views/userManager/setting/index.vue   | 3 ---
 .../template/tinyvue/src/views/userManager/useradd/index.vue   | 3 ---
 2 files changed, 6 deletions(-)

diff --git a/packages/toolkits/pro/template/tinyvue/src/views/userManager/setting/index.vue b/packages/toolkits/pro/template/tinyvue/src/views/userManager/setting/index.vue
index f5757cd3..ecc26385 100644
--- a/packages/toolkits/pro/template/tinyvue/src/views/userManager/setting/index.vue
+++ b/packages/toolkits/pro/template/tinyvue/src/views/userManager/setting/index.vue
@@ -379,9 +379,6 @@
         }
       }
 
-      //.margin-bottom {
-      //  margin: 15px 0;
-      //}
       .col {
         padding: 4px 0;
         color: #fff;
diff --git a/packages/toolkits/pro/template/tinyvue/src/views/userManager/useradd/index.vue b/packages/toolkits/pro/template/tinyvue/src/views/userManager/useradd/index.vue
index f927ddaa..f5d2f29f 100644
--- a/packages/toolkits/pro/template/tinyvue/src/views/userManager/useradd/index.vue
+++ b/packages/toolkits/pro/template/tinyvue/src/views/userManager/useradd/index.vue
@@ -380,9 +380,6 @@
         }
       }
 
-      //.margin-bottom {
-      //  margin: 15px 0;
-      //}
       .col {
         padding: 4px 0;
         color: #fff;