diff --git a/src/api/models/add-sys-user-input.ts b/src/api/models/add-sys-user-input.ts
index 13bec1f..27490d2 100644
--- a/src/api/models/add-sys-user-input.ts
+++ b/src/api/models/add-sys-user-input.ts
@@ -31,6 +31,12 @@ export interface AddSysUserInput {
* @memberof AddSysUserInput
*/
name: string;
+ /**
+ * 密码
+ * @type {string}
+ * @memberof AddSysUserInput
+ */
+ password?: string;
/**
*
* @type {Gender}
diff --git a/src/views/match/coupon/index.vue b/src/views/match/coupon/index.vue
index 9218739..aeea63d 100644
--- a/src/views/match/coupon/index.vue
+++ b/src/views/match/coupon/index.vue
@@ -19,7 +19,7 @@
{{ scope.row.type == 1 ? scope.row.value + '%' : scope.row.value + '元' }}
- {{ scope.row.startTime }} - {{ scope.row.endTime }}
+ {{ formatDate(scope.row.startTime) }} - {{ formatDate(scope.row.endTime) }}
{
+ if (!dateStr) return '';
+ if (/^\d{4}-\d{2}-\d{2}$/.test(dateStr)) {
+ return dateStr;
+ }
+ // 截取前10个字符(YYYY-MM-DD)
+ return dateStr.slice(0, 10);
+};
+
// 定义表单引用类型
const formRef = ref();
const eventList = ref([]);
@@ -196,10 +207,12 @@ const onOpenMenu = async (row) => {
}
dialogTitle.value = row ? '编辑' : '新增';
if (row) {
- // const { data } = await couponEdit(row.id);
- formData.value = row;
- formData.value.time = [row.startTime.slice(0, 10), row.endTime.slice(0, 10)];
-
+ formData.value = {
+ ...row,
+ startTime: formatDate(row.startTime),
+ endTime: formatDate(row.endTime),
+ time: [formatDate(row.startTime), formatDate(row.endTime)],
+ };
} else {
formData.value = {
name: '',
diff --git a/src/views/permission/account/index.vue b/src/views/permission/account/index.vue
index 66232cd..b72f1cd 100644
--- a/src/views/permission/account/index.vue
+++ b/src/views/permission/account/index.vue
@@ -37,6 +37,16 @@
+
+
+
+
+
+
+
+
+
+
@@ -71,9 +81,24 @@ const eventList = ref([]);
const formData = ref({
name: '',
account: '',
+ password: '',
+ confirmPassword: '',
roles: []
})
const initParam = ref(true)
+
+// 确认密码验证
+const validateConfirmPassword = (rule, value, callback) => {
+ const actualValue = value ?? formData.value.confirmPassword;
+ if (!actualValue || actualValue === '') {
+ callback(new Error('请再次输入密码'));
+ } else if (actualValue !== formData.value.password) {
+ callback(new Error('两次输入密码不一致'));
+ } else {
+ callback();
+ }
+};
+
const formRules = ref({
name: [
{ required: true, message: '姓名', trigger: 'blur' }
@@ -81,6 +106,13 @@ const formRules = ref({
account: [
{ required: true, message: '请输入账号', trigger: 'blur' }
],
+ password: [
+ { required: true, message: '请输入密码', trigger: 'blur' },
+ { min: 6, max: 32, message: '密码长度在 6 到 32 个字符', trigger: 'blur' }
+ ],
+ confirmPassword: [
+ { required: true, validator: validateConfirmPassword, trigger: 'blur' }
+ ],
});
const columns = ref([
@@ -130,11 +162,12 @@ const onOpenMenu = async (row) => {
dialogTitle.value = row ? '编辑' : '新增';
if (row) {
formData.value = row;
-
} else {
formData.value = {
name: '',
account: '',
+ password: '',
+ confirmPassword: '',
roles: []
};
}