luoyali 10 сар өмнө
parent
commit
4ef42b6670

+ 4 - 12
src/views/flow/form/index.vue

@@ -57,16 +57,8 @@
 				:columns="activeColumns"
 			>
 				<template #toolLeft>
-					<el-button type="primary" @click="addHandler('tableTemplate')">
-						<el-icon class="btn-icon">
-							<Plus />
-						</el-icon>
-					</el-button>
-					<el-button type="danger" :disabled="curSelectionRows.length === 0" @click="batch_del">
-						<el-icon class="btn-icon">
-							<Delete />
-						</el-icon>
-					</el-button>
+					<el-button plain :icon="Plus" @click="addHandler('tableTemplate')" type="primary">新增</el-button>
+					<el-button plain :icon="Delete" :disabled="curSelectionRows.length === 0" @click="batch_del" type="danger">删除</el-button>
 				</template>
 
 				<template #filterAvatarSlot="scope">
@@ -265,9 +257,9 @@ const leftTreeClick = data => {
 const forms = ref([
 	{
 		prop: 'name',
-		label: '名称:',
+		label: '模板名称:',
 		itemType: 'input',
-		placeholder: '请输入名称'
+		placeholder: '请输入模板名称'
 	},
 	{
 		prop: 'type',

+ 2 - 6
src/views/message/list/index.vue

@@ -13,12 +13,8 @@
 			:columns="activeColumns"
 		>
 			<template #toolLeft>
-				<el-button type="primary">全部标记已读</el-button>
-				<el-button type="danger" :disabled="curSelectionRows.length === 0" @click="batch_del">
-					<el-icon class="btn-icon">
-						<Delete />
-					</el-icon>
-				</el-button>
+				<el-button plain type="primary">全部标记已读</el-button>
+				<el-button plain :icon="Delete" :disabled="curSelectionRows.length === 0" @click="batch_del" type="danger">删除</el-button>
 			</template>
 
 			<template #categorySlot="scope">

+ 2 - 6
src/views/message/list/my.vue

@@ -14,12 +14,8 @@
 				:columns="activeColumns"
 			>
 				<template #toolLeft>
-					<el-button type="primary">全部标记已读</el-button>
-					<el-button type="danger" :disabled="curSelectionRows.length === 0" @click="batch_del">
-						<el-icon class="btn-icon">
-							<Delete />
-						</el-icon>
-					</el-button>
+					<el-button plain type="primary">全部标记已读</el-button>
+					<el-button plain :icon="Delete" :disabled="curSelectionRows.length === 0" @click="batch_del" type="danger">删除</el-button>
 				</template>
 
 				<template #categorySlot="scope">

+ 1 - 1
src/views/setting/app/index.vue

@@ -114,7 +114,7 @@ const treeRef = ref<InstanceType<typeof ElTree>>()
 // 表格搜索条件
 const forms = ref([
 	{
-		prop: 'keyword',
+		prop: 'identification',
 		label: '应用标识:',
 		itemType: 'input',
 		placeholder: '请输入应用标识'

+ 29 - 37
src/views/setting/department/index.vue

@@ -14,16 +14,8 @@
 				:columns="activeColumns"
 			>
 				<template #toolLeft>
-					<el-button type="primary" @click="addHandler">
-						<el-icon class="btn-icon">
-							<Plus />
-						</el-icon>
-					</el-button>
-					<el-button type="danger" :disabled="curSelectionRows.length === 0" @click="batch_del">
-						<el-icon class="btn-icon">
-							<Delete />
-						</el-icon>
-					</el-button>
+					<el-button plain :icon="Plus" @click="addHandler" type="primary">新增</el-button>
+					<el-button plain :icon="Delete" :disabled="curSelectionRows.length === 0" @click="batch_del" type="danger">删除</el-button>
 				</template>
 
 				<template #statusSlot="scope">
@@ -85,9 +77,9 @@ const formsDialog = ref([
 	},
 	{
 		prop: 'code',
-		label: '编码',
+		label: '部门编码',
 		itemType: 'input',
-		rules: [{ required: true, message: '请输入编码', trigger: 'blur' }]
+		rules: [{ required: true, message: '请输入部门编码', trigger: 'blur' }]
 	},
 	{
 		prop: 'sort',
@@ -97,7 +89,7 @@ const formsDialog = ref([
 	},
 	{
 		prop: 'status',
-		label: '状态',
+		label: '部门状态',
 		itemType: 'switch',
 		activeText: '正常',
 		inactiveText: '禁用'
@@ -148,7 +140,7 @@ const queryList = async () => {
 	const { options, searchParams } = tableOpts
 	options.loading = true
 	try {
-		const list = await department.departmentPageApi(searchParams)
+		const list = await department.departmentPageApi(searchParams.data || {})
 		// tableOpts.total = total
 		tableOpts.list = list
 		formsDialog.value[0].options = list
@@ -173,16 +165,16 @@ const selectionChange = e => {
 // 表格搜索条件
 const forms = ref([
 	{
-		prop: 'keyword',
+		prop: 'name',
 		label: '部门名称:',
 		itemType: 'input',
 		placeholder: '请输入部门名称'
 	},
 	{
 		prop: 'status',
-		label: '状态:',
+		label: '部门状态:',
 		itemType: 'select',
-		placeholder: '请选择状态',
+		placeholder: '请选择部门状态',
 		options: [
 			{
 				label: '禁用',
@@ -205,12 +197,11 @@ const columns = [
 	},
 	{
 		prop: 'code',
-		label: '编码',
-		minWidth: 100
+		label: '部门编码'
 	},
 	{
 		prop: 'status',
-		label: '状态',
+		label: '部门状态',
 		minWidth: 80,
 		slots: {
 			default: 'statusSlot'
@@ -226,21 +217,21 @@ const columns = [
 		label: '排序',
 		minWidth: 80
 	},
-	{
-		prop: 'updateBy',
-		label: '修改人',
-		minWidth: 100
-	},
-	{
-		prop: 'updateTime',
-		label: '修改时间',
-		minWidth: 150
-	},
-	{
-		prop: 'createBy',
-		label: '创建人',
-		minWidth: 100
-	},
+	// {
+	// 	prop: 'updateBy',
+	// 	label: '修改人',
+	// 	minWidth: 100
+	// },
+	// {
+	// 	prop: 'updateTime',
+	// 	label: '修改时间',
+	// 	minWidth: 150
+	// },
+	// {
+	// 	prop: 'createBy',
+	// 	label: '创建人',
+	// 	minWidth: 100
+	// },
 	{
 		prop: 'createTime',
 		label: '创建时间',
@@ -263,7 +254,8 @@ const { searchData, tableOpts, checkedColumns, activeColumns, updateParams } = u
 		options: {
 			showIndex: false,
 			defaultExpandAll: false,
-			onSelectionChange: selectionChange
+			onSelectionChange: selectionChange,
+			showPagination: false
 		},
 		// 需要展示的列
 		columns,
@@ -360,7 +352,7 @@ const addHandler = () => {
 }
 
 const handleStatusChange = (row: any) => {
-	// 状态 0、禁用 1、正常
+	// 部门状态 0、禁用 1、正常
 	const status = row.status
 	let text = Number(row.status) === 0 ? '禁用' : '启用'
 	ElMessageBox.confirm('请确认是否' + text + '当前数据?', '提示', { type: 'warning' })

+ 26 - 36
src/views/setting/dict/index.vue

@@ -56,16 +56,8 @@
 				:columns="activeColumns"
 			>
 				<template #toolLeft>
-					<el-button type="primary" @click="addHandler('table')">
-						<el-icon class="btn-icon">
-							<Plus />
-						</el-icon>
-					</el-button>
-					<el-button type="danger" :disabled="curSelectionRows.length === 0" @click="batch_del">
-						<el-icon class="btn-icon">
-							<Delete />
-						</el-icon>
-					</el-button>
+					<el-button plain :icon="Plus" type="primary" @click="addHandler('table')">新增</el-button>
+					<el-button plain :icon="Delete" :disabled="curSelectionRows.length === 0" type="danger" @click="batch_del">删除</el-button>
 				</template>
 
 				<template #filterAvatarSlot="scope">
@@ -120,19 +112,19 @@ const formsDialog = [
 	},
 	{
 		prop: 'name',
-		label: '名称',
+		label: '字典名称',
 		itemType: 'input',
-		rules: [{ required: true, message: '请输入名称', trigger: 'blur' }]
+		rules: [{ required: true, message: '请输入字典名称', trigger: 'blur' }]
 	},
 	{
 		prop: 'code',
-		label: '编码',
+		label: '字典编码',
 		itemType: 'input',
-		rules: [{ required: true, message: '请输入编码', trigger: 'blur' }]
+		rules: [{ required: true, message: '请输入字典编码', trigger: 'blur' }]
 	},
 	{
 		prop: 'status',
-		label: '状态',
+		label: '字典状态',
 		itemType: 'switch',
 		activeText: '正常',
 		inactiveText: '禁用'
@@ -206,21 +198,21 @@ const leftTreeClick = data => {
 const forms = ref([
 	{
 		prop: 'name',
-		label: '名称:',
+		label: '字典名称:',
 		itemType: 'input',
-		placeholder: '请输入名称'
+		placeholder: '请输入字典名称'
 	},
 	{
 		prop: 'code',
-		label: '编码:',
+		label: '字典编码:',
 		itemType: 'input',
-		placeholder: '请输入编码'
+		placeholder: '请输入字典编码'
 	},
 	{
 		prop: 'status',
-		label: '状态:',
+		label: '字典状态:',
 		itemType: 'select',
-		placeholder: '请选择状态',
+		placeholder: '请选择字典状态',
 		options: [
 			{
 				label: '禁用',
@@ -253,37 +245,35 @@ const queryList = async () => {
 const columns = [
 	{
 		prop: 'name',
-		label: '名称',
+		label: '字典名称',
 		minWidth: 80
 	},
 	{
 		prop: 'code',
-		label: '编码',
+		label: '字典编码',
 		minWidth: 100
 	},
+	{
+		prop: 'content',
+		label: '内容',
+		minWidth: 150
+	},
+	{
+		prop: 'sort',
+		label: '排序'
+	},
 	{
 		prop: 'status',
-		label: '状态',
-		minWidth: 50,
+		label: '字典状态',
 		slots: {
 			default: 'statusSlot'
 		}
 	},
-	{
-		prop: 'content',
-		label: '内容',
-		minWidth: 150
-	},
 	{
 		prop: 'remark',
 		label: '备注',
 		minWidth: 100
 	},
-	{
-		prop: 'sort',
-		label: '排序',
-		minWidth: 50
-	},
 	{
 		prop: 'action',
 		label: '操作',
@@ -403,7 +393,7 @@ const dicEdit = data => {
 }
 
 const handleStatusChange = (row: any) => {
-	// 状态 0、禁用 1、正常
+	// 字典状态 0、禁用 1、正常
 	const status = row.status
 	let text = Number(row.status) === 0 ? '禁用' : '启用'
 	ElMessageBox.confirm('请确认是否' + text + '当前数据?', '提示', { type: 'warning' })