Merge remote-tracking branch 'origin/main' into lichang

src/views/system/config/index.vue

@@ -527,6 +527,8 @@ onMounted(() => {
                 v-model:value="queryRangePicker"
                 allow-clear
                 bordered
+                :show-time="{ format: 'HH:mm:ss' }"
+                format="YYYY-MM-DD HH:mm:ss"
                 value-format="x"
                 style="width: 100%"
               ></a-range-picker>

src/views/system/dict/index.vue

@@ -527,6 +527,8 @@ onMounted(() => {
                 v-model:value="queryRangePicker"
                 allow-clear
                 bordered
+                :show-time="{ format: 'HH:mm:ss' }"
+                format="YYYY-MM-DD HH:mm:ss"
                 value-format="x"
                 style="width: 100%"
               ></a-range-picker>

src/views/system/role/index.vue

@@ -719,7 +719,11 @@ function fnGetList(pageNum?: number) {
       }
       tablePagination.total = res.total;
       tableState.data = res.rows;
-      if (tablePagination.total <=(queryParams.pageNum - 1) * tablePagination.pageSize &&queryParams.pageNum !== 1) {
+      if (
+        tablePagination.total <=
+          (queryParams.pageNum - 1) * tablePagination.pageSize &&
+        queryParams.pageNum !== 1
+      ) {
         tableState.loading = false;
         fnGetList(queryParams.pageNum - 1);
       }
@@ -791,6 +795,8 @@ onMounted(() => {
                 v-model:value="queryRangePicker"
                 allow-clear
                 bordered
+                :show-time="{ format: 'HH:mm:ss' }"
+                format="YYYY-MM-DD HH:mm:ss"
                 value-format="x"
                 style="width: 100%"
               ></a-range-picker>
@@ -1008,7 +1014,7 @@ onMounted(() => {
           </a-col>
           <a-col :lg="12" :md="12" :xs="24">
             <a-form-item
-              :label="t('views.system.role.roleId')"
+              :label="t('views.system.role.createTime')"
               name="createTime"
             >
               <span v-if="+modalState.from.createTime > 0">
@@ -1019,7 +1025,10 @@ onMounted(() => {
         </a-row>
         <a-row :gutter="16">
           <a-col :lg="12" :md="12" :xs="24">
-            <a-form-item :label="t('views.system.role.roleId')" name="roleSort">
+            <a-form-item
+              :label="t('views.system.role.roleSort')"
+              name="roleSort"
+            >
               {{ modalState.from.roleSort }}
             </a-form-item>
           </a-col>

src/views/system/user/index.vue

@@ -58,7 +58,7 @@ let queryParams = reactive({
   /**手机号 */
   phonenumber: '',
   /**部门ID */
-  deptId: '',
+  deptId: undefined,
   /**用户状态 */
   status: undefined,
   /**记录开始时间 */
@@ -76,7 +76,7 @@ function fnQueryReset() {
   queryParams = Object.assign(queryParams, {
     userName: '',
     phonenumber: '',
-    deptId: '',
+    deptId: undefined,
     status: undefined,
     beginTime: '',
     endTime: '',
@@ -434,8 +434,7 @@ function fnModalOk() {
   let validateName = ['nickName', 'email', 'phonenumber'];
   if (!modalState.from.userId) {
     validateName.push('userName', 'password');
-  }
-  console.log(validateName);
+  } 
   modalStateFrom
     .validate(validateName)
     .then(() => {
@@ -811,6 +810,7 @@ onMounted(() => {
                 tree-node-filter-prop="label"
                 style="width: 100%"
                 :dropdown-style="{ maxHeight: '400px', overflow: 'auto' }"
+                :placeholder="t('common.selectPlease')"
               >
               </a-tree-select>
             </a-form-item>
@@ -877,6 +877,8 @@ onMounted(() => {
                 v-model:value="queryRangePicker"
                 allow-clear
                 bordered
+                :show-time="{ format: 'HH:mm:ss' }"
+                format="YYYY-MM-DD HH:mm:ss"
                 value-format="x"
                 style="width: 100%"
               ></a-range-picker>
@@ -1276,6 +1278,7 @@ onMounted(() => {
                 v-model:value="modalState.from.userName"
                 allow-clear
                 :maxlength="30"
+                :placeholder="t('common.inputPlease')"
               >
                 <template #prefix>
                   <UserOutlined />
@@ -1292,6 +1295,7 @@ onMounted(() => {
               <a-input-password
                 v-model:value="modalState.from.password"
                 :maxlength="26"
+                :placeholder="t('common.inputPlease')"
               >
                 <template #prefix>
                   <LockOutlined />
@@ -1312,6 +1316,7 @@ onMounted(() => {
                 v-model:value="modalState.from.nickName"
                 allow-clear
                 :maxlength="30"
+                :placeholder="t('common.inputPlease')"
               ></a-input>
             </a-form-item>
           </a-col>
@@ -1329,6 +1334,7 @@ onMounted(() => {
                 option-label-prop="postName"
                 :options="modalState.options.posts"
                 :field-names="{ label: 'postName', value: 'postId' }"
+                :placeholder="t('common.selectPlease')"
               >
               </a-select>
             </a-form-item>
@@ -1342,11 +1348,12 @@ onMounted(() => {
               name="phonenumber"
               v-bind="modalStateFrom.validateInfos.phonenumber"
             >
-              <a-input
+              <IntlTelInput
                 v-model:value="modalState.from.phonenumber"
                 allow-clear
                 :maxlength="16"
-              ></a-input>
+                :placeholder="t('common.inputPlease')"
+              ></IntlTelInput>
             </a-form-item>
           </a-col>
           <a-col :lg="12" :md="12" :xs="24">
@@ -1359,6 +1366,7 @@ onMounted(() => {
                 v-model:value="modalState.from.email"
                 allow-clear
                 :maxlength="40"
+                :placeholder="t('common.inputPlease')"
               ></a-input>
             </a-form-item>
           </a-col>
@@ -1371,6 +1379,7 @@ onMounted(() => {
                 v-model:value="modalState.from.sex"
                 default-value="1"
                 :options="dict.sysUserSex"
+                :placeholder="t('common.selectPlease')"
               >
               </a-select>
             </a-form-item>
@@ -1381,6 +1390,7 @@ onMounted(() => {
                 v-model:value="modalState.from.status"
                 default-value="0"
                 :options="dict.sysNormalDisable"
+                :placeholder="t('common.selectPlease')"
               >
               </a-select>
             </a-form-item>
@@ -1402,6 +1412,7 @@ onMounted(() => {
             option-label-prop="roleName"
             :options="modalState.options.roles"
             :field-names="{ label: 'roleName', value: 'roleId' }"
+            :placeholder="t('common.selectPlease')"
           >
           </a-select>
         </a-form-item>
@@ -1425,6 +1436,7 @@ onMounted(() => {
             tree-node-filter-prop="label"
             style="width: 100%"
             :dropdown-style="{ maxHeight: '400px', overflow: 'auto' }"
+            :placeholder="t('common.selectPlease')"
           >
           </a-tree-select>
         </a-form-item>
@@ -1439,6 +1451,7 @@ onMounted(() => {
             :auto-size="{ minRows: 4, maxRows: 6 }"
             :maxlength="450"
             :show-count="true"
+            :placeholder="t('common.inputPlease')"
           />
         </a-form-item>
       </a-form>