Skip to content

Q
qr-consistency-vue3
Commit 7ed7c34f authored by Mr.Tang's avatar Mr.Tang
Browse files
Options

引用全局删除组件 修复树状图搜索bug

parent b4be2ae2
Hide whitespace changes
Inline Side-by-side
Showing with 127 additions and 107 deletions
src/locales/system/role/en.json
View file @ 7ed7c34f
{
"handleAdd": "Create New Role",
"serialNumber": "Serial Number",
"permissionCharacters": "PermissionCharacters",
"order": "order",
"permissionCharacters": "Permission Characters",
"order": "Order",
"createTime": "Create Time",
"updateTime": "Update Time",
"operation":"operation",
"operation":"Operation",
"add": "add",
"handleUpdate": "Edit",
"handleDelete": "Delete",
......
src/views/baseData/vehicleModelData/domesticModel.vue
View file @ 7ed7c34f
......@@ -631,16 +631,19 @@ const filterNode = (value, data) => {
/** 节点单击事件 */
function handleNodeClick(data) {
console.log('data', data)
//console.log('data', data)
queryParams.value.modelCode = ''
queryParams.value.modelAnnouncementNumber = ''
if (data.label === '全部') {
queryParams.value.modelCode = ''
queryParams.value.modelAnnouncementNumber = ''
handleQuery()
return
}
// 判断节点类型
if (data.children) {
// 这是type节点（父节点）
queryParams.value.type = data.label
} else {
if (data.children) {
queryParams.value.modelCode = data.label
} else {
queryParams.value.modelAnnouncementNumber = data.label
}
queryParams.value.modelAnnouncementNumber = data.label
}
handleQuery()
......
src/views/baseData/vehicleModelData/internationalModel.vue
View file @ 7ed7c34f
......@@ -616,17 +616,26 @@ const filterNode = (value, data) => {
}
function handleNodeClick(data) {
console.log('data', data)
// 重置查询参数
queryParams.value.type = ''
queryParams.value.modelCode = ''
queryParams.value.powerType = ''
// 处理"全部"节点
if (data.label === '全部') {
queryParams.value.type = ''
queryParams.value.modelCode = ''
queryParams.value.powerType = ''
handleQuery()
return
}
// 判断节点类型
if (data.children) {
// 这是type节点（父节点）
queryParams.value.type = data.label
} else {
if (data.children) {
queryParams.value.modelCode = data.label
} else {
queryParams.value.powerType = data.label
}
// 这是modelCode节点（子节点）
queryParams.value.modelCode = data.modelCode || data.label.split(' ')[0]
queryParams.value.powerType =
data.powerType || data.label.split(' ')[1] || ''
}
handleQuery()
......@@ -701,7 +710,7 @@ function getTreeList() {
label: `${item.modelCode || '未命名公告号'} ${item.powerType || ''}`,
modelCode: item.modelCode, // 保留原始字段
powerType: item.powerType, // 保留原始字段
originalData: item, // 保留原始数据
//originalData: item, // 保留原始数据
})),
}),
)
......
src/views/system/basicdata/manufacturer/index.vue
View file @ 7ed7c34f
......@@ -399,39 +399,13 @@
</div>
</template>
</el-dialog>
<el-dialog
v-model="undoDialogVisible"
title=""
align-center
style="width: 400px; height: 230px; margin-top: 300px"
:fullscreen="true"
>
<template #header>
<div>{{ cn.prompt }}</div>
<div>{{ en.prompt }}</div>
</template>
<div style="display: flex; align-items: center">
<el-icon style="color: orange; font-size: 18px; margin: 5px">
<WarningFilled />
</el-icon>
<div>
<div style="font-size: 14px">是否确认删除该数据项？</div>
<div style="font-size: 14px">
Are you sure to delete this data item?
</div>
</div>
</div>
<template #footer>
<div style="margin-top: 10px">
<el-button class="btn-B" @click="handleCancel">
{{ cn.cancel }}/{{ en.cancel }}
</el-button>
<el-button class="btn-A" @click="confirmDelete">
{{ cn.submitForm }}/{{ en.submitForm }}
</el-button>
</div>
</template>
</el-dialog>
<DeleteDialog
:visible="undoDialogVisible"
:content="`${cn.confirmDelete}`"
:english-content="`${en.confirmDelete}`"
@confirm="confirmDelete"
@cancel="handleCancel"
/>
</div>
</template>
......@@ -449,6 +423,7 @@ import { getAllFactoryName } from '@/api/system/factory'
import { formatFactories } from '@/utils/factoryFormatter'
import cn from '@/locales/system/manufacturer/cn.json'
import en from '@/locales/system/manufacturer/en.json'
import DeleteDialog from '@/components/DeleteDialog/index.vue'
const { proxy } = getCurrentInstance()
const { sys_manufacture, production_factory } = proxy.useDict(
'sys_manufacture',
......
src/views/system/role/index.vue
View file @ 7ed7c34f
......@@ -32,17 +32,16 @@
</el-select>
</el-form-item>
<el-form-item>
<el-button class="btn-A" icon="Search" @click="handleQuery"
<el-button class="btn-A" @click="handleQuery"
>{{ cn.search }}/{{ en.search }}</el-button
>
<el-button class="btn-B" icon="Refresh" @click="resetQuery"
<el-button class="btn-B" @click="resetQuery"
>{{ cn.reset }}/{{ en.reset }}</el-button
>
</el-form-item>
<el-button
v-hasPermi="['system:role:add']"
type="primary"
icon="Plus"
style="float: right; background: #0154fb"
@click="handleAdd"
>{{ cn.handleAdd }}/{{ en.handleAdd }}</el-button
......@@ -58,38 +57,62 @@
@selection-change="handleSelectionChange"
>
<!-- <el-table-column type="selection" width="55" align="center" />-->
<el-table-column label="序号" prop="roleId" width="120" align="center">
<template #header>
<div style="display: flex; flex-direction: column">
<div>{{ cn.serialNumber }}</div>
<div>{{ en.serialNumber }}</div>
</div>
</template>
</el-table-column>
<el-table-column
:label="`${cn.serialNumber}/${en.serialNumber}`"
prop="roleId"
width="120"
align="center"
/>
<el-table-column
:label="`${cn.roleName}/${en.roleName}`"
label="角色名称"
prop="roleName"
:show-overflow-tooltip="true"
width="150"
align="center"
/>
>
<template #header>
<div style="display: flex; flex-direction: column">
<div>{{ cn.roleName }}</div>
<div>{{ en.roleName }}</div>
</div>
</template>
</el-table-column>
<el-table-column
:label="`${cn.permissionCharacters}/${en.permissionCharacters}`"
label="权限字符"
prop="roleKey"
:show-overflow-tooltip="true"
width="150"
align="center"
/>
>
<template #header>
<div style="display: flex; flex-direction: column">
<div>{{ cn.permissionCharacters }}</div>
<div>{{ en.permissionCharacters }}</div>
</div>
</template>
</el-table-column>
<el-table-column
:label="`${cn.order}/${en.order}`"
label="显示顺序"
prop="roleSort"
width="100"
align="center"
/>
<el-table-column
:label="`${cn.roleState}/${en.roleState}`"
align="center"
width="150"
sortable
>
<template #header>
<div style="display: flex; flex-direction: column">
<div>{{ cn.order }}</div>
<div>{{ en.order }}</div>
</div>
</template>
</el-table-column>
<el-table-column label="角色状态" align="center" width="150" sortable>
<template #header>
<div style="display: flex; flex-direction: column">
<div>{{ cn.roleState }}</div>
<div>{{ en.roleState }}</div>
</div>
</template>
<template #default="scope">
<el-switch
v-model="scope.row.status"
......@@ -100,32 +123,50 @@
</template>
</el-table-column>
<el-table-column
:label="`${cn.createTime}/${en.createTime}`"
label="创建时间"
align="center"
prop="createTime"
width="200"
sortable
>
<template #header>
<div style="display: flex; flex-direction: column">
<div>{{ cn.createTime }}</div>
<div>{{ en.createTime }}</div>
</div>
</template>
<template #default="scope">
<span>{{ parseTime(scope.row.createTime) }}</span>
</template>
</el-table-column>
<el-table-column
:label="`${cn.updateTime}/${en.updateTime}`"
label="修改时间"
align="center"
prop="updateTime"
width="200"
sortable
>
<template #header>
<div style="display: flex; flex-direction: column">
<div>{{ cn.updateTime }}</div>
<div>{{ en.updateTime }}</div>
</div>
</template>
<template #default="scope">
<span>{{ parseTime(scope.row.updateTime) }}</span>
</template>
</el-table-column>
<el-table-column
:label="`${cn.operation}/${en.operation}`"
label="操作"
align="center"
class-name="small-padding fixed-width"
>
<template #header>
<div style="display: flex; flex-direction: column">
<div>{{ cn.operation }}</div>
<div>{{ en.operation }}</div>
</div>
</template>
<template #default="scope">
<el-tooltip
v-if="scope.row.roleId !== 1"
......@@ -134,11 +175,10 @@
>
<el-button
v-hasPermi="['system:role:edit']"
plain
type="primary"
icon="Edit"
link
style="color: #0154fb"
@click="handleUpdate(scope.row)"
>{{ cn.handleUpdate }}/{{ en.handleUpdate }}</el-button
>{{ cn.handleUpdate }}</el-button
>
</el-tooltip>
<el-tooltip
......@@ -148,26 +188,12 @@
>
<el-button
v-hasPermi="['system:role:edit']"
plain
type="primary"
icon="CircleCheck"
link
style="color: #0154fb"
@click="handleDataScope(scope.row)"
>{{ cn.assignmentsMenu }}/{{ en.assignmentsMenu }}</el-button
>{{ cn.assignmentsMenu }}</el-button
>
</el-tooltip>
<!-- <el-tooltip
v-if="scope.row.roleId !== 1"
content="分配用户"
placement="top"
>
<el-button
v-hasPermi="['system:role:edit']"
plain
type="primary"
icon="User"
@click="handleAuthUser(scope.row)"
>分配用户</el-button>
</el-tooltip>-->
<el-tooltip
v-if="scope.row.roleId !== 1"
:content="`${cn.handleDelete}/${en.handleDelete}`"
......@@ -175,11 +201,10 @@
>
<el-button
v-hasPermi="['system:role:remove']"
plain
type="danger"
icon="Delete"
link
style="color: #df5454"
@click="handleDelete(scope.row)"
>{{ cn.handleDelete }}/{{ en.handleDelete }}</el-button
>{{ cn.handleDelete }}</el-button
>
</el-tooltip>
</template>
......@@ -268,8 +293,12 @@
</el-form>
<template #footer>
<div class="dialog-footer">
<el-button class="btn-A" @click="submitForm">确 定</el-button>
<el-button class="btn-B" @click="cancel">取 消</el-button>
<el-button class="btn-A" @click="submitForm"
>{{ cn.submitForm }}/{{ en.submitForm }}</el-button
>
<el-button class="btn-B" @click="cancel"
>{{ cn.cancel }}/{{ en.cancel }}</el-button
>
</div>
</template>
</el-dialog>
......@@ -329,8 +358,12 @@
</el-form>
<template #footer>
<div class="dialog-footer">
<el-button class="btn-A" @click="submitDataScope">确 定</el-button>
<el-button class="btn-B" @click="cancelDataScope">取 消</el-button>
<el-button class="btn-A" @click="submitDataScope"
>{{ cn.submitForm }}/{{ en.submitForm }}</el-button
>
<el-button class="btn-B" @click="cancelDataScope"
>{{ cn.cancel }}/{{ en.cancel }}</el-button
>
</div>
</template>
</el-dialog>
......@@ -548,7 +581,7 @@ function handleAdd() {
reset()
getMenuTreeselect()
open.value = true
title.value = '添加角色'
title.value = '新建角色/Create New Role'
}
/** 修改角色 */
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment