Merge remote-tracking branch 'origin/master'

src/components/scWorkflow/nodes/branch.vue

@@ -236,7 +236,7 @@ export default {
 			conditionList.push({
 				label: '',
 				field: '',
-				operator: '=',
+				operator: '==',
 				value: ''
 			})
 		},

src/hooks/useTablePage.ts

@@ -23,7 +23,8 @@ export const useTablePage = (tableProps: Partial<LeTableProps> = {}, config: Par
 			updateParams: () => {
 				tableOpts.searchParams = {
 					...(tableOpts.searchParams as SearchParams),
-					...searchData.value,
+					// ...searchData.value,
+					data: searchData.value,
 					// ...todo 若有更多操作 searchData 进行请求，请覆盖updateParams 方法
 					page: 1
 				}

src/styles/index.scss

@@ -148,8 +148,12 @@ div:focus {
 	display: flex;
 	height: 100%;
 	min-height: 0;
+	padding: 10px 8px 0 8px;
 	&.bgc {
-		background-color: var(--el-fill-color-lighter);
+		background-color: var(--el-bg-color-page);
+	}
+	&.no-padding {
+		padding: 0px;
 	}
 }
 .content-warp {

src/views/approve/launch/index.vue

@@ -1,99 +1,97 @@
 <template>
 	<div class="flex-column-page-wrap pageWrap">
-		<div style="padding: 10px">
-			<!-- 快捷入口 -->
-			<el-row :gutter="10" style="margin-bottom: 10px">
-				<el-col :span="6">
-					<div class="left-item-box box">
-						<div class="launch-todo" @click="jumpOtherPage('待审批')">
-							<el-row :gutter="5">
-								<el-col :span="12" class="mt-icon">
-									<LeIcon icon-class="icon-processInfo-lingdang" />
-								</el-col>
-								<el-col :span="12">
-									<div class="flex flex-v">
-										<div class="mt-title">待审批的</div>
-										<div class="mt-value">{{ countNum }}</div>
-									</div>
-								</el-col>
-							</el-row>
-						</div>
-					</div>
-				</el-col>
-				<el-col :span="18">
-					<div class="right-item-box box">
-						<el-row>
-							<el-col :span="6">
-								<div class="app-task" @click="jumpOtherPage('我的申请')">
-									<LeIcon class="app-task-icon" icon-class="icon-processInfo-tuiguangzhong" />
-									<div class="app-task-title">我申请的</div>
-								</div>
-							</el-col>
-							<el-col :span="6">
-								<div class="app-task" @click="jumpOtherPage('我收到的')">
-									<!--									<div class="app-task-icon">
-										<img style="width: 30px; height: 30px" src="@/assets/icons/processInfo/horn.svg" />
-									</div>-->
-									<LeIcon class="app-task-icon" icon-class="icon-processInfo-horn" />
-
-									<div class="app-task-title">我收到的</div>
-								</div>
-							</el-col>
-							<el-col :span="6">
-								<div class="app-task" @click="jumpOtherPage('认领任务')">
-									<LeIcon class="app-task-icon" icon-class="icon-processInfo-lingqu" />
-
-									<div class="app-task-title">认领任务</div>
-								</div>
+		<!-- 快捷入口 -->
+		<el-row :gutter="10" style="margin-bottom: 10px">
+			<el-col :span="6">
+				<div class="left-item-box box">
+					<div class="launch-todo" @click="jumpOtherPage('待审批')">
+						<el-row :gutter="5">
+							<el-col :span="12" class="mt-icon">
+								<LeIcon icon-class="icon-processInfo-lingdang" />
 							</el-col>
-							<el-col :span="6">
-								<div class="app-task" @click="jumpOtherPage('已审批')">
-									<LeIcon class="app-task-icon" icon-class="icon-processInfo-wanjie" />
-
-									<div class="app-task-title">已审批的</div>
+							<el-col :span="12">
+								<div class="flex flex-v">
+									<div class="mt-title">待审批的</div>
+									<div class="mt-value">{{ countNum }}</div>
 								</div>
 							</el-col>
 						</el-row>
 					</div>
-				</el-col>
-			</el-row>
+				</div>
+			</el-col>
+			<el-col :span="18">
+				<div class="right-item-box box">
+					<el-row>
+						<el-col :span="6">
+							<div class="app-task" @click="jumpOtherPage('我的申请')">
+								<LeIcon class="app-task-icon" icon-class="icon-processInfo-tuiguangzhong" />
+								<div class="app-task-title">我申请的</div>
+							</div>
+						</el-col>
+						<el-col :span="6">
+							<div class="app-task" @click="jumpOtherPage('我收到的')">
+								<!--									<div class="app-task-icon">
+									<img style="width: 30px; height: 30px" src="@/assets/icons/processInfo/horn.svg" />
+								</div>-->
+								<LeIcon class="app-task-icon" icon-class="icon-processInfo-horn" />
 
-			<!-- 审批列表 -->
-			<el-card class="box-card" shadow="never">
-				<el-collapse v-model="activeNames" @change="handleChange">
-					<el-collapse-item v-for="item in startList" :key="item.categoryId" :title="item.categoryName" :name="item.categoryName">
-						<template #title>
-							<div class="common_title">
-								{{ item.categoryName }}
+								<div class="app-task-title">我收到的</div>
 							</div>
-						</template>
-						<div class="task-item">
-							<div v-for="process in item.processList" :key="process.processId" style="padding: 4px">
-								<div class="card-in" @click="testEv(process)">
-									<LeIcon class="flow-icon" :icon-class="`${flowIconPrefix}${process.processIcon}`" />
-									<!--									<div class="flow-icon">
-										<img :src="getAssetsFile(process.processIcon + '.svg')" />
-									</div>-->
-									<div class="space space-vertical">
-										<div class="space-item">
-											<div class="first-edit" :title="process.processName">
-												<span>{{ process.processName }}</span>
-											</div>
-										</div>
-										<!--										<div class="space-item">
-											<div>{{ process.createTime }}</div>
-										</div>-->
-										<div class="space-item" :title="process.processKey">
-											<div>{{ process.processKey }}</div>
+						</el-col>
+						<el-col :span="6">
+							<div class="app-task" @click="jumpOtherPage('认领任务')">
+								<LeIcon class="app-task-icon" icon-class="icon-processInfo-lingqu" />
+
+								<div class="app-task-title">认领任务</div>
+							</div>
+						</el-col>
+						<el-col :span="6">
+							<div class="app-task" @click="jumpOtherPage('已审批')">
+								<LeIcon class="app-task-icon" icon-class="icon-processInfo-wanjie" />
+
+								<div class="app-task-title">已审批的</div>
+							</div>
+						</el-col>
+					</el-row>
+				</div>
+			</el-col>
+		</el-row>
+
+		<!-- 审批列表 -->
+		<el-card class="box-card" shadow="never">
+			<el-collapse v-model="activeNames" @change="handleChange">
+				<el-collapse-item v-for="item in startList" :key="item.categoryId" :title="item.categoryName" :name="item.categoryName">
+					<template #title>
+						<div class="common_title">
+							{{ item.categoryName }}
+						</div>
+					</template>
+					<div class="task-item">
+						<div v-for="process in item.processList" :key="process.processId" style="padding: 4px">
+							<div class="card-in" @click="testEv(process)">
+								<LeIcon class="flow-icon" :icon-class="`${flowIconPrefix}${process.processIcon}`" />
+								<!--									<div class="flow-icon">
+									<img :src="getAssetsFile(process.processIcon + '.svg')" />
+								</div>-->
+								<div class="space space-vertical">
+									<div class="space-item">
+										<div class="first-edit" :title="process.processName">
+											<span>{{ process.processName }}</span>
 										</div>
 									</div>
+									<!--										<div class="space-item">
+										<div>{{ process.createTime }}</div>
+									</div>-->
+									<div class="space-item" :title="process.processKey">
+										<div>{{ process.processKey }}</div>
+									</div>
 								</div>
 							</div>
 						</div>
-					</el-collapse-item>
-				</el-collapse>
-			</el-card>
-		</div>
+					</div>
+				</el-collapse-item>
+			</el-collapse>
+		</el-card>
 		<ItemDrawer v-if="drawerVisible" v-model="drawerVisible" :record="record" />
 	</div>
 </template>

src/views/configure/index.vue

@@ -238,13 +238,13 @@ const { searchData, tableOpts, checkedColumns, activeColumns, curSelectionRows,
 
 // 删除
 const deleteItem = async ids => {
-	try {
-		await app.appDeleteApi(ids)
-		updateParams()
-	} catch (e) {
-		console.log('删除失败')
-		ElMessage.error(`删除失败~`)
-	}
+	// try {
+	await app.appDeleteApi(ids)
+	updateParams()
+	// } catch (e) {
+	// 	console.log('删除失败')
+	// 	ElMessage.error(`删除失败~`)
+	// }
 }
 
 // 单个删除

src/views/dashboard/productAuth/index.vue

@@ -1,62 +1,57 @@
 <template>
-	<div class="pageWrap">
-		<div class="content-warp flex-column-page-wrap">
-			<!-- 二维码 -->
-			<div class="wechat-box flex flex-align-pack-center">
-				<img src="@/assets/images/wx.jpg" alt="" style="width: 200px; height: 200px; margin-top: 20px" />
-			</div>
+	<el-scrollbar class="dashboard-container column-page-wrap">
+		<!-- 二维码 -->
+		<div class="wechat-box flex flex-align-pack-center">
+			<img src="@/assets/images/wx.jpg" alt="" style="width: 200px; height: 200px; margin-top: 20px" />
+		</div>
 
-			<!-- 常见问题 -->
-			<div class="issues-box-tl">
-				<div class="issues-box">
-					<div class="text-center pb-5">
-						<h2 class="issue-title">常见问题</h2>
-					</div>
+		<!-- 常见问题 -->
+		<div class="issues-box-tl">
+			<div class="issues-box">
+				<div class="text-center pb-5">
+					<h2 class="issue-title">常见问题</h2>
+				</div>
 
-					<div class="text-container">
-						<el-row :gutter="15">
-							<el-col :span="12">
-								<h5 class="issues-sub">01. 商用授权如何保障？</h5>
-								<p class="issues-tip">
-									AiZuDa官方提供的付费软件享有版权保障，您可放心商用； 购买付费版软件后，我们将为您签订授权合同，提供商用授权书，保障您的商用权益；
-								</p>
-							</el-col>
-							<el-col :span="12">
-								<h5 class="issues-sub">02. 是否可以开发票？在哪里开？</h5>
-								<p class="issues-tip">可以，我们支持开具增值税电子普通发票。购买后加上述微信进行索取。</p>
-							</el-col>
-							<el-col :span="12">
-								<h5 class="issues-sub">03. 更新权是什么意思？</h5>
-								<p class="issues-tip">
-									获取授权后，您将拥有AiZuDa永久使用权，但仅拥有一年的更新权，一年以后支付订阅费继续可以享受更新技术服务。
-									例如：您在2024年2月22日，购买了一年更新权的版本，那么只要在2025年2月22日之前发布的版本，您都可以升级并免费使用，但在2025年2月22日之后发布的版本是不可以升级使用的，
-									如果需要，您可以支付订阅费
-								</p>
-							</el-col>
-						</el-row>
-					</div>
+				<div class="text-container">
+					<el-row :gutter="15">
+						<el-col :span="12">
+							<h5 class="issues-sub">01. 商用授权如何保障？</h5>
+							<p class="issues-tip">
+								AiZuDa官方提供的付费软件享有版权保障，您可放心商用； 购买付费版软件后，我们将为您签订授权合同，提供商用授权书，保障您的商用权益；
+							</p>
+						</el-col>
+						<el-col :span="12">
+							<h5 class="issues-sub">02. 是否可以开发票？在哪里开？</h5>
+							<p class="issues-tip">可以，我们支持开具增值税电子普通发票。购买后加上述微信进行索取。</p>
+						</el-col>
+						<el-col :span="12">
+							<h5 class="issues-sub">03. 更新权是什么意思？</h5>
+							<p class="issues-tip">
+								获取授权后，您将拥有AiZuDa永久使用权，但仅拥有一年的更新权，一年以后支付订阅费继续可以享受更新技术服务。
+								例如：您在2024年2月22日，购买了一年更新权的版本，那么只要在2025年2月22日之前发布的版本，您都可以升级并免费使用，但在2025年2月22日之后发布的版本是不可以升级使用的，
+								如果需要，您可以支付订阅费
+							</p>
+						</el-col>
+					</el-row>
 				</div>
 			</div>
 		</div>
-	</div>
+	</el-scrollbar>
 </template>
 
-<script setup lang="ts"></script>
 <style scoped lang="scss">
-.ApprovalList {
-}
 .text-container {
 	width: 90%;
 	margin: 0 auto;
 }
 
 .issues-box-tl {
-	background: url(@/assets/images/footer-left.png) no-repeat top left;
-	background-size: 55%;
+	//background: url(@/assets/images/footer-left.png) no-repeat top left;
+	//background-size: 55%;
 }
 .issues-box {
-	background: url(@/assets/images/footer-right.png) no-repeat bottom right;
-	background-size: 55%;
+	//background: url(@/assets/images/footer-right.png) no-repeat bottom right;
+	//background-size: 55%;
 	.text-center {
 		text-align: center;
 	}

src/views/flow/group/index.vue

@@ -74,7 +74,7 @@ const createProcessEv = () => {
 </script>
 <style scoped lang="scss">
 .group-container {
-	background-color: var(--el-bg-color);
+	background-color: var(--el-bg-color-page);
 	overflow-y: scroll;
 	padding-bottom: 15px;
 }

src/views/message/list/index.vue

@@ -1,7 +1,7 @@
 <template>
 	<div class="flex-column-page-wrap pageWrap bgc">
 		<!-- 公用搜索组件 -->
-		<LeSearchForm ref="searchForm" v-model:searchData="searchData" :forms="forms" :loading="tableOpts.options.loading"> </LeSearchForm>
+		<LeSearchForm ref="searchForm" v-model:searchData="searchData" :forms="forms" :loading="tableOpts.options.loading"></LeSearchForm>
 
 		<!--  LeTable 组件使用  -->
 		<LeTable
@@ -44,7 +44,7 @@
 			</template>
 		</LeTable>
 
-		<message-detail v-if="visibleDetail" v-model="visibleDetail" :message-id="currentId" @closed="visibleDetail = false"> </message-detail>
+		<message-detail v-if="visibleDetail" v-model="visibleDetail" :message-id="currentId" @closed="visibleDetail = false"></message-detail>
 	</div>
 </template>
 <script lang="tsx" setup>
@@ -150,14 +150,14 @@ const { searchData, tableOpts, checkedColumns, activeColumns, curSelectionRows,
 
 // 删除
 const deleteItem = async ids => {
-	try {
-		await message.messageDeleteApi(ids)
-		updateParams()
-		ElMessage.success(`删除成功~`)
-	} catch (e) {
-		console.log('删除失败')
-		ElMessage.error(`删除失败~`)
-	}
+	// try {
+	await message.messageDeleteApi(ids)
+	updateParams()
+	ElMessage.success(`删除成功~`)
+	// } catch (e) {
+	// 	console.log('删除失败')
+	// 	ElMessage.error(`删除失败~`)
+	// }
 }
 
 // 单个删除

src/views/message/list/my.vue

@@ -2,7 +2,7 @@
 	<div class="pageWrap bgc flex-column-page-wrap">
 		<div class="flex-column-page-wrap">
 			<!-- 公用搜索组件 -->
-			<LeSearchForm ref="searchForm" v-model:searchData="searchData" :forms="forms" :loading="tableOpts.options.loading"> </LeSearchForm>
+			<LeSearchForm ref="searchForm" v-model:searchData="searchData" :forms="forms" :loading="tableOpts.options.loading"></LeSearchForm>
 
 			<!--  LeTable 组件使用  -->
 			<LeTable
@@ -46,7 +46,7 @@
 			</LeTable>
 		</div>
 
-		<message-detail v-if="visibleDetail" v-model="visibleDetail" :message-id="currentId" @closed="visibleDetail = false"> </message-detail>
+		<message-detail v-if="visibleDetail" v-model="visibleDetail" :message-id="currentId" @closed="visibleDetail = false"></message-detail>
 	</div>
 </template>
 <script lang="tsx" setup>
@@ -152,14 +152,14 @@ const { searchData, tableOpts, checkedColumns, activeColumns, curSelectionRows,
 
 // 删除
 const deleteItem = async ids => {
-	try {
-		await message.messageDeleteApi(ids)
-		updateParams()
-		ElMessage.success(`删除成功~`)
-	} catch (e) {
-		console.log('删除失败')
-		ElMessage.error(`删除失败~`)
-	}
+	// try {
+	await message.messageDeleteApi(ids)
+	updateParams()
+	ElMessage.success(`删除成功~`)
+	// } catch (e) {
+	// 	console.log('删除失败')
+	// 	ElMessage.error(`删除失败~`)
+	// }
 }
 
 // 单个删除

src/views/setting/app/index.vue

@@ -1,8 +1,8 @@
 <template>
-	<div class="pageWrap">
+	<div class="pageWrap bgc">
 		<div class="content-warp flex-column-page-wrap">
 			<!-- 公用搜索组件 -->
-			<LeSearchForm ref="searchForm" v-model:searchData="searchData" :forms="forms" :loading="tableOpts.options.loading"> </LeSearchForm>
+			<LeSearchForm ref="searchForm" v-model:searchData="searchData" :forms="forms" :loading="tableOpts.options.loading"></LeSearchForm>
 
 			<!--  LeTable 组件使用  -->
 			<LeTable
@@ -136,7 +136,29 @@ const forms = ref([
 		label: '标识：',
 		itemType: 'input',
 		placeholder: '请输入标识'
-	}
+	},
+	{
+		prop: 'name',
+		label: '名称：',
+		itemType: 'input',
+		placeholder: '请输入名称'
+	},
+  {
+    prop: 'status',
+    label: '状态：',
+    itemType: 'select',
+    placeholder: '请选择状态',
+    options: [
+      {
+        label: '禁用',
+        value: 0
+      },
+      {
+        label: '正常',
+        value: 1
+      }
+    ]
+  }
 ])
 
 // table列表数据请求
@@ -239,14 +261,14 @@ const { searchData, tableOpts, checkedColumns, activeColumns, curSelectionRows,
 
 // 删除
 const deleteItem = async ids => {
-	try {
-		await app.appDeleteApi(ids)
-		ElMessage.success(`删除成功~`)
-		updateParams()
-	} catch (e) {
-		console.log('删除失败')
-		ElMessage.error(`删除失败~`)
-	}
+	// try {
+	await app.appDeleteApi(ids)
+	ElMessage.success(`删除成功~`)
+	updateParams()
+	// } catch (e) {
+	// 	console.log('删除失败')
+	// 	ElMessage.error(`删除失败~`)
+	// }
 }
 
 // 单个删除

src/views/setting/configure/index.vue

@@ -1,8 +1,8 @@
 <template>
-	<div class="pageWrap">
+	<div class="pageWrap bgc">
 		<div class="content-warp flex-column-page-wrap">
 			<!-- 公用搜索组件 -->
-			<LeSearchForm ref="searchForm" v-model:searchData="searchData" :forms="forms" :loading="tableOpts.options.loading"> </LeSearchForm>
+			<LeSearchForm ref="searchForm" v-model:searchData="searchData" :forms="forms" :loading="tableOpts.options.loading"></LeSearchForm>
 
 			<!--  LeTable 组件使用  -->
 			<LeTable
@@ -122,10 +122,16 @@ const treeRef = ref<InstanceType<typeof ElTree>>()
 // 表格搜索条件
 const forms = ref([
 	{
-		prop: 'keyword',
+		prop: 'title',
 		label: '标题：',
 		itemType: 'input',
 		placeholder: '请输入标题'
+	},
+	{
+		prop: 'keyword',
+		label: '关键字：',
+		itemType: 'input',
+		placeholder: '请输入关键字'
 	}
 ])
 
@@ -226,14 +232,14 @@ const { searchData, tableOpts, checkedColumns, activeColumns, curSelectionRows,
 
 // 删除
 const deleteItem = async ids => {
-	try {
-		await configure.configureDeleteApi(ids)
-		ElMessage.success(`删除成功~`)
-		updateParams()
-	} catch (e) {
-		console.log('删除失败')
-		ElMessage.error(`删除失败~`)
-	}
+	// try {
+	await configure.configureDeleteApi(ids)
+	ElMessage.success(`删除成功~`)
+	updateParams()
+	// } catch (e) {
+	// 	console.log('删除失败')
+	// 	ElMessage.error(`删除失败~`)
+	// }
 }
 
 // 单个删除

src/views/setting/department/index.vue

@@ -1,8 +1,8 @@
 <template>
-	<div class="pageWrap">
+	<div class="pageWrap bgc">
 		<div class="content-warp flex-column-page-wrap">
 			<!-- 公用搜索组件 -->
-			<LeSearchForm ref="searchForm" v-model:searchData="searchData" :forms="forms" :loading="tableOpts.options.loading"> </LeSearchForm>
+			<LeSearchForm ref="searchForm" v-model:searchData="searchData" :forms="forms" :loading="tableOpts.options.loading"></LeSearchForm>
 
 			<!--  LeTable 组件使用  -->
 			<LeTable
@@ -64,7 +64,7 @@
 <script lang="tsx" setup>
 import department from '@/api/system/department'
 import { computed, nextTick, ref, watch } from 'vue'
-import {ElMessage, ElMessageBox, ElTree} from 'element-plus'
+import { ElMessage, ElMessageBox, ElTree } from 'element-plus'
 import { useTablePage } from '@/hooks/useTablePage'
 import { Plus, Delete } from '@element-plus/icons-vue'
 import StatusIndicator from '@/components/StatusIndicator'
@@ -187,6 +187,22 @@ const forms = ref([
 		label: '角色名称：',
 		itemType: 'input',
 		placeholder: '请输入角色名称'
+	},
+	{
+		prop: 'status',
+		label: '状态：',
+		itemType: 'select',
+		placeholder: '请选择状态',
+		options: [
+			{
+				label: '禁用',
+				value: 0
+			},
+			{
+				label: '正常',
+				value: 1
+			}
+		]
 	}
 ])
 
@@ -273,14 +289,14 @@ const { searchData, tableOpts, checkedColumns, activeColumns, updateParams } = u
 
 // 删除
 const deleteItem = async ids => {
-	try {
-		await department.departmentDeleteApi(ids)
-    ElMessage.success(`删除成功~`)
-		updateParams()
-	} catch (e) {
-		console.log('删除失败')
-		ElMessage.error(`删除失败~`)
-	}
+	// try {
+	await department.departmentDeleteApi(ids)
+	ElMessage.success(`删除成功~`)
+	updateParams()
+	// } catch (e) {
+	// 	console.log('删除失败')
+	// 	ElMessage.error(`删除失败~`)
+	// }
 }
 
 // 单个删除
@@ -291,14 +307,14 @@ const table_del = row => {
 //批量删除
 const batch_del = () => {
 	const ids = curSelectionRows.value.map(item => item.id) // 多选数据
-  ElMessageBox.confirm('是否删除选中数据？', '提示', {
-    confirmButtonText: '确认',
-    cancelButtonText: '取消',
-    type: 'error',
-    buttonSize: 'default'
-  }).then(() => {
-    deleteItem(ids)
-  })
+	ElMessageBox.confirm('是否删除选中数据？', '提示', {
+		confirmButtonText: '确认',
+		cancelButtonText: '取消',
+		type: 'error',
+		buttonSize: 'default'
+	}).then(() => {
+		deleteItem(ids)
+	})
 }
 
 const table_edit = async row => {

src/views/setting/dict/index.vue

@@ -1,5 +1,5 @@
 <template>
-	<div class="pageWrap">
+	<div class="pageWrap bgc">
 		<el-aside style="background: #fff; margin-right: 10px" width="200px">
 			<el-container style="height: 100%">
 				<el-header>
@@ -33,12 +33,17 @@
 				</el-main>
 				<el-footer style="height: 51px">
 					<el-button type="primary" style="width: 100%" @click="addHandler('tree')">
-						<el-icon><Plus /></el-icon>字典分类</el-button
-					>
+						<el-icon>
+							<Plus />
+						</el-icon>
+						字典分类
+					</el-button>
 				</el-footer>
 			</el-container>
 		</el-aside>
 		<div class="content-warp flex-column-page-wrap">
+			<!-- 公用搜索组件 -->
+			<LeSearchForm ref="searchForm" v-model:searchData="searchData" :forms="forms" :loading="tableOpts.options.loading"></LeSearchForm>
 			<!--  LeTable 组件使用  -->
 			<LeTable
 				ref="tableRef"
@@ -203,9 +208,40 @@ const getGroup = async () => {
 
 // 左侧菜单点击
 const leftTreeClick = data => {
-	searchData.value = { ...searchData.value, data: { pid: data.id ? data.id : null } }
+	searchData.value = { ...searchData.value, pid: data.id ? data.id : null }
 }
 
+// 表格搜索条件
+const forms = ref([
+	{
+		prop: 'name',
+		label: '名称：',
+		itemType: 'input',
+		placeholder: '请输入名称'
+	},
+	{
+		prop: 'code',
+		label: '编码：',
+		itemType: 'input',
+		placeholder: '请输入编码'
+	},
+	{
+		prop: 'status',
+		label: '状态：',
+		itemType: 'select',
+		placeholder: '请选择状态',
+		options: [
+			{
+				label: '禁用',
+				value: 0
+			},
+			{
+				label: '正常',
+				value: 1
+			}
+		]
+	}
+])
 // table列表数据请求
 const queryList = async () => {
 	const { options, searchParams } = tableOpts
@@ -288,16 +324,16 @@ const { searchData, tableOpts, checkedColumns, activeColumns, curSelectionRows,
 
 // 删除
 const deleteItem = async ids => {
-	try {
-		await dict.dictDeleteApi(ids)
-		if (current_mode.value === 'tree') {
-			getGroup()
-		}
-		updateParams()
-		ElMessage.success(`删除成功~`)
-	} catch (e) {
-		ElMessage.error(`删除失败~`)
+	// try {
+	await dict.dictDeleteApi(ids)
+	if (current_mode.value === 'tree') {
+		getGroup()
 	}
+	updateParams()
+	ElMessage.success(`删除成功~`)
+	// } catch (e) {
+	// 	ElMessage.error(`删除失败~`)
+	// }
 }
 
 // 单个删除
@@ -354,11 +390,11 @@ const dictDel = (node, data) => {
 	current_mode.value = 'tree'
 	ElMessageBox.confirm(`确定删除 ${data.name} 项吗？`, '提示')
 		.then(async () => {
-			try {
-				deleteItem([data.id])
-			} catch (e) {
-				ElMessage.error(`删除失败~`)
-			}
+			// try {
+			deleteItem([data.id])
+			// } catch (e) {
+			// 	ElMessage.error(`删除失败~`)
+			// }
 		})
 		.catch(() => {})
 }

src/views/setting/menu/index.vue

@@ -1,6 +1,6 @@
 <template>
-	<div class="pageWrap">
-		<el-aside v-loading="menuLoading" width="300px" style="margin-right: 10px">
+	<div class="pageWrap bgc">
+		<el-aside v-loading="menuLoading" width="300px" style="background: #fff; margin-right: 10px">
 			<el-container style="height: 100%">
 				<header style="padding: 13px 15px; border-bottom: 1px solid var(--el-border-color-light)">
 					<el-input v-model="menuFilterText" placeholder="输入关键字进行过滤" clearable></el-input>

src/views/setting/post/index.vue

@@ -1,5 +1,5 @@
 <template>
-	<div class="pageWrap">
+	<div class="pageWrap bgc">
 		<div class="content-warp flex-column-page-wrap">
 			<!-- 公用搜索组件 -->
 			<LeSearchForm ref="searchForm" v-model:searchData="searchData" :forms="forms" :loading="tableOpts.options.loading"> </LeSearchForm>
@@ -126,6 +126,28 @@ const forms = ref([
 		label: '岗位名称：',
 		itemType: 'input',
 		placeholder: '请输入岗位名称'
+	},
+	{
+		prop: 'code',
+		label: '编码：',
+		itemType: 'input',
+		placeholder: '请输入编码'
+	},
+	{
+		prop: 'status',
+		label: '状态：',
+		itemType: 'select',
+		placeholder: '请选择状态',
+		options: [
+			{
+				label: '禁用',
+				value: 0
+			},
+			{
+				label: '正常',
+				value: 1
+			}
+		]
 	}
 ])
 
@@ -231,14 +253,14 @@ const { searchData, tableOpts, checkedColumns, activeColumns, curSelectionRows,
 
 // 删除
 const deleteItem = async ids => {
-	try {
-		await post.postDeleteApi(ids)
-		ElMessage.error(`删除成功~`)
-		updateParams()
-	} catch (e) {
-		console.log('删除失败')
-		ElMessage.error(`删除失败~`)
-	}
+	// try {
+	await post.postDeleteApi(ids)
+	ElMessage.error(`删除成功~`)
+	updateParams()
+	// } catch (e) {
+	// 	console.log('删除失败')
+	// 	ElMessage.error(`删除失败~`)
+	// }
 }
 
 // 单个删除

src/views/setting/region/index.vue

@@ -1,8 +1,8 @@
 <template>
-	<div class="pageWrap">
+	<div class="pageWrap bgc">
 		<div class="content-warp flex-column-page-wrap">
 			<!-- 公用搜索组件 -->
-			<LeSearchForm ref="searchForm" v-model:searchData="searchData" :forms="forms" :loading="tableOpts.options.loading"> </LeSearchForm>
+			<LeSearchForm ref="searchForm" v-model:searchData="searchData" :forms="forms" :loading="tableOpts.options.loading"></LeSearchForm>
 
 			<!--  LeTable 组件使用  -->
 			<LeTable
@@ -247,14 +247,14 @@ const { searchData, tableOpts, checkedColumns, activeColumns, updateParams } = u
 
 // 删除
 const deleteItem = async ids => {
-	try {
-		await region.regionDeleteApi(ids)
-		ElMessage.success(`删除成功~`)
-		updateParams()
-	} catch (e) {
-		console.log('删除失败')
-		ElMessage.error(`删除失败~`)
-	}
+	// try {
+	await region.regionDeleteApi(ids)
+	ElMessage.success(`删除成功~`)
+	updateParams()
+	// } catch (e) {
+	// 	console.log('删除失败')
+	// 	ElMessage.error(`删除失败~`)
+	// }
 }
 
 // 单个删除

src/views/setting/role/index.vue

@@ -1,8 +1,8 @@
 <template>
-	<div class="pageWrap">
+	<div class="pageWrap bgc">
 		<div class="content-warp flex-column-page-wrap">
 			<!-- 公用搜索组件 -->
-			<LeSearchForm ref="searchForm" v-model:searchData="searchData" :forms="forms" :loading="tableOpts.options.loading"> </LeSearchForm>
+			<LeSearchForm ref="searchForm" v-model:searchData="searchData" :forms="forms" :loading="tableOpts.options.loading"></LeSearchForm>
 
 			<!--  LeTable 组件使用  -->
 			<LeTable
@@ -25,8 +25,8 @@
 						</el-icon>
 					</el-button>
 					<el-button type="primary" plain :disabled="!curSelectionRows.length || curSelectionRows.length !== 1" @click="visiblePermission = true"
-						>权限设置</el-button
-					>
+						>权限设置
+					</el-button>
 				</template>
 
 				<template #statusSlot="scope">
@@ -140,6 +140,22 @@ const forms = ref([
 		label: '角色名称：',
 		itemType: 'input',
 		placeholder: '请输入角色名称'
+	},
+	{
+		prop: 'status',
+		label: '状态：',
+		itemType: 'select',
+		placeholder: '请选择状态',
+		options: [
+			{
+				label: '禁用',
+				value: 0
+			},
+			{
+				label: '正常',
+				value: 1
+			}
+		]
 	}
 ])
 
@@ -242,14 +258,14 @@ const { searchData, tableOpts, checkedColumns, activeColumns, curSelectionRows,
 
 // 删除
 const deleteItem = async ids => {
-	try {
-		await role.roleDeleteApi(ids)
-		ElMessage.success(`删除成功~`)
-		updateParams()
-	} catch (e) {
-		console.log('删除失败')
-		ElMessage.error(`删除失败~`)
-	}
+	// try {
+	await role.roleDeleteApi(ids)
+	ElMessage.success(`删除成功~`)
+	updateParams()
+	// } catch (e) {
+	// 	console.log('删除失败')
+	// 	ElMessage.error(`删除失败~`)
+	// }
 }
 
 // 单个删除

src/views/setting/user/index.vue

@@ -1,6 +1,6 @@
 <template>
-	<div class="pageWrap">
-		<el-aside style="margin-right: 10px" width="200px">
+	<div class="pageWrap bgc">
+		<el-aside style="background: #fff; margin-right: 10px" width="200px">
 			<el-container>
 				<el-header>
 					<el-input v-model="groupFilterText" placeholder="输入关键字进行过滤" clearable style="margin-top: 10px" />
@@ -25,7 +25,7 @@
 		<!--		<el-divider direction="vertical" style="height: 100%" />-->
 		<div class="content-warp flex-column-page-wrap">
 			<!-- 公用搜索组件 -->
-			<LeSearchForm ref="searchForm" v-model:searchData="searchData" :forms="forms" :loading="tableOpts.options.loading"> </LeSearchForm>
+			<LeSearchForm ref="searchForm" v-model:searchData="searchData" :forms="forms" :loading="tableOpts.options.loading"></LeSearchForm>
 
 			<!--  LeTable 组件使用  -->
 			<LeTable
@@ -47,7 +47,7 @@
 							<Delete />
 						</el-icon>
 					</el-button>
-					<el-button plain :disabled="curSelectionRows.length === 0" @click="chooseThing('role')"> 分配角色 </el-button>
+					<el-button plain :disabled="curSelectionRows.length === 0" @click="chooseThing('role')"> 分配角色</el-button>
 					<el-button plain :disabled="curSelectionRows.length === 0" @click="chooseThing('department')"> 分配部门 </el-button>
 					<el-button plain :disabled="curSelectionRows.length === 0" @click="resetPwdVisibile = true"> 密码重置 </el-button>
 				</template>
@@ -264,7 +264,8 @@ const getDepartmentsList = async () => {
 const roleClick = data => {
 	console.log(data.id, 'data.id')
 	// 修改search参数 watch 变更 自动刷新 列表
-	searchData.value = { ...searchData.value, data: { roleId: data.id ? data.id : null } }
+	// searchData.value = { ...searchData.value, data: { roleId: data.id ? data.id : null } }
+	searchData.value = { ...searchData.value, roleId: data.id || null }
 }
 
 // 表格搜索条件
@@ -274,6 +275,22 @@ const forms = ref([
 		label: '账号/姓名：',
 		itemType: 'input',
 		placeholder: '请输入登录账号 / 姓名'
+	},
+	{
+		prop: 'status',
+		label: '状态：',
+		itemType: 'select',
+		placeholder: '请选择状态',
+		options: [
+			{
+				label: '禁用',
+				value: 0
+			},
+			{
+				label: '正常',
+				value: 1
+			}
+		]
 	}
 ])
 
@@ -385,14 +402,14 @@ const { searchData, tableOpts, checkedColumns, activeColumns, curSelectionRows,
 
 // 删除
 const deleteItem = async ids => {
-	try {
-		await user.userDeleteApi(ids)
-		ElMessage.success(`删除成功~`)
-		updateParams()
-	} catch (e) {
-		console.log('删除失败')
-		ElMessage.error(`删除失败~`)
-	}
+	// try {
+	await user.userDeleteApi(ids)
+	ElMessage.success(`删除成功~`)
+	updateParams()
+	// } catch (e) {
+	// 	console.log('删除失败')
+	// 	ElMessage.error(`删除失败~`)
+	// }
 }
 
 // 单个删除