diff --git a/gear-admin/src/main/resources/application.yml b/gear-admin/src/main/resources/application.yml index 7d69357..62c4ebf 100644 --- a/gear-admin/src/main/resources/application.yml +++ b/gear-admin/src/main/resources/application.yml @@ -70,7 +70,7 @@ spring: # 国际化资源文件路径 basename: i18n/messages profiles: - active: @profiles.active@ + active: prod # 文件上传 servlet: multipart: diff --git a/gear-ui3/package.json b/gear-ui3/package.json index f7a0fec..879aa38 100644 --- a/gear-ui3/package.json +++ b/gear-ui3/package.json @@ -27,6 +27,7 @@ "element-plus": "2.9.9", "file-saver": "2.0.5", "fuse.js": "6.6.2", + "i": "^0.3.7", "js-beautify": "1.14.11", "js-cookie": "3.0.5", "jsencrypt": "3.3.2", diff --git a/gear-ui3/src/views/oms/reimbursement/index.vue b/gear-ui3/src/views/oms/reimbursement/index.vue index 66441cf..fa998a2 100644 --- a/gear-ui3/src/views/oms/reimbursement/index.vue +++ b/gear-ui3/src/views/oms/reimbursement/index.vue @@ -99,7 +99,7 @@ clearable v-model="form.uploadTime" type="date" - value-format="YYYY-MM-DD" + value-format="YYYY-MM-DD HH:mm:ss" placeholder="请选择上传时间" /> diff --git a/gear-ui3/src/views/system/user/index.vue b/gear-ui3/src/views/system/user/index.vue index 1d9cde7..5e01928 100644 --- a/gear-ui3/src/views/system/user/index.vue +++ b/gear-ui3/src/views/system/user/index.vue @@ -501,6 +501,14 @@ function handleAdd() { function handleUpdate(row) { reset() const userId = row.userId || ids.value + // let userId + // if (row && row.userId) { + // userId = row.userId + // } else if (ids.value && ids.value.length > 0) { + // userId = ids.value[0] + // } else { + // return + // } getUser(userId).then(response => { form.value = response.data postOptions.value = response.data.posts @@ -509,7 +517,7 @@ function handleUpdate(row) { form.value.roleIds = response.data.roleIds open.value = true title.value = "修改用户" - form.password = "" + form.value.password = "" }) }