From b21afc26b596a5a7cb77b36cd96f6e0df91637eb Mon Sep 17 00:00:00 2001
From: yuan <123@>
Date: 星期三, 26 八月 2026 14:21:41 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev_天津_建诚恒商贸' into dev_天津_建诚恒商贸
---
src/views/system/role/index.vue | 17 ++++++++++-------
1 files changed, 10 insertions(+), 7 deletions(-)
diff --git a/src/views/system/role/index.vue b/src/views/system/role/index.vue
index 0a52f44..706504c 100644
--- a/src/views/system/role/index.vue
+++ b/src/views/system/role/index.vue
@@ -108,11 +108,11 @@
></el-switch>
</template>
</el-table-column>
- <el-table-column label="鍒涘缓鏃堕棿" align="center" prop="createTime">
- <template #default="scope">
- <span>{{ parseTime(scope.row.createTime) }}</span>
- </template>
- </el-table-column>
+<el-table-column label="鍒涘缓鏃堕棿" align="center" prop="createTime">
+ <template #default="scope">
+ <span>{{ parseTime(scope.row.createTime, '{y}-{m}-{d}') }}</span>
+ </template>
+ </el-table-column>
<el-table-column label="鎿嶄綔" align="center" class-name="small-padding fixed-width">
<template #default="scope">
<el-tooltip content="淇敼" placement="top" v-if="scope.row.roleId !== 1">
@@ -244,6 +244,7 @@
<script setup name="Role">
import { addRole, changeRoleStatus, dataScope, delRole, getRole, listRole, updateRole, deptTreeSelect } from "@/api/system/role"
import { roleMenuTreeselect, treeselect as menuTreeselect } from "@/api/system/menu"
+import {onMounted} from "vue";
const router = useRouter()
const { proxy } = getCurrentInstance()
@@ -272,7 +273,7 @@
/** 鏁版嵁鑼冨洿閫夐」*/
const dataScopeOptions = ref([
{ value: "1", label: "鍏ㄩ儴鏁版嵁鏉冮檺" },
- { value: "2", label: "鑷畾鏁版嵁鏉冮檺" },
+ // { value: "2", label: "鑷畾鏁版嵁鏉冮檺" },
{ value: "3", label: "鏈儴闂ㄦ暟鎹潈闄�" },
{ value: "4", label: "鏈儴闂ㄥ強浠ヤ笅鏁版嵁鏉冮檺" },
{ value: "5", label: "浠呮湰浜烘暟鎹潈闄�" }
@@ -580,5 +581,7 @@
reset()
}
-getList()
+onMounted(() => {
+ getList();
+});
</script>
--
Gitblit v1.9.3