From 33dbc6a161554f3a897f9e9273feb4f2c1b47381 Mon Sep 17 00:00:00 2001
From: chenlu <1320612696@qq.com>
Date: 星期一, 15 十二月 2025 17:04:27 +0800
Subject: [PATCH] Merge branch 'master' of http://10.153.19.25:10105/r/ERP_override
---
north-glass-erp/northglass-erp/src/views/system/userLog/UserListLog.vue | 92 ++++------------------------------------------
1 files changed, 8 insertions(+), 84 deletions(-)
diff --git a/north-glass-erp/northglass-erp/src/views/system/userLog/UserListLog.vue b/north-glass-erp/northglass-erp/src/views/system/userLog/UserListLog.vue
index eb3180c..2b09a97 100644
--- a/north-glass-erp/northglass-erp/src/views/system/userLog/UserListLog.vue
+++ b/north-glass-erp/northglass-erp/src/views/system/userLog/UserListLog.vue
@@ -9,8 +9,6 @@
const { t } = useI18n()
const router = useRouter()
const route = useRoute()
-const dialogVisible = ref(false)
-const dialogVisibleProcess = ref(false)
let roleList = ref([])
//宸ュ簭
const processValue = ref()
@@ -55,9 +53,9 @@
//琛ㄥご鍙傛暟
columns:[
{type: 'seq', title: t('basicData.Number'), width: 80 ,fixed:"left"},
- {field: 'operator_id',width:120, title: t('鐧诲綍鍚�'), sortable: true, filters:[{ data: '' }],slots: { filter: 'num1_filter' },filterMethod:filterChanged},
- {field: 'operator',width:120, title: t('鐢ㄦ埛鍚�'), sortable: true, filters:[{ data: '' }],slots: { filter: 'num1_filter' },filterMethod:filterChanged},
- {field: 'format_create_time',width:160, title: t('鐧诲綍鏃堕棿'),sortable: true},
+ {field: 'operator_id',width:120, title: t('userLog.loginName'), sortable: true, filters:[{ data: '' }],slots: { filter: 'num1_filter' },filterMethod:filterChanged},
+ {field: 'operator',width:120, title: t('userLog.userName'), sortable: true, filters:[{ data: '' }],slots: { filter: 'num1_filter' },filterMethod:filterChanged},
+ {field: 'format_create_time',width:160, title: t('userLog.loginDate'),sortable: true},
],
//琛ㄥご鎸夐挳
@@ -86,31 +84,8 @@
const getTableRow = (row,type) => {
switch (type) {
- case 'edit': {
- userRole.value.roles = []
- dialogVisible.value = true
- row.userRoleList.forEach(item=>{
- userRole.value.roles.push(item.roleId)
- })
- userRole.value.userId = row.id
- break
- }
- case 'delete': {
- request.post(`/userInfo/userDelete/${row.id}`).then((res) => {
- if(res.code==200 && res.data ===true){
- ElMessage.success(t('searchOrder.msgDeleteSuccess'))
- router.push({path:'/main/user/userList',query:{random:Math.random()}})
- }else{
- ElMessage.warning(t('searchOrder.msgDeleteFail'))
- }
- })
- break
- }
- case 'editProcess': {
- dialogVisibleProcess.value = true
- processRow.value.userId = row.id
- break
- }
+
+
}
}
@@ -151,15 +126,7 @@
</div>
</template>
- <template #button_slot="{ row }">
- <el-button @click="getTableRow(row,'edit')" link type="primary" size="small">{{ $t('user.setUpRoles') }}</el-button>
- <el-button @click="getTableRow(row,'editProcess')" link type="primary" size="small">{{ $t('user.setProcess') }}</el-button>
- <el-popconfirm @confirm="getTableRow(row,'delete')" :title="$t('searchOrder.deleteConfirm')">
- <template #reference>
- <el-button link type="primary" size="small">{{ $t('basicData.delete') }}</el-button>
- </template>
- </el-popconfirm>
- </template>
+
<template #num1_filter="{ column, $panel }">
<div>
@@ -171,51 +138,8 @@
</vxe-grid>
</div>
- <el-dialog
- v-model="dialogVisible"
- :title="$t('user.roleSelection')"
- width="30%"
- :before-close="handleClose"
- >
- <span>
- <el-radio v-for="(item) in roleList"
- :label="item.id"
- v-model="userRole.roles" >
- {{item.role}}
- </el-radio>
- </span>
- <template #footer>
- <span class="dialog-footer">
- <el-button @click="dialogVisible = false">{{ $t('basicData.cancelButtonText') }}</el-button>
- <el-button type="primary" @click="roleUpdate">
- {{ $t('basicData.confirmButtonText') }}
- </el-button>
- </span>
- </template>
- </el-dialog>
- <el-dialog
- v-model="dialogVisibleProcess"
- :title="$t('user.roleSelection')"
- width="30%"
- :before-close="handleClose"
- >
- <el-select v-model="processValue" clearable :placeholder="$t('reportingWorks.selectProcess')" default-value="default_city" style="width: 120px">
- <el-option
- v-for="item in processRow['process']"
- :key="item.id"
- :label="item.basic_name"
- :value="item.basic_name"
- />
- </el-select>
- <template #footer>
- <span class="dialog-footer">
- <el-button @click="dialogVisibleProcess = false">{{ $t('basicData.cancelButtonText') }}</el-button>
- <el-button type="primary" @click="updateProcess">
- {{ $t('basicData.confirmButtonText') }}
- </el-button>
- </span>
- </template>
- </el-dialog>
+
+
</div>
</template>
--
Gitblit v1.8.0